From 604e63ec67bb6679b50fbe263f928214683fc26b 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, 25 Jul 2023 11:20:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=EF=BC=8C=E7=9B=98=E7=82=B9=E7=B1=BB=E5=9E=8Bexcel?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=94=BE=E5=BC=80=E5=8E=9F=E6=9D=90=E6=96=99?= =?UTF-8?q?=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/components/StepsCountPlanForm/index.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fe/PC/src/components/StepsCountPlanForm/index.vue b/fe/PC/src/components/StepsCountPlanForm/index.vue index 26990ac01..583bb5e6f 100644 --- a/fe/PC/src/components/StepsCountPlanForm/index.vue +++ b/fe/PC/src/components/StepsCountPlanForm/index.vue @@ -407,7 +407,9 @@ export default { // 如果是pda类型盘点，库位类型 则使用 locationTypeForPADPlan 枚举（区别为线边库位为不可选） // 如果是Excel类型盘点，库位类型 则使用 locationTypeForExcelPlan 枚举（区别为原材料库位为不可选） if(item.prop == 'type'){ - item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationTypeForExcelPlan' + // todo:暂时 + // item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationTypeForExcelPlan' + item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationType' } }); return _list @@ -451,7 +453,9 @@ export default { // 盘点库存 过滤线边仓数据 20230703更新 // 如果是Excel盘点类型(this.CreateFormData.requestType == 1)，过滤原材料2 // 如果不是Excel盘点类型(this.CreateFormData.requestType != 1)，过滤线边仓数据5 - let type_value = this.CreateFormData.requestType == 1 ? '2' : '5' + // todo://暂时 + // let type_value = this.CreateFormData.requestType == 1 ? '2' : '5' + let type_value = this.CreateFormData.requestType == 1 ? null : '5' let _filter = { action: "!=", column: "type", @@ -468,7 +472,7 @@ export default { hide: true } if(this.pageListLocation.condition.filters.length <= 0){ - this.pageListLocation.condition.filters.push(_filter) + if(type_value)this.pageListLocation.condition.filters.push(_filter) this.pageListLocation.condition.filters.push(_filter_code) } // code多选处理 20230705更新