Преглед изворни кода

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

28169 пре 6 месеци
родитељ
комит
15c99684de

+ 5 - 5
src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue Прегледај датотеку

698
                                     monitor_record.operate_time ==
698
                                     monitor_record.operate_time ==
699
                                       record.dialysis_order.start_time)
699
                                       record.dialysis_order.start_time)
700
                                   "
700
                                   "
701
-                                  >【开始透析】
701
+                                  >【开始透析】引血100ml/min
702
                                   </template>
702
                                   </template>
703
 
703
 
704
                                 {{ monitor_record.end }} {{ monitor_record.symptom }} &nbsp;{{
704
                                 {{ monitor_record.end }} {{ monitor_record.symptom }} &nbsp;{{
1697
               this.records[i].monitor_records[j].end = ""
1697
               this.records[i].monitor_records[j].end = ""
1698
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
1698
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
1699
                 if(this.org_id!=10683){
1699
                 if(this.org_id!=10683){
1700
-                  this.records[i].monitor_records[j].end = "【结束透析】";
1700
+                  this.records[i].monitor_records[j].end = "【结束透析】回血100ml/min";
1701
                 }
1701
                 }
1702
 
1702
 
1703
                tempmonitorflag = false;
1703
                tempmonitorflag = false;
1704
             }
1704
             }
1705
-            if(this.org_id!=10515 && this.org_id!=0){
1705
+            if(this.org_id!=10515){
1706
               if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
1706
               if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
1707
                 if(this.org_id!=10683){
1707
                 if(this.org_id!=10683){
1708
-                  this.records[i].monitor_records[j].end = "【结束透析】";
1708
+                  this.records[i].monitor_records[j].end = "【结束透析】回血100ml/min";
1709
                 }
1709
                 }
1710
 
1710
 
1711
              }
1711
              }
1712
              if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
1712
              if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
1713
                if(this.org_id!=10683){
1713
                if(this.org_id!=10683){
1714
-                  this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
1714
+                  this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】回血100ml/min"
1715
                }
1715
                }
1716
 
1716
 
1717
              }
1717
              }

+ 3 - 3
src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue Прегледај датотеку

675
                                   monitor.operate_time ==
675
                                   monitor.operate_time ==
676
                                     dialysisOrder.start_time)&&(org_id!=10414) && (org_id!=10683)
676
                                     dialysisOrder.start_time)&&(org_id!=10414) && (org_id!=10683)
677
                                 "
677
                                 "
678
-                                >【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>
678
+                                >【开始透析】 <span>引血100ml/min</span>
679
                                 </template>
679
                                 </template>
680
 
680
 
681
                               {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
681
                               {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
2207
           if (Object.keys(monitor).length > 0 && index > 1) {
2207
           if (Object.keys(monitor).length > 0 && index > 1) {
2208
             if ((this.dialysisOrder &&monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)) {
2208
             if ((this.dialysisOrder &&monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)) {
2209
               if(this.org_id!=10683){
2209
               if(this.org_id!=10683){
2210
-                this.monitors[index].end = "【结束透析】";
2210
+                this.monitors[index].end = "【结束透析】回血100ml/min";
2211
               }
2211
               }
2212
 
2212
 
2213
               tempmonitorflag = false;
2213
               tempmonitorflag = false;
2214
             }
2214
             }
2215
             if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
2215
             if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
2216
               if(this.org_id!=10683){
2216
               if(this.org_id!=10683){
2217
-                this.monitors[index].end = "【结束透析】";
2217
+                this.monitors[index].end = "【结束透析】回血100ml/min";
2218
               }
2218
               }
2219
             }
2219
             }
2220
           }
2220
           }

+ 5 - 5
src/xt_pages/outpatientCharges/statementPrint.vue Прегледај датотеку

22
           org_id == 10028 ||
22
           org_id == 10028 ||
23
           org_id == 10278 ||
23
           org_id == 10278 ||
24
           org_id == 10610 ||
24
           org_id == 10610 ||
25
-          org_id==10537 
25
+          org_id==10537
26
         "
26
         "
27
       >
27
       >
28
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
28
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
81
             org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
81
             org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
82
             org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 &&
82
             org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 &&
83
             org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&
83
             org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&
84
-            org_id != 10510 &&org_id != 10633 &&org_id != 0  && this.paramsObj.balance_accounts_type == 2">
84
+            org_id != 10510 &&org_id != 10633 && org_id != 10721 &&org_id != 0  && this.paramsObj.balance_accounts_type == 2">
85
       </privateChargePrint>
85
       </privateChargePrint>
86
 
86
 
87
     </div>
87
     </div>
1158
               return false
1158
               return false
1159
             } else {
1159
             } else {
1160
               console.log('response.data.data',response.data.data);
1160
               console.log('response.data.data',response.data.data);
1161
-              
1161
+
1162
               var that = this
1162
               var that = this
1163
               that.info = response.data.data.info
1163
               that.info = response.data.data.info
1164
               that.p_admin = response.data.data.printor_admin
1164
               that.p_admin = response.data.data.printor_admin
1297
               for (let i = len; i < list.length; i++) {
1297
               for (let i = len; i < list.length; i++) {
1298
                 R_list.push(list[i])
1298
                 R_list.push(list[i])
1299
               }
1299
               }
1300
-              
1300
+
1301
 
1301
 
1302
               that.info['L_list'] = L_list
1302
               that.info['L_list'] = L_list
1303
               that.info['R_list'] = R_list
1303
               that.info['R_list'] = R_list
1304
               console.log('that.info10721',this.info);
1304
               console.log('that.info10721',this.info);
1305
-              
1305
+
1306
             }
1306
             }
1307
           })
1307
           })
1308
         } else {
1308
         } else {