Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/api/model/hfnf.js

@@ -6,8 +6,8 @@ export default {
             name: "列表",
             req: async function(data){
                 return await http.post(
-                    // `${config.HOST_URL}/hfnf_api/mplogx/`,
+                    `${config.HOST_URL}/hfnf_api/mplogx/`,
-                    "http://10.0.11.52:5800/mplogx/",
+                    // "http://10.0.11.52:5800/mplogx/",
                     data
                 );
             }

src/components/scTable/index.vue

@@ -10,9 +10,9 @@
 <template>
   <div class="scTable" :style="{ height: _height }" ref="scTableMain" v-loading="loading">
     <div class="scTable-table" :style="{ height: _table_height }">
-      <el-table v-bind="$attrs" :data="tableData" :row-key="rowKey" :key="toggleIndex" ref="scTable"
+      <el-table v-bind="$attrs" :data="tableData" :row-key="rowKey || undefined" :key="toggleIndex" ref="scTable"
         :height="height == 'auto' ? null : '100%'" :size="config.size" :border="config.border" :stripe="config.stripe"
-        :summary-method="remoteSummary ? remoteSummaryMethod : summaryMethod" :expand-row-keys="expandRowKeys" @sort-change="sortChange"
+        :summary-method="remoteSummary ? remoteSummaryMethod : summaryMethod" :expand-row-keys="rowKey ? expandRowKeys : undefined" @sort-change="sortChange"
         @filter-change="filterChange" @selection-change="selectionChange">
         <slot></slot>
         <template v-for="(item, index) in userColumn" :key="index">

src/views/fac_cal/hfnf_index.vue

@@ -4,7 +4,7 @@
         <div class="summary-banner">
             <div class="banner-left">
                 <div class="banner-icon">
-                    <el-icon :size="40"><DataAnalysis /></el-icon>
+                    <img src="/media/logo2.png" class="banner-logo" />
                 </div>
                 <div class="banner-info">
                     <h2>水泥生产数据采集总览</h2>
@@ -389,6 +389,12 @@ onBeforeUnmount(() => {
     justify-content: center;
 }
 
+.banner-logo {
+    width: 40px;
+    height: 40px;
+    object-fit: contain;
+}
+
 .banner-info h2 {
     margin: 0 0 4px 0;
     font-size: 22px;

src/views/hrm/empcontract.vue

@@ -29,7 +29,7 @@
     </el-main>
   </el-container>
   <el-drawer title="劳动合同变更" v-model="drawerVisible" :size="'80%'" destroy-on-close>
-    <empcontract_form :mode="mode" :t_id="t_id"></empcontract_form>
+    <empcontract_form :mode="mode" :t_id="t_id" @success="handleSuccess"></empcontract_form>
   </el-drawer>
 </template>
 <script setup>
@@ -41,7 +41,9 @@ import { actStateEnum } from "@/utils/enum.js"
 const drawerVisible = ref(false)
 const mode = ref('add')
 const t_id = ref(null)
+const table = ref(null)
 const handleAdd = () => { mode.value = 'add'; t_id.value = null; drawerVisible.value = true; }
+const handleSuccess = () => { drawerVisible.value = false; table.value.refresh(); }
 const exportCols = [
   { header: "部门", key: "dept_need_name", wch: 15 },
   { header: "员工姓名", key: "employee_name", wch: 10 },