From ab95d601343bf7dfa4117b1fb84c7a6a0ead7953 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 27 Jun 2022 16:29:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E9=85=8D=E8=B4=A7=E7=AE=A1=E7=90=86=EF=BC=8C=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88=E6=88=96=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=97=B6=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=8A=A8=E7=94=BB=E4=B8=8D=E6=B6=88=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/warehouse/stockOrderEditor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index 41578d5..6a0795e 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -859,6 +859,7 @@ export default {
             }
         },
         hideDetailForm() {
+            this.detailLoading = false;
             // 更改值
             this.detailFormVisible = !this.detailFormVisible;
             return true;
@@ -888,7 +889,6 @@ export default {
                 if (valid) {
                     this.detailLoading = true;
                     let tQuery = this.detailFormData;
-                    console.log(this.detailCountMax + "---" + this.detailFormData.count + "---" + this.detailFormData.reCount)
                     if (this.detailCountMax) {
                         if (this.detailFormData.count < this.detailFormData.reCount) {
                             this.$message.error("实际数量不能高于订单数量");

From 1d66f66c0562bbce325fb940ed20a655175e39d1 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 27 Jun 2022 17:52:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=89=80=E5=B1=9E=E5=9C=B0=E5=8C=BA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=85=A8=E9=83=A8=E6=97=B6=EF=BC=8C=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0undefined=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/userManage/register.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/userManage/register.vue b/src/views/userManage/register.vue
index 347de78..2113a86 100644
--- a/src/views/userManage/register.vue
+++ b/src/views/userManage/register.vue
@@ -639,7 +639,6 @@ export default {
         onSubmit(formName) {
             // this.formVisible = true;
 
-
             this.$refs[formName].validate((valid) => {
                 if (valid) {
                     if (this.registerConfigMap.companyCheckStatus) {
@@ -734,8 +733,15 @@ export default {
             }, 1000);
         },
         handleChange(value) {
-            this.inputQuery.area =
-                CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]];
+            this.inputQuery.area = CodeToText[value[0]];
+            if (CodeToText[value[1]] != null && CodeToText[value[1]] != ""
+                && CodeToText[value[1]] != "undefined") {
+                this.inputQuery.area += CodeToText[value[1]];
+            }
+            if (CodeToText[value[2]] != null && CodeToText[value[2]] != ""
+                && CodeToText[value[2]] != "undefined") {
+                this.inputQuery.area += CodeToText[value[2]];
+            }
             this.inputQuery.areaCode = value.toString();
         },
         copy() {