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/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 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29" 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 || this.$store.getters.xt_user.template_info.template_id == 29" 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 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40" 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 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 40" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
 
         </li>
 
           <label>总量: </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 ">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
           <label>首剂 : </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 " >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 ||  this.$store.getters.xt_user.template_info.template_id == 40)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span >
           <label>维持 : </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 ||  this.$store.getters.xt_user.template_info.template_id == 40)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>

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

 
           <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
 
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987' :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 10157' :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                         v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
             </el-form-item>
 
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987' :label="'首剂(mg) : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10157' :label="'首剂(mg) : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
 
 
           <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
-            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987">
+            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 10157">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                         v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
             </el-form-item>
-            <el-form-item :label="'维持(mg/h) : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987">
+            <el-form-item :label="'维持(mg/h) : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10157">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
           </el-col>
 
           <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987' :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 10157' :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                         v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
             </el-form-item>
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987' :label="'总量(mg) : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10157' :label="'总量(mg) : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
               ></el-input>
             </el-form-item>
           </el-col>
-          <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 && this.$store.getters.xt_user.template_info.template_id != 29"
+          <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 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40" 
                   v-show="zhiShow">
             <el-form-item label="置换量(L)：">
               <el-input

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

                      {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "" }}
                   </div>
                 </td>
-                <td width="10">L)</td>
+                <td width="10">ml)</td>
                 <td width="50"><label-box :isChecked="prescription.mode_id != 5 && prescription.mode_id != 1 && prescription.mode_id != 2 ? true : false" showValue="其他"></label-box></td>
                 <td width="50">
                   <div class="under-line">&nbsp;
                 <td width="80">透析液配方:</td>
                 <td width="10">钙</td>
                 <td width="10">(</td>
-                <td width="220">
+                <td width="240">
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('1.25') > -1 ? true : false" showValue="1.25"></label-box>
                   &nbsp;
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('1.5') > -1 ? true : false" showValue="1.5"></label-box>
                   &nbsp;
-                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('1.75') > -1 ? true : false" showValue="1.75mmol/L"></label-box>
+                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('1.75') > -1 ? true : false" showValue="1.75（mmol/L）"></label-box>
                   &nbsp;
                 </td>
                 <td width="10">)</td>
           <td width="40" style="line-height:20px">机温<br />℃</td>
           <td width="60" style="line-height:20px">血流量<br />ml/min</td>
           <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
+          <td width="60" style="line-height:20px">超滤量<br />ml</td>
           <!-- <td width="60">钠浓度<br/>mmol/L</td>
         <td width="80">透析液温度<br/>℃</td>
         <td width="60">置换率<br/>ml/min</td> -->
 
           <td width="" style="line-height:20px">病情变化及处理</td>
+          <td width="60" style="line-height:20px">护士签名</td>
         </tr>
 
         <tr v-for="monitor in monitors" :key="monitor.id">
           <td>
             &nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}
           </td>
+          <td>
+            &nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
+          </td>
           <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
         <td>&nbsp;{{monitor.dialysate_temperature}}</td>
         <td>&nbsp;{{monitor.replacement_rate}}</td> -->
           <td>
             &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
           </td>
+          <td>
+            <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
+              {{ getAdminUser(monitor.monitoring_nurse) }}
+            </span>
+            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+              <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
+            </span>
+          </td>
         </tr>
         </tbody>
       </table>
             <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset v-else />
           </td>
           <td>
-            <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
-            <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
+            <span v-if="advice.start_time">
+                <span v-if="advice.checker > 0">
+                    <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
+                    <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
+                </span>
+                <span v-else>未核对</span>
+            </span>
           </td>
           <td>
             <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
                         <label-box showValue="有" :isChecked="afterdialysis.is_eat == 1 ? true : false"></label-box>
                         <label-box showValue="无" :isChecked="afterdialysis.is_eat == 2 ? true : false"></label-box>
                     </td>
+                    <td width="90">实际置换总量</td>
+                    <td width="50">
+                        <div class="under-line">&nbsp;{{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "" }}</div>
+                    </td>
+                    <td width="20">ml</td>
                     <td></td>
                 </tr>
                 </tbody>

src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue

             <div>
                 <span style="position: absolute;left:590px;top:40px;">{{ printDate.slice(0,4) }}</span>
                 <span style="position: absolute;left:630px;top:40px;">{{ printDate.slice(5,7) }}</span>
-                <span style="position: absolute;left:660px;top:40px;">{{ printDate.slice(8,11) }}</span>
+                <span style="position: absolute;left:690px;top:40px;">{{ printDate.slice(8,11) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">