From fd8e27022e7435a9ee679c8fc9d0b8c0ee13182a Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 23 Aug 2024 09:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5565=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=A4=87=E6=B3=A8=E6=94=B9=E4=B8=BA=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=8D=95=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts | 2 +-
 .../scrap/scrapRecordMain/scrapRecordMain.data.ts              | 2 +-
 .../wms/inventoryjobManage/scrap/scrapRequestMain/index.vue    | 3 +++
 .../scrap/scrapRequestMain/scrapRequestMain.data.ts            | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index b6f29dca9..032f68823 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -354,7 +354,7 @@ export const ScrapJobMain = useCrudSchemas(
       }
     },
     {
-      label: '备注',
+      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 b5da4fca0..833d98069 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -357,7 +357,7 @@ export const ScrapRecordMain = useCrudSchemas(
       }
     },
     {
-      label: '备注',
+      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 b09097359..50518741e 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -190,6 +190,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       console.log("报废出库主表")
       const setV = {}
       if (formField == 'q1Number') {
+        setV['remark'] = val[0]['desc']
         ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
           if (item.field == 'q2Number' || item.field == 'q3Number') {
             item.componentProps.enterSearch = false
@@ -199,6 +200,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         })
       }
       if (formField == 'q2Number') {
+        setV['remark'] = val[0]['desc']
         ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
           if (item.field == 'q1Number' || item.field == 'q3Number') {
             item.componentProps.enterSearch = false
@@ -208,6 +210,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         })
       }
       if (formField == 'q3Number') {
+        setV['remark'] = val[0]['desc']
         ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
           if (item.field == 'q1Number' || item.field == 'q2Number') {
             item.componentProps.enterSearch = false
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 2aed0a8b8..8960f82cc 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -617,7 +617,7 @@ export const ScrapRequestMain = useCrudSchemas(
       }
     },
     {
-      label: '备注',
+      label: '通知单描述',
       field: 'remark',
       sort: 'custom',
       isTable: false,