diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index 4bc06a6d2..ce23a8b8f 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -53,54 +53,7 @@
规则条件
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -556,31 +330,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -612,36 +361,6 @@ />小时 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -727,22 +446,12 @@ const formData = ref({ RowOrder: 'ASC', // 列排序方向 ColumOrder: 'ASC', - // 优先整包 - EntirePackageFirst: 'FALSE', - // 发料包装类型 - IssueStorageType: 'SINGLE', // 是否拆分发料 IsSplit: '', // 拆分数量 EachTimeQty: '', // 时间间隔 TimeInterval: '', - // 是否使用整理库位 - UseOrganizeLocation: 'FALSE', - // 是否使用在途库位 - UseTransportLocation: 'FALSE', - // 是否生成发料接收任务 - CreateReceiptJob: 'FALSE' } }) // 验证规则 @@ -777,14 +486,6 @@ const options = reactive({ //范围下拉框列表 rangeOptions1: formatRangeOptions('IN', 'NOT IN'), rangeOptions2: formatRangeOptions('>', '<', '>=', '<='), - // 供应商客户下拉框列表 - typeOptions: [ - { value: 'SupplierCode', label: '供应商' }, - { value: 'CustomerCode', label: '客户' } - ], - //供应商列表 - supplierList: [], - originSupplierList: [], // 物料类型列表 itemTypeOptions: [ { value: 'ItemType', label: '物料类型' }, @@ -794,12 +495,6 @@ const options = reactive({ { value: 'AbcClass', label: 'ABC类' }, { value: 'ItemStatus', label: '物料状态' } ], - // 重量体积面积类型列表 - calculationTypeOptions: [ - { value: 'Weight', label: '重量' }, - { value: 'Volume', label: '体积' }, - { value: 'Area', label: '面积' } - ], //仓库列表 warehouseTypeOptions: [ { value: 'WarehouseCode', label: '从仓库' }, @@ -807,8 +502,6 @@ const options = reactive({ { value: 'LocationGroupCode', label: '从库位组' }, { value: 'LocationCode', label: '从库位' } ], - warehouseList: [], - originWarehouseList: [], // 排列方式 sortOptions: [ { value: 'ASC', label: '从小到大' }, @@ -832,109 +525,10 @@ const buttonBaseClick = (val, item) => { } } -// 获取供应商列表 -const getFormSupplierList = async () => { - options.originSupplierList = await getSupplierList(null) - options.supplierList = [...options.originSupplierList] -} -// 获取客户列表 -const getFormCustomerList = async () => { - options.originSupplierList = await getCustomerList(null) - options.supplierList = [...options.originSupplierList] -} -const filterMethod = (query: string) => { - if (query) { - options.supplierList = options.originSupplierList.filter((item) => { - if(!item.name||item.name==''){ - return item.code.includes(query) - }else{ - return item.name.includes(query) - } - }) - } else { - options.supplierList = [...options.originSupplierList] - } -} -// 选择客户还是承运商 -const changeSupplierCustomer = (e) => { - formData.value.condition[0].Value = '' - if (e == 'CustomerCode') { - getFormCustomerList() - } else if (e == 'SupplierCode') { - getFormSupplierList() - } -} -getFormSupplierList() // 选择物料类型/物料分组/abc类/物料/项目 const changeItemsType = () => { formData.value.condition[1].Value = '' } -// 选择重量/体积/面积 -const changeCalculation = () => { - formData.value.condition[2].Value = '' -} -// 获取仓库列表 -const getFormWarehouseList = async () => { - const loading = ElLoading.service({ - lock: true, - text: t('ts.加载中'), - background: 'rgba(0, 0, 0, 0.7)', - }) - options.originWarehouseList = await getWarehouseList() - options.warehouseList = [...options.originWarehouseList] - nextTick(()=>{ - loading.close() - }) -} -// 获取库区列表 -const getFormAreaList = async () => { - const loading = ElLoading.service({ - lock: true, - text: t('ts.加载中'), - background: 'rgba(0, 0, 0, 0.7)', - }) - options.originWarehouseList = await getAreaList() - options.warehouseList = [...options.originWarehouseList] - nextTick(()=>{ - loading.close() - }) -} -// 获取库位组列表 -const getFormLocationgrouList = async () => { - const loading = ElLoading.service({ - lock: true, - text: t('ts.加载中'), - background: 'rgba(0, 0, 0, 0.7)', - }) - options.originWarehouseList = await getLocationgroupList() - options.warehouseList = [...options.originWarehouseList] - nextTick(()=>{ - loading.close() - }) -} -// 获取库位列表 -const getFormLocationList = async () => { - const loading = ElLoading.service({ - lock: true, - text: t('ts.加载中'), - background: 'rgba(0, 0, 0, 0.7)', - }) - options.originWarehouseList = await getLocationList() - options.warehouseList = [...options.originWarehouseList] - nextTick(()=>{ - loading.close() - }) -} -const filterMethodWarehouseList = (query: string) => { - if (query) { - options.warehouseList = options.originWarehouseList.filter((item) => { - return item.code.includes(query) - }) - } else { - options.warehouseList = options.originWarehouseList - } -} - const searchTableRef = ref() @@ -1177,23 +771,7 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { } }) } -// getFormWarehouseList() -// 选择仓库/库位/库位组/库区 -const changeWarehouse = (e) => { - formData.value.configuration.WarehouseCode = '' - formData.value.configuration.AreaCode = '' - formData.value.configuration.LocationGroupCode = '' - formData.value.configuration.LocationCode = '' - if (e == 'WarehouseCode') { - getFormWarehouseList() - } else if (e == 'AreaCode') { - getFormAreaList() - } else if (e == 'LocationGroupCode') { - getFormLocationgrouList() - } else if (e == 'LocationCode') { - getFormLocationList() - } -} + /** 打开弹窗 */ const open = async (type: string, strategyCode: string, id?: number) => { formStrategyCode.value = strategyCode @@ -1243,12 +821,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { if (data.configuration) { formData.value.configuration = JSON.parse(data.configuration) } - // 判断是获取客户列表还是供应上列表 - if (formData.value.condition[0].ParamCode == 'SupplierCode') { - getFormSupplierList() - } else { - getFormCustomerList() - } + // 判断是获取仓库/库位/库位组/库区列表 if ( 'WarehouseCode' in formData.value.configuration && @@ -1392,22 +965,12 @@ const resetForm = () => { RowOrder: 'ASC', // 列排序方向 ColumOrder: 'ASC', - // 优先整包 - EntirePackageFirst: 'FALSE', - // 发料包装类型 - IssueStorageType: 'SINGLE', // 是否拆分发料 IsSplit: '', // 拆分数量 EachTimeQty: '', // 时间间隔 TimeInterval: '', - // 是否使用整理库位 - UseOrganizeLocation: 'FALSE', - // 是否使用在途库位 - UseTransportLocation: 'FALSE', - // 是否生成发料接收任务 - CreateReceiptJob: 'FALSE' } } } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue index 36f91fdf6..b033f9dc4 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue @@ -191,7 +191,6 @@ v-model="item.ParamCode" placeholder="" style="width: 110px; margin-right: 10px" - @change="changeWarehouse" :disabled="formData.priority==0&&formType=='update'" > { formData.value.condition[1].Value = '' } - -// 获取仓库列表 -const getFormWarehouseList = async () => { - options.warehouseList = await getWarehouseList() -} -// 获取库区列表 -const getFormAreaList = async () => { - options.warehouseList = await getAreaList() -} -// 获取库位组列表 -const getFormLocationgrouList = async () => { - options.warehouseList = await getLocationgroupList() -} -// 获取库位列表 -const getFormLocationList = async () => { - options.warehouseList = await getLocationList() -} -getFormLocationList() -// 选择仓库/库位/库位组/库区 -const changeWarehouse = (e) => { - formData.value.condition[2].Value = '' - if (e == 'WarehouseCode') { - getFormWarehouseList() - } else if (e == 'AreaCode') { - getFormAreaList() - } else if (e == 'LocationGroupCode') { - getFormLocationgrouList() - } else if (e == 'LocationCode') { - getFormLocationList() - } -} /** 打开弹窗 */ const open = async (type: string, strategyCode: string, id?: number) => { formStrategyCode.value = strategyCode @@ -553,16 +521,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { } else { getFormCustomerList() } - // 判断是获取仓库/库位/库位组/库区列表 - if (formData.value.condition[2].ParamCode == 'WarehouseCode') { - getFormWarehouseList() - } else if (formData.value.condition[2].ParamCode == 'AreaCode') { - getFormAreaList() - } else if (formData.value.condition[2].ParamCode == 'LocationGroupCode') { - getFormLocationgrouList() - } else if (formData.value.condition[2].ParamCode == 'LocationCode') { - getFormLocationList() - } + } finally { formLoading.value = false } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index 90963a742..871342dee 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -442,45 +442,6 @@ const changeItemsType = () => { formData.value.condition[0].Value = '' } -// 获取仓库列表 -const getFormWarehouseList = async () => { - options.warehouseList = await getWarehouseList() -} -// 获取库区列表 -const getFormAreaList = async () => { - options.warehouseList = await getAreaList() -} -// 获取库位组列表 -const getFormLocationgrouList = async () => { - options.warehouseList = await getLocationgroupList() -} -// 获取库位列表 -const getFormLocationList = async (queryParms) => { - if (queryParms) { - options.overflowWarehouseList = await getLocationList(queryParms) - } else { - options.warehouseList = await getLocationList() - } -} -getFormLocationList() -// 获取溢流库位 -const queryParms = { - type: 'OVERFLOW' -} -getFormLocationList(queryParms) -// 选择仓库/库位/库位组/库区 -const changeWarehouse = (e) => { - formData.value.condition[1].Value = '' - if (e == 'WarehouseCode') { - getFormWarehouseList() - } else if (e == 'AreaCode') { - getFormAreaList() - } else if (e == 'LocationGroupCode') { - getFormLocationgrouList() - } else if (e == 'LocationCode') { - getFormLocationList() - } -} /** 打开弹窗 */ const open = async (type: string, strategyCode: string, id?: number) => { formStrategyCode.value = strategyCode @@ -523,16 +484,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.configuration = JSON.parse(data.configuration) } - // 判断是获取仓库/库位/库位组/库区列表 - if (formData.value.condition[1].ParamCode == 'WarehouseCode') { - getFormWarehouseList() - } else if (formData.value.condition[1].ParamCode == 'AreaCode') { - getFormAreaList() - } else if (formData.value.condition[1].ParamCode == 'LocationGroupCode') { - getFormLocationgrouList() - } else if (formData.value.condition[1].ParamCode == 'LocationCode') { - getFormLocationList() - } + } finally { formLoading.value = false } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue index 860ee09f5..7ebeee92e 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue @@ -435,45 +435,6 @@ const changeItemsType = () => { formData.value.condition[0].Value = '' } -// 获取仓库列表 -const getFormWarehouseList = async () => { - options.warehouseList = await getWarehouseList() -} -// 获取库区列表 -const getFormAreaList = async () => { - options.warehouseList = await getAreaList() -} -// 获取库位组列表 -const getFormLocationgrouList = async () => { - options.warehouseList = await getLocationgroupList() -} -// 获取库位列表 -const getFormLocationList = async (queryParms) => { - if (queryParms) { - options.overflowWarehouseList = await getLocationList(queryParms) - } else { - options.warehouseList = await getLocationList() - } -} -getFormLocationList() -// 获取溢流库位 -const queryParms = { - type: 'OVERFLOW' -} -getFormLocationList(queryParms) -// 选择仓库/库位/库位组/库区 -const changeWarehouse = (e) => { - formData.value.condition[1].Value = '' - if (e == 'WarehouseCode') { - getFormWarehouseList() - } else if (e == 'AreaCode') { - getFormAreaList() - } else if (e == 'LocationGroupCode') { - getFormLocationgrouList() - } else if (e == 'LocationCode') { - getFormLocationList() - } -} /** 打开弹窗 */ const open = async (type: string, strategyCode: string, id?: number) => { formStrategyCode.value = strategyCode @@ -515,16 +476,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.configuration = JSON.parse(data.configuration) } - // 判断是获取仓库/库位/库位组/库区列表 - if (formData.value.condition[1].ParamCode == 'WarehouseCode') { - getFormWarehouseList() - } else if (formData.value.condition[1].ParamCode == 'AreaCode') { - getFormAreaList() - } else if (formData.value.condition[1].ParamCode == 'LocationGroupCode') { - getFormLocationgrouList() - } else if (formData.value.condition[1].ParamCode == 'LocationCode') { - getFormLocationList() - } + } finally { formLoading.value = false } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue index ac3b3b11b..c226515df 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue @@ -380,45 +380,6 @@ const buttonBaseClick = (val, item) => { } } -// 获取仓库列表 -const getFormWarehouseList = async () => { - options.warehouseList = await getWarehouseList() -} -// 获取库区列表 -const getFormAreaList = async () => { - options.warehouseList = await getAreaList() -} -// 获取库位组列表 -const getFormLocationgrouList = async () => { - options.warehouseList = await getLocationgroupList() -} -// 获取库位列表 -const getFormLocationList = async (queryParms) => { - if (queryParms) { - options.overflowWarehouseList = await getLocationList(queryParms) - } else { - options.warehouseList = await getLocationList() - } -} -getFormWarehouseList() -// 获取溢流库位 -const queryParms = { - type: 'OVERFLOW' -} -getFormLocationList(queryParms) -// 选择仓库/库位/库位组/库区 -const changeWarehouse = (e) => { - formData.value.condition[0].Value = '' - if (e == 'WarehouseCode') { - getFormWarehouseList() - } else if (e == 'AreaCode') { - getFormAreaList() - } else if (e == 'LocationGroupCode') { - getFormLocationgrouList() - } else if (e == 'LocationCode') { - getFormLocationList() - } -} /** 打开弹窗 */ const open = async (type: string, strategyCode: string, id?: number) => { formStrategyCode.value = strategyCode @@ -460,16 +421,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.configuration = JSON.parse(data.configuration) } - // 判断是获取仓库/库位/库位组/库区列表 - if (formData.value.condition[0].ParamCode == 'WarehouseCode') { - getFormWarehouseList() - } else if (formData.value.condition[0].ParamCode == 'AreaCode') { - getFormAreaList() - } else if (formData.value.condition[0].ParamCode == 'LocationGroupCode') { - getFormLocationgrouList() - } else if (formData.value.condition[0].ParamCode == 'LocationCode') { - getFormLocationList() - } + } finally { formLoading.value = false }