From 691ba55304fc8c3785ec8ded4c16d70017dec17a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 17:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegate/relegateRequest/index.vue        | 25 +++++++++++--------
 .../relegateRequestMain.data.ts               |  2 ++
 .../saleShipmentMainRequest/index.vue         | 17 ++++++++-----
 .../saleShipmentMain.data.ts                  |  1 +
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 0311d8b2e..777c111db 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -29,7 +29,7 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm ref="basicFormRef" 
-    :isOpenSearchTable="false" 
+    :isOpenSearchTable="true"
     fieldTableColumn="itemCode" 
     @success="getList"
     :rules="RelegateRequestMainRules" 
@@ -93,15 +93,20 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
   nextTick(() => {
     if (type == 'tableForm') {
       if (formField == 'itemCode') {
-        row['itemCode'] = val[0]['itemCode']
-        row['uom'] = val[0]['uom']
-        row['qty'] = val[0]['qty']
-        row['fromBatch'] = val[0]['batch']
-        row['fromPackingNumber'] = val[0]['packingNumber']
-        row['toBatch'] = val[0]['batch']
-        row['toPackingNumber'] = val[0]['packingNumber']
-        row['fromLocationCode'] = val[0]['locationCode']
-        row['inventoryStatus'] = val[0]['inventoryStatus']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['itemCode'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['qty'] = item['qty']
+          newRow['fromBatch'] = item['batch']
+          newRow['fromPackingNumber'] = item['packingNumber']
+          newRow['toBatch'] = item['batch']
+          newRow['toPackingNumber'] = item['packingNumber']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['inventoryStatus'] = item['inventoryStatus']
+          tableData.value.push(newRow)
+        })
+        
       } else if (formField == 'downItemCode') {
         row['downItemCode'] = val[0]['code']
       } else if (formField == 'toLocationCode') {
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index c759b61b6..9111450eb 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -59,6 +59,7 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -318,6 +319,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index afac9f2f0..f34280f34 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -42,7 +42,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="basicFormRef"
-    :isOpenSearchTable="false"
+    :isOpenSearchTable="true"
     fieldTableColumn="soLine"
     @success="getList"
     :rules="SaleShipmentMainRules"
@@ -111,11 +111,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       if(formField == 'soLine') {
-        row['soLine'] = val[0]['lineNumber']
-        row['soNumber'] = val[0]['number']    
-        row['itemCode'] = val[0]['itemCode']
-        row['projectCode'] = val[0]['projectCode']
-        row['uom'] = val[0]['uom']
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['soLine'] = item['lineNumber']
+          newRow['soNumber'] = item['number']    
+          newRow['itemCode'] = item['itemCode']
+          newRow['projectCode'] = item['projectCode']
+          newRow['uom'] = item['uom']
+          tableData.value.push(newRow)
+        })
+        
       }else if(formField == 'fromLocationCode'){
         row['fromLocationCode'] = val[0]['defaultLocationCode']
       }
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
index 08d9752d6..139f6b6f4 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@@ -339,6 +339,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      multiple: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择销售订单行',
       searchField: 'lineNumber',