From 863f0561ab0e981e1b3ddbf2db0498e2421c0abc Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 2 Apr 2024 11:24:41 +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--?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86--=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |  8 +++-
 .../supplierdeliver/purchaseMain/index.vue    | 40 ++++++++++++-------
 .../purchaseMain/purchaseMain.data.ts         |  1 +
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index bdeb41002..4977efef5 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -266,6 +266,12 @@ const props = defineProps({
     required: false,
     default: false
   },
+  // TableForm 的第几列按钮
+  indexTableColumn :{
+    type: Number,
+    required: false,
+    default: 0
+  }
 })
 
 const { t } = useI18n() // 国际化
@@ -576,7 +582,7 @@ const handleAddTable = () => {
     tableAllSchemas.value.tableFormColumns.forEach(item => {
       tableFormKeys[item.field] = item.default ? item.default : ''
     })
-    inpuFocus(tableAllSchemas.value.tableFormColumns[0],tableFormKeys,0)
+    inpuFocus(tableAllSchemas.value.tableFormColumns[props.indexTableColumn],tableFormKeys,0)
   }else{
     emit('handleAddTable')
   }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index ac0a5bd4d..645d5f1eb 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -28,6 +28,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm ref="formRef" 
     @success="getList" 
+    :isOpenSearchTable="true"
+    :indexTableColumn="1"
     :rules="PurchaseMainRules" 
     :formAllSchemas="PurchaseMain.allSchemas"
     :tableAllSchemas="PurchaseDetail.allSchemas" 
@@ -96,25 +98,33 @@
       if (type == 'tableForm') {
         // 明细查询页赋值
         if(formField == 'itemCode'){
-          let subList = tableData.value
-          let flag = false;
-          if(subList.length > 0){
-            subList.forEach((item) => {
-              if(item.itemCode == val[0]['itemCode']){
-                flag = true;
+          const repeatCode = [] //重复数据
+          if(tableData.value.length > 0){
+            tableData.value.forEach((item) => {
+              const findIndex = val.findIndex(valItem=>valItem['itemCode']==item.itemCode) 
+              if(findIndex > -1){
+                val.splice(findIndex,1)
+                repeatCode.push(item.itemCode)
               }
             })
           }
-          if(flag){
-            message.warning("物料代码已经存在");
-            return;
+          if(repeatCode.length>0){
+            message.warning(`物料代码${repeatCode.join(',')}已经存在`);
           }
-          row[formField] = val[0][searchField]
-          await ItembasicApi.getItembasicPage({
-            code: row['itemCode']
-          }).then(res => {
-            row['uom'] = res.list[0].uom
-          })
+          if(val.length>0){
+            val.forEach(item=>{
+              const newRow = {...row}
+              newRow[formField] = item[searchField]
+              tableData.value.push(newRow)
+            })
+            const itemCodes = val.map(valItem=>valItem['itemCode'])
+            await ItembasicApi.getItembasicPage({
+              code: itemCodes.join(',')
+            }).then(res => {
+              row['uom'] = res.list[0].uom
+            })
+          }
+          
         }
       } else {
         const setV = {}
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 023d6051e..8d5b70a15 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -400,6 +400,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      multiple:true,//多选
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择供应商物料',
       searchField: 'itemCode',