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

src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue

@@ -34,7 +34,7 @@
           <td style="text-align:center;" colspan="2">
             透析年限:
             <span style="display:inline-block;margin-left:10px;">
-                {{ patientInfo.first_dialysis_date ? getMonths(patientInfo.first_dialysis_date) : '/' }}月
+                {{ patientInfo.first_dialysis_date ? getMonths(patientInfo.first_dialysis_date) : '/' }}
             </span>
           </td>
         </tr>
@@ -53,16 +53,16 @@
         <tr>
           <td style="text-align:left;" colspan="5">
             <span style="display:inline-block;margin-left:15px;">血管通路类型:</span>
-            <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('自体内瘘')>-1?true:false"
+            <label-box :isChecked="prescription.blood_access_part_opera_name ? prescription.blood_access_part_opera_name.indexOf('自体内瘘')>-1?true:false : false"
                 showValue='自体内瘘'></label-box>
             &nbsp;
-            <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('移植物内瘘')>-1?true:false"
+            <label-box :isChecked="prescription.blood_access_part_opera_name ? prescription.blood_access_part_opera_name.indexOf('移植物内瘘')>-1?true:false : false"
                 showValue='移植物内瘘'></label-box>
             &nbsp;
-            <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('临时插管')>-1?true:false"
+            <label-box :isChecked="prescription.blood_access_part_opera_name ? prescription.blood_access_part_opera_name.indexOf('临时插管')>-1?true:false : false"
                 showValue='临时插管'></label-box>
             &nbsp;
-            <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('长期插管')>-1?true:false"
+            <label-box :isChecked="prescription.blood_access_part_opera_name ? prescription.blood_access_part_opera_name.indexOf('长期插管')>-1?true:false : false"
                 showValue='长期插管'></label-box>
             &nbsp;
           </td>
@@ -127,7 +127,7 @@
           <td style="text-align:left;" colspan="1">
             <span style="display:inline-block;margin-left:15px;">
               净脱水:
-              {{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}kg
+              {{ afterdialysis.weight_loss ? afterdialysis.weight_loss : "/" }}kg
             </span>
           </td>
         </tr>
@@ -181,16 +181,16 @@
         <tr>
           <td style="text-align:left;" colspan="5">
             <span style="display:inline-block;margin-left:15px;">
-                总结：{{ summary.dialysis_summary ? summary.dialysis_summary : "/" }}
+                总结：{{ dialysis_summary ? dialysis_summary : "/" }}
             </span>
           </td>
           <td style="text-align:left;" colspan="1">
             <span style="display:inline-block;margin-left:15px;">
                 医生签名:
-                <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(prescription.prescription_doctor) == ''">
-                {{ getAdminUser(prescription.prescription_doctor) }}
+                <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
+                {{ getAdminUser(prescription.creater) }}
                 </span>
-                <img style="height:30px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else />
+                <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
             </span>
           </td>
         </tr>
@@ -246,7 +246,7 @@
             </span>
           </td>
           
-          <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+          <td>{{ getTime(advice.execution_time, "{h}:{i}") }}</td>
           <td>
             <span v-if="setAdminUserES(advice.execution_staff) == ''">
               {{
@@ -365,15 +365,9 @@
             </td>
         </tr>
         <tr>
-            <td style="text-align:left;" colspan="4">
-                <span style="display:inline-block;margin-left:15px;">
-                    导管功能评估：
-                    {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
-                </span>
-            </td>
-            <td style="text-align:left;" colspan="4">
+            <td style="text-align:left;" colspan="8">
                 <span style="display:inline-block;margin-left:15px;">
-                    导管隧道评估:
+                    导管评估：
                     {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
                 </span>
             </td>
@@ -399,25 +393,25 @@
             <td style="text-align:left;" colspan="4">
                 <span style="margin-left:15px;align-items: center;display: flex;">
                     核对护士:
-                    <span style="width: 80px;text-align: center" v-if="dialysisOrder == null">
+                    <span style="width: 80px;text-align: center;display: flex;align-items: center;" v-if="dialysisOrder == null">
                       <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                         {{ getAdminUser(check == null ? 0 : check.creater) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
                     </span>
-                    <span style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.modifier">
+                    <span style="width: 80px;text-align: center;display: flex;align-items: center;" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.modifier">
                       <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                         {{ getAdminUser(check == null ? 0 : check.creater) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
                     </span>
-                    <span style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.creater">
+                    <span style="width: 80px;text-align: center;display: flex;align-items: center;" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.creater">
                       <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                         {{ getAdminUser(check == null ? 0 : check.modifier) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" v-else />
                     </span>
-                    <span style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse != check.creater && dialysisOrder.start_nurse != check.modifier">
+                    <span style="width: 80px;text-align: center;display: flex;align-items: center;" v-if="dialysisOrder != null && dialysisOrder.start_nurse != check.creater && dialysisOrder.start_nurse != check.modifier">
                       <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                         {{ getAdminUser(check == null ? 0 : check.creater) }}
                       </span>
@@ -733,7 +727,12 @@ export default {
       var ty=tt.getFullYear(); //今天年
       var tm=tt.getMonth()+1; //今天月
       var gm=(ty-oy)*12+(tm-om); //距今月数
-      return gm
+      if(gm < 12){
+          return gm + '个月'
+      }else{
+          return parseInt(gm / 12) + '年' + gm % 12 + '个月'
+      }
+      
     },
     getCruor(cruor){
       if(cruor.indexOf(',') == -1){
@@ -923,6 +922,7 @@ export default {
           this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
             this.predialysis.blood_access_part_opera_id
           )
+          
           var afterdialysis = response.data.data.AssessmentAfterDislysis
           // eslint-disable-next-line no-undef
           console.log('透后评估', afterdialysis)
@@ -1192,6 +1192,9 @@ export default {
           this.prescription.dialysate_formulation_name = this.dialysateFormulationName(
             this.prescription.dialysate_formulation
           )
+          this.prescription.blood_access_part_opera_name = this.bloodAccessParOperaName(
+            this.prescription.blood_access
+          );
 
           var paLen = this.perfusionApparatus.length
           this.prescription.perfusion_apparatus_name = ''

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1,5 +1,8 @@
 <template>
-    <div class="main-contain outpatientChargesManagement">
+    <div class="main-contain outpatientChargesManagement" v-loading="newLoading"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)">
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
@@ -120,9 +123,7 @@
                                                                 type="primary"
                                                         >修改医疗类型
                                                         </el-button>
-                                                    </el-tab-pane>
-
-                                                    <div style="margin-bottom:10px;float: right">
+                                                        <div style="margin-bottom:10px;float: right">
                                                         <div>
                                                             <el-button
                                                                     v-if="(hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"
@@ -148,6 +149,9 @@
                                                             </el-button>
                                                         </div>
                                                     </div>
+                                                    </el-tab-pane>
+
+                                                    
 
                                                     <prescription-table ref="prescription_tables"
                                                                         :prescription="items.curPrescriptions"></prescription-table>
@@ -690,7 +694,8 @@
 
         temp_ids: '',
 
-        other_prescriptions: []
+        other_prescriptions: [],
+        newLoading:false
 
       }
     },
@@ -857,7 +862,7 @@
         })
 
       }, chargeConfirm(form) {
-
+        this.newLoading = true
         form['id'] = this.patientInfo.id
         form['his_patient_id'] = this.hisPatientInfo.id
         form['record_time'] = this.record_date
@@ -884,6 +889,7 @@
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               this.loadingtwo = false
+              this.newLoading = false
               this.$refs.charge.hide()
               return false
             } else {
@@ -896,6 +902,7 @@
               this.$message({ message: '收费成功', type: 'success' })
               this.$refs.charge.hide()
               this.loadingtwo = false
+              this.newLoading = false
             }
           })
 
@@ -919,8 +926,9 @@
                     confirmButtonText: '确 定',
                     type: 'warning'
                   }).then(() => {
-
+                    that.newLoading = false
                   }).catch(() => {
+                    that.newLoading = false
                   })
 
                 } else {
@@ -934,12 +942,12 @@
                   that.cal_one = this.cal_one - 1
                   that.cal_two = this.cal_two + 1
                   that.patientTableData.splice(this.current_index, 1)
-
+                  that.newLoading = false
                 }
               }
             })
             .catch(function(error) {
-
+              that.newLoading = false
             })
         }
       }, chargeCancel() {
@@ -2113,7 +2121,7 @@
           }
           var ids_str = ids.join(',')
           this.temp_ids = ids_str
