Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/pages/doctorAdvice/components/Inspection.vue

@@ -169,7 +169,8 @@ export default {
       index: 0,
       name: "",
       date: "",
-      index: ""
+      index: "",
+      restatus: 0
     };
   },
   methods: {
@@ -323,14 +324,27 @@ export default {
     onLoad() {},
     toInspection(date) {
       var patientid = this.$route.query.patientid;
-      this.$router.push(
-        "/allinspection?patientid=" +
-          patientid +
-          "&date=" +
-          date +
-          "&active=" +
-          this.active
-      );
+      if (this.restatus == 1) {
+        this.$router.push(
+          "/allinspection?patientid=" +
+            patientid +
+            "&date=" +
+            date +
+            "&active=" +
+            this.active +
+            "&restatus=" +
+            this.restatus
+        );
+      } else {
+        this.$router.push(
+          "/allinspection?patientid=" +
+            patientid +
+            "&date=" +
+            date +
+            "&active=" +
+            this.active
+        );
+      }
     },
     Delete(date, index) {
       this.newShow = true;
@@ -404,6 +418,8 @@ export default {
     // 获取所有检验检查项目
     this.getAllInspection();
     this.getInspection(patientid);
+    var restatus = this.$route.query.restatus;
+    this.restatus = restatus;
   }
 };
 </script>

src/pages/doctorAdvice/index.vue

@@ -562,6 +562,7 @@ export default {
       this.$router.push("/editPatient?patientid=" + this.patient_id);
     },
     toReturn() {
+      console.log("this.restatus", this.restatus);
       if (this.restatus == 1) {
         this.$router.push(
           "/details?patient_id=" +

src/pages/patientCenter/allCheck/index.vue

@@ -83,7 +83,8 @@ export default {
       activeTwo: 0,
       patientid: 0,
       data: [],
-      projectName: []
+      projectName: [],
+      restatus: 0
     };
   },
   methods: {
@@ -130,7 +131,7 @@ export default {
       getInspectionDetail(patientid, date, this.project_id).then(response => {
         if (response.data.state === 1) {
           var InspectionDetail = response.data.data.InspectionDetail;
-          //console.log("数据是", InspectionDetail);
+          // console.log("数据是", InspectionDetail);
           this.InspectionDetail = InspectionDetail;
         }
       });
@@ -150,12 +151,23 @@ export default {
       return uParseTime(time, "{y}-{m}-{d}");
     },
     toReturn() {
-      this.$router.push(
-        "/patientdetail?patientid=" +
-          this.patientid +
-          "&active=" +
-          this.activeTwo
-      );
+      if (this.restatus == 1) {
+        this.$router.push(
+          "/patientdetail?patientid=" +
+            this.patientid +
+            "&active=" +
+            this.activeTwo +
+            "&restatus=" +
+            this.restatus
+        );
+      } else {
+        this.$router.push(
+          "/patientdetail?patientid=" +
+            this.patientid +
+            "&active=" +
+            this.activeTwo
+        );
+      }
     }
   },
   created() {
@@ -170,6 +182,8 @@ export default {
     this.GetAllProjectNameByDate(date, patientid);
     this.getAllInspection();
     this.getPatientName(patientid);
+    var restatus = this.$route.query.restatus;
+    this.restatus = restatus;
   }
 };
 </script>
@@ -277,7 +291,7 @@ export default {
     font-weight: bold;
     flex-basis: 26% !important;
   }
-  .van-tabs__wrap{
+  .van-tabs__wrap {
     overflow: inherit;
   }
 }