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

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -44,8 +44,8 @@
           <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">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id == 13">{{ 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 ">{{ 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') == 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>
@@ -81,8 +81,8 @@
           <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" 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" 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" 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" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>
@@ -110,8 +110,8 @@
           <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" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id == 13" >{{ 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 " >{{ 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') == 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 >
@@ -200,8 +200,8 @@
           <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">{{ 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">{{ 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 ">{{ 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') == 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

@@ -141,13 +141,13 @@
           </el-col>
 
           <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' :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' :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' :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' :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"
@@ -157,13 +157,13 @@
 
 
           <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">
+            <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">
               <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">
+            <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">
               <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"
@@ -172,13 +172,13 @@
           </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' :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' :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' :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' :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"