From 2920c471657eeb251199f0770ef7c839e627943b Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 22 Jul 2024 17:14:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E5=A4=87=E6=B3=A8bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../onlinesettlement/onlinesettlementRecordMain/index.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
index d5d90e77b..b4f8a8d89 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
+++ b/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")
 }
 
 /** 导出按钮操作 */

From 274cd7b971d0b6ea1e0540661a19a5c6d857f493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Mon, 22 Jul 2024 17:15:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/inspectionJob/inspectionJobMain.data.ts     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
index ea0fa697d..093592ed4 100644
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/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',