From d86da885470c8c468e5fc0d3e52c0e0d1248c38e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Tue, 4 Jul 2023 16:16:23 +0800 Subject: [PATCH] =?UTF-8?q?1=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85=202?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=9D=A1=E4=BB=B6=E5=80=BC=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86=203=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8F=AA=E7=95=99=E5=BA=93=E4=BD=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=BA=93=E4=BD=8D=E7=B1=BB=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=8F=AA=E7=95=99=E7=AD=89=E4=BA=8E=E5=92=8C?= =?UTF-8?q?=E4=B8=8D=E7=AD=89=E4=BA=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/StepsCountPlanForm/index.vue | 11 ++++- .../src/components/conditionFilters/index.vue | 12 +++++ fe/PC/src/components/searchPage/index.vue | 6 +++ fe/PC/src/utils/tableColumns/index.js | 48 +++++++++++++++++++ 4 files changed, 76 insertions(+), 1 deletion(-) diff --git a/fe/PC/src/components/StepsCountPlanForm/index.vue b/fe/PC/src/components/StepsCountPlanForm/index.vue index ac95ef276..41e55e9c6 100644 --- a/fe/PC/src/components/StepsCountPlanForm/index.vue +++ b/fe/PC/src/components/StepsCountPlanForm/index.vue @@ -45,6 +45,7 @@ @sxBtnClickHandle="sxBtnClickHandle" ref="searchTable" :tableLoading="tableLoading" + :filterActionOptions="filterActionOptions" :advancedFilter="advancedFilter( 'basedata/location', pageListLocation, @@ -381,6 +382,13 @@ export default { { label: "取消", name: "cancel" }, { label: "下一步", type: "primary", name: "determine" }, ], + filterActionOptions:[{ + value: '==', + label: '等于' + }, { + value: '!=', + label: '不等于' + }] }; }, mounted() { @@ -389,7 +397,8 @@ export default { methods: { // 初始化库位筛选列表数据，目的：pda的库位类型不可以选择线边库位 initSearchPageTableColums(){ - let _list = JSON.parse(JSON.stringify(this.$isTableColumns.Location)); + // let _list = JSON.parse(JSON.stringify(this.$isTableColumns.Location)); + let _list = JSON.parse(JSON.stringify(this.$isTableColumns.CountPlanByAddLocation)); _list.forEach(item => { // 如果是pda类型盘点，库位类型 则使用 locationTypeForPADPlan 枚举（区别为线边库位为不可选） // 如果是Excel类型盘点，库位类型 则使用 locationTypeForExcelPlan 枚举（区别为原材料库位为不可选） diff --git a/fe/PC/src/components/conditionFilters/index.vue b/fe/PC/src/components/conditionFilters/index.vue index 637995f89..73febd884 100644 --- a/fe/PC/src/components/conditionFilters/index.vue +++ b/fe/PC/src/components/conditionFilters/index.vue @@ -36,6 +36,7 @@ placeholder="请选择筛选对象" :disabled="item.hide" :filterable="true" + @change="filterColumnChange(item)" > @@ -139,6 +140,11 @@ export default { type: Boolean, default: false }, + // 筛选条件自定义（等于/不等于/大于/小于等数据） + filterActionOptions:{ + type: Array, + default: null + }, //确认筛选后续操作 advancedFilter: { type: Function, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index ea5bf4bef..a7b601376 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -3320,6 +3320,54 @@ export const CountPlan = [ // { label: "jsonInventoryStatus", prop: 'jsonInventoryStatus' }, // ************** 确认隐藏 ************************ ] +// 新增盘点计划-选择库位 20230328 +export const CountPlanByAddLocation = [ + { + label: "库位代码", + fixed: "left", + type: "name", + prop: "code" + }, + { label: "库位名称", prop: "name", showProp:true }, + { label: "仓库代码", prop: "warehouseCode", showProp:true }, + { label: "区域代码", prop: "areaCode", showProp:true }, + { label: "库位组代码", prop: "locationGroupCode", showProp:true }, + { label: "工作组代码", prop: "workGroupCode", showProp:true }, + { label: "库位类型", prop: "type", type: "filter", filters: "locationType" }, + { label: "ERP系统库位代码", prop: "erpLocationCode", showProp:true }, + { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage", width:'130px', showProp:true }, + { label: "货架号", prop: "shelfCode", showProp:true }, + { label: "行号", prop: "rowCode", showProp:true }, + { label: "列号", prop: "columnCode", showProp:true }, + { label: "拣料优先级", prop: "pickPriority", showProp:true }, + { label: "拣料顺序", prop: "pickOrder", showProp:true }, + { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot", showProp:true }, + { label: "备注", prop: "remark", showProp:true }, + { label: "描述", prop: "description", showProp:true }, + { label: "创建时间", prop: "creationTime", type: "dateTime", showProp:true }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime", showProp:true }, + // { + // label: "操作", + // type:"buttonOperation", + // buttonText:'编辑|删除', + // buttonName:'edit|delete', + // fixed: "right" + // }, +] // 盘点任务 20230415 export const CountJob = [ {