缺陷：HL-5565增加通知单描述字段

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: {

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: {

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:''
     })
   }
 }

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: {