From 81b88d47b4fbef2de5dd64ff425cdeafaf326a49 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 12 Jan 2024 09:22:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=BA=93=E5=8C=BA=E4=BB=A3=E7=A0=81=E5=B1=95=E7=A4=BA=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=92=8C=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/countManage/count/countPlanMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index f4c2d91b2..2b5ea97d0 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -739,7 +739,7 @@ const getAreaAllList = async () => { allList.value.areaAllList = res.map((element) => { return { value: element.code, - label: element.name + label: element.name + '-'+ element.code } }) }) From adb98c2ed03c24d9090d689aa2ab18ed886c3fc4 Mon Sep 17 00:00:00 2001 From: chenfang Date: Fri, 12 Jan 2024 09:38:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E8=BD=AC=E5=9C=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRequestMain/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 61f377340..06fe53e9d 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -508,7 +508,8 @@ const submitForm = async (formType, data) => { return; } }) - if(flag){ + if(flag.value){ + formRef.value.formLoading = false return } try {