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

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

@@ -666,7 +666,7 @@
             align="center"
             label="置换液流量(ml/h)"
             width="100"
-            v-if="isShow('置换液流量') && template_id != 27"
+            v-if="isShow('置换液流量') && template_id != 27 && template_id != 60"
           >
             <template slot-scope="scope">
               {{
@@ -681,7 +681,7 @@
             align="center"
             label="置换液流量(ml/min)"
             width="100"
-            v-if="isShow('置换液流量') && template_id == 27"
+            v-if="isShow('置换液流量') && (template_id == 27 || template_id == 60)"
           >
             <template slot-scope="scope">
               {{
@@ -1492,13 +1492,13 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('置换液流量') && template_id != 27">
+          <el-col :span="8" v-if="isShow('置换液流量') && template_id != 27  && template_id != 60">
             <el-form-item label="置换液流量(ml/h)：" :prop="isName('置换液流量')"
               :rules="isCheckmust('置换液流量')">
               <el-input v-model="form.displacement_flow_quantity"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('置换液流量') && template_id == 27">
+          <el-col :span="8" v-if="isShow('置换液流量') && (template_id ==27 ||  template_id == 60)">
             <el-form-item label="置换液流量(ml/min)：" :prop="isName('置换液流量')"
               :rules="isCheckmust('置换液流量')">
               <el-input v-model="form.displacement_flow_quantity"></el-input>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -28,8 +28,8 @@
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558" 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('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>
-          <th v-if="isShow('置换液流量') && template_id == 27" width="92px">置换液流量(ml/min)</th>
+          <th v-if="isShow('置换液流量') && template_id != 27 && template_id != 60" width="92px">置换液流量(ml/h)</th>
+          <th v-if="isShow('置换液流量') && (template_id == 27 ||  template_id == 60)" width="92px">置换液流量(ml/min)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -709,7 +709,6 @@ export default {
               } else {
                 that.radio = 1
                 that.getPatientList()
-
                 that.$message({ message: '撤销成功', type: 'success', duration: 5000 })
               }
 
@@ -773,7 +772,7 @@ export default {
               } else {
                 that.isloading = false
                 that.isdisabled = false
-                that.radio = 2
+                // that.radio = 1
                 that.$message({ message: '上传成功', type: 'success', duration: 5000 })
                 that.getPatientList()
               }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -151,7 +151,7 @@
 
 
             <el-button size="small" @click="open(5)" type="primary"
-                       v-if="this.radio == 2  && this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
+                       v-if="this.radio == 2">
               退费
             </el-button>