Merge branch 'master' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP

src/views/pro/traceability/components/traceabilityCom.vue

@@ -95,8 +95,8 @@ option.value = Object.assign(option.value, {
       search: false,
     },
     {
-      label: "工时",
-      prop: "standardWorktime",
+      label: "工时(秒)",
+      prop: "totalTime",
       search: false,
     },
     {

src/views/pro/traceability/index.vue

@@ -10,6 +10,7 @@
           :option="option"
           v-model:page="page"
           @cell-click="handleCellClick"
+          @search-change="searchChange"
         >
           <template #seqNo="{ row }">
             <el-tag :type="chooseTagType(row.seqNo, 'css')">{{
@@ -150,7 +151,7 @@ const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
     src: "/api/v1/process/web/traceability",
   });
 
-const { dataList, createRow, updateRow, deleteRow } = Methords; //增删改查
+const { dataList, createRow, updateRow, deleteRow, searchChange } = Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm } = Utils; //按钮权限等工具