-
+          this.newLoading = true
           var that = this
           let form = {}
           form['id'] = this.patientInfo.id
@@ -2146,14 +2154,16 @@
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
                   this.loadingtwo = false
+                  this.newLoading = false
                   return false
                 } else {
                   this.changeRadioAndPatient(1)
                   this.$message({ message: '预结算成功', type: 'success' })
+                  this.newLoading = false
                 }
               })
             }).catch(() => {
-
+              this.newLoading = false
             })
 
           } else {
@@ -2178,20 +2188,22 @@
                         confirmButtonText: '确 定',
                         type: 'warning'
                       }).then(() => {
-
+                        that.newLoading = false
                       }).catch(() => {
+                        that.newLoading = false
                       })
                     } else {
                       that.changeRadioAndPatient(1)
                       that.$message({ message: '预结算成功', type: 'success', duration: 5000 })
+                      that.newLoading = false
                     }
                   }
                 })
                 .catch(function(error) {
-
+                  that.newLoading = false
                 })
             }).catch(() => {
-
+              that.newLoading = false
             })
           }
 
@@ -4103,7 +4115,7 @@
         position: relative;
 
         overflow-y: auto;
-        height: 350px;
+        height: 450px;
 
 
     .el-tabs__item {

src/xt_pages/user/templateSummaryPrint.vue

@@ -47,10 +47,9 @@
         </div>
       </div> -->
       <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
-        <span style="font-weight:bold;">阶段小结总结:</span><div style="line-height:24px;">
+        <span style="font-weight:bold;">阶段小结总结:</span>
           <!-- {{patientList.template_summary_content}} -->
-          <div v-html="patientList.template_summary_content"></div>
-        </div>  
+          <div style="line-height:24px;" v-html="patientList.template_summary_content"></div>
       </div>
      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:250px;">
         <span style="font-weight:bold;">阶段小结化验结果:</span>
@@ -292,7 +291,7 @@ export default {
     printThisPage() {
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
-        const style ='@media print {.dialysis-print-order{width:960px;margin:0 auto;letter-spacing:5px}.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:23px;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;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;font-weight: bold;margin: 10px 0;}'
+        const style ='@media print {.dialysis-print-order{width:960px;margin:0 auto;letter-spacing:5px} .dialysis-print-order p{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:23px;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;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;font-weight: bold;margin: 10px 0;}'
         printJS({
             printable: 'dialysis-print-box',
             type: 'html',

src/xt_pages/workforce/remind_print_setting.vue

@@ -28,7 +28,7 @@
                 </div> 
                 <div>用量:  
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 4">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 5">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
@@ -209,7 +209,7 @@
 
       },
       printAction: function() {
-        const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+        const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } @page {margin-top:10px;}}'
 
         printJS({
           printable: 'print_content',