Merge remote-tracking branch 'origin/fencang' into fencang

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() {

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("实际数量不能高于订单数量");