Merge branch 'feature_20260226_新建家装店时问题修复' into release

src/views/deviceOutside/suishenbangOutstoreVisit.vue

@@ -543,6 +543,7 @@ export default {
                 that.isToOtherSystem = true;
               }
             } else {
+              that.visitId = res.data;
               that.$toast(res.msg);
             }
           });
@@ -597,10 +598,12 @@ export default {
                 that.isToOtherSystem = true;
               }
             } else {
+              // 获取门店拜访任务失败依然返回拜访id，取消拜访使用
+              that.visitId = res.data;
               that.$toast(res.msg);
             }
           });
-        }
+        },
       );
     },
     filterSfaTaskList(list) {

src/views/storeManagement/storeAdd.vue

@@ -973,7 +973,7 @@ export default {
             val.location.lat +
             ',' +
             val.location.lng +
-            ',1000,0)&page_size=20&page_index=1&orderby=_distance&output=jsonp&key=WLCBZ-HRM6L-YOMPV-ME62B-AQOG6-JUBW6'
+            ',1000,0)&page_size=20&page_index=1&orderby=_distance&output=jsonp&key=WLCBZ-HRM6L-YOMPV-ME62B-AQOG6-JUBW6',
         ).then((res) => {
           that.maplist = res.data;
           that.marker.setGeometries([]);
@@ -1001,7 +1001,7 @@ export default {
           this.location.lat1 +
           ',' +
           this.location.lon1 +
-          '&output=jsonp&key=WLCBZ-HRM6L-YOMPV-ME62B-AQOG6-JUBW6&page_size=20&region_fix=1'
+          '&output=jsonp&key=WLCBZ-HRM6L-YOMPV-ME62B-AQOG6-JUBW6&page_size=20&region_fix=1',
       ).then((res) => {
         this.searchSHow = true;
         that.mapsearchlist = res.data;
@@ -1015,7 +1015,7 @@ export default {
             styleId: 'abc',
             position: new TMap.LatLng(
               this.maplist[val].location.lat,
-              this.maplist[val].location.lng
+              this.maplist[val].location.lng,
             ),
           },
         ]);
@@ -1035,7 +1035,7 @@ export default {
           this.location.lat1 +
           ',' +
           this.location.lon1 +
-          ',1000,0)&page_size=10&page_index=1&orderby=_distance&output=jsonp&key=WLCBZ-HRM6L-YOMPV-ME62B-AQOG6-JUBW6'
+          ',1000,0)&page_size=10&page_index=1&orderby=_distance&output=jsonp&key=WLCBZ-HRM6L-YOMPV-ME62B-AQOG6-JUBW6',
       ).then((res) => {
         this.maplist = res.data;
         setTimeout(() => {
@@ -1260,7 +1260,7 @@ export default {
           } else {
             this.$toast.fail('请求超时');
           }
-        }
+        },
       );
     },
     newimgarr1(val) {
@@ -1333,7 +1333,7 @@ export default {
               }
               if (
                 res.data.StreetInfoList[j2].countyName.indexOf(
-                  this.fromValue.districtNameOld + ''
+                  this.fromValue.districtNameOld + '',
                 ) != -1
               ) {
                 this.fromValue.district = res.data.StreetInfoList[j2].countyCode;
@@ -1719,7 +1719,7 @@ export default {
       this.fromValue.orderProductStoreList = arrList;
       this.toastLoading(0, '上传中...', true);
       var fromValue = this.fromValue;
-      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;
@@ -1770,11 +1770,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 (
@@ -1945,7 +1941,7 @@ export default {
                           '&marklat=' +
                           this.mlan +
                           '&marklon=' +
-                          this.mlon
+                          this.mlon,
                       );
                     } else {
                       this.$dialog
@@ -1987,14 +1983,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;