huangyw 2 years ago
parent
commit
29b3554c4a

+ 1 - 2
src/xt_pages/dialysis/dialysisPrintOrder.vue View File

1451
         this.org_template_info.template_id == 11 ||
1451
         this.org_template_info.template_id == 11 ||
1452
         this.org_template_info.template_id == 49 ||
1452
         this.org_template_info.template_id == 49 ||
1453
         this.org_template_info.template_id == 50 ||
1453
         this.org_template_info.template_id == 50 ||
1454
-        this.org_template_info.template_id == 51 ||
1455
-        this.org_template_info.template_id == 54
1454
+        this.org_template_info.template_id == 51
1456
       ) {
1455
       ) {
1457
         printJS({
1456
         printJS({
1458
           printable: "dialysis-print-box-1",
1457
           printable: "dialysis-print-box-1",

+ 1 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue View File

247
                   prescription.dialysate_flow ? prescription.dialysate_flow : ""
247
                   prescription.dialysate_flow ? prescription.dialysate_flow : ""
248
                 }}
248
                 }}
249
               </span>
249
               </span>
250
-              ml/h;
250
+              ml/min;
251
             </td>
251
             </td>
252
             <td width="200" style="padding-left: 10px">
252
             <td width="200" style="padding-left: 10px">
253
               医师签名:
253
               医师签名:
1339
           }
1339
           }
1340
 
1340
 
1341
           var tableAdvice = this.advices;
1341
           var tableAdvice = this.advices;
1342
-          // console.log("医生", tableAdvice);
1343
           if (tableAdvice.length === 0) {
1342
           if (tableAdvice.length === 0) {
1344
             var obj = { advice_name: "", start_time: "" };
1343
             var obj = { advice_name: "", start_time: "" };
1345
             var obj1 = { advice_name: "", start_time: "" };
1344
             var obj1 = { advice_name: "", start_time: "" };

+ 10 - 3
src/xt_pages/hospitalStation/invoicePrint.vue View File

15
       <div class="dialysisPage">
15
       <div class="dialysisPage">
16
         <printOne
16
         <printOne
17
           v-if="
17
           v-if="
18
-            org_id != 10215 && org_id != 10265 && org_id != 4 && org_id != 0 && org_id != 9675
18
+            org_id != 10215 &&
19
+            org_id != 10265 &&
20
+            org_id != 4 &&
21
+            org_id != 0 &&
22
+            org_id != 9675
19
           "
23
           "
20
           :paramsObj="invoiceParams"
24
           :paramsObj="invoiceParams"
21
         ></printOne>
25
         ></printOne>
22
-        <printTwo v-if="org_id == 10215 " :paramsObj="invoiceParams"></printTwo>
26
+        <printTwo
27
+          v-if="org_id == 10215 || org_id == 0"
28
+          :paramsObj="invoiceParams"
29
+        ></printTwo>
23
         <printThree
30
         <printThree
24
-          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 ||  org_id == 0"
31
+          v-if="org_id == 10265 || org_id == 4 || org_id == 9675"
25
           :paramsObj="invoiceParams"
32
           :paramsObj="invoiceParams"
26
         ></printThree>
33
         ></printThree>
27
       </div>
34
       </div>

File diff suppressed because it is too large
+ 9 - 13
src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue


+ 3 - 1
src/xt_pages/hospitalStation/summary.vue View File

306
       width="1200px"
306
       width="1200px"
307
       title="打印"
307
       title="打印"
308
       :visible.sync="invoiceVisible"
308
       :visible.sync="invoiceVisible"
309
+      destroy-on-close
309
     >
310
     >
310
       <invoicePrint ref="print" :invoiceParams="invoiceParams"></invoicePrint>
311
       <invoicePrint ref="print" :invoiceParams="invoiceParams"></invoicePrint>
311
     </el-dialog>
312
     </el-dialog>
1122
         setl_time: obj.setl_time,
1123
         setl_time: obj.setl_time,
1123
       };
1124
       };
1124
       this.invoiceParams = paramsObj;
1125
       this.invoiceParams = paramsObj;
1126
+      
1125
       const loading = this.$loading({
1127
       const loading = this.$loading({
1126
           lock: true,
1128
           lock: true,
1127
           text: '正在加载中...',
1129
           text: '正在加载中...',
1129
           background: 'rgba(0, 0, 0, 0.7)'
1131
           background: 'rgba(0, 0, 0, 0.7)'
1130
         });
1132
         });
1131
         setTimeout(() => {
1133
         setTimeout(() => {
1132
-          loading.close();
1133
           this.invoiceVisible = true;
1134
           this.invoiceVisible = true;
1135
+          loading.close();
1134
         }, 1000);
1136
         }, 1000);
1135
     },
1137
     },
1136
     shouJuPrint(obj) {
1138
     shouJuPrint(obj) {