Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/qms/inspectionJob/inspectionJobMain.data.ts

@@ -560,6 +560,18 @@ export const InspectionJobMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.JOB_STATUS,
+      dictClass: 'string',
+      isForm: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
     {
       label: '创建时间',
       field: 'createTime',
@@ -624,6 +636,7 @@ export const InspectionJobMain = useCrudSchemas(
         width: 150
       }
     },
+
     {
       label: '操作',
       field: 'action',

src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue

@@ -139,7 +139,7 @@ const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
   if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
-  detailRef.value.openDetail(row, titleName, titleValue)
+  detailRef.value.openDetail(row, titleName, titleValue,"recordOnlinesettlementMain")
 }
 
 /** 导出按钮操作 */