zhengchengwu před 6 roky
rodič
revize
dd59c5f44e

+ 19 - 14
src/xt_pages/dialysis/batch_print/batch_print_order.vue Zobrazit soubor

2
  <div class="main-contain">
2
  <div class="main-contain">
3
     <div class="position">
3
     <div class="position">
4
       <bread-crumb :crumbs='crumbs'></bread-crumb>
4
       <bread-crumb :crumbs='crumbs'></bread-crumb>
5
-      <el-button size="small" icon="el-icon-printer"  @click="printAction" type="primary">打印</el-button>
5
+      <el-button :loading="loading"  size="small" icon="el-icon-printer"  @click="printAction" type="primary">打印</el-button>
6
     </div>
6
     </div>
7
     <div class="app-container">
7
     <div class="app-container">
8
         <div id="print_content">
8
         <div id="print_content">
384
                                     <table class="inside_table">
384
                                     <table class="inside_table">
385
                                         <thead>
385
                                         <thead>
386
                                             <tr>
386
                                             <tr>
387
-                                                
387
+
388
                                             <td width="40px">时间</td>
388
                                             <td width="40px">时间</td>
389
                                             <td width="120px">医嘱内容</td>
389
                                             <td width="120px">医嘱内容</td>
390
                                             <td width="80px">医生签名</td>
390
                                             <td width="80px">医生签名</td>
398
                                             <td width="80px">执行护士</td>
398
                                             <td width="80px">执行护士</td>
399
                                             <td width="65px">执行时间</td>
399
                                             <td width="65px">执行时间</td>
400
                                             <td width="75px">核对护士</td>
400
                                             <td width="75px">核对护士</td>
401
-                                            
401
+
402
                                                 <!-- <td width="100">时间</td>
402
                                                 <!-- <td width="100">时间</td>
403
                                                 <td>医嘱内容</td>
403
                                                 <td>医嘱内容</td>
404
                                                 <td width="120">医生签名</td>
404
                                                 <td width="120">医生签名</td>
554
                 {path:false, name:'批量打印'},
554
                 {path:false, name:'批量打印'},
555
             ],
555
             ],
556
             records: [ // 模拟有多条数据
556
             records: [ // 模拟有多条数据
557
-                // { 
557
+                // {
558
                 //     monitor_records: [ {},{},{},{},{},{},{},{},{},{},{}, ],
558
                 //     monitor_records: [ {},{},{},{},{},{},{},{},{},{},{}, ],
559
                 //     advices: [ {},{},{},{},{},{},{}, ],
559
                 //     advices: [ {},{},{},{},{},{},{}, ],
560
                 // },
560
                 // },
561
-                // { 
561
+                // {
562
                 //     monitor_records: [],
562
                 //     monitor_records: [],
563
                 //     advices: [],
563
                 //     advices: [],
564
                 // },
564
                 // },
565
             ],
565
             ],
566
+            loading:false,
566
             orgname: '',
567
             orgname: '',
567
             bloodAccessParOpera: {},
568
             bloodAccessParOpera: {},
568
             anticoagulantsConfit: {},
569
             anticoagulantsConfit: {},
604
     //   }
605
     //   }
605
     },
606
     },
