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/template/DialysisPrintOrderSix.vue

@@ -564,7 +564,7 @@
                       <td style="line-height:16px;padding:0px;">
                         <div style="min-height:35px;line-height:35px; overflow:hidden;">
                           <span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
-                            <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】</template>
+                            <!-- <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】</template> -->
                             {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
                           </span>
                         </div>
@@ -1482,19 +1482,19 @@ export default {
         }
 
         var tempmonitorflag = true
-        for (let index = 0; index < this.monitors.length; index++) {
-          const monitor = this.monitors[index]
-          this.monitors[index].end = ''
-          if (Object.keys(monitor).length > 0 && index > 1) {
-            if (this.dialysisOrder && monitor.operate_time == this.dialysisOrder.end_time) {
-              this.monitors[index].end = '【结束透析】'
-              tempmonitorflag = false
-            }
-            if (tempmonitorflag && index == this.monitors.length - 1) {
-              this.monitors[index].end = '【结束透析】'
-            }
-          }
-        }
+        // for (let index = 0; index < this.monitors.length; index++) {
+        //   const monitor = this.monitors[index]
+        //   this.monitors[index].end = ''
+        //   if (Object.keys(monitor).length > 0 && index > 1) {
+        //     if (this.dialysisOrder && monitor.operate_time == this.dialysisOrder.end_time) {
+        //       this.monitors[index].end = '【结束透析】'
+        //       tempmonitorflag = false
+        //     }
+        //     if (tempmonitorflag && index == this.monitors.length - 1) {
+        //       this.monitors[index].end = '【结束透析】'
+        //     }
+        //   }
+        // }
 
         this.jilurow = this.monitors.length + 1