From 9d33de9c5d8db67410731b18da054c00277b7484 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 15 Aug 2024 13:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5291,HL-5016=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRecordMain.data.ts         | 23 ++++++++++++++++++-
 .../purchasereceiptRecordMain.data.ts         |  5 ++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
index 3e5b910f5..0ca439920 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
@@ -595,6 +595,28 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     hiddenInMain: true,
   },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -694,7 +716,6 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-
 ]))
 
 //表单校验
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index 2d8d0ba03..3ea07b778 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -341,12 +341,12 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '备注',
-    field: 'remark',
+    field: 'mainRemark',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable:false,
+    isTable:true,
   },
   {
     label: '创建者',
@@ -1942,6 +1942,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    hiddenInMain:true,
     form: {
       componentProps: {
         disabled:true