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

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -4204,9 +4204,9 @@ export default {
         this.summary = response.data.data.summary;
         this.org_template_info = response.data.data.org_template_info;
 
-        if (this.monitors.length <= 6) {
-          var nl = 6;
-          this.print_length = 6;
+        if (this.monitors.length <= 3) {
+          var nl = 3;
+          this.print_length = 3;
 
           for (let index = 0; index < nl; index++) {
             if (

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>
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -84,9 +84,9 @@
               </el-form>
               <div class="tabsBox">
 
-                  <el-button v-if="dayorMonth == 'day'" type="text" class="addTab" @click="addCharges"
-                             icon="el-icon-circle-plus">附加收费
-                  </el-button>
+<!--                  <el-button v-if="dayorMonth == 'day'" type="text" class="addTab" @click="addCharges"-->
+<!--                             icon="el-icon-circle-plus">附加收费-->
+<!--                  </el-button>-->
                   <div class="RP" v-if="dayorMonth == 'month'">Rp
                       <el-date-picker
                               v-model="start_time"

src/xt_pages/workforce/printOne.vue

@@ -664,7 +664,7 @@ export default {
         for (let i = 0; i < arr.length; i++) {
           arr[i].name = this.nameSplit(arr[i].name)
           if (this.hiddenFlag) {
-            str += arr[i].name + '&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp '
+            str += arr[i].name + '&nbsp&nbsp&nbsp&nbsp'
           } else {
             str += arr[i].name + '(' + '上次床位:' + arr[i].order.DeviceNumber.zone.name + '-' + arr[i].order.DeviceNumber.number + '  ' + '血管通路:' + this.getBloodAccess(arr[i].order.blood_access_id) + '  ' + '排班备注:' + arr[i].order.schedule_remark + ')<br/>'
           }