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

src/xt_pages/dialysis/details/DialysisPrescription.vue

           <span class="content">{{
             replacement_total != "0" ? replacement_total : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 20" class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 20" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28" class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
 
         </li>
 
           <span class="content">{{
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>

src/xt_pages/dialysis/details/assessmentAfter.vue

           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26" >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28" >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

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

           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26)">
+                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28)">
             <el-form-item label="目标超滤量(ml)：">
               <el-input
                 type="number"
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26">
+                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28">
             <el-form-item label="目标超滤量(L)：">
               <el-input
                 type="number"
 
 
 
-          <el-col :span="8" v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20)"
+          <el-col :span="8" v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28)"
                   v-show="zhiShow">
             <el-form-item label="置换量(ml)：">
               <el-input
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20"
+          <el-col :span="8" v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28"
                   v-show="zhiShow">
             <el-form-item label="置换量(L)：">
               <el-input

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

 <template>
   <div id="dialysis-print-box">
     <div class="dialysis-print-order">
-      <div class="order-yy-name">{{ orgname }}</div>
-      <div class="order-title">血液净化治疗记录单</div>
+      <!-- <div class="order-yy-name">{{ orgname }}</div> -->
+      <div class="order-title">{{ orgname }}&nbsp;&nbsp;血液净化治疗记录单</div>
       <table class="table-box" style="margin-top: 10px;">
         <tbody>
         <tr>
               <tbody>
               <tr>
                 <td width="70">血管通路:</td>
-                <td width="580">
+                <td width="600">
                   <div>
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('自体内瘘') > -1 ? true : false" showValue="自体内瘘"></label-box>
                     &nbsp;
                 <td width="70">穿刺针:</td>
                 <td width="180">
                   <div>
-                    <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('15G') > -1 ? true : false" showValue="15G"></label-box>
-                    &nbsp;
                     <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G') > -1 ? true : false" showValue="16G"></label-box>
                     &nbsp;
+                    <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G') > -1 ? true : false" showValue="17G"></label-box>
+                    &nbsp;
                     <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('钝针') > -1 ? true : false" showValue="钝针"></label-box>
                     &nbsp;
                   </div>
                 <td width="120">
                   ( 1.5mmol/L )
                 </td>
+                <td width="10">钾</td>
                 <td width="50">
-                  <label-box :isChecked="prescription.dialysate_formulation_name == '钾' ? true : false" showValue="钾"></label-box>
-                </td>
-                <td width="10">(</td>
-                <td width="50">
-                  <div class="under-line">&nbsp;<span v-if="prescription.dialysate_formulation_name == '钾'">{{ prescription.kalium ? prescription.kalium : "" }}</span></div>
+                  <div class="under-line">&nbsp;{{ prescription.kalium ? prescription.kalium : "" }}</div>
                 </td>
                 <td width="10">mmol/L</td>
-                <td width="10">)</td>
                 <td></td>
 
                 <!-- <td width="50">
                   <td width="20">ml</td>
                   <td width="30">V端</td>
                   <td width="30">
-                    <div class="under-line">{{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "" }}</div>
+                    <div class="under-line">&nbsp;{{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "" }}</div>
                   </td>
                   <td width="20">ml</td>
                   <td></td>
                       <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅲ度')> -1  ? true : false" showValue="+ + +"></label-box>
                     </div>
                   </td>
-                  <!--<td width="80"></td>-->
-                  <!--<td width="60">管路:</td>-->
-                  <!--<td width="220">-->
-                  <!--<div style="display:flex;justify-content:space-between;">-->
-                  <!--<label-box showValue="无" :isChecked="-->
-                  <!--afterdialysis.channel == 1 ? true : false-->
-                  <!--"></label-box>-->
-                  <!--<label-box showValue="+" :isChecked="-->
-                  <!--afterdialysis.channel == 2 ? true : false-->
-                  <!--"></label-box>-->
-                  <!--<label-box showValue="+ +" :isChecked="-->
-                  <!--afterdialysis.channel == 3  ? true : false-->
-                  <!--"></label-box>-->
-                  <!--<label-box showValue="+ + +" :isChecked="-->
-                  <!--afterdialysis.channel == 4 ? true : false-->
-                  <!--"></label-box>-->
-                  <!--</div>-->
-                  <!--</td>-->
-                  <td></td>
-                </tr>
-                </tbody>
-              </table>
-
-              <table class="table-box">
-                <tbody>
-                  <tr>
-                    <td width="70">静脉管道:</td>
+                  <td width="20"></td>
+                  <td width="70">静脉管道:</td>
                     <td width="220">
                       <div style="display:flex;justify-content:space-between;">
                         <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="无"></label-box>
                         <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="+ + +"></label-box>
                       </div>
                     </td>
