From e39f22675374570053796af2bd7b8dfe7e7ca515 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Sun, 15 Sep 2024 18:14:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=AD=96=E7=95=A5-=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=94=A8=E5=BA=93=E5=AD=98=E4=BA=8B?=
 =?UTF-8?q?=E5=8A=A1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/upShelfStrategy/AddForm.vue      | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 21f198f91..000036fea 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -314,7 +314,7 @@
                   </el-input>
               </el-form-item> -->
               <!-- 业务类型 -->
-              <el-form-item key="业务类型formItem" label="业务类型" class="err-120" v-if="index == 6">
+              <el-form-item key="业务类型formItem" label="业务类型" class="err-120" v-if="index == 5">
                 <el-select key="业务类型Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
@@ -684,10 +684,8 @@ const formData = ref({
     { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
     // 存储类型
     { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
-    // 库存事务
+    // 库存事务     // 业务类型
     { ParamCode: 'TransactionType', Operator: 'IN', Value: '' },
-    // 业务类型
-    { ParamCode: 'BusinessType', Operator: 'IN', Value: '' },
   ],
   configuration: {
     // 仓库代码
@@ -1030,7 +1028,7 @@ const searchBusinessType = ()=>{
     '请选择业务类型',
     Businesstype.allSchemas,
     BusinesstypeApi.getBusinesstypePage,
-    'BusinessType',
+    'TransactionType',
     'code',
     true,
     undefined,
@@ -1074,14 +1072,15 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
   // let searchTableTitle  =  warehouseType.value == 'WarehouseCode'?'请选择仓库':warehouseType.value == 'AreaCode'?'请选择库区':warehouseType.value == 'LocationGroupCode'?'请选择库位组':warehouseType.value == 'LocationCode'?'请选择库位':''
   console.log('searchTableSuccess',formField, searchField, val, type, row)
   console.log(val.map(item=>(item['code'])).join(','))
+  // if(formField=='TransactionType'){
+  //   let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+  //   if(transactionType){
+  //     transactionType.Value = val.map(item=>(item['code'])).join(',')
+  //   }
+  //   return
+  // }else 
   if(formField=='TransactionType'){
-    let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
-    if(transactionType){
-      transactionType.Value = val.map(item=>(item['code'])).join(',')
-    }
-    return
-  }else if(formField=='BusinessType'){
-    let businessType = formData.value.condition.find(item=>item['ParamCode']=='BusinessType')
+    let businessType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
     if(businessType){
       businessType.Value = val.map(item=>(item['code'])).join(',')
     }
@@ -1153,9 +1152,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
             item.Value = item.Value.split(',')
           }
         })
-        if(!formData.value.condition[6]){
-          formData.value.condition[6] = { ParamCode: 'BusinessType', Operator: 'IN', Value: '' }
-        }
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -1314,10 +1310,8 @@ const resetForm = () => {
       { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
       // 存储类型
       { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
-      // 库存事务
+      // 库存事务 // 业务类型
       { ParamCode: 'TransactionType', Operator: 'IN', Value: '' },
-      // 业务类型
-      { ParamCode: 'BusinessType', Operator: 'IN', Value: '' },
     ],
     configuration: {
       // 仓库代码