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/dialog/monitor_dialog.vue

@@ -276,7 +276,7 @@
             align="center"
             label="置换量(ml)"
             width="100"
-            v-if=" isShow('置换量') && ((template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26) || org_id != 9919)" >
+            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -287,7 +287,7 @@
             align="center"
             label="置换量(L)"
             width="100"
-            v-if=" isShow('置换量') &&  ((template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26) || org_id == 9919)" >
+            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -527,12 +527,12 @@
               <el-input v-model="form.replacement_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if=" isShow('置换量') &&  ((template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26) || org_id == 9919)">
+          <el-col :span="8" v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26)">
             <el-form-item label="置换量(L)：">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if=" isShow('置换量') && ((template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26) || org_id != 9919)">
+          <el-col :span="8" v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26)">
             <el-form-item label="置换量(ml)：">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -22,8 +22,8 @@
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26) " width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26" width="92px" > 置换率(L/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26) || org_id != 9919)" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26) || org_id == 9919)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26)" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量')" width="92px">置换液流量(ml/h)</th>