1

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -111,7 +111,7 @@
               诊断：
               <div
                 class="under_line"
-                style="width: 740px;text-align: left;word-break: break-all;word-wrap: break-word;display: inline-block;white-space: unset;"
+                style="width: 640px;text-align: left;word-break: break-all;word-wrap: break-word;display: inline-block;white-space: unset;"
               >
                 {{ record.patient.diagnose }}
               </div>
@@ -258,68 +258,6 @@
                         </div>
                         mmHg
                       </div>
-                      <div class="inline_block" style="margin-left:10px;">
-                        血管通路：
-                        <div
-                          class="under_line"
-                          style="width: 200px;text-align: center;"
-                        >
-                          {{
-                              record.assessment_before_dislysis &&
-                                record.assessment_before_dislysis
-                                  .blood_access_part_id
-                                ? record.assessment_before_dislysis
-                                    .blood_access_part_id
-                                : 0  
-                          }}
-                          {{
-                            record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis
-                              .blood_access_part_opera_name
-                              ? record.assessment_before_dislysis
-                                  .blood_access_part_opera_name
-                              : ""
-                          }}
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="row"
-                      style="padding: 2px 0;line-height:23px;display:flex;"
-                    >
-                      <div class="inline_block" style="flex:1;">
-                        内瘘：
-                        <div
-                          class="under_line"
-                          style="width: 120px;text-align: center"
-                        >
-                          {{
-                            record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis.internal_fistula
-                              ? record.assessment_before_dislysis
-                                  .internal_fistula
-                              : "/"
-                          }}
-                        </div>
-                      </div>
-
-                      <div
-                        class="inline_block"
-                        style="margin-left:10px;flex:1;"
-                      >
-                        导管：
-                        <div
-                          class="under_line"
-                          style="width: 120px;text-align: center"
-                        >
-                          {{
-                            record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis.catheter
-                              ? record.assessment_before_dislysis.catheter
-                              : "/"
-                          }}
-                        </div>
-                      </div>
                       <div
                         class="inline_block"
                         style="margin-left:10px;flex:1;"
@@ -334,45 +272,6 @@
                           v-if="record.assessment_before_dislysis"
                           style="display: inline-block;"
                         >
-                          <!-- <div
-                            class="under_line"
-                            style="width: 100px;text-align: center"
-                            v-if="
-                              record.assessment_before_dislysis.puncture_way ==
-                                0
-                            "
-                          ></div>
-                          <div
-                            class="under_line"
-                            style="width: 100px;text-align: center"
-                            v-if="
-                              record.assessment_before_dislysis.puncture_way ==
-                                1
-                            "
-                          >
-                            绳梯
-                          </div>
-                          <div
-                            class="under_line"
-                            style="width: 100px;text-align: center"
-                            v-if="
-                              record.assessment_before_dislysis.puncture_way ==
-                                2
-                            "
-                          >
-                            扣眼
-                          </div>
-                          <div
-                            class="under_line"
-                            style="width: 100px;text-align: center"
-                            v-if="
-                              record.assessment_before_dislysis.puncture_way ==
-                                3
-                            "
-                          >
-                            区域
-                          </div> -->
-
                           <div
                             class="under_line"
                             style="width: 100px;text-align: center"
@@ -430,6 +329,77 @@
                           }}
                         </div>
                       </div>
