diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue index 89e5cb834..6aacedc4d 100644 --- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue +++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue @@ -210,9 +210,14 @@ export default { focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic",this.isFilter("type", "10C02"),1000)}, width:"auto" }, - { type: "filterSelect", label: "箱标签", prop: "packingCode", optionsLabel: "packingCode", optionsValue: "packingCode", clearable:true, + // { type: "filterSelect", label: "箱标签", prop: "packingCode", optionsLabel: "packingCode", optionsValue: "packingCode", clearable:true,getType:"getPage", + // beforeFocus:(tableScope)=>{if(!this.addPopData_YL[tableScope.$index].itemCode || this.addPopData_YL[tableScope.$index].length <= 0){this.$message.error('请选择'+_Names.itemCode); return false}else{return true}}, + // focus: async (type,val,tableScope) => { return this.getFilterList(type, val, "wms/inventory/Inventory-Balance",await this.getPackingFilterYl(this.addPopData_YL[tableScope.$index].itemCode),1000)}, + // width:"auto", + // }, + { type: "filterSelect", label: "箱标签", prop: "packingCode", optionsLabel: "packingCode", optionsValue: "packingCode", clearable:true,getType:"getPage", beforeFocus:(tableScope)=>{if(!this.addPopData_YL[tableScope.$index].itemCode || this.addPopData_YL[tableScope.$index].length <= 0){this.$message.error('请选择'+_Names.itemCode); return false}else{return true}}, - focus: async (type,val,tableScope) => { return this.getFilterList(type, val, "wms/inventory/Inventory-Balance",await this.getPackingFilterYl(this.addPopData_YL[tableScope.$index].itemCode),1000)}, + focus: async (type,val,tableScope) => { return this.getFilterList(type, await this.getPackingFilterYl(this.addPopData_YL[tableScope.$index].itemCode), "wms/inventory/inventory-balance/usable-list-by-type")}, width:"auto", }, // 库存数量、库位:自动带出 @@ -698,19 +703,27 @@ export default { }, // 原料箱标签筛选条件 async getPackingFilterYl(itemCode){ - let _filters = [] - _filters = this.isFilter("itemCode",itemCode) - // 获取原料库的库位代码 - let _locationsYL = await getLocationByTypes({types:2}) - let _ylArr = [] - _locationsYL.forEach(item=>{ _ylArr.push(item.code)}) - _filters.push({ - logic: "And", - column: "locationCode", - action: "In", - value: JSON.stringify(_ylArr) - }) - return _filters + // let _filters = [] + // _filters = this.isFilter("itemCode",itemCode) + // // 获取原料库的库位代码 + // let _locationsYL = await getLocationByTypes({types:2}) + // let _ylArr = [] + // _locationsYL.forEach(item=>{ _ylArr.push(item.code)}) + // _filters.push({ + // logic: "And", + // column: "locationCode", + // action: "In", + // value: JSON.stringify(_ylArr) + // }) + // return _filters + // let _locationsYL = await getLocationByTypes({types:2}) + return { + itemCode:itemCode, + // Locations:_locationsYL, + LocationTypes:2, + Statuses:2, + IsPackingCode:true + } }, // 原料下拉 pushYL(data){