From 8fa59f50548dd861bd945ec1d0680d0b6db67eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Wed, 26 Jul 2023 08:50:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/version.json | 2 +- fe/PC/src/components/StepsCountPlanForm/index.vue | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index c4b6ddc79..e0861ead5 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.64" + "version": "1.0.65" } \ No newline at end of file diff --git a/fe/PC/src/components/StepsCountPlanForm/index.vue b/fe/PC/src/components/StepsCountPlanForm/index.vue index 583bb5e6f..b9fc53917 100644 --- a/fe/PC/src/components/StepsCountPlanForm/index.vue +++ b/fe/PC/src/components/StepsCountPlanForm/index.vue @@ -408,8 +408,8 @@ export default { // 如果是Excel类型盘点,库位类型 则使用 locationTypeForExcelPlan 枚举(区别为原材料库位为不可选) if(item.prop == 'type'){ // todo:暂时 - // item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationTypeForExcelPlan' - item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationType' + item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationTypeForExcelPlan' + // item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationType' } }); return _list @@ -454,8 +454,8 @@ export default { // 如果是Excel盘点类型(this.CreateFormData.requestType == 1),过滤原材料2 // 如果不是Excel盘点类型(this.CreateFormData.requestType != 1),过滤线边仓数据5 // todo://暂时 - // let type_value = this.CreateFormData.requestType == 1 ? '2' : '5' - let type_value = this.CreateFormData.requestType == 1 ? null : '5' + let type_value = this.CreateFormData.requestType == 1 ? '2' : '5' + // let type_value = this.CreateFormData.requestType == 1 ? null : '5' let _filter = { action: "!=", column: "type",