1

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -2,7 +2,7 @@
  <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
-      <el-button size="small" icon="el-icon-printer"  @click="printAction" type="primary">打印</el-button>
+      <el-button :loading="loading"  size="small" icon="el-icon-printer"  @click="printAction" type="primary">打印</el-button>
     </div>
     <div class="app-container">
         <div id="print_content">
@@ -384,7 +384,7 @@
                                     <table class="inside_table">
                                         <thead>
                                             <tr>
-                                                
+
                                             <td width="40px">时间</td>
                                             <td width="120px">医嘱内容</td>
                                             <td width="80px">医生签名</td>
@@ -398,7 +398,7 @@
                                             <td width="80px">执行护士</td>
                                             <td width="65px">执行时间</td>
                                             <td width="75px">核对护士</td>
-                                            
+
                                                 <!-- <td width="100">时间</td>
                                                 <td>医嘱内容</td>
                                                 <td width="120">医生签名</td>
@@ -554,15 +554,16 @@ export default {
                 {path:false, name:'批量打印'},
             ],
             records: [ // 模拟有多条数据
-                // { 
+                // {
                 //     monitor_records: [ {},{},{},{},{},{},{},{},{},{},{}, ],
                 //     advices: [ {},{},{},{},{},{},{}, ],
                 // },
-                // { 
+                // {
                 //     monitor_records: [],
                 //     advices: [],
                 // },
             ],
+            loading:false,
             orgname: '',
             bloodAccessParOpera: {},
             anticoagulantsConfit: {},
@@ -604,6 +605,7 @@ export default {
     //   }
     },
     mounted() {
+      this.loading = true
         var ids = this.$store.getters.temp_params.batch_print_dialysis_record_ids
         if (ids.length == 0) {
             this.$router.back(-1)
@@ -612,7 +614,8 @@ export default {
         GetBatchPrintDialysisData(ids.join(",")).then(rs => {
             var resp = rs.data
             if (resp.state == 1) {
-                this.records = this.records.concat(resp.data.schedules);
+
+              this.records = this.records.concat(resp.data.schedules);
                 for (const recordIndex in this.records) {
                     var dlegh = 0;
                     if(this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length<8) {
@@ -629,7 +632,7 @@ export default {
                         }
                     }
 
-                
+
                     var childMap = {};
                     for (const index in this.records[recordIndex].advices) {
                         if (this.records[recordIndex].advices[index].parent_id == 0) {
@@ -693,11 +696,13 @@ export default {
                         this.$set(this.operatorMaps, this.operators[index].id, this.operators[index]);
                     }
                 }
-                
+
                 this.adminUser = resp.data.users;
-                
+                this.loading = false
+
             } else {
-                this.$message.error(resp.msg)
+              this.loading = false
+              this.$message.error(resp.msg)
             }
         }).catch(err => {
             this.$message.error(err)
@@ -706,7 +711,7 @@ export default {
     methods: {
         printAction: function() {
             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;}';
-            
+
             printJS({
                 printable: "print_content",
                 type: "html",
@@ -832,7 +837,7 @@ export default {
 <style scoped>
 .print_page_main_content {
     background-color: white;
-    width:960px; 
+    width:960px;
     margin:0 auto 50px;
     padding: 0 0 0 0;
     page-break-after: always;
@@ -862,7 +867,7 @@ export default {
     display: inline-block;
     border-bottom: 1px solid #999;
     text-align: center;
-    white-space: nowrap; 
+    white-space: nowrap;
 }
 .under_line::before {
     content: "\00A0";
@@ -902,7 +907,7 @@ export default {
     line-height: 30px;
 }
 .print_page_main_content .proj_table .inside_table {
-    width: 100%; 
+    width: 100%;
     border: hidden; /* 解决边框冲突 */
     border-collapse: collapse;
 }

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2,16 +2,16 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
-      <el-button size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印</el-button>
+      <el-button  :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印</el-button>
     </div>
     <div class="app-container ">
-      <div class="order-print-btn"
-           v-loading="loading"
-           element-loading-text="加载中"
-           element-loading-spinner="el-icon-loading"
-           element-loading-background="rgba(0, 0, 0, 0.8)"
-           style="width: 100%;">
-      </div>
+      <!--<div class="order-print-btn"-->
+           <!--v-loading="loading"-->
+           <!--element-loading-text="加载中"-->
+           <!--element-loading-spinner="el-icon-loading"-->
+           <!--element-loading-background="rgba(0, 0, 0, 0.8)"-->
+           <!--style="width: 100%;">-->
+      <!--</div>-->
 
       <!--<dialysis-print-order-two :patientInfo="patientInfo" :receiverTreatmentAccess="receiverTreatmentAccess" :predialysis="predialysis"></dialysis-print-order-two>-->
 
@@ -1982,7 +1982,7 @@
                     <td width="35">其它</td>
                     <td width="">
                       <div class="under-line">&nbsp;
-                        <span v-if="afterdialysis.in_advance_reason_other.length > 0">{{afterdialysis.in_advance_reason_other}}</span>
+                        <span v-if="afterdialysis.in_advance_reason.length > 0">{{afterdialysis.in_advance_reason_other}}</span>
                       </div>
                     </td>
                     <td width="10">)</td>
@@ -2366,7 +2366,7 @@
 
         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;}'
 
-        if (this.org_template_info.template_id == 1) {
+        if (this.org_template_info.template_id != 2) {
           printJS({
             printable: 'dialysis-print-box',
             type: 'html',
@@ -2427,6 +2427,8 @@
         return typeof (this.modeOptions[mode_id]) !== 'undefined' && typeof (this.modeOptions[mode_id].name) !== 'undefined' ? this.modeOptions[mode_id].name : ''
       },
       getDialysisRecord() {
+        this.loading = true
+
         getDialysisRecord(this.queryParams).then(response => {
           if (response.data.state == 1) {
             this.adminUser = response.data.data.users
@@ -2580,7 +2582,9 @@
               item.push(rightAdvice[i])
               this.advices.push(item)
             }
+            this.loading = false
           } else {
+            this.loading = false
             this.$message.error('请求数据失败')
             return false
           }

src/xt_pages/user/components/PatientForm.vue

@@ -615,17 +615,18 @@
         GetPatientTotal().then(response => {
           if (response.data.state == 1) {
             this.patientTotal = response.data.data.total
-            if ((this.subscibe.state == 2 && this.patientTotal >= 100) || (this.subscibe.state == 1 && this.patientTotal >= 200)) {
-              this.$alert('患者数已达到当前服务版本病人数，需要升级到更高的版本', '提示', {
-                confirmButtonText: '确定',
-                showClose: false,
-                callback: action => {
-                  this.$router.push('/service/buy')
-                }
-              })
-            } else {
-              this.subscibeFlag = true
-            }
+            this.subscibeFlag = true;
+            // if ((this.subscibe.state == 2 && this.patientTotal >= 100) || (this.subscibe.state == 1 && this.patientTotal >= 200)) {
+            //   this.$alert('患者数已达到当前服务版本病人数，需要升级到更高的版本', '提示', {
+            //     confirmButtonText: '确定',
+            //     showClose: false,
+            //     callback: action => {
+            //       this.$router.push('/service/buy')
+            //     }
+            //   })
+            // } else {
+            //   this.subscibeFlag = true
+            // }
           } else {
             this.$message.error(response.data.msg)
           }