Merge branch 'feature_20260226_新建家装店时问题修复' into uat(dev)

# Conflicts:
#	src/views/storeManagement/storeAdd.vue

src/views/deviceOutside/suishenbangOutstoreVisit.vue

@@ -543,6 +543,7 @@ export default {
                 that.isToOtherSystem = true;
               }
             } else {
+              that.visitId = res.data.visitId;
               that.$toast(res.msg);
             }
           });
@@ -597,10 +598,11 @@ export default {
                 that.isToOtherSystem = true;
               }
             } else {
+              that.visitId = res.data.visitId;
               that.$toast(res.msg);
             }
           });
-        }
+        },
       );
     },
     filterSfaTaskList(list) {

src/views/storeManagement/storeAdd.vue

@@ -1774,7 +1774,7 @@ export default {
         this.fromValue.storeCompetitorList = [];
       }
       this.activatedStoreCompetitor = [];
-      var telrg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      var telrg = /^1[123456789]\d{9}$/;
       if (fromValue.orgId == '') {
         this.$toast('部门未选择');
         return;
@@ -1825,11 +1825,7 @@ export default {
       ) {
         this.$toast('联系电话未填写');
         return;
-      } else if (
-        !telrg.test(fromValue.telephone) &&
-        fromValue.ifJzStoreType != 1 &&
-        fromValue.storeCategory != 'C917'
-      ) {
+      } else if (fromValue.telephone.trim() != '' && !telrg.test(fromValue.telephone)) {
         this.$toast('手机号格式错误');
         return;
       } else if (
@@ -2058,14 +2054,14 @@ export default {
       console.log(name, title);
     },
     phoneCheck() {
-      if (this.fromValue.ifJzStoreType != 1) {
-        var telrg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
-        if (this.fromValue.telephone.trim() == '') {
-          return;
-        } else if (!telrg.test(this.fromValue.telephone)) {
-          this.$toast('手机号格式错误');
-          return;
-        } else {
+      var telrg = /^1[123456789]\d{9}$/;
+      if (this.fromValue.telephone.trim() == '') {
+        return;
+      } else if (!telrg.test(this.fromValue.telephone)) {
+        this.$toast('手机号格式错误');
+        return;
+      } else {
+        if (this.fromValue.ifJzStoreType != 1) {
           phoneCheck({ phoneNumber: this.fromValue.telephone }).then((res) => {
             if (res.code == 200) {
               this.phoneNumber = true;