Quellcode durchsuchen

Merge branch 'feature_20250527_门店拜访任务列表访问速度优化' into uat(dev)

zhujindu vor 6 Monaten
Ursprung
Commit
3d5838ac1e

+ 5 - 1
src/views/deviceOutside/index.vue

@@ -1249,6 +1249,10 @@ export default {
       });
     },
     storeVisit(val) {
+      if (val.visitSource && val.visitSource == 2) {
+        this.$toast('请先取消异常拜访后再进入正常拜访!');
+        return;
+      }
       localStorage.setItem('tabVal', this.tabVal);
       localStorage.removeItem('visitId');
       checkVisit({ storeId: val.storeId }).then((res) => {
@@ -1882,7 +1886,7 @@ export default {
                               message: '定位失败,请开启企微定位权限',
                             })
                             .then(() => {
-                              this.$router.go(-1);
+                              // this.$router.go(-1);
                             });
                         } else {
                           clearInterval(times);

+ 4 - 0
src/views/deviceOutside/rangeStore.vue

@@ -1707,6 +1707,10 @@ export default {
 
     storeVisit(val) {
       // localStorage.setItem("tabVal",this.tabVal)
+      if (val.visitSource && val.visitSource == 2) {
+        this.$toast('请先取消异常拜访后再进入正常拜访!');
+        return;
+      }
       localStorage.removeItem('visitId');
       var rdId = val.rdId;
       var that = this;

+ 4 - 0
src/views/deviceOutside/topStore.vue

@@ -1464,6 +1464,10 @@ export default {
       });
     },
     storeVisit(val) {
+      if (val.visitSource && val.visitSource == 2) {
+        this.$toast('请先取消异常拜访后再进入正常拜访!');
+        return;
+      }
       localStorage.setItem('tabVal', this.tabVal);
       localStorage.removeItem('visitId');
       checkVisit({ storeId: val.storeId }).then((res) => {

+ 4 - 0
src/views/deviceWithin/index.vue

@@ -792,6 +792,10 @@ export default {
       });
     },
     storeVisit(val) {
+      if (val.visitSource && val.visitSource == 2) {
+        this.$toast('请先取消异常拜访后再进入正常拜访!');
+        return;
+      }
       var that = this;
       localStorage.removeItem('visitId');
       checkVisit({ storeId: val.storeId }).then((res) => {

+ 0 - 12
src/views/historicalVisit/hisvistdeils.vue

@@ -304,19 +304,7 @@ export default {
       putInCode: '',
     };
   },
-  // watch: {
-  //   $route(to, from) {
-  //     if (from.path == "/historicalDetails" && to.path == "/historiStoreVisit") {
-  //       this.getPhotoTypeList()
-  //       this.info()
-  //     }
-  //   }
-  // },
   activated() {
-    this.getPhotoTypeList();
-    this.info();
-  },
-  created() {
     this.taskType = this.$route.query.taskType;
     this.PhotoType = this.$route.query.photoType;
     this.visitId = this.$route.query.visitId + '';

+ 4 - 0
src/views/home/hintTabPage/noVisit.vue

@@ -137,6 +137,10 @@ export default {
     tabChange(val) {},
     // 进入拜访
     storeVisit(val) {
+      if (val.visitSource && val.visitSource == 2) {
+        this.$toast('请先取消异常拜访后再进入正常拜访!');
+        return;
+      }
       if (!this.clickIsFlage) return;
       this.clickIsFlage = false;
       this.toastLoading(0, '加载中...', true);