-                    <td width="80"></td>
+                    <td width="20"></td>
                     <td width="70">动脉管道:</td>
                     <td width="220">
                       <div style="display:flex;justify-content:space-between;">
                         <label-box :isChecked="afterdialysis.arterial_tube == 4 ? true : false" showValue="+ + +"></label-box>
                       </div>
                     </td>
-                    <td></td>
-                  </tr>
+                  <td></td>
+                </tr>
                 </tbody>
               </table>
+
               <table class="table-box">
                 <tbody>
                 <tr>
                     </div>
                   </td>
                   <td width="35">min</td>
-                  <td></td>
-                </tr>
-                </tbody>
-              </table>
-
-              <table class="table-box">
-                <tbody>
-                  <tr>
-                    <td width="40">去向:</td>
+                  <td width="40">去向:</td>
                     <td width="160">
                       <div style="display:flex;justify-content:space-between;">
                         <label-box :isChecked="afterdialysis.patient_gose == 1 ? true : false" showValue="回家"></label-box>
                     <td>
                       <div class="under-line">&nbsp;</div>
                     </td>
-                  </tr>
+                </tr>
                 </tbody>
               </table>
 
+              
+
               <!-- <table class="table-box">
                 <tbody>
                   <tr>
         }
       },
       getNumber() {
-        if (this.dialysisOrder != null) {
+      if (this.dialysisOrder != null) {
+        if(this.patientInfo.DialysisSchedule.device_zone.name.indexOf("区") > -1){
           return (
-            //   this.patientInfo.DialysisSchedule.device_zone.name +
+            this.patientInfo.DialysisSchedule.device_zone.name +
             this.dialysisOrder.DeviceNumber.number
-          )
+          );
         } else {
           return (
-            //   this.patientInfo.DialysisSchedule.device_zone.name +
+            this.patientInfo.DialysisSchedule.device_zone.name + "区" +
+            this.dialysisOrder.DeviceNumber.number
+          );
+        }
+        
+      } else {
+        if(this.patientInfo.DialysisSchedule.device_zone.name.indexOf("区") > -1){
+          return (
+            this.patientInfo.DialysisSchedule.device_zone.name +
             this.patientInfo.DialysisSchedule.device_number.number
-          )
+          );
+        }else{
+          return (
+            this.patientInfo.DialysisSchedule.device_zone.name + "区" +
+            this.patientInfo.DialysisSchedule.device_number.number
+          );
         }
-      },
+        
+      }
+    },
 
       getXuserName(id) {
         if (id <= 0) {
             if (this.org_template_info.org_id == 9535) {
               this.isShowZero = true
             }
-            if (this.monitors.length < 8) {
-              var nl = 8 - this.monitors.length
+            if (this.monitors.length < 12) {
+              var nl = 12 - this.monitors.length
               for (let index = 0; index < nl; index++) {
                 this.monitors.push([])
               }
               this.doctor_advices.push(obj3)
               this.doctor_advices.push(obj3)
               this.doctor_advices.push(obj3)
+              this.doctor_advices.push(obj3)
             }
             if (this.doctor_advices.length === 1) {
               var obj = { advice_name: '', start_time: '' }
               this.doctor_advices.push(obj2)
               this.doctor_advices.push(obj2)
               this.doctor_advices.push(obj2)
+              this.doctor_advices.push(obj2)
             }
             if (this.doctor_advices.length === 2) {
               var obj = { advice_name: '', start_time: '' }
               this.doctor_advices.push(obj1)
               this.doctor_advices.push(obj1)
               this.doctor_advices.push(obj1)
+              this.doctor_advices.push(obj1)
             }
             if (this.doctor_advices.length === 3) {
               // eslint-disable-next-line no-redeclare
               this.doctor_advices.push(obj)
               this.doctor_advices.push(obj)
               this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
             }
             if (this.doctor_advices.length === 4) {
               // eslint-disable-next-line no-redeclare
               var obj = { advice_name: '', start_time: '' }
               this.doctor_advices.push(obj)
               this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
             }
             if (this.doctor_advices.length === 5) {
               // eslint-disable-next-line no-redeclare
               var obj = { advice_name: '', start_time: '' }
               this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
+            }
+            if (this.doctor_advices.length === 6) {
+              // eslint-disable-next-line no-redeclare
+              var obj = { advice_name: '', start_time: '' }
+              this.doctor_advices.push(obj)
             }
 
             if (this.doctor_advices.length > 0) {