Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

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

@@ -910,6 +910,7 @@
 
                     <el-col :span="8">
                         <el-form-item
+                                label="置换方式："
                                 v-if="isShows('置换液')&&this.$store.getters.xt_user.org.id != 10206"
                                 v-show="huShow"
                                 prop="displace_liqui_part"

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

@@ -784,7 +784,7 @@
                 org_id!=10558 &&
                 org_id!=10517 && 
                 org_id!=10414 && 
-                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644) ||
+                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10721) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
@@ -797,8 +797,8 @@
                 org_id == 10340 ||
                 org_id == 10432 ||
                 org_id == 10445 ||
-                org_id == 10395 ||
-                org_id == 10721)
+                org_id == 10395 
+                )
             "
           >
             <template slot-scope="scope">
@@ -817,7 +817,7 @@
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644 || org_id == 10721) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -831,8 +831,7 @@
               org_id !=10340 &&
               org_id !=10432 &&
               org_id !=10445 && 
-              org_id!=10395  &&
-              org_id!=10721
+              org_id!=10395 
             "
           >
             <template slot-scope="scope">