From e6e005a49e8f644cab0c0eec738c290802a6cb3a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 20 Sep 2024 15:03:07 +0800
Subject: [PATCH] =?UTF-8?q?HL-5987=E9=83=A8=E9=97=A8=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E3=80=81=E6=89=BF=E6=8E=A5=E4=BA=BA=E3=80=81=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=BA=BA=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrap/scrapJobMain/scrapJobMain.data.ts   | 20 +++++++++----------
 .../scrapRecordMain/scrapRecordMain.data.ts   | 16 +++++++--------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index 38ceaab30..5c91579a9 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -400,14 +400,14 @@ export const ScrapJobMain = useCrudSchemas(
         width: 150
       }
     },
-    {
-      label: '部门',
-      field: 'departmentCode',
-      sort: 'custom',
-      table: {
-        width: 150
-      }
-    },
+    // {
+    //   label: '部门',
+    //   field: 'departmentCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   }
+    // },
     {
       label: '通知单描述',
       field: 'noticeRemark',
@@ -642,7 +642,7 @@ export const ScrapJobMain = useCrudSchemas(
     },
     {
       label: '承接人',
-      field: 'acceptUserId',
+      field: 'acceptUserName',
       sort: 'custom',
       table: {
         width: 150
@@ -670,7 +670,7 @@ export const ScrapJobMain = useCrudSchemas(
     },
     {
       label: '完成人',
-      field: 'completeUserId',
+      field: 'completeUserName',
       sort: 'custom',
       table: {
         width: 150
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 69cbd2449..c7d9d4b39 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -381,14 +381,14 @@ export const ScrapRecordMain = useCrudSchemas(
         width: 150
       }
     },
-    {
-      label: '部门',
-      field: 'departmentCode',
-      sort: 'custom',
-      table: {
-        width: 150
-      }
-    },
+    // {
+    //   label: '部门',
+    //   field: 'departmentCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   }
+    // },
     // {
     //   label: '接口类型',
     //   field: 'interfaceType',