diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
new file mode 100644
index 000000000..2c3204eea
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
@@ -0,0 +1,1208 @@
+
+
+
+
+
+
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/index.vue
new file mode 100644
index 000000000..96e297849
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/index.vue
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 35f193ba3..c1d18040e 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -54,53 +54,53 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
@@ -544,91 +557,91 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
- {{ cur.label }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
- 小时
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -665,9 +678,8 @@ import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/l
import { isString } from '@/utils/is'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
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'
const { t } = useI18n() // 国际化
@@ -693,18 +705,10 @@ const formData = ref({
status: true, //状态
//规则条件集合
condition: [
- // 供应商
- { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// 物料类型/物料分组/物料/abc类/项目/
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
- // 重量/体积/面积
- { ParamCode: 'Weight', Operator: '>', Value: [] },
- // 库存状态
- { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
- // 存储类型
- { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
- // 库存事务
- { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }
+ // 生产线
+ { ParamCode: 'Productionline', Operator: 'IN', Value: '' }
],
configuration: {
// 仓库代码
@@ -789,7 +793,8 @@ const options = reactive({
{ value: 'ItemGroup', label: '物料分组' },
{ value: 'ItemCode', label: '物料' },
{ value: 'Project', label: '项目' },
- { value: 'AbcClass', label: 'ABC类' }
+ { value: 'AbcClass', label: 'ABC类' },
+ { value: 'ItemStatus', label: '物料状态' }
],
// 重量体积面积类型列表
calculationTypeOptions: [
@@ -1007,10 +1012,10 @@ const blurWarehouse = async ()=>{
//事务类型
const searchTransactionType = ()=>{
searchTableRef.value.open(
- '请选择事务类型',
- Transactiontype.allSchemas,
- TransactiontypeApi.getTransactiontypePage,
- 'TransactionType',
+ '请选择生产线',
+ Productionline.allSchemas,
+ ProductionlineApi.getProductionlinePage,
+ 'Productionline',
'code',
true,
undefined,
@@ -1096,8 +1101,8 @@ const searchWarehouse = ()=>{
}
const searchTableSuccess = (formField, searchField, val, type, row) => {
- if(formField=='TransactionType'){
- let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+ if(formField=='Productionline'){
+ let transactionType = formData.value.condition.find(item=>item['ParamCode']=='Productionline')
if(transactionType){
transactionType.Value = val.map(item=>(item['code'])).join(',')
}
@@ -1164,11 +1169,14 @@ const open = async (type: string, strategyCode: string, id?: number) => {
if (data.condition) {
formData.value.condition = JSON.parse(data.condition)
formData.value.condition.forEach((item, index) => {
+ console.log(item)
if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+ console.log(item.Value)
item.Value = item.Value.split(',')
}
})
}
+ console.log(formData.value.condition)
if (data.configuration) {
formData.value.configuration = JSON.parse(data.configuration)
}
@@ -1298,8 +1306,8 @@ const resetForm = () => {
{ ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
// 存储类型
{ ParamCode: 'StorageType', Operator: 'IN', Value: [] },
- // 库存事务
- { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }
+ // 生产线
+ { ParamCode: 'Productionline', Operator: 'IN', Value: '' }
],
configuration: {