Merge branch 'syf-scale1220' into test

src/components/PathInfo.vue

@@ -112,6 +112,7 @@ export default {
       showStart: false,
       allMoudles: {},
       scaleCount: 0,
+      i: "",
     };
   },
   computed: {
@@ -137,7 +138,14 @@ export default {
   },
   methods: {
     comfirnDel() {
-      this.goNext();
+      if (this.i == 1) {
+        this.goNext();
+      } else {
+        this.$router.push({
+          path: "/chooseScale",
+          query: JSON.parse(localStorage.getItem("loginParam")),
+        });
+      }
     },
     cancelDel() {
       this.showToast = false;
@@ -247,9 +255,13 @@ export default {
         const result = res.data;
         if (result.code == 0) {
           let data = result.data;
-          if ((data.detailCount > 0 && data.physicalCount > 0 && i== 1) || (data.scaleCount > 0 && i== 2)) {
+          if (
+            (data.detailCount > 0 && data.physicalCount > 0 && i == 1) ||
+            (data.scaleCount > 0 && i == 2)
+          ) {
             //有预问诊信息
             this.showToast = true;
+            this.i = i;
           } else {
             if (i == 1) {
               this.goNext();