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/batch_print/batch_print_order_eightyone.vue

@@ -698,7 +698,7 @@
                                     monitor_record.operate_time ==
                                       record.dialysis_order.start_time)
                                   "
-                                  >【开始透析】
+                                  >【开始透析】引血100ml/min
                                   </template>
 
                                 {{ monitor_record.end }} {{ monitor_record.symptom }} &nbsp;{{
@@ -1697,21 +1697,21 @@ export default {
               this.records[i].monitor_records[j].end = ""
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
                 if(this.org_id!=10683){
-                  this.records[i].monitor_records[j].end = "【结束透析】";
+                  this.records[i].monitor_records[j].end = "【结束透析】回血100ml/min";
                 }
 
                tempmonitorflag = false;
             }
-            if(this.org_id!=10515 && this.org_id!=0){
+            if(this.org_id!=10515){
               if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
                 if(this.org_id!=10683){
-                  this.records[i].monitor_records[j].end = "【结束透析】";
+                  this.records[i].monitor_records[j].end = "【结束透析】回血100ml/min";
                 }
 
              }
              if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
                if(this.org_id!=10683){
-                  this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
+                  this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】回血100ml/min"
                }
 
              }

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

@@ -675,7 +675,7 @@
                                   monitor.operate_time ==
                                     dialysisOrder.start_time)&&(org_id!=10414) && (org_id!=10683)
                                 "
-                                >【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>
+                                >【开始透析】 <span>引血100ml/min</span>
                                 </template>
 
                               {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
@@ -2207,14 +2207,14 @@ export default {
           if (Object.keys(monitor).length > 0 && index > 1) {
             if ((this.dialysisOrder &&monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)) {
               if(this.org_id!=10683){
-                this.monitors[index].end = "【结束透析】";
+                this.monitors[index].end = "【结束透析】回血100ml/min";
               }
 
               tempmonitorflag = false;
             }
             if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
               if(this.org_id!=10683){
-                this.monitors[index].end = "【结束透析】";
+                this.monitors[index].end = "【结束透析】回血100ml/min";
               }
             }
           }

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -22,7 +22,7 @@
           org_id == 10028 ||
           org_id == 10278 ||
           org_id == 10610 ||
-          org_id==10537 
+          org_id==10537
         "
       >
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
@@ -81,7 +81,7 @@
             org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
             org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 &&
             org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&
-            org_id != 10510 &&org_id != 10633 &&org_id != 0  && this.paramsObj.balance_accounts_type == 2">
+            org_id != 10510 &&org_id != 10633 && org_id != 10721 &&org_id != 0  && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
 
     </div>
@@ -1158,7 +1158,7 @@ export default {
               return false
             } else {
               console.log('response.data.data',response.data.data);
-              
+
               var that = this
               that.info = response.data.data.info
               that.p_admin = response.data.data.printor_admin
@@ -1297,12 +1297,12 @@ export default {
               for (let i = len; i < list.length; i++) {
                 R_list.push(list[i])
               }
-              
+
 
               that.info['L_list'] = L_list
               that.info['R_list'] = R_list
               console.log('that.info10721',this.info);
-              
+
             }
           })
         } else {