From 2357112a08634662fbbb3c660c7697f58fbf4240 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 14 Oct 2024 13:22:05 +0800
Subject: [PATCH] =?UTF-8?q?HL-6187=E4=BB=BB=E5=8A=A1=E5=92=8C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrap/scrapJobMain/scrapJobMain.data.ts   | 55 +++++++++++++------
 .../scrapRecordMain/scrapRecordMain.data.ts   | 55 +++++++++++++------
 2 files changed, 74 insertions(+), 36 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index 5c91579a9..b711a2a2b 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -186,24 +186,24 @@ export const ScrapJobMain = useCrudSchemas(
       isForm:false,
       isTableForm:false,
     },
-    {
-      label: '出库原因',
-      field: 'outboundReason',
-      dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
-      dictClass: 'string',
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          filterable: true
-        }
-      },
-      tableForm: {
-        type: 'Select',
-        filterable: true
-      }
-    },
+    // {
+    //   label: '出库原因',
+    //   field: 'outboundReason',
+    //   dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
+    //   dictClass: 'string',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     componentProps: {
+    //       filterable: true
+    //     }
+    //   },
+    //   tableForm: {
+    //     type: 'Select',
+    //     filterable: true
+    //   }
+    // },
     {
       label: 'Q1通知单号',
       field: 'q1Number',
@@ -922,6 +922,25 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '报废原因',
     field: 'reason',
+    dictType: DICT_TYPE.SCRAP_REASON,
+    dictClass: 'string',
+    isForm: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      filterable:true
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    isForm: true,
+    isTable: true,
+    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 c7d9d4b39..fc7019e3c 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -141,24 +141,24 @@ export const ScrapRecordMain = useCrudSchemas(
         }
       }
     },
-    {
-      label: '出库原因',
-      field: 'outboundReason',
-      dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
-      dictClass: 'string',
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          filterable: true
-        }
-      },
-      tableForm: {
-        type: 'Select',
-        filterable: true
-      }
-    },
+    // {
+    //   label: '出库原因',
+    //   field: 'outboundReason',
+    //   dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
+    //   dictClass: 'string',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     componentProps: {
+    //       filterable: true
+    //     }
+    //   },
+    //   tableForm: {
+    //     type: 'Select',
+    //     filterable: true
+    //   }
+    // },
     {
       label: '项目代码',
       field: 'projectCode',
@@ -705,6 +705,25 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '报废原因',
     field: 'reason',
+    dictType: DICT_TYPE.SCRAP_REASON,
+    dictClass: 'string',
+    isForm: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      filterable:true
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    isForm: true,
+    isTable: true,
+    sort: 'custom',
     table: {
       width: 150
     },