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 @@ --> - + { '请选择业务类型', 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: { // 仓库代码