From 62eb670a4c11066b0ad3b1e7fd35cb784d531bd3 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 30 Sep 2024 13:39:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E6=8A=A5=E5=BA=9F=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain.data.ts        | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 3948c7119..75923063c 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -839,15 +839,12 @@ export const ProductionscrapRequestMain = useCrudSchemas(
       isForm: false
     },
     {
-      label: '备注',
-      field: 'remark',
+      label: '主备注',
+      field: 'mainRemark',
       sort: 'custom',
       table: {
         width: 150
       },
-      isForm:false,
-      isTableForm:false,
-      isTable: false,
     },
     {
       label: '业务类型',
@@ -1340,7 +1337,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         isMainValue: false
       },{
           key: 'businessType',
-          value: 'ReturnToStore', // 合格退料
+          value: 'ProductionScrap', // 合格退料
           isMainValue: false
         }]
     },
@@ -1705,6 +1702,14 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
+  {
+    label: '明细备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '创建者',
     field: 'creator',
@@ -1773,15 +1778,6 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain: true,
-  },
   {
     label: '操作',
     field: 'action',