From 7a3029f49f5e1e135e13c1af2bb8744fa344d017 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 2 Apr 2024 13:15:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86--=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7--?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95--=E6=96=B0=E5=A2=9E--formt?=
 =?UTF-8?q?able=E4=B8=AD=E8=A1=8C=E5=8F=B7=E5=92=8C=E8=AE=A1=E9=87=8F?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchaseMain/index.vue                 | 6 ++++++
 .../supplierdeliver/purchaseMain/purchaseMain.data.ts      | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index 645d5f1eb..d1af5fe63 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -115,6 +115,12 @@
             val.forEach(item=>{
               const newRow = {...row}
               newRow[formField] = item[searchField]
+              let lineNumber = 1
+              if(tableData.value.length>0){
+                lineNumber = 1+(tableData.value[tableData.value.length-1]['lineNumber'])
+              }
+              newRow['lineNumber'] = lineNumber
+              newRow['uom'] = item['supplierUom']
               tableData.value.push(newRow)
             })
             const itemCodes = val.map(valItem=>valItem['itemCode'])
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 8d5b70a15..5f3eeed5e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -390,6 +390,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      disabled:true,
       isSearchList: true, // 开启查询弹窗
     }
   },
@@ -849,9 +850,9 @@ export const PurchaseDetailRules = reactive({
   orderQty:  [
     { required: true, message: '请输入订单数量', trigger: 'blur' }
   ],
-  uom:  [
-    { required: true, message: '请选择计量单位', trigger: 'change' }
-  ],
+  // uom:  [
+  //   { required: true, message: '请选择计量单位', trigger: 'change' }
+  // ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],