+                      
+                    </div>
+                    <div
+                      class="row"
+                      style="padding: 2px 0;line-height:23px;display:flex;"
+                    >
+                      <div class="inline_block">
+                        血管通路：
+                        <div
+                          class="under_line"
+                          style="width: 200px;text-align: center;"
+                        >
+                          {{
+                              record.assessment_before_dislysis &&
+                                record.assessment_before_dislysis
+                                  .blood_access_part_id
+                                ? record.assessment_before_dislysis
+                                    .blood_access_part_id
+                                : 0  
+                          }}
+                          {{
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis
+                              .blood_access_part_opera_name
+                              ? record.assessment_before_dislysis
+                                  .blood_access_part_opera_name
+                              : ""
+                          }}
+                        </div>
+                      </div>
+                      <div class="inline_block" style="flex:1;">
+                        内瘘：
+                        <div
+                          class="under_line"
+                          style="width: 120px;text-align: center"
+                        >
+                          {{
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis.internal_fistula
+                              ? record.assessment_before_dislysis
+                                  .internal_fistula
+                              : "/"
+                          }}
+                        </div>
+                      </div>
+
+                      <div
+                        class="inline_block"
+                        style="margin-left:10px;flex:1;"
+                      >
+                        导管：
+                        <div
+                          class="under_line"
+                          style="width: 120px;text-align: center"
+                        >
+                          {{
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis.catheter
+                              ? record.assessment_before_dislysis.catheter
+                              : "/"
+                          }}
+                        </div>
+                      </div>
+                      <div class="inline_block" style="margin-left:10px;flex:1;" v-if="org_id == 10223">
+                        导管打折：
+                        <div class="under_line" style="width: 50px;text-align: center;white-space: normal;">
+                          <span v-if="record.assessment_before_dislysis.catheter_bend == 0">/</span>
+                          <span v-if="record.assessment_before_dislysis.catheter_bend == 1">有</span>
+                          <span v-if="record.assessment_before_dislysis.catheter_bend == 2">无</span>
+                        </div>
+                      </div>
                     </div>
                     <div
                       class="row"
@@ -1058,11 +1028,10 @@
                             {{monitor_record.temperature? monitor_record.temperature: ""}}
                           </td>
                           <td>
