From 1805acf1f054b98d8533c8b19aa2646da4cc3e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 23 May 2024 19:57:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E6=96=99=E9=97=AE=E9=A2=98=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicData/ItemsManage/ItemContainer.vue | 12 +++------- .../materialsAdjustmentFunc.vue | 24 ++++++++++++++----- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue b/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue index 386ad87c2..fb2994f01 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue @@ -201,17 +201,11 @@ export default { isFilterItemCode () { let filter = [ { - logic: "Or", + logic: "And", column: "type", - action: "==", - value: "10C04" + action: "In", + value: JSON.stringify(['10C04','10C01']) }, - { - logic: "Or", - column: "type", - action: "==", - value: "10C01" - } ] return filter }, diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue index 6350001f0..8be354435 100644 --- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue +++ b/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)}, - width:"auto", + 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")}, + 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)}, - width:"auto", + 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")}, + 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) },