【nev-pc】回收料问题暂存

fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue

@@ -201,17 +201,11 @@ export default {
     isFilterItemCode () {
       let filter = [
         {
-          logic: "Or",
+          logic: "And",
           column: "type",
-          action: "==",
+          action: "In",
-          value: "10C04"
+          value: JSON.stringify(['10C04','10C01'])
         },
-        {
-          logic: "Or",
-          column: "type",
-          action: "==",
-          value: "10C01"
-        }
       ]
       return filter
     },

fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue

@@ -165,11 +165,17 @@ export default {
           width:"auto",
         },
         { 
-          type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,
+          type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "number", clearable:true,getType:"getPage",
           beforeFocus:(tableScope)=>{if(!this.addPopData_FS[tableScope.$index].itemCode || this.addPopData_FS[tableScope.$index].itemCode.length <= 0 || !this.addPopData_FS[tableScope.$index].supplierCode || this.addPopData_FS[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择物品代码和供应商代码'); return false}else{return true}},
-          focus: (type,val,tableScope) => { return this.getFilterList(type, val, "wms/store/supplier-asn",this.isFilter("supplierCode", this.addPopData_FS[tableScope.$index].supplierCode),1000)},
+          focus: (type,val,tableScope) => { return this.getFilterList(type, {itemCode:this.addPopData_FS[tableScope.$index].itemCode,supplierCode:this.addPopData_FS[tableScope.$index].supplierCode}, "wms/store/purchase-order/get-list-by-supplier-code-and-item-code")},
-          width:"auto",
+          colSpan: 12,width:"auto", 
         },
+        // { 
+        //   type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,
+        //   beforeFocus:(tableScope)=>{if(!this.addPopData_FS[tableScope.$index].itemCode || this.addPopData_FS[tableScope.$index].itemCode.length <= 0 || !this.addPopData_FS[tableScope.$index].supplierCode || this.addPopData_FS[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择物品代码和供应商代码'); return false}else{return true}},
+        //   focus: (type,val,tableScope) => { return this.getFilterList(type, val, "wms/store/supplier-asn",this.isFilter("supplierCode", this.addPopData_FS[tableScope.$index].supplierCode),1000)},
+        //   width:"auto",
+        // },
         { type: "filterSelect", label: "目标库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",this.isFilter("type", "2"),1000)},
           // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.addPopData_HB) }, 
@@ -256,11 +262,17 @@ export default {
           width:"auto",
         },
         { 
-          type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,
+          type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "number", clearable:true,getType:"getPage",
           beforeFocus:(tableScope)=>{if(!this.addPopData_HB[tableScope.$index].itemCode || this.addPopData_HB[tableScope.$index].itemCode.length <= 0 || !this.addPopData_HB[tableScope.$index].supplierCode || this.addPopData_HB[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择物品代码和供应商代码'); return false}else{return true}},
-          focus: (type,val,tableScope) => { return this.getFilterList(type, val, "wms/store/supplier-asn",this.isFilter("supplierCode", this.addPopData_HB[tableScope.$index].supplierCode),1000)},
+          focus: (type,val,tableScope) => {  return this.getFilterList(type, {itemCode:this.addPopData_HB[tableScope.$index].itemCode,supplierCode:this.addPopData_HB[tableScope.$index].supplierCode}, "wms/store/purchase-order/get-list-by-supplier-code-and-item-code")},
-          width:"auto",
+          colSpan: 12,width:"auto", 
         },
+        // { 
+        //   type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,
+        //   beforeFocus:(tableScope)=>{if(!this.addPopData_HB[tableScope.$index].itemCode || this.addPopData_HB[tableScope.$index].itemCode.length <= 0 || !this.addPopData_HB[tableScope.$index].supplierCode || this.addPopData_HB[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择物品代码和供应商代码'); return false}else{return true}},
+        //   focus: (type,val,tableScope) => { return this.getFilterList(type, val, "wms/store/supplier-asn",this.isFilter("supplierCode", this.addPopData_HB[tableScope.$index].supplierCode),1000)},
+        //   width:"auto",
+        // },
         { type: "filterSelect", label: "目标库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",false,1000)},
           // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.addPopData_HB) },