-                            {{monitor_record.sodium_concentration? monitor_record.sodium_concentration: ""}}
+                            {{monitor_record.conductivity? monitor_record.conductivity: ""}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "0"}}
+                            <span v-if="monitor_record.operate_time">{{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: ""}}</span>
                           </td>
                           <td v-if=" record.prescription.mode_id == 2 || record.prescription.mode_id == 5 ||(record.prescription.mode_id == 12 &&monitor_record.operate_time >record.dialysis_order.end_time) " style="width:50px">
                             {{
@@ -1073,14 +1042,13 @@
                           </td>
                           <td style="line-height:16px;padding:0px;">
                             <div
-                              style="min-height:40px;line-height:20px; overflow:hidden;"
+                              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="index == 0"
-                                  >【开始透析】</template
-                                >
+                                <template v-if="(record.dialysis_order && monitor_record.operate_time == record.dialysis_order.start_time)">【开始透析】</template>
+                                <template v-if="(record.dialysis_order && monitor_record.operate_time == record.dialysis_order.end_time)">【结束透析】</template>
                                 {{ monitor_record.end }}
                                 {{ monitor_record.symptom }} &nbsp;{{
                                   monitor_record.dispose
@@ -1427,7 +1395,7 @@
                       </div>
                       <div
                         class="inline_block"
-                        style="margin-left:10px;flex:1;"
+                        style="margin-left:10px;flex:1.5;"
                       >
                         BP：
                         <div
@@ -1459,55 +1427,7 @@
                         </div>
                         mmHg
                       </div>
-                    </div>
-                    <div
-                      class="row"
-                      style="padding: 2px 0;line-height:23px;display:flex;"
-                    >
-                      <!-- <div class="inline_block" style="flex:1;">
-                        透析器凝血：
-                        <div
-                          class="under_line"
-                          style="width: 70px;text-align: center"
-                        >
-                          {{
-                            record.assessment_after_dislysis &&
-                            record.assessment_after_dislysis.cruor
-                              ? record.assessment_after_dislysis.cruor
-                              : "/"
-                          }}
-                        </div>
-                      </div> -->
-                      <div class="inline_block" style="flex:1;">
-                        内瘘：
-                        <div
-                          class="under_line"
-                          style="width: 70px;text-align: center"
-                        >
-                          {{
-                            record.assessment_after_dislysis &&
-                            record.assessment_after_dislysis.internal_fistula
-                              ? record.assessment_after_dislysis
-                                  .internal_fistula
-                              : "/"
-                          }}
-                        </div>
-                      </div>
-                      <div class="inline_block" style="flex:1;">
-                        导管：
-                        <div
-                          class="under_line"
-                          style="width: 150px;text-align: center"
-                        >
-                          {{
-                            record.assessment_after_dislysis &&
-                            record.assessment_after_dislysis.catheter
-                              ? record.assessment_after_dislysis.catheter
-                              : "/"
-                          }}
-                        </div>
-                      </div>
-                      <div class="inline_block" style="flex:1;">
+                      <div class="inline_block" style="flex:1.5;">
                         实际治疗时间：
                         <div
                           class="under_line"
@@ -1538,16 +1458,14 @@
                         </div>
                         min
                       </div>
-                      <!-- 只是占位 -->
-                      <div
-                        class="inline_block"
-                        style="flex:1;visibility: hidden;"
-                      >
+                    </div>
+                    <div
+                      class="row"
+                      style="padding: 2px 0;line-height:23px;display:flex;"
+                    >
+                      <div class="inline_block" style="flex:2.5;">
                         透析器凝血：
-                        <div
-                          class="under_line"
-                          style="width: 70px;text-align: center"
-                        >
+                        <div class="under_line" style="width:170px;text-align:center;white-space: normal;">
                           {{
                             record.assessment_after_dislysis &&
                             record.assessment_after_dislysis.cruor
@@ -1556,6 +1474,31 @@
                           }}
                         </div>
                       </div>
+                      <div class="inline_block" style="flex:2;">
+                        内瘘：
+                        <div class="under_line" style="width: 170px;text-align: center;white-space: normal;">
+                          {{
+                            record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis.internal_fistula
+                              ? record.assessment_after_dislysis
+                                  .internal_fistula
+                              : "/"
+                          }}
+                        </div>
+                      </div>
+                      <div class="inline_block" style="flex:4;">
+                        导管：
+                        <div class="under_line" style="min-width: 120px;text-align: center">
+                          {{
+                            record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis.catheter
+                              ? record.assessment_after_dislysis.catheter
+                              : "/"
+                          }}
+                        </div>
+                      </div>
+                      
+                      
                     </div>
 
                     <div
@@ -1599,7 +1542,7 @@
                         kg
                       </div>
 
-                      <div class="inline_block" style="flex:1;">
+                      <div class="inline_block" style="flex:1;" v-if="org_id != 10223">
                         透析中入量：
                         <div
                           class="under_line"
@@ -1634,32 +1577,64 @@
                         ml
                       </div>
                     </div>
-                    <div
-                      class="row"
-                      style="padding: 2px 0;line-height:23px;display:flex;"
-                    >
-                      <div class="inline_block" style="flex:1;">
-                        透析器凝血：
-                        <span
-                          style="width: 95%;line-height: 25px;text-align: left;margin-left: 2px;text-underline-position: under; text-decoration: underline;"
-                        >
-                          {{
-                            record.assessment_after_dislysis &&
-                            record.assessment_after_dislysis.cruor
-                              ? record.assessment_after_dislysis.cruor
-                              : "/"
-                          }}
-                        </span>
+                    <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" v-if="org_id == 10223">
+                    <div class="inline_block" style="flex:1;">
+                      动脉管道：
+                      <div class="under_line" style="width: 100px;text-align: center">
+                        <span v-if="record.assessment_after_dislysis.arterial_tube == 0">/</span>
+                        <span v-if="record.assessment_after_dislysis.arterial_tube == 1">动脉管道0</span>
+                        <span v-if="record.assessment_after_dislysis.arterial_tube == 2">动脉管道+</span>
+                        <span v-if="record.assessment_after_dislysis.arterial_tube == 3">动脉管道++</span>
+                        <span v-if="record.assessment_after_dislysis.arterial_tube == 4">动脉管道+++</span>
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex:1;">
+                      静脉管道：
+                      <div class="under_line" style="width: 100px;text-align: center">
+                        <span v-if="record.assessment_after_dislysis.intravenous_tube == 0">/</span>
+                        <span v-if="record.assessment_after_dislysis.intravenous_tube == 1">静脉管道0</span>
+                        <span v-if="record.assessment_after_dislysis.intravenous_tube == 2">静脉管道+</span>
+                        <span v-if="record.assessment_after_dislysis.intravenous_tube == 3">静脉管道++</span>
+                        <span v-if="record.assessment_after_dislysis.intravenous_tube == 4">静脉管道+++</span>
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex:1;">
+                      并发症：
+                      <div class="under_line" style="width: 170px;text-align: center">
+                        {{ record.assessment_after_dislysis.complication ? record.assessment_after_dislysis.complication : "/" }}
                       </div>
                     </div>
+                  </div>
+                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" v-if="org_id == 10223">
+                    <div class="inline_block" style="flex:1;">
+                      穿刺处血肿：
+                      <div class="under_line" style="width: 50px;text-align: center">
+                        <span v-if="record.assessment_after_dislysis.puncture_point_haematoma == 0">/</span>
+                        <span v-if="record.assessment_after_dislysis.puncture_point_haematoma == 1">有</span>
+                        <span v-if="record.assessment_after_dislysis.puncture_point_haematoma == 2">无</span>
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex:1;">
+                      中心静脉封管(肝素-A端):
+                      <div class="under_line" style="width: 70px;text-align: center">
+                        {{ record.assessment_after_dislysis.cvc_a ? record.assessment_after_dislysis.cvc_a : "/" }}
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex:1;">
+                      中心静脉封管(肝素-V端):
+                      <div class="under_line" style="width: 70px;text-align: center">
+                        {{ record.assessment_after_dislysis.cvc_v ? record.assessment_after_dislysis.cvc_v : "/" }}
+                      </div>
+                    </div>
+                  </div>
                     <div
                       class="row"
                       style="padding: 2px 0;line-height:23px;display:flex;"
                     >
-                      <div class="inline_block" style="flex:1;">
+                      <div class="inline_block" style="flex:1; display:inline-block;">
                         治疗小结：
-                        <div
-                          style="width: 95%;line-height: 25px;text-align: left;margin-left: 2px;text-underline-position: under; text-decoration: underline;"
+                        <div class="under_line"
+                          style="width: 840px;line-height: 25px;text-align: left;margin-left: 2px;display: inline-block;white-space: normal;"
                         >
                           {{
                             record.summer && record.summer.dialysis_summary
@@ -2077,9 +2052,9 @@ export default {
             var dlegh = 0;
             if (
               this.records[recordIndex].monitor_records &&
-              this.records[recordIndex].monitor_records.length < 8
+              this.records[recordIndex].monitor_records.length < 6
             ) {
-              dlegh = 8 - this.records[recordIndex].monitor_records.length;
+              dlegh = 6 - this.records[recordIndex].monitor_records.length;
             } else {
               dlegh = 0;
             }
@@ -2104,9 +2079,9 @@ export default {
             var delghTwo = 0;
             if (
               this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 7
+              this.records[recordIndex].advices.length < 12
             ) {
-              delghTwo = 7 - this.records[recordIndex].advices.length;
+              delghTwo = 12 - this.records[recordIndex].advices.length;
             } else {
               delghTwo = 0;
             }

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -1392,6 +1392,8 @@ export default {
             })
           }
         })
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getCruor(cruor){

src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue

@@ -340,8 +340,8 @@
             <td>{{ monitor.venous_pressure }}</td>
             <td>{{ monitor.transmembrane_pressure }}</td>
             <td>{{ monitor.conductivity }}</td>
-            <td>{{ monitor.ultrafiltration_volume }}</td>
-            <td>{{ monitor.ultrafiltration_rate }}</td>
+            <td><span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : '0' }}</span></td>
+            <td><span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '0' }}</span></td>
             <td>{{ monitor.dialysate_temperature }}</td>
             <td style="text-align:left;padding-left:10px;">
               <div style="line-height:20px;text-align: left;display: inline-block;">

src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue

@@ -1856,6 +1856,28 @@ export default {
           this.$message.error('核对护士未填')
         }else if(this.doctor_advices.length > 0 && (this.doctor_advices[0].execution_staff != this.check.creater) && this.check.creater == 0 ){
           this.$message.error('核对护士未填')
+        }else if(this.tableAdvice.length > 0){
+          this.tableAdvice.map(item => {
+            if(item.id > 0 && item.created_time){
+              this.users.map(it => {
+                if(it.id == item.advice_doctor){
+                  if(it.type != 2){
+                    this.$message.error('存在不是医生保存的医嘱')
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.type != 3){
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.type != 3){
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
+                }
+              })
+            }
+          })
+        }else{
+          this.$message.success('核对完成')
         }
       },
       getComplication(complication){
@@ -2123,6 +2145,7 @@ export default {
             }
 
             this.advices = response.data.data.advices
+            this.tableAdvice = response.data.data.advices;
             // console.log('hhhhhhhhhhhh', this.advices)
             this.monitors = response.data.data.monitors
             // console.log('哈哈哈哈哈哈哈', this.monitors)

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -515,7 +515,7 @@
                               <span>{{prescription.dialysis_dialyszers}}</span>
                               <span v-if="prescription.dialysis_irrigation!=''">/{{prescription.dialysis_irrigation}}</span>
                             </span>
-                          &nbsp;<span else>{{ prescription.dialyzer_perfusion_apparatus }}</span>
+                            <span v-else>{{ prescription.dialyzer_perfusion_apparatus }}</span>
                         </div>
                       </td>
                     </tr>
@@ -1220,7 +1220,7 @@ export default {
         this.$message.error('患者去向未填')
       }else if(this.afterdialysis.creater == 0){
         this.$message.error('当班责任（核对）护士未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0){
         this.$message.error('下机护士未填')
       }else if(this.tableAdvice.length > 0){
         this.tableAdvice.map(item => {
@@ -1242,6 +1242,8 @@ export default {
             })
           }
         })
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getAdminUser(id) {

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -760,6 +760,8 @@ export default {
             })
           }
         })
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getDisplaceLiquiPart: function(val) {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1359,9 +1359,9 @@ export default {
         this.$message.error('实际超滤量未填')
       } else if (this.summary.dialysis_summary == '') {
         this.$message.error('透析小结未填')
-      } else if (this.dialysisOrder.puncture_nurse == 0) {
+      } else if (this.dialysisOrder == null || this.dialysisOrder.puncture_nurse == 0) {
         this.$message.error('穿刺护士未填')
-      } else if (this.dialysisOrder.start_nurse == 0) {
+      } else if (this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0) {
         this.$message.error('治疗护士未填')
       } else if (this.dialysisOrder == null && this.check.creater == 0) {
         this.$message.error('核对人员未填')
@@ -1371,10 +1371,32 @@ export default {
         this.$message.error('核对人员未填')
       } else if (this.dialysisOrder != null && this.dialysisOrder.start_nurse != this.check.creater && this.dialysisOrder.start_nurse != this.check.modifier && this.check.creater == 0) {
         this.$message.error('核对人员未填')
-      } else if (this.dialysisOrder.finish_nurse == 0) {
+      } else if (this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0) {
         this.$message.error('下机护士未填')
       } else if (this.prescription.creater == 0) {
         this.$message.error('医生签名未填')
+      }else if(this.tableAdvice.length > 0){
+        this.tableAdvice.map(item => {
+          if(item.id > 0 && item.created_time){
+            this.users.map(it => {
+              if(it.id == item.advice_doctor){
+                if(it.type != 2){
+                  this.$message.error('存在不是医生保存的医嘱')
+                }
+              }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                if(it.type != 3){
+                  this.$message.error('存在不是护士执行的医嘱')
+                }
+              }else if(it.id == item.checker && item.checker > 0){
+                if(it.type != 3){
+                  this.$message.error('存在不是护士核对的医嘱')
+                }
+              }
+            })
+          }
+        })
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getDisplaceLiquiPart: function(val) {
@@ -1664,6 +1686,7 @@ export default {
         }
 
         this.advices = response.data.data.advices
+        this.tableAdvice = response.data.data.advices;
         console.log('医嘱数据2222222222', this.advices)
         this.monitors = response.data.data.monitors
         this.summary = response.data.data.summary

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -1260,9 +1260,9 @@ export default {
         this.$message.error('实际超滤量未填')
       }else if(this.summary.dialysis_summary == ""){
         this.$message.error('透析小结未填')
-      }else if(this.dialysisOrder.puncture_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse == 0){
         this.$message.error('穿刺护士未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('治疗护士未填')
       }else if(this.dialysisOrder == null && this.check.creater == 0){
         this.$message.error('核对人员未填')
@@ -1272,7 +1272,7 @@ export default {
         this.$message.error('核对人员未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse != this.check.creater && this.dialysisOrder.start_nurse != this.check.modifier && this.check.creater == 0){
         this.$message.error('核对人员未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0){
         this.$message.error('下机护士未填')
       }else if(this.prescription.prescription_doctor == 0){
         this.$message.error('治疗医生未填')
@@ -1308,6 +1308,8 @@ export default {
             })
           }
         })
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getDisplaceLiquiPart: function(val) {

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -1388,9 +1388,9 @@ export default {
         this.$message.error('透析器凝血未填')
       }else if(this.afterdialysis.patient_gose == 0){
         this.$message.error('患者去向未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('责任护士未填')
-      }else if(this.dialysisOrder.puncture_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse == 0){
         this.$message.error('穿刺者未填')
       }else if(this.dialysisOrder == null && this.check.creater == 0){
         this.$message.error('核对人未填')
@@ -1400,9 +1400,9 @@ export default {
         this.$message.error('核对人未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse != this.check.creater && this.dialysisOrder.start_nurse != this.check.modifier && this.check.creater == 0){
         this.$message.error('核对人未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0){
         this.$message.error('收针者未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('血透室护士签名未填')
       }else if(this.prescription.mode_id == ""){
         this.$message.error('治疗方式未填')
@@ -1468,6 +1468,8 @@ export default {
             })
           }
         })
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getIsCheckDataConfig(pName, cName, targetName) {

src/xt_pages/workforce/appointment.vue

@@ -227,6 +227,13 @@
       UploadExcel
     },
     methods: {
+      compare(p){ //这是比较函数
+        return function(m,n){
+            var a = m[p];
+            var b = n[p];
+            return a - b; //升序
+        }
+      },
       // printTable(){
       //   this.$router.push({path: '/scheduleTablePrint?partition_id='+this.partition_id+"&weekTime="+this.activeName})
       // },
@@ -302,7 +309,16 @@
           })
 
           var that = this
+
           if (partitions.length > 0) {
+            let arrSort = []
+            partitions.forEach((item) => {
+              let num = Math.max.apply(Math, item.jihaos.map(function(o) {return o.sort}))
+              item.sort = num
+              arrSort.push(item)
+            })
+            arrSort.sort(this.compare('sort'))
+            partitions = arrSort
             partitions.forEach(function(partition) {
               if (partition.jihaos.length == 0) {
                 return false
@@ -466,7 +482,6 @@
                   total: 0
                 }
                 that.scheduleZone.push(thisPa)
-
               })
             })
           }

src/xt_pages/workforce/components/tableData.vue

@@ -122,6 +122,7 @@
       :data="scheduleZone"
       :span-method="objectSpanMethod"
       @cell-click="clickThis"
+      @cell-mouse-enter="hoverMouse"
       :summary-method="getSummaries"
       show-summary
       :row-class-name="tableRowClassName"
@@ -771,7 +772,8 @@ export default {
         nextTwoWeek: 0
       },
       zoneIdList:[],
-      strArr:""
+      strArr:"",
+      patient_id_hover:0
     };
   },
 
@@ -1014,11 +1016,27 @@ export default {
         return "";
       } else {
         if (this.weekTime == "lastWeek") {
-          return "schedule-table-cell-disable";
+          if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover){
+            return 'hover-td schedule-table-cell-disable'
+          }else {
+            return 'schedule-table-cell-disable'
+          }
+          // return "schedule-table-cell-disable";
         } else if (this.weekTime == "thisWeek") {
           var weekday = Math.floor((columnIndex - 2) / 3 + 1);
           if (weekday < this.weekday) {
-            return "schedule-table-cell-disable";
+            if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover){
+              return 'hover-td schedule-table-cell-disable'
+            }else {
+              return 'schedule-table-cell-disable'
+            }
+            // return "schedule-table-cell-disable";
+          }else {
+            if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover){
+              return 'hover-td'
+            }else {
+              return ''
+            }
           }
         }
       }
@@ -1498,6 +1516,14 @@ export default {
           this.creating_schedule = false;
         });
     },
+    hoverMouse(row, column, cell, event){
+      if (row[column.property].schedule_id > 0) {
+        let patient_id = row[column.property].patient_id
+        this.patient_id_hover = patient_id
+      } else {
+        this.patient_id_hover = -1
+      }
+    },
     clickThis(row, column, cell, event) {
       // debugger
       var week = this.weekDay(column.property);
@@ -2363,6 +2389,9 @@ export default {
 .el-table td {
   border-color: #d0d3da;
 }
+// .hover-td{
+//   color: red;
+// }
 
 // .el-table__body tr.current-row > td {
 //   background-color: #409eff !important;
@@ -2380,6 +2409,10 @@ export default {
     background-color: #409eff !important;
     color: #fff;
   }
+  .el-table__body tr .hover-td {
+    background-color: #409eff !important;
+    color: #fff;
+  }
 }
 .backPurple{
   color: #08c3df !important;

src/xt_pages/workforce/components/template_table.vue

@@ -370,7 +370,6 @@
             }
           }
         })
-
         // this.$refs.table.doLayout()
       },
       tableHeight(val) {