From d1cd1eba9be33c1cb302ed1aee657a1f094b32e8 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 9 Nov 2023 15:48:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8B=86=E5=88=86=E7=AD=96=E7=95=A5=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=88=A4=E6=96=AD=EF=BC=8CtableForm=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=88=97=E8=A1=A8=E6=A1=86=E7=9A=84input=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue             |  4 ++++
 src/components/TableForm/src/TableForm.vue             | 10 +++++-----
 .../strategy/purchaseReceiptStrategy/AddForm.vue       |  9 ++++++++-
 .../supplierdeliver/purchaseMain/purchaseMain.data.ts  |  3 +++
 .../purchaseclaimRequestMain.data.ts                   |  2 +-
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index c893fa868..60595d56e 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -130,6 +130,7 @@ const opensearchTable = (formField, searchField, searchTitle, searchAllSchemas,
   const _searchTableTitle = searchTitle
   const _searchTableAllSchemas = searchAllSchemas
   const _searchTablePage = searchPage
+  console.log(_searchTablePage)
   searchTableRef.value.open(_searchTableTitle, _searchTableAllSchemas, _searchTablePage, formField, searchField, type, row)
 }
 // 弹层确定返回所选数据
@@ -294,6 +295,9 @@ const handleAddTable = () => {
 }
 // 输入框聚焦
 const inpuFocus = (headerItem, row, index) => {
+  console.log(11)
+  console.log(headerItem)
+  console.log(11)
   opensearchTable(
     headerItem.field, 
     headerItem.tableForm.searchField, 
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 442cd0a40..10b156350 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -57,16 +57,16 @@
           <!-- 字符串输入框 -->
           <el-form-item 
             v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'"
-            :prop="headerItem.field">
+            :prop="headerItem.field" style="display: flex;align-items: center;">
             <el-input 
               v-model="row[headerItem.field]"
               clearable
               :type="headerItem?.tableForm?.inputType"
               :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
-              :disabled="itemIsDisabled(headerItem, row)" 
-              style="width: 100%;" 
-              @click="inpuFocus(headerItem,row,index)"
+              :disabled="headerItem?.tableForm?.isSearchList ? true : false" 
+              style="flex:1" 
             />
+            <el-button  v-if="headerItem?.tableForm?.isSearchList" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
           </el-form-item>
           <!-- 金额输入框 -->
             <el-form-item 
@@ -389,7 +389,7 @@ const handleAddTable = () => {
 }
 // 输入框聚焦
 const inpuFocus = (headerItem, row, index)=>{
-  if(headerItem?.tableForm?.isInpuFocusShow){
+  if(headerItem?.tableForm?.isSearchList){
    emit('inpuFocus', headerItem, row, index)
   }
 }
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
index 537b21a57..45a1027ea 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
@@ -138,7 +138,7 @@ const formData = ref({
     // 按库位拆分
     { ParamCode: 'ByLocation', Value: true },
     // 按器具拆分
-    { ParamCode: 'ByContainer', Value: 'false' },
+    { ParamCode: 'ByContainer', Value: false },
     // 每个任务明细数量
     { ParamCode: 'JobDetailCount', Value: 0 },
   ]
@@ -244,6 +244,13 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return;
+  let onlyOne = formData.value.configuration.filter(item=>{
+    return item.Value == true
+  })
+  if(onlyOne?.length !=1){
+    message.error('只能选择一种拆分方式')
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 2a153ddf9..7e134e4f1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -336,6 +336,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm:{
+      isSearchList: true, // 开启查询弹窗
+    }
   },
   {
     label: 'ERP库位',
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
index 49ad70f70..79c0cdb08 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
@@ -334,7 +334,7 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '订单号',
     field: 'poNumber',
     tableForm:{
-      isInpuFocusShow: true,
+      isSearchList: true, // 开启查询弹窗
       searchListPlaceholder: '请选择订单号',
       searchField: 'poNumber',
       searchTitle: '供应商发货记录',