diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
index 7c56b4b18..d942b9216 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
@@ -167,14 +167,13 @@
v-else-if="item.ParamCode == 'Project'"
:disabled="formData.priority==0&&formType=='update'"
/>
-
+
+
+
+
+
+
+
@@ -483,6 +482,8 @@ import * as TransactiontypeApi from '@/api/wms/transactiontype'
import { Transactiontype } from '@/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data'
import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
import * as ProductionlineApi from '@/api/wms/productionline'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic} from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
import { Customer, CustomerRules } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
import * as CustomerApi from '@/api/wms/customer'
@@ -853,6 +854,21 @@ const blurCustomerList = async ()=>{
}
}
}
+
+//物料
+const searchItemCode = ()=>{
+ searchTableRef.value.open(
+ '请选择物料',
+ Itembasic.allSchemas,
+ ItembasicApi.getItembasicPage,
+ 'ItemCode',
+ 'code',
+ true,
+ undefined,
+ undefined,
+ undefined
+ )
+}
// 生产线
const searchTransactionType = ()=>{
searchTableRef.value.open(
@@ -960,6 +976,14 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
}
return
}
+ if(formField=='ItemCode'){
+ // 条件规则--物料
+ let itemCode = formData.value.condition.find(item=>item['ParamCode']=='ItemCode')
+ if(itemCode){
+ itemCode.Value = val.map(item=>(item['code'])).join(',')
+ }
+ return
+ }
// 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(','))
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 088d6d02e..2cf69dc8d 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -215,14 +215,13 @@
v-else-if="item.ParamCode == 'Project'"
:disabled="formData.priority==0&&formType=='update'"
/>
-
+
+
+
+
+
+
+
@@ -680,7 +679,8 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import * as TransactiontypeApi from '@/api/wms/transactiontype'
import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
import * as ProductionlineApi from '@/api/wms/productionline'
-
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic} from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@@ -1009,6 +1009,23 @@ const blurWarehouse = async ()=>{
})
}
+
+
+//物料
+const searchItemCode = ()=>{
+ searchTableRef.value.open(
+ '请选择物料',
+ Itembasic.allSchemas,
+ ItembasicApi.getItembasicPage,
+ 'ItemCode',
+ 'code',
+ true,
+ undefined,
+ undefined,
+ undefined
+ )
+}
+
//事务类型
const searchTransactionType = ()=>{
searchTableRef.value.open(
@@ -1108,6 +1125,14 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
}
return
}
+ if(formField=='ItemCode'){
+ // 条件规则--物料
+ let itemCode = formData.value.condition.find(item=>item['ParamCode']=='ItemCode')
+ if(itemCode){
+ itemCode.Value = val.map(item=>(item['code'])).join(',')
+ }
+ return
+ }
// 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(','))