606
     mounted() {
607
     mounted() {
608
+      this.loading = true
607
         var ids = this.$store.getters.temp_params.batch_print_dialysis_record_ids
609
         var ids = this.$store.getters.temp_params.batch_print_dialysis_record_ids
608
         if (ids.length == 0) {
610
         if (ids.length == 0) {
609
             this.$router.back(-1)
611
             this.$router.back(-1)
612
         GetBatchPrintDialysisData(ids.join(",")).then(rs => {
614
         GetBatchPrintDialysisData(ids.join(",")).then(rs => {
613
             var resp = rs.data
615
             var resp = rs.data
614
             if (resp.state == 1) {
616
             if (resp.state == 1) {
615
-                this.records = this.records.concat(resp.data.schedules);
617
+
618
+              this.records = this.records.concat(resp.data.schedules);
616
                 for (const recordIndex in this.records) {
619
                 for (const recordIndex in this.records) {
617
                     var dlegh = 0;
620
                     var dlegh = 0;
618
                     if(this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length<8) {
621
                     if(this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length<8) {
629
                         }
632
                         }
630
                     }
633
                     }
631
 
634
 
632
-                
635
+
633
                     var childMap = {};
636
                     var childMap = {};
634
                     for (const index in this.records[recordIndex].advices) {
637
                     for (const index in this.records[recordIndex].advices) {
635
                         if (this.records[recordIndex].advices[index].parent_id == 0) {
638
                         if (this.records[recordIndex].advices[index].parent_id == 0) {
693
                         this.$set(this.operatorMaps, this.operators[index].id, this.operators[index]);
696
                         this.$set(this.operatorMaps, this.operators[index].id, this.operators[index]);
694
                     }
697
                     }
695
                 }
698
                 }
696
-                
699
+
697
                 this.adminUser = resp.data.users;
700
                 this.adminUser = resp.data.users;
698
-                
701
+                this.loading = false
702
+
699
             } else {
703
             } else {
700
-                this.$message.error(resp.msg)
704
+              this.loading = false
705
+              this.$message.error(resp.msg)
701
             }
706
             }
702
         }).catch(err => {
707
         }).catch(err => {
703
             this.$message.error(err)
708
             this.$message.error(err)
706
     methods: {
711
     methods: {
707
         printAction: function() {
712
         printAction: function() {
708
             const style = '@media print { .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 14px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 0 0; page-break-after: always; } .print_page_main_content .order-yy-name { margin: auto; text-align: center; font-size: 20px; letter-spacing: 5px;} .print_page_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .row { font-size: 14px; line-height: 20px; padding: 5px 0; } .inline_block { display: inline-block; } .under_line { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .flex { display: -webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex; align-items: center; -webkit-align-items: center; box-align: center; -moz-box-align: center; -webkit-box-align: center; text-align: center; -webkit-justify-content: space-between; justify-content: space-between; -moz-box-pack: space-between; -webkit--moz-box-pack: space-between; box-pack: space-between; } .print_page_main_content .proj_table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } .print_page_main_content .proj_table tbody tr td { border: 1px solid; font-size: 16px; padding: 10px 8px; line-height: 30px; } .print_page_main_content .proj_table .inside_table { width: 100%; border: hidden; border-collapse: collapse; } .print_page_main_content .proj_table .inside_table tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 8px 5px; line-height: 25px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.advice-children{display:flex;}';
713
             const style = '@media print { .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 14px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 0 0; page-break-after: always; } .print_page_main_content .order-yy-name { margin: auto; text-align: center; font-size: 20px; letter-spacing: 5px;} .print_page_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .row { font-size: 14px; line-height: 20px; padding: 5px 0; } .inline_block { display: inline-block; } .under_line { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .flex { display: -webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex; align-items: center; -webkit-align-items: center; box-align: center; -moz-box-align: center; -webkit-box-align: center; text-align: center; -webkit-justify-content: space-between; justify-content: space-between; -moz-box-pack: space-between; -webkit--moz-box-pack: space-between; box-pack: space-between; } .print_page_main_content .proj_table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } .print_page_main_content .proj_table tbody tr td { border: 1px solid; font-size: 16px; padding: 10px 8px; line-height: 30px; } .print_page_main_content .proj_table .inside_table { width: 100%; border: hidden; border-collapse: collapse; } .print_page_main_content .proj_table .inside_table tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 8px 5px; line-height: 25px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.advice-children{display:flex;}';
709
-            
714
+
710
             printJS({
715
             printJS({
711
                 printable: "print_content",
716
                 printable: "print_content",
712
                 type: "html",
717
                 type: "html",
832
 <style scoped>
837
 <style scoped>
833
 .print_page_main_content {
838
 .print_page_main_content {
834
     background-color: white;
839
     background-color: white;
835
-    width:960px; 
840
+    width:960px;
836
     margin:0 auto 50px;
841
     margin:0 auto 50px;
837
     padding: 0 0 0 0;
842
     padding: 0 0 0 0;
838
     page-break-after: always;
843
     page-break-after: always;
862
     display: inline-block;
867
     display: inline-block;
863
     border-bottom: 1px solid #999;
868
     border-bottom: 1px solid #999;
864
     text-align: center;
869
     text-align: center;
865
-    white-space: nowrap; 
870
+    white-space: nowrap;
866
 }
871
 }
867
 .under_line::before {
872
 .under_line::before {
868
     content: "\00A0";
873
     content: "\00A0";
902
     line-height: 30px;
907
     line-height: 30px;
903
 }
908
 }
904
 .print_page_main_content .proj_table .inside_table {
909
 .print_page_main_content .proj_table .inside_table {
905
-    width: 100%; 
910
+    width: 100%;
906
     border: hidden; /* 解决边框冲突 */
911
     border: hidden; /* 解决边框冲突 */
907
     border-collapse: collapse;
912
     border-collapse: collapse;
908
 }
913
 }

+ 14 - 10
src/xt_pages/dialysis/dialysisPrintOrder.vue Zobrazit soubor

2
   <div class="main-contain">
2
   <div class="main-contain">
3
     <div class="position">
3
     <div class="position">
4
       <bread-crumb :crumbs='crumbs'></bread-crumb>
4
       <bread-crumb :crumbs='crumbs'></bread-crumb>
5
-      <el-button size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印</el-button>
5
+      <el-button  :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印</el-button>
6
     </div>
6
     </div>
7
     <div class="app-container ">
7
     <div class="app-container ">
8
-      <div class="order-print-btn"
9
-           v-loading="loading"
10
-           element-loading-text="加载中"
11
-           element-loading-spinner="el-icon-loading"
12
-           element-loading-background="rgba(0, 0, 0, 0.8)"
13
-           style="width: 100%;">
14
-      </div>
8
+      <!--<div class="order-print-btn"-->
9
+           <!--v-loading="loading"-->
10
+           <!--element-loading-text="加载中"-->
11
+           <!--element-loading-spinner="el-icon-loading"-->
12
+           <!--element-loading-background="rgba(0, 0, 0, 0.8)"-->
13
+           <!--style="width: 100%;">-->
14
+      <!--</div>-->
15
 
15
 
16
       <!--<dialysis-print-order-two :patientInfo="patientInfo" :receiverTreatmentAccess="receiverTreatmentAccess" :predialysis="predialysis"></dialysis-print-order-two>-->
16
       <!--<dialysis-print-order-two :patientInfo="patientInfo" :receiverTreatmentAccess="receiverTreatmentAccess" :predialysis="predialysis"></dialysis-print-order-two>-->
17
 
17
 
1982
                     <td width="35">其它</td>
1982
                     <td width="35">其它</td>
1983
                     <td width="">
1983
                     <td width="">
1984
                       <div class="under-line">&nbsp;
1984
                       <div class="under-line">&nbsp;
1985
-                        <span v-if="afterdialysis.in_advance_reason_other.length > 0">{{afterdialysis.in_advance_reason_other}}</span>
1985
+                        <span v-if="afterdialysis.in_advance_reason.length > 0">{{afterdialysis.in_advance_reason_other}}</span>
1986
                       </div>
1986
                       </div>
1987
                     </td>
1987
                     </td>
1988
                     <td width="10">)</td>
1988
                     <td width="10">)</td>
2366
 
2366
 
2367
         const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:15px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;}'
2367
         const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:15px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;}'
2368
 
2368
 
2369
-        if (this.org_template_info.template_id == 1) {
2369
+        if (this.org_template_info.template_id != 2) {
2370
           printJS({
2370
           printJS({
2371
             printable: 'dialysis-print-box',
2371
             printable: 'dialysis-print-box',
2372
             type: 'html',
2372
             type: 'html',
2427
         return typeof (this.modeOptions[mode_id]) !== 'undefined' && typeof (this.modeOptions[mode_id].name) !== 'undefined' ? this.modeOptions[mode_id].name : ''
2427
         return typeof (this.modeOptions[mode_id]) !== 'undefined' && typeof (this.modeOptions[mode_id].name) !== 'undefined' ? this.modeOptions[mode_id].name : ''
2428
       },
2428
       },
2429
       getDialysisRecord() {
2429
       getDialysisRecord() {
2430
+        this.loading = true
2431
+
2430
         getDialysisRecord(this.queryParams).then(response => {
2432
         getDialysisRecord(this.queryParams).then(response => {
2431
           if (response.data.state == 1) {
2433
           if (response.data.state == 1) {
2432
             this.adminUser = response.data.data.users
2434
             this.adminUser = response.data.data.users
2580
               item.push(rightAdvice[i])
2582
               item.push(rightAdvice[i])
2581
               this.advices.push(item)
2583
               this.advices.push(item)
2582
             }
2584
             }
2585
+            this.loading = false
2583
           } else {
2586
           } else {
2587
+            this.loading = false
2584
             this.$message.error('请求数据失败')
2588
             this.$message.error('请求数据失败')
2585
             return false
2589
             return false
2586
           }
2590
           }

+ 12 - 11
src/xt_pages/user/components/PatientForm.vue Zobrazit soubor

615
         GetPatientTotal().then(response => {
615
         GetPatientTotal().then(response => {
616
           if (response.data.state == 1) {
616
           if (response.data.state == 1) {
617
             this.patientTotal = response.data.data.total
617
             this.patientTotal = response.data.data.total
618
-            if ((this.subscibe.state == 2 && this.patientTotal >= 100) || (this.subscibe.state == 1 && this.patientTotal >= 200)) {
619
-              this.$alert('患者数已达到当前服务版本病人数,需要升级到更高的版本', '提示', {
620
-                confirmButtonText: '确定',
621
-                showClose: false,
622
-                callback: action => {
623
-                  this.$router.push('/service/buy')
624
-                }
625
-              })
626
-            } else {
627
-              this.subscibeFlag = true
628
-            }
618
+            this.subscibeFlag = true;
619
+            // if ((this.subscibe.state == 2 && this.patientTotal >= 100) || (this.subscibe.state == 1 && this.patientTotal >= 200)) {
620
+            //   this.$alert('患者数已达到当前服务版本病人数,需要升级到更高的版本', '提示', {
621
+            //     confirmButtonText: '确定',
622
+            //     showClose: false,
623
+            //     callback: action => {
624
+            //       this.$router.push('/service/buy')
625
+            //     }
626
+            //   })
627
+            // } else {
628
+            //   this.subscibeFlag = true
629
+            // }
629
           } else {
630
           } else {
630
             this.$message.error(response.data.msg)
631
             this.$message.error(response.data.msg)
631
           }
632
           }