Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_twentyEight.vue

@@ -1076,9 +1076,9 @@ export default {
             var dlegh = 0
             if (
               this.records[recordIndex].monitor_records &&
-              this.records[recordIndex].monitor_records.length < 11
+              this.records[recordIndex].monitor_records.length < 8
             ) {
-              dlegh = 11 - this.records[recordIndex].monitor_records.length
+              dlegh = 8 - this.records[recordIndex].monitor_records.length
             } else {
               dlegh = 0
             }

src/xt_pages/dialysis/details/NavIgation.vue

@@ -206,7 +206,7 @@ export default {
 
   data() {
     return {
-      temp_schedual: null
+      temp_schedual: {}
     };
   },
   mounted() {},
@@ -578,7 +578,9 @@ export default {
         system_prescribe
       );
 
-      // this.temp_schedual = schedual
+      this.temp_schedual = schedual
+
+      console.log("排班列表2222222222222222",schedual)
     },
 
     add_monitor: function(monitor) {

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1593,7 +1593,7 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre,schedual,last,his_is_open) {
-
+        
         if(his_is_open == 1){
           this.is_open = 0
         }
@@ -1632,9 +1632,9 @@
         // 入口
         var pre = pre
         console.log("香锅2222222",this.dialysisPrescription)
-     
+        console.log("列表2223323323223",this.schedual)
         this.dialysisPrescription.mode_id = this.$route.query.mode_id
-        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12) {
+        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || this.schedual.mode_id == 2 || this.schedual.mode_id == 5 || this.schedual.mode_id == 12) {
           this.zhiShow = true
           this.huShow = true
           this.totalShow = true

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -2006,8 +2006,8 @@ export default {
             if (this.org_template_info.org_id == 9535) {
               this.isShowZero = true
             }
-            if (this.monitors.length < 11) {
-              var nl = 11 - this.monitors.length
+            if (this.monitors.length < 8) {
+              var nl = 8 - this.monitors.length
               for (let index = 0; index < nl; index++) {
                 this.monitors.push([])
               }