From 6284448b12e8a881b1426770b79b4b4ad0a89fe0 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 27 Aug 2024 08:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5565=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=80=9A=E7=9F=A5=E5=8D=95=E6=8F=8F=E8=BF=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrap/scrapJobMain/scrapJobMain.data.ts          |  8 ++++++++
 .../scrap/scrapRecordMain/scrapRecordMain.data.ts    |  8 ++++++++
 .../scrap/scrapRequestMain/index.vue                 | 12 ++++++------
 .../scrap/scrapRequestMain/scrapRequestMain.data.ts  |  8 ++++++++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index 032f68823..eb2d25e55 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -355,6 +355,14 @@ export const ScrapJobMain = useCrudSchemas(
     },
     {
       label: '通知单描述',
+      field: 'noticeRemark',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '备注',
       field: 'remark',
       sort: 'custom',
       table: {
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 833d98069..c16321c8e 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -358,6 +358,14 @@ export const ScrapRecordMain = useCrudSchemas(
     },
     {
       label: '通知单描述',
+      field: 'noticeRemark',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '备注',
       field: 'remark',
       sort: 'custom',
       table: {
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 174db20e9..1220f6e91 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -190,7 +190,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       console.log("报废出库主表")
       const setV = {}
       if (formField == 'q1Number') {
-        setV['remark'] = val[0]['desc']
+        setV['noticeRemark'] = val[0]['desc']
         ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
           if (item.field == 'q2Number' || item.field == 'q3Number') {
             item.componentProps.enterSearch = false
@@ -200,7 +200,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         })
       }
       if (formField == 'q2Number') {
-        setV['remark'] = val[0]['desc']
+        setV['noticeRemark'] = val[0]['desc']
         ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
           if (item.field == 'q1Number' || item.field == 'q3Number') {
             item.componentProps.enterSearch = false
@@ -210,7 +210,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         })
       }
       if (formField == 'q3Number') {
-        setV['remark'] = val[0]['desc']
+        setV['noticeRemark'] = val[0]['desc']
         ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
           if (item.field == 'q1Number' || item.field == 'q2Number') {
             item.componentProps.enterSearch = false
@@ -249,7 +249,7 @@ const clearSearchInput = (field) => {
       }
     })
     formRef.value.formRef.setValues({
-      remark:''
+      noticeRemark:''
     })
   }
   if (field == 'q2Number') {
@@ -261,7 +261,7 @@ const clearSearchInput = (field) => {
       }
     })
     formRef.value.formRef.setValues({
-      remark:''
+      noticeRemark:''
     })
   }
   if (field == 'q3Number') {
@@ -273,7 +273,7 @@ const clearSearchInput = (field) => {
       }
     })
     formRef.value.formRef.setValues({
-      remark:''
+      noticeRemark:''
     })
   }
 }
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 4e9cd950e..39c29353d 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -618,6 +618,14 @@ export const ScrapRequestMain = useCrudSchemas(
     },
     {
       label: '通知单描述',
+      field: 'noticeRemark',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '备注',
       field: 'remark',
       sort: 'custom',
       table: {