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/PatientBox.vue

@@ -53,8 +53,11 @@
         </div>
       </div>
       <div class="dislysisInfo">
-        <p>体重(前/后kg):{{ schedule.assessment_before_dislysis ? schedule.assessment_before_dislysis.weight_before : '' }}/{{ schedule.assessment_after_dislysis ? schedule.assessment_after_dislysis.weight_after : '' }}</p>
-        <p>目标超滤量:{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}
+        <p>体重(前/后kg):
+          {{ schedule.assessment_before_dislysis ? schedule.assessment_before_dislysis.weight_before : '' }}
+          <span v-if="schedule.assessment_after_dislysis && schedule.assessment_after_dislysis.weight_after>0">/{{ schedule.assessment_after_dislysis ? schedule.assessment_after_dislysis.weight_after : '' }}</span> </p>
+        <p>目标超滤量:
+          <span v-if="schedule.prescription && schedule.prescription.target_ultrafiltration>0">{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}</span>
        
         </p>
         <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -109,11 +109,9 @@
       <ul>
         <li v-if="isShow('目标超滤量')">
           <label>目标超滤量 : </label>
-          <span class="content">{{
-            target_ultrafiltration != "0" ? target_ultrafiltration : ""
-          }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555 && this.$store.getters.xt_user.template_info.org_id != 9671"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 9671" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>
@@ -712,7 +710,7 @@ export default {
     displace_speed:function(){
       return this.getValueStr('displace_speed','displace_speed')
     },
-
+  
   },
   created() {
     console.log("中国出口233232323233223",this.prescription)
@@ -778,6 +776,11 @@ export default {
        }
        return name
     }
+  },
+  watch:{
+     prescription:function(){
+     console.log("中国出口233232323233223",this.prescription)
+   }
   }
 }
 </script>

src/xt_pages/dialysis/details/NavIgation.vue

@@ -635,7 +635,7 @@ export default {
       this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation,this.lastAssessment);
     },
     showDoubleCheck: function() {
-       
+      console.log("h322323232323232332",this.prescription)
       this.$refs.doubleCheck.show();
     },
     showrTeatmentSummary: function() {

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1750,7 +1750,7 @@ export default {
   created(){
     //获取自备药
     this.getSelfMedicalList()
-    console.log("模板数据",this.adviceTemplates)
+    
   }
 };
 </script>

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -1296,7 +1296,7 @@
       this.record_date = date ? uParseTime(date, "{y}-{m}-{d}") : parseTime(new Date(), '{y}-{m}-{d}')
       //获取皮肤
       this.skins = getDataConfig('hemodialysis','skin')
-      console.log("皮肤",this.skins)
+      
       this.pinholings = getDataConfig('hemodialysis','pinholing')
       console.log("针眼",this.pinholings)
       this.catheter_maintenancelist = getDataConfig('hemodialysis','catheter_maintenance')

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -2257,7 +2257,7 @@
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '1'
-
+            ParamsQuery['patient_id'] = this.patient.id
             console.log('第一', ParamsQuery)
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
@@ -2300,6 +2300,7 @@
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
+              ParamsQuery['patient_id'] = this.patient.id
                console.log('第二')
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
@@ -2347,8 +2348,9 @@
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
+              ParamsQuery['patient_id'] = this.patient.id
               console.log('第三')
-
+            
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -2420,6 +2422,7 @@
               ParamsQuery['record_date'] = this.record_date
               // console.log(this.prescription);
               console.log('第四')
+              ParamsQuery['patient_id'] = this.patient.id
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -2461,6 +2464,7 @@
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
+              ParamsQuery['patient_id'] = this.patient.id
               console.log('第五')
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
@@ -2504,6 +2508,7 @@
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
                 console.log('第6')
+                ParamsQuery['patient_id'] = this.patient.id
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2552,6 +2557,7 @@
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
                 console.log('第七')
+                ParamsQuery['patient_id'] = this.patient.id
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2621,7 +2627,9 @@
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
+                ParamsQuery['patient_id'] = this.patient.id
                 console.log('第八')
+                
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2660,14 +2668,15 @@
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '2'
-
+            ParamsQuery['patient_id'] = this.patient.id
+          
             if (
               this.$store.getters.xt_user.user.id !=
               this.dialysisPrescription.creater
             ) {
               ParamsQuery['mode'] = '3'
             }
-            console.log('第九')
+            console.log('第九',ParamsQuery)
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -3221,13 +3230,12 @@
       isShows(name) {
         var filedList = store.getters.xt_user.fileds
         for (let i = 0; i < filedList.length; i++) {
-          if (
-            filedList[i].module == 1 &&
-            filedList[i].filed_name_cn == name &&
-            filedList[i].is_show == 1
-          ) {
+         
+          if (filedList[i].module == 1 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+
             return true
           }
+
         }
         return false
       },

src/xt_pages/dialysis/details/dialog/doubleCheckDialog.vue

@@ -222,7 +222,7 @@
                   '{y}-{m}-{d} {h}:{i}'
                 ).split(' ')[1]
 
-                console.log('真性感')
+                
             }
 
           }else if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
@@ -326,7 +326,7 @@
            
 
             let doublecheck_resp = response.data.data.doubleCheck
-            console.log("双核2332322323",doublecheck_resp)
+            console.log("处方233232323232232332",this.prescription)
             var doubleCheck = this.double_check
             for (var index in doublecheck_resp) {        
               this.$set(doubleCheck, index, doublecheck_resp[index])
@@ -920,40 +920,95 @@
     },
     watch: {
       isVisibility(val) {
-        
+         
         if(this.prescription!=null && this.prescription.id!=0){
+          if(this.prescription.dialyzer_perfusion_apparatus !="" || this.prescription.dialysis_dialyszers!="" || this.prescription.dialysis_irrigation!=""){
+            this.diazes = ""
+            this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus
+            this.diazes = this.diazes + this.prescription.dialysis_dialyszers+this.prescription.dialysis_irrigation
+          }else{
+            this.diazes = ""
+            this.diazes = this.diazes 
+          }
+          
+          if(this.prescription.dialysate_formulation!=""){
+             this.dialysate_formulation = this.dialysate_formulation + this.GetDialysateFormulationById(this.prescription.dialysate_formulation)
+          }else{
+            this.dialysate_formulation = this.dialysate_formulation 
+          }
+          
+          if(this.prescription.kalium!=""){
+           this.kalium = this.kalium + (this.prescription.kalium?this.prescription.kalium:"")
+          }else{
+            this.kalium = this.kalium 
+          }
+       
+          if(this.prescription.calcium!=""){
+           this.calcium = this.calcium + (this.prescription.calcium?this.prescription.calcium:"")
+          }else{
+            this.calcium = this.calcium
+          }
+         
+          if(this.prescription.mode_id > 0){
+            this.dialys_mode = this.dialys_mode + this.getMode(this.prescription.mode_id) 
+          }else{
+             this.dialys_mode = this.dialys_mode
+          }
+          
+          if(this.prescription.dialysis_duration_hour !="" || this.prescription.dialysis_duration_minute!=""){
+            this.long_time = this.long_time + (this.prescription.dialysis_duration_hour?this.prescription.dialysis_duration_hour:"") +"小时" +(this.prescription.dialysis_duration_minute?this.prescription.dialysis_duration_minute:"") +"分"
+          }else{
+             this.long_time = this.long_time
+          }
+          
+          if(this.prescription.target_ultrafiltration!=""){
+           this.target_ultrafiltration = this.target_ultrafiltration + (this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:"")
+          }else{
+            this.target_ultrafiltration = this.target_ultrafiltration
+          }
           
-          this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus
-          this.diazes = this.diazes + this.prescription.dialysis_dialyszers+this.prescription.dialysis_irrigation
-          this.prescription.dialyzer_perfusion_apparatus = ""
-          this.prescription.dialysis_dialyszers = ""
-          this.prescription.dialysis_irrigation = ""
-          this.dialysate_formulation = this.dialysate_formulation + this.GetDialysateFormulationById(this.prescription.dialysate_formulation)
-          // this.prescription.dialysate_formulation = ""
-          this.kalium = this.kalium + (this.prescription.kalium?this.prescription.kalium:"")
-          this.prescription.kalium = ""
-          this.calcium = this.calcium + (this.prescription.calcium?this.prescription.calcium:"")
-          this.prescription.calcium = ""
-          this.dialys_mode = this.dialys_mode + this.getMode(this.prescription.mode_id)
-          this.prescription.mode_id= ""
-          this.long_time = this.long_time + (this.prescription.dialysis_duration_hour?this.prescription.dialysis_duration_hour:"") +"小时" +this.prescription.dialysis_duration_minute +"分"
-          this.prescription.dialysis_duration_hour=""
-          this.target_ultrafiltration = this.target_ultrafiltration + (this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:"")
-          this.prescription.target_ultrafiltration = ""
-          this.anticoagulant = this.anticoagulant + this.getAnticoagulant(this.prescription.anticoagulant)
-          this.prescription.anticoagulant=""
-          this.anticoagulant_shouji = this.anticoagulant_shouji + (this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:"")
-          this.prescription.anticoagulant_shouji = ""
-          this.anticoagulant_weichi = this.anticoagulant_weichi + (this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:"")
-         this.prescription.anticoagulant_weichi=""
-         this.anticoagulant_zongliang = this.anticoagulant_zongliang+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:"")
-         this.prescription.anticoagulant_zongliang = ""
-         this.displace_liqui_part = this.displace_liqui_part + (this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:"")
-          this.prescription.displace_liqui_part
-          this.replacement_total = this.replacement_total + (this.prescription.replacement_total?this.prescription.replacement_total:"")
-          this.prescription.replacement_total= ""
-          this.dialysate_flow = this.dialysate_flow + (this.prescription.dialysate_flow?this.prescription.dialysate_flow:"")
-          this.prescription.dialysate_flow= ""
+          if(this.prescription.anticoagulant!=""){
+            this.anticoagulant = this.anticoagulant + this.getAnticoagulant(this.prescription.anticoagulant)
+          }else{
+            this.anticoagulant = this.anticoagulant 
+          }
+         
+          if(this.prescription.anticoagulant_shouji!=""){
+            this.anticoagulant_shouji = this.anticoagulant_shouji + (this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:"")
+          }else{
+             this.anticoagulant_shouji = this.anticoagulant_shouji
+          }
+          
+          if(this.prescription.anticoagulant_weichi!=""){
+             this.anticoagulant_weichi = this.anticoagulant_weichi + (this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:"")
+          }else{
+           this.anticoagulant_weichi = this.anticoagulant_weichi 
+          }
+          
+          if(this.prescription.anticoagulant_zongliang!=""){
+             this.anticoagulant_zongliang = this.anticoagulant_zongliang+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:"")
+          }else{
+             this.anticoagulant_zongliang = this.anticoagulant_zongliang
+          }
+       
+          if(this.prescription.displace_liqui_part!=""){
+            this.displace_liqui_part = this.displace_liqui_part + (this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:"")
+          }else{
+             this.displace_liqui_part = this.displace_liqui_part
+          }
+          
+          if(this.prescription.replacement_total!=""){
+             this.replacement_total = this.replacement_total + (this.prescription.replacement_total?this.prescription.replacement_total:"")
+          }else{
+             this.replacement_total = this.replacement_total
+          }
+        
+          if(this.prescription.dialysate_flow!=""){
+             this.dialysate_flow = this.dialysate_flow + (this.prescription.dialysate_flow?this.prescription.dialysate_flow:"")
+          }else{
+             this.dialysate_flow = this.dialysate_flow
+          }
+
         }
         if(this.predialysis_evaluation!=null && this.predialysis_evaluation.id!=0){
           this.puncture_needle = this.puncture_needle + this.predialysis_evaluation.puncture_needle

src/xt_pages/dialysis/details/index.vue

@@ -981,6 +981,7 @@ export default {
           var schedual = resp.data.schedual // 患者排班信息
           console.log("排班22222222222",schedual)
           var prescription = resp.data.prescription // 透析处方
+          console.log("中华人民共和过2332233232323223",prescription)
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0
@@ -1338,7 +1339,13 @@ export default {
         var resp = rs.data
         if (resp.state == 1) {
           var schedules = resp.data.schedules
-          console.log("当前排班信息4444444444444444",schedules)
+          console.log("恭喜发慈爱2323232323323323223322332",schedules,this.prescription.patient_id)
+          for(let i=0;i<schedules.length;i++){
+            if(this.prescription.patient_id == schedules[i].patient_id){
+               this.prescription = schedules[i].prescription
+            }
+          }
+          console.log("hh2332223323232",this.prescription)
           this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
           const patientArr = JSON.parse(JSON.stringify(this.zone_schedules))
           if (this.activeName == 'first') {

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -3232,11 +3232,8 @@
           }, 400)
         }
       }
-    },
-    created(){
-      console.log("中华任命工商过多水分我333323232",this.org_id)
-      console.log("jjjjjjjjjjjjjjjjjjjjjjjjjjjj",this.drugs)
     }
+  
 
   }
 </script>

src/xt_pages/outpatientTool/components/detail.vue

@@ -6,10 +6,10 @@
     <div>
         <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
             <div>
-                <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
-                <!--@click="Action">-->
-                <!--导出-->
-                <!--</el-button>-->
+                <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
+                @click="Action">
+                导出
+                </el-button>
                 <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
                           @keyup.enter.native='searchAction'
                           placeholder="请输入患者姓名"
@@ -104,6 +104,8 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { GetSummaryDetail } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
+  import axios from 'axios'
+
   // import NewStatementPrint from './newStatementPrint'
   const moment = require('moment')
   export default {
@@ -132,6 +134,71 @@
       }
     },
     methods: {
+      Action(){
+        var that = this
+        axios.get('http://127.0.0.1:9531/handelExcel', {
+          params: {}
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+
+
+              return false
+            } else {
+
+              var list = []
+              for(let i = 0; i < response.data.data.list.length; i++){
+                let team =  response.data.data.list[i]
+                for(let b = 0; b < team.list.length; b++){
+                  let name = ""
+                  if(team.list[b].type == 2){
+                    name = team.list[b].project.project_name
+                  }else{
+
+                    name = team.list[b].good_info.good_name
+
+                  }
+
+                  let obj = {
+                    '客户组合编码': team.id,
+                    '客户组合名称': team.project_team,
+                    '客户单项编码': team.list[b].id,
+                    '客户单项名称': name,
+                    '中心组合编码': '',
+                    '中心组合名称': '',
+                    '中心单项编码': '',
+                    '中心单项名称': '',
+                  }
+
+                  list.push(obj)
+                }
+              }
+
+              import('@/vendor/Export2Excel').then(excel => {
+                const tHeader = [ '客户组合编码', '客户组合名称', '客户单项编码', '客户单项名称', '中心组合编码', '中心组合名称', '中心单项编码', '中心单项名称']
+                const filterVal = [ '客户组合编码', '客户组合名称', '客户单项编码', '客户单项名称', '中心组合编码', '中心组合名称', '中心单项编码', '中心单项名称']
+                const data = that.formatJson(filterVal, list)
+                excel.export_json_to_excel({
+                  header: tHeader,
+                  data,
+                  filename: "消费明细"
+                })
+              })
+
+
+            }
+          })
+          .catch(function(error) {
+
+          })
+
+
+
+
+      },formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+      },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
         if (columnIndex === 0) {
           if (rowIndex % 2 === 0) {

src/xt_pages/outpatientTool/components/settle.vue

@@ -91,6 +91,16 @@
           <el-table-column align="center" prop="item_name" label="个人支付金额">
               <template slot-scope="scope">{{scope.row.psn_cash_pay.toFixed(2)}}</template>
           </el-table-column>
+
+          <el-table-column align="center" prop="item_name" label="企业补充医疗保险基金支出">
+              <template slot-scope="scope">{{scope.row.hifes_pay.toFixed(2)}}</template>
+          </el-table-column>
+
+
+          <el-table-column align="center" prop="item_name" label="居民大病保险资金支出">
+              <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
+          </el-table-column>
+
           <el-table-column align="center" prop="total" label="费用总额">
               <template slot-scope="scope">
                   <div>{{scope.row.total.toFixed(2)}}</div>
@@ -126,7 +136,10 @@
           { id: 1, name: '医保' },
           { id: 2, name: '自费' },
           { id: 3, name: '门诊特殊病' },
-          { id: 4, name: '普通门诊' }
+          { id: 4, name: '普通门诊' },
+          { id: 5, name: '城乡居民基本医疗保险' },
+          { id: 6, name: '职工基本医疗保险' }
+
 
         ]
 
@@ -332,7 +345,10 @@
           let fund_pay_sumamt = ""
           let acct_pay = ""
           let psn_cash_pay = ""
+          let hifes_pay = ""
+          let hifmi_pay = ""
           let total = ""
+
           if(order.setl_time.length == 0){
 
             time = this.getTimes(order.settle_accounts_date)
@@ -363,6 +379,8 @@
           fund_pay_sumamt = order.fund_pay_sumamt
           acct_pay = order.acct_pay
           psn_cash_pay = order.psn_cash_pay
+          hifes_pay = order.hifes_pay
+          hifmi_pay = order.hifmi_pay
           total = order.total
 
 
@@ -375,13 +393,16 @@
             '基金支付金额': fund_pay_sumamt,
             '个人账户支付金额': acct_pay,
             '个人支付基金': psn_cash_pay,
+            '企业补充医疗保险基金支出': hifes_pay,
+            '居民大病保险资金支出': hifmi_pay,
             '费用总额':total,
+
           }
           list.push(obj)
         }
         import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = [ '患者姓名', '结算日期', '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金', '费用总额']
-          const filterVal = [ '患者姓名', '结算日期', '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金', '费用总额']
+          const tHeader = [ '患者姓名', '结算日期', '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金','企业补充医疗保险基金支出','居民大病保险资金支出', '费用总额']
+          const filterVal = [ '患者姓名', '结算日期', '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金','企业补充医疗保险基金支出','居民大病保险资金支出',  '费用总额']
           const data = this.formatJson(filterVal, list)
           excel.export_json_to_excel1({
             header: tHeader,

src/xt_pages/outpatientTool/fapiao.vue

@@ -216,7 +216,6 @@
           .catch(() => {
           })
       },
-
       handleIsUse: function(index, row) {
         this.$confirm('是否开启?', '开启', {
           confirmButtonText: '确定',
@@ -244,7 +243,6 @@
           })
 
       },
-
       showDetails: function(index, row) {
         let params = {
           id: row.id
@@ -272,7 +270,6 @@
             fapiao_code: val.fapiao_code,
             fapiao_number: val.fapiao_number,
             id: this.editId
-
           }
           modifyFaPiao(params).then(response => {
             if (response.data.state == 0) {
@@ -290,6 +287,7 @@
             }
           })
         } else if (val.isCreated == 1) {
+
           //新增
           createFaPiao(val).then(response => {
             if (response.data.state == 0) {
@@ -301,27 +299,22 @@
             }
           })
         }
-      },
-      dialogCancle: function() {
+      }, dialogCancle: function() {
         this.$refs.dialog.hide()
-      },
-      showDialog: function() {
+      }, showDialog: function() {
         this.Dialog.formValue = Object.assign(
           {},
           this.Dialog.resetForm
         )
         this.$refs.dialog.show()
         this.Dialog.isCreated = 1
-      },
-      handleSizeChange(val) {
+      }, handleSizeChange(val) {
         this.limit = val
         this.getList()
-      },
-      handleCurrentChange(val) {
+      }, handleCurrentChange(val) {
         this.page = val
         this.getList()
-      },
-      getList() {
+      }, getList() {
         let params = {
           page: this.page,
           limit: this.limit
@@ -356,7 +349,6 @@
     .el-table--group {
         border-color: #d0d3da;
     }
-
     .el-table--border::after,
     .el-table--group::after,
     .el-table::before {