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

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -686,7 +686,6 @@
           <div class="inline_block">
             入科方式：
             <!--<check-box v-for="item, index in nutrition_arr" :key="index" :text="item.name" :checked="receiverTreatmentAccess.nutrition == item.id?true:false"></check-box>-->
-
             <div v-for="(item, index) in way_arr" class="under_line" v-if="receiverTreatmentAccess.way == item.id" style="width: 180px;text-align: left" >
               {{ item.name }}
             </div>
@@ -843,121 +842,62 @@
                       {{ afterdialysis.actual_treatment_hour ? afterdialysis.actual_treatment_hour : "/" }}
                     </div>
                     h
-                    <div
-                      class="under_line"
-                      style="width: 30px;text-align: center"
-                    >
-                      {{
-                        afterdialysis.actual_treatment_minute
-                          ? afterdialysis.actual_treatment_minute
-                          : 0
-                      }}
+                    <div class="under_line" style="width: 30px;text-align: center" >
+                      {{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0  }}
                     </div>
                     min
                   </div>
                 </div>
-                <div
-                  class="row"
-                  style="padding: 2px 0;line-height:23px;display:flex;"
-                >
+                <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:170px;text-align:center;white-space: normal;"
-                    >
+                    <div class="under_line" style="width:170px;text-align:center;white-space: normal;" >
                       {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
                     </div>
                   </div>
                   <div class="inline_block" style="flex:2;">
                     内瘘：
-                    <div
-                      class="under_line"
-                      style="width: 170px;text-align: center;white-space: normal;"
-                    >
-                      {{
-                        afterdialysis.internal_fistula
-                          ? afterdialysis.internal_fistula
-                          : "/"
-                      }}
+                    <div class="under_line" style="width: 170px;text-align: center;white-space: normal;" >
+                      {{  afterdialysis.internal_fistula ? afterdialysis.internal_fistula : "/" }}
                     </div>
                   </div>
                   <div class="inline_block" style="flex:4;">
                     导管：
-                    <div
-                      class="under_line"
-                      style="min-width: 120px;text-align: center"
-                    >
-                      {{
-                        afterdialysis.catheter ? afterdialysis.catheter : "/"
-                      }}
+                    <div class="under_line" style="min-width: 120px;text-align: center" >
+                      {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
                     </div>
                   </div>
                 </div>
 
-                <div
-                  class="row"
-                  style="padding: 2px 0;line-height:23px;display:flex;"
-                >
+                <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"
-                    >
-                      {{
-                        afterdialysis.weight_after
-                          ? parseFloat(
-                              afterdialysis.weight_after -
-                                afterdialysis.additional_weight
-                            ).toFixed(1)
-                          : "/"
-                      }}
+                    <div class="under_line" style="width: 70px;text-align: center" >
+                      {{ afterdialysis.weight_after ? parseFloat( afterdialysis.weight_after - afterdialysis.additional_weight ).toFixed(1) : "/" }}
                     </div>
                     kg
                   </div>
 
                   <div class="inline_block" style="flex:1;">
                     体重减少：
-                    <div
-                      class="under_line"
-                      style="width: 70px;text-align: center"
-                    >
-                      {{
-                        afterdialysis.weight_loss
-                          ? afterdialysis.weight_loss
-                          : "/"
-                      }}
+                    <div class="under_line"  style="width: 70px;text-align: center"  >
+                      {{ afterdialysis.weight_loss ? afterdialysis.weight_loss : "/" }}
                     </div>
                     kg
                   </div>
 
                   <div class="inline_block" style="flex:1;">
                     透析中入量：
-                    <div
-                      class="under_line"
-                      style="width: 70px;text-align: center"
-                    >
-                      {{
-                        afterdialysis.dialysis_intakes
-                          ? afterdialysis.dialysis_intakes
-                          : "/"
-                      }}
+                    <div  class="under_line" style="width: 70px;text-align: center" >
+                      {{ afterdialysis.dialysis_intakes  ? afterdialysis.dialysis_intakes  : "/" }}
                     </div>
                     {{ getUnit(afterdialysis.dialysis_intakes_unit) }}
                   </div>
 
                   <div class="inline_block" style="flex:1;">
                     实际超滤量：
-                    <div
-                      class="under_line"
-                      style="width: 70px;text-align: center"
-                    >
-                      {{
-                        afterdialysis.actual_ultrafiltration
-                          ? afterdialysis.actual_ultrafiltration
-                          : "/"
-                      }}
+                    <div class="under_line" style="width: 70px;text-align: center" >
+                      {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/"  }}
                     </div>
                     ml
                   </div>
@@ -983,245 +923,55 @@
             </tr>
             <tr>
               <td colspan="7">
-                <div
-                  class="row"
-                  style="padding: 2px 0;line-height:23px;display:flex;"
-                >
+                <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: 80px;text-align: center"
-                    >
+                    <div class="under_line" style="width: 80px;text-align: center" >
                       <span
-                        v-if="
-                          setAdminUserES(
-                            dialysisOrder == null
-                              ? 0
-                              : dialysisOrder.puncture_nurse
-                          ) == ''
-                        "
-                        >{{
-                          getAdminUser(
-                            dialysisOrder == null
-                              ? 0
-                              : dialysisOrder.puncture_nurse
-                          )
-                        }}</span
-                      >
-                      <img
-                        style="height:20px;"
-                        :src="
-                          setAdminUserES(
-                            dialysisOrder == null
-                              ? 0
-                              : dialysisOrder.puncture_nurse
-                          )
-                        "
-                        alt=""
-                        srcset=""
-                        v-else
-                      />
+                        v-if=" setAdminUserES( dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse  ) == '' " >{{ getAdminUser( dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse ) }}</span >
+                      <img style="height:20px;" :src=" setAdminUserES( dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse ) " alt="" srcset="" v-else />
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">
                     治疗护士：
-                    <div
-                      class="under_line"
-                      style="width: 80px;text-align: center"
-                    >
-                      <span
-                        v-if="
-                          setAdminUserES(
-                            dialysisOrder == null
-                              ? 0
-                              : dialysisOrder.start_nurse
-                          ) == ''
-                        "
-                        >{{
-                          getAdminUser(
-                            dialysisOrder == null
-                              ? 0
-                              : dialysisOrder.start_nurse
-                          )
-                        }}</span
-                      >
-                      <img
-                        style="height:20px;"
-                        :src="
-                          setAdminUserES(
-                            dialysisOrder == null
-                              ? 0
-                              : dialysisOrder.start_nurse
-                          )
-                        "
-                        alt=""
-                        srcset=""
-                        v-else
-                      />
+                    <div class="under_line" style="width: 80px;text-align: center" >
+                      <span v-if=" setAdminUserES( dialysisOrder == null ? 0 : dialysisOrder.start_nurse ) == '' " >{{ getAdminUser( dialysisOrder == null ? 0 : dialysisOrder.start_nurse ) }}</span >
+                      <img style="height:20px;" :src=" setAdminUserES( dialysisOrder == null ? 0 : dialysisOrder.start_nurse ) " alt="" srcset="" v-else  />
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">
                     核对人员：
-                    <div
-                      class="under_line"
-                      style="width: 80px;text-align: center"
-                      v-if="dialysisOrder == null"
-                    >
-                      <span
-                        v-if="
-                          setAdminUserES(check == null ? 0 : check.creater) ==
-                            ''
-                        "
-                        >{{
-                          getAdminUser(check == null ? 0 : check.creater)
-                        }}</span
-                      >
-                      <img
-                        style="height:20px;"
-                        :src="setAdminUserES(check == null ? 0 : check.creater)"
-                        alt=""
-                        srcset=""
-                        v-else
-                      />
+                    <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder == null" >
+                      <span v-if=" setAdminUserES(check == null ? 0 : check.creater) == '' " >{{ getAdminUser(check == null ? 0 : check.creater) }}</span >
+                      <img style="height:20px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
                     </div>
-                    <div
-                      class="under_line"
-                      style="width: 80px;text-align: center"
-                      v-if="
-                        dialysisOrder != null &&
-                          dialysisOrder.start_nurse == check.modifier
-                      "
-                    >
-                      <span
-                        v-if="
-                          setAdminUserES(check == null ? 0 : check.creater) ==
-                            ''
-                        "
-                        >{{
-                          getAdminUser(check == null ? 0 : check.creater)
-                        }}</span
-                      >
-                      <img
-                        style="height:20px;"
-                        :src="setAdminUserES(check == null ? 0 : check.creater)"
-                        alt=""
-                        srcset=""
-                        v-else
-                      />
+                    <div class="under_line" style="width: 80px;text-align: center" v-if=" dialysisOrder != null && dialysisOrder.start_nurse == check.modifier " >
+                      <span v-if=" setAdminUserES(check == null ? 0 : check.creater) == '' " >{{ getAdminUser(check == null ? 0 : check.creater) }}</span >
+                      <img style="height:20px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset=""  v-else />
                     </div>
-                    <div
-                      class="under_line"
-                      style="width: 80px;text-align: center"
-                      v-if="
-                        dialysisOrder != null &&
-                          dialysisOrder.start_nurse == check.creater
-                      "
-                    >
+                    <div class="under_line" style="width: 80px;text-align: center" v-if="  dialysisOrder != null && dialysisOrder.start_nurse == check.creater " >
                       <span
-                        v-if="
-                          setAdminUserES(check == null ? 0 : check.modifier) ==
-                            ''
-                        "
-                        >{{
-                          getAdminUser(check == null ? 0 : check.modifier)
-                        }}</span
-                      >
-                      <img
-                        style="height:20px;"
-                        :src="
-                          setAdminUserES(check == null ? 0 : check.modifier)
-                        "
-                        alt=""
-                        srcset=""
-                        v-else
-                      />
+                        v-if=" setAdminUserES(check == null ? 0 : check.modifier) == '' " >{{ getAdminUser(check == null ? 0 : check.modifier) }}</span >
+                      <img style="height:20px;" :src=" setAdminUserES(check == null ? 0 : check.modifier) " alt="" srcset="" v-else  />
                     </div>
-                    <div
-                      class="under_line"
-                      style="width: 80px;text-align: center"
-                      v-if="
-                        dialysisOrder != null &&
-                          dialysisOrder.start_nurse != check.creater &&
-                          dialysisOrder.start_nurse != check.modifier
-                      "
-                    >
-                      <span
-                        v-if="
-                          setAdminUserES(check == null ? 0 : check.creater) ==
-                            ''
-                        "
-                        >{{
-                          getAdminUser(check == null ? 0 : check.creater)
-                        }}</span
-                      >
-                      <img
-                        style="height:20px;"
-                        :src="setAdminUserES(check == null ? 0 : check.creater)"
-                        alt=""
-                        srcset=""
-                        v-else
-                      />
+                    <div class="under_line" style="width: 80px;text-align: center" v-if=" dialysisOrder != null && dialysisOrder.start_nurse != check.creater && dialysisOrder.start_nurse != check.modifier " >
+                      <span v-if=" setAdminUserES(check == null ? 0 : check.creater) == '' " >{{ getAdminUser(check == null ? 0 : check.creater) }}</span>
+                      <img style="height:20px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">
                     下机护士：
-                    <div
-                      class="under_line"
-                      style="width: 80px;text-align: center"
-                    >
+                    <div class="under_line" style="width: 80px;text-align: center" >
                       <span
-                        v-if="
-                          setAdminUserES(
-                            dialysisOrder == null
-                              ? 0
-                              : dialysisOrder.finish_nurse
-                          ) == ''
-                        "
-                        >{{
-                          getAdminUser(
-                            dialysisOrder == null
-                              ? 0
-                              : dialysisOrder.finish_nurse
-                          )
-                        }}</span
-                      >
-                      <img
-                        style="height:20px;"
-                        :src="
-                          setAdminUserES(
-                            dialysisOrder == null
-                              ? 0
-                              : dialysisOrder.finish_nurse
-                          )
-                        "
-                        alt=""
-                        srcset=""
-                        v-else
-                      />
+                        v-if=" setAdminUserES( dialysisOrder == null ? 0 : dialysisOrder.finish_nurse ) == '' " >{{ getAdminUser( dialysisOrder == null ? 0 : dialysisOrder.finish_nurse ) }}</span >
+                      <img style="height:20px;" :src=" setAdminUserES( dialysisOrder == null ? 0 : dialysisOrder.finish_nurse ) " alt="" srcset="" v-else />
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">
                     治疗医生：
-                    <div
-                      class="under_line"
-                      style="width: 80px;text-align: center"
-                    >
-                      <span
-                        v-if="
-                          setAdminUserES(prescription.prescription_doctor) == ''
-                        "
-                        >{{
-                          getAdminUser(prescription.prescription_doctor)
-                        }}</span
-                      >
-                      <img
-                        style="height:20px;"
-                        :src="setAdminUserES(prescription.prescription_doctor)"
-                        alt=""
-                        srcset=""
-                        v-else
-                      />
+                    <div class="under_line" style="width: 80px;text-align: center" >
+                      <span v-if=" setAdminUserES(prescription.prescription_doctor) == '' " >{{ getAdminUser(prescription.prescription_doctor) }}</span >
+                      <img style="height:20px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else  />
                     </div>
                   </div>
                 </div>