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

src/lang/zh.js

@@ -229,7 +229,7 @@ export default {
     outpatientRecord: '住院工作站',
     advancePayment: '预交金',
     labelPrinting: '标签打印',
-    summary: '项目消费明细汇总',
+    summary: '收费列表',
     outpatientPharmacy: '门诊药房',
     pharmacyFormula: '药房配发药',
     prescriptionDrugReturn: '处方退药',

src/vendor/Export2Excel.js

@@ -219,3 +219,94 @@ export function export_json_to_excel({
     type: "application/octet-stream"
   }), `${filename}.${bookType}`);
 }
+
+export function export_json_to_excel1({
+  multiHeader = [],
+  header,
+  data,
+  filename,
+  ref,
+  merges = [],
+  autoWidth = true,
+  bookType = 'xlsx'
+} = {}) {
+  /* original data */
+  filename = filename || 'excel-list'
+  data = [...data]
+  data.unshift(header);
+
+  for (let i = multiHeader.length - 1; i > -1; i--) {
+    data.unshift(multiHeader[i])
+  }
+
+  var ws_name = "SheetJS";
+  var wb = new Workbook(),
+    ws = sheet_from_array_of_arrays(data);
+
+  if (merges.length > 0) {
+    if (!ws['!merges']) ws['!merges'] = [];
+    merges.forEach(item => {
+      console.log(XLSX.utils.decode_range(item))
+      ws['!merges'].push(XLSX.utils.decode_range(item))
+    })
+  }
+
+  if (autoWidth) {
+    /*设置worksheet每列的最大宽度*/
+    const colWidth = data.map(row => row.map(val => {
+      /*先判断是否为null/undefined*/
+      if (val == null) {
+        return {
+          'wch': 10
+        };
+      }
+      /*再判断是否为中文*/
+      else if (val.toString().charCodeAt(0) > 255) {
+        return {
+          'wch': val.toString().length * 2
+        };
+      } else {
+        return {
+          'wch': val.toString().length
+        };
+      }
+    }))
+    /*以第一行为初始值*/
+    let result = colWidth[0];
+    for (let i = 1; i < colWidth.length; i++) {
+      for (let j = 0; j < colWidth[i].length; j++) {
+        if (result[j]['wch'] < colWidth[i][j]['wch']) {
+          result[j]['wch'] = colWidth[i][j]['wch'];
+        }
+      }
+    }
+    ws['!cols'] = result;
+  }
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+
+  try {
+    const $e = ref
+    let $table = $e.querySelector('.el-table__fixed')
+    if(!$table) {
+      $table = $e
+    }
+
+    const wb = XLSX.utils.table_to_book($table, {raw:true})
+    const wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST:true, type: 'array'})
+    var wbout = XLSX.write(wb, {
+      bookType: bookType,
+      bookSST: false,
+      type: 'binary'
+    });
+    saveAs(new Blob([s2ab(wbout)], {
+      type: "application/octet-stream"
+    }), `${filename}.${bookType}`);
+  } catch (e) {
+    if (typeof console !== 'undefined') console.error(e)
+  }
+  
+}

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -636,7 +636,7 @@
                       <td style="line-height:16px;padding:0px;">
                         <div style="min-height:20px;line-height:20px; overflow:hidden;">
                           <span v-if="getTime(monitor.operate_time, '{h}:{i}')" style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
-                            <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】引血100ml/min</template>
+                            <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】 <span v-if="org_id != 10233">引血100ml/min</span></template>
                             <span v-if="dialysisOrder && monitor.operate_time == dialysisOrder.end_time">{{ monitor.end }}</span>
                             {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
                           </span>
@@ -1224,11 +1224,19 @@ export default {
           this.monitors[index].end = ''
           if (Object.keys(monitor).length > 0 && index > 1) {
             if (this.dialysisOrder && monitor.operate_time == this.dialysisOrder.end_time) {
-              this.monitors[index].end = '【结束透析】回血100ml/min'
+              if(this.org_id != 10233){
+                this.monitors[index].end = '【结束透析】回血100ml/min'
+              }else{
+                this.monitors[index].end = '【结束透析】'
+              }
               tempmonitorflag = false
             }
             if (tempmonitorflag && index == this.monitors.length - 1) {
-              this.monitors[index].end = '【结束透析】回血100ml/min'
+              if(this.org_id != 10233){
+                this.monitors[index].end = '【结束透析】回血100ml/min'
+              }else{
+                this.monitors[index].end = '【结束透析】'
+              }
             }
           }
         }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

@@ -1126,7 +1126,123 @@ export default {
   },
     methods: {
       checkData(){
-
+        if(this.predialysis.dialysis_count == 0){
+          this.$message.error('透析频率未填')
+        }else if(this.receiverTreatmentAccess.way == 0){
+          this.$message.error('入科方式未填')
+        }else if(this.receiverTreatmentAccess.consciousness == 0){
+          this.$message.error('意识未填')
+        }else if(this.predialysis.is_infect == 0){
+          this.$message.error('感染未填')
+        }else if(this.predialysis.temperature == ""){
+          this.$message.error('透前体温未填')
+        }else if(this.predialysis.pulse_frequency == ""){
+          this.$message.error('透前脉搏未填')
+        }else if(this.predialysis.systolic_blood_pressure == 0 || this.predialysis.diastolic_blood_pressure == 0){
+          this.$message.error('透前血压未填完整')
+        }else if(this.predialysis.catheter == ''){
+          this.$message.error('导管口未填')
+        }else if(this.predialysis.catheter_bend == 0){
+          this.$message.error('打折未填')
+        }else if(this.predialysis.urine_volume == 0){
+          this.$message.error('尿量未填')
+        }else if(this.predialysis.internal_fistula == ''){
+          this.$message.error('内瘘评估震颤未填')
+        }else if(this.predialysis.exposed == 0){
+          this.$message.error('外露未填')
+        }else if(this.predialysis.internal_fistula_skin == ''){
+          this.$message.error('内瘘皮肤情况未填')
+        }else if(this.predialysis.is_hemorrhage == 0){
+          this.$message.error('活动性出血未填')
+        }else if(this.predialysis.is_hemorrhage == 1 && this.predialysis.hemorrhage == ""){
+          this.$message.error('活动性出血选项未填')
+        }else if(this.predialysis.blood_access_part_opera_name == ''){
+          this.$message.error('血管通路未填')
+        }else if(this.predialysis.weight_before == 0){
+          this.$message.error('透前体重未填')
+        }else if(this.predialysis.dry_weight == 0){
+          this.$message.error('干体重未填')
+        }else if(this.predialysis.additional_weight == 0){
+          this.$message.error('衣物重未填')
+        }else if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
+          this.$message.error('计划治疗时间未填')
+        }else if(this.prescription.blood_flow_volume == 0){
+          this.$message.error('血流量未填')
+        }else if(this.prescription.target_ultrafiltration == 0){
+          this.$message.error('计划超滤总量未填')
+        }else if(this.prescription.displace_liqui_part == 0 && (prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12)){
+          this.$message.error('置换方式未填')
+        }else if(this.prescription.replacement_total == 0 && (prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12)){
+          this.$message.error('置换量未填')
+        }else if(this.prescription.mode_id == ""){
+          this.$message.error('透析方式未填')
+        }else if(this.prescription.anticoagulant == 0){
+          this.$message.error('治疗抗凝未填')
+        }else if(this.prescription.dialysate_formulation_name == ""){
+          this.$message.error('透析液配方未填')
+        }else if(this.prescription.dialyzer_perfusion_apparatus == ""){
+          this.$message.error('透析器型号未填')
+        }else if(this.afterdialysis.internal_fistula == ''){
+          this.$message.error('透后内瘘震颤未填')
+        }else if(this.afterdialysis.catheter == ''){
+          this.$message.error('透后导管未填')
+        }else if(this.afterdialysis.puncture_point_oozing_blood == 0){
+          this.$message.error('拔针后穿刺点渗血未填')
+        }else if(this.afterdialysis.puncture_point_haematoma == 0){
+          this.$message.error('穿刺处血肿未填')
+        }else if(this.afterdialysis.cvc_a == 0){
+          this.$message.error('A端未填')
+        }else if(this.afterdialysis.cvc_v == 0){
+          this.$message.error('V端未填')
+        }else if(this.afterdialysis.complication == ""){
+          this.$message.error('透后并发症未填')
+        }else if(this.afterdialysis.cruor == ""){
+          this.$message.error('透析器凝血未填')
+        }else if(this.afterdialysis.arterial_tube == 0){
+          this.$message.error('动脉管道未填')
+        }else if(this.afterdialysis.intravenous_tube == 0){
+          this.$message.error('静脉管道未填')
+        }else if(this.afterdialysis.weight_after == 0){
+          this.$message.error('透后体重未填')
+        }else if(this.afterdialysis.actual_ultrafiltration == 0){
+          this.$message.error('实际超滤量未填')
+        }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
+          this.$message.error('实际治疗时间未填')
+        }else if(this.summary.dialysis_summary == ""){
+          this.$message.error('透析小结未填')
+        }else if(this.prescription.creater == 0){
+          this.$message.error('医生签名未填')
+        }else if(this.dialysisOrder.puncture_nurse == 0){
+          this.$message.error('穿刺护士未填')
+        }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
+          this.$message.error('核对护士未填')
+        }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0){
+          this.$message.error('核对护士未填')
+        }else if(this.dialysisOrder.start_nurse == 0){
+          this.$message.error('看机护士未填')
+        }else if(this.dialysisOrder.finish_nurse == 0){
+          this.$message.error('下机护士未填')
+        }else if(this.tableAdvice.length > 0){
+          this.tableAdvice.map(item => {
+            if(item.id > 0 && item.created_time){
+              this.users.map(it => {
+                if(it.id == item.advice_doctor){
+                  if(it.type != 2){
+                    this.$message.error('存在不是医生保存的医嘱')
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.type != 3){
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.type != 3){
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
+                }
+              })
+            }
+          })
+        }
       },
       getComplication(complication){
         if(complication.indexOf(',') == -1){
@@ -1393,6 +1509,7 @@ export default {
             }
 
             this.advices = response.data.data.advices
+            this.tableAdvice = response.data.data.advices;
             console.log('hhhhhhhhhhhh', this.advices)
             this.monitors = response.data.data.monitors
             console.log('哈哈哈哈哈哈哈', this.monitors)

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -127,7 +127,6 @@
                 <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
                              :hisPatientInfo="hisPatientInfo" v-if="titleType == '电子病历'" :detalid="detalid"
                              ref="child"></desk-record>
-                c
                 <medicalRecord ref='medicalRecord' @func="getMsgFormSon"></medicalRecord>
                 <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
                 <!--<dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'></dialysis-index>-->
@@ -4179,7 +4178,7 @@
 
       // this.diagnoses = this.getDictionaryDataConfig('system', 'diagnose')
       // this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
-      let tableHeight = document.body.clientHeight - 263
+      let tableHeight = document.body.clientHeight - 323
       this.tableHeight = tableHeight
 
     },
@@ -4197,7 +4196,7 @@
       fullHeight(val) {
         if (!this.timer) {
           this.fullHeight = val
-          let tableHeight = val - 263
+          let tableHeight = val - 323
           this.tableHeight = tableHeight
           this.timer = true
           let that = this

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -61,7 +61,7 @@
                             <template slot-scope="scope">{{scope.row.name}}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="就诊号" width="110">
-                            <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}
+                            <template slot-scope="scope">{{ scope.row ?scope.row.number:''}}
                             </template>
                         </el-table-column>
                     </el-table>
@@ -869,11 +869,11 @@
             let three_count = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].his_patient.order.order_status == 0 || response.data.data.list[i].his_patient.order.order_status == 1 || response.data.data.list[i].his_patient.order.order_status == 3) {
+              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
-              if (response.data.data.list[i].his_patient.order.order_status == 2) {
+              if (response.data.data.list[i].order.order_status == 2) {
                 two_count = two_count + 1
               }
 
@@ -895,16 +895,16 @@
                 this.patientTableData = []
 
                 for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].his_patient.order.order_status == 0 || this.all_table_data[i].his_patient.order.order_status == 1) {
+                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
                 }
                 if (this.patientTableData.length > 0) {
                   for (let i = 0; i < this.patientTableData.length; i++) {
-                    if (this.patientTableData[i].id == this.patientInfo.id) {
+                    if (this.patientTableData[i].patient_id == this.patientInfo.id) {
                       this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                      this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id)
+                      this.getPatientInformation(this.patientTableData[i].patient_id, this.patientTableData[i].order.number, this.patientTableData[i].id)
                     }
                   }
                 }
@@ -986,11 +986,11 @@
 
             for (let i = 0; i < response.data.data.list_two.length; i++) {
               this.hisPatientDatas.push(response.data.data.list_two[i])
-              if (response.data.data.list_two[i].his_patient.order.order_status == 0 || response.data.data.list_two[i].his_patient.order.order_status == 1 || response.data.data.list_two[i].his_patient.order.order_status == 3) {
+              if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1 || response.data.data.list_two[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
-              if (response.data.data.list_two[i].his_patient.order.order_status == 2) {
+              if (response.data.data.list_two[i].order.order_status == 2) {
                 two_count = two_count + 1
               }
 
@@ -1010,16 +1010,16 @@
                 this.patientTableData = []
 
                 for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                  if (this.hisPatientDatas[i].his_patient.order.order_status == 0 || this.hisPatientDatas[i].his_patient.order.order_status == 1 || this.hisPatientDatas[i].his_patient.order.order_status == 3) {
+                  if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1 || this.hisPatientDatas[i].order.order_status == 3) {
                     this.patientTableData.push(this.hisPatientDatas[i])
                   }
 
                 }
                 if (this.patientTableData.length > 0) {
                   for (let i = 0; i < this.patientTableData.length; i++) {
-                    if (this.patientTableData[i].id == this.patientInfo.id) {
+                    if (this.patientTableData[i].patient_id == this.patientInfo.id) {
                       this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                      this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id)
+                      this.getPatientInformation(this.patientTableData[i].patient_id, this.patientTableData[i].order.number, this.patientTableData[i].id)
                     }
                   }
                 }
@@ -2069,7 +2069,7 @@
 
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].his_patient.order.order_status == 0 || response.data.data.list[i].his_patient.order.order_status == 1 || response.data.data.list[i].his_patient.order.order_status == 3) {
+              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
@@ -2085,16 +2085,16 @@
               case 1:
                 this.patientTableData = []
                 for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].his_patient.order.order_status == 0 || this.all_table_data[i].his_patient.order.order_status == 1) {
+                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
                 }
                 for (let i = 0; i < this.patientTableData.length; i++) {
-                  if (this.patientInfo.id == this.patientTableData[i].id) {
+                  if (this.patientInfo.id == this.patientTableData[i].patient_id) {
                     this.current_index = i
                     this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                    this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].his_patient.order.number, this.patientTableData[i].his_patient.id)
+                    this.getPatientInformation(this.patientTableData[i].patient_id, this.patientTableData[i].order.number, this.patientTableData[i].id)
 
                   }
                 }
@@ -2199,7 +2199,7 @@
 
               for (let i = 0; i < response.data.data.list.length; i++) {
                 this.all_table_data.push(response.data.data.list[i])
-                if (response.data.data.list[i].his_patient.order.order_status == 0 || response.data.data.list[i].his_patient.order.order_status == 1 || response.data.data.list[i].his_patient.order.order_status == 3) {
+                if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                   one_count = one_count + 1
                 }
 
@@ -2216,7 +2216,7 @@
 
               for (let i = 0; i < response.data.data.list_two.length; i++) {
                 this.hisPatientDatas.push(response.data.data.list_two[i])
-                if (response.data.data.list_two[i].his_patient.order.order_status == 0 || response.data.data.list_two[i].his_patient.order.order_status == 1) {
+                if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1) {
                   one_count = one_count + 1
                 }
 
@@ -2243,7 +2243,7 @@
                 if (this.activeName == 'first') {
 
                   for (let i = 0; i < this.all_table_data.length; i++) {
-                    if (this.all_table_data[i].his_patient.order.order_status == 0 || this.all_table_data[i].his_patient.order.order_status == 1) {
+                    if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
                       this.patientTableData.push(this.all_table_data[i])
                     }
 
@@ -2251,7 +2251,7 @@
 
                 } else {
                   for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                    if (this.hisPatientDatas[i].his_patient.order.order_status == 0 || this.hisPatientDatas[i].his_patient.order.order_status == 1) {
+                    if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1) {
                       this.patientTableData.push(this.hisPatientDatas[i])
                     }
 
@@ -2261,7 +2261,7 @@
 
                 this.current_index = 0
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
-                this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].his_patient.order.number, this.patientTableData[0].his_patient.id)
+                this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].order.number, this.patientTableData[0].id)
 
                 break
               case 2:
@@ -2363,7 +2363,7 @@
             let three_count = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].his_patient.order.order_status == 0 || response.data.data.list[i].his_patient.order.order_status == 1 || response.data.data.list[i].his_patient.order.order_status == 3) {
+              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
@@ -2379,13 +2379,13 @@
               case 1:
                 this.patientTableData = []
                 for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].his_patient.order.order_status == 0 || this.all_table_data[i].his_patient.order.order_status == 1 || this.all_table_data[i].his_patient.order.order_status == 3) {
+                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1 || this.all_table_data[i].order.order_status == 3) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
                 }
 
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
-                this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].his_patient.order.number, this.patientTableData[0].his_patient.id)
+                this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].order.number, this.patientTableData[0].id)
 
                 break
               case 2:
@@ -2620,7 +2620,7 @@
         this.prescriptions = []
         this.month_prescriptions = []
         if(this.radio == 1){
-          this.getPatientInformation(val.id, val.his_patient.order.number, val.his_patient.id)
+          this.getPatientInformation(val.patient_id, val.order.number, val.id)
         }else{
           this.getPatientInformation(val.id, val.number, val.his_patient_id)
 

src/xt_pages/outpatientTool/components/detail.vue

@@ -1,9 +1,9 @@
 <template>
-    <div class="main-contain outpatientChargesManagement">
+    <!-- <div class="main-contain outpatientChargesManagement">
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
-        </div>
-        <div class="app-container">
+        </div> -->
+        <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"-->
@@ -12,6 +12,7 @@
                     <!--</el-button>-->
                     <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
                               @keyup.enter.native='searchAction'
+                              placeholder="请输入患者姓名"
                               class="filter-item"/>
                     <el-select size="small" v-model="item_type" placeholder="请选择"
                                style="width:150px;margin-left:10px;" @change="changeItem">
@@ -48,12 +49,17 @@
                       <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
                     </el-popover> -->
-                    <!--<el-button size="small" type="primary" @click="export_detail">报表下载</el-button>-->
+                    <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
                 </div>
             </div>
-            <el-table :data="tableData" border :row-style="{ color: '#303133' }"
+            <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       :span-method="merge"
+                      show-summary
+                      :summary-method="getTotal"
+                      max-height="600"
+
+                      v-loading="detail_loading"
                       highlight-current-row>
 
                 <el-table-column align="center" prop="name" label="患者名字">
@@ -78,7 +84,7 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column align="center" prop="name" label="费用总额">
+                <el-table-column align="center" prop="total" label="费用总额">
                     <template slot-scope="scope">
                         <div>{{scope.row.total.toFixed(2)}}</div>
                     </template>
@@ -87,7 +93,7 @@
             </el-table>
         </div>
 
-    </div>
+    <!-- </div> -->
 </template>
 
 
@@ -104,7 +110,10 @@
     },
     data() {
       return {
+        detail_loading:false,
         tempArr: [],
+        pos:0,
+
         sameRowArr: [],
         keywords: '',
         tableData: [],
@@ -151,6 +160,7 @@
 
       },
       getSummaryDetailList() {
+        this.detail_loading = true
         let start_time = this.chargeDate[0]
         let end_time = this.chargeDate[1]
         let params = {
@@ -161,9 +171,13 @@
         }
         GetSummaryDetail(params).then(response => {
           if (response.data.state == 0) {
+            this.detail_loading = false
+
             this.$message.error(response.data.msg)
             return false
           } else {
+            this.detail_loading = false
+
             this.tableData = []
             let tempPatients = []
             let tempPatientsTwo = []
@@ -200,9 +214,17 @@
                   newObj['price'] = orders[b].order_info[c].pric
                   if (orders[b].order_info[c].advice_id > 0 && orders[b].order_info[c].project_id == 0) {
                     newObj['type'] = 1
-                    newObj['item_name'] = orders[b].order_info[c].advice.advice_name
+                    // newObj['item_name'] = orders[b].order_info[c].advice.advice_name
                     newObj['item_id'] = orders[b].order_info[c].advice.drug_id
 
+                    if(orders[b].order_info[c].advice.drug.min_unit != orders[b].order_info[c].advice.drug.dose_unit) {
+                      newObj['item_name'] = orders[b].order_info[c].advice.advice_name + "（ " + orders[b].order_info[c].advice.drug.dose + orders[b].order_info[c].advice.drug.dose_unit + "*" + orders[b].order_info[c].advice.drug.min_number + orders[b].order_info[c].advice.drug.min_unit + "/" + orders[b].order_info[c].advice.drug.max_unit + " ）"
+                    }else{
+
+                      newObj['item_name'] = ""
+                    }
+
+
                   }
                   if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
                     newObj['type'] = 2
@@ -210,8 +232,12 @@
 
                     if (orders[b].order_info[c].project.type == 2) {
                       newObj['item_name'] = orders[b].order_info[c].project.project.project_name
+
+
                     } else if (orders[b].order_info[c].project.type == 3) {
                       newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name + "（ "+ orders[b].order_info[c].project.good_info.specification_name+" ）"
+
+
                     }
                   }
                   obj.order_info.push(newObj)
@@ -219,7 +245,7 @@
               }
               tempPatientsTwo.push(obj)
             }
-            console.log(tempPatientsTwo)
+
 
             for (let d = 0; d < tempPatientsTwo.length; d++) {
               tempPatientsTwo[d]['new_order_info'] = []
@@ -276,17 +302,27 @@
             for (let i = 0; i < tempPatientsTwo.length; i++) {
               let total = 0
               for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-                if (tempPatientsTwo[i].new_order_info[b].item_name.length != 0) {
+                let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+                new_name=new_name.replace("（ ","");
+                new_name=new_name.replace(" ）","");
+                if (new_name.length != 0) {
                   total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString().toString())).toFixed(2))
                 }
               }
               tempPatientsTwo[i]['total'] = total
             }
-
+            console.log('tempPatientsTwo',tempPatientsTwo)
             for (let i = 0; i < tempPatientsTwo.length; i++) {
-              console.log(tempPatientsTwo[i].total)
+              // console.log(111,tempPatientsTwo[i].total)
+              if(tempPatientsTwo[i].new_order_info.length > 0){
+
+              
               for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-                if (tempPatientsTwo[i].new_order_info[b].item_name.length != 0) {
+                let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+                new_name=new_name.replace("（ ","");
+                new_name=new_name.replace(" ）","");
+
+                if (new_name.length != 0) {
                   let obj = {
                     name: tempPatientsTwo[i].name,
                     patient_id: tempPatientsTwo[i].patient_id,
@@ -295,12 +331,19 @@
                     item_name: tempPatientsTwo[i].new_order_info[b].item_name,
                     item_id: tempPatientsTwo[i].new_order_info[b].item_id,
                     count: tempPatientsTwo[i].new_order_info[b].count,
-                    total: tempPatientsTwo[i].total
+
                   }
+
+                  // if(b == 0){
+                    obj['total'] =  tempPatientsTwo[i].total
+                  // }else{
+                  //   obj['total'] = 0
+                  // }
                   this.tableData.push(obj)
                 }
 
               }
+              }
             }
             this.handleSpanTempArr()
             // this.tableData = tempPatientsTwo
@@ -435,7 +478,75 @@
             colspan: _col
           }
         }
-      }
+      }, export_detail() {
+
+        let list = []
+        for (let i = 0; i < this.tableData.length; i++) {
+          let order = this.tableData[i]
+          let name = order.name
+          let item_name = order.item_name
+          let count = order.count
+          let price = order.price.toFixed(2)
+          let pay_sumamt = (order.price.toFixed(2)*order.count).toFixed(2)
+          let total = order.total.toFixed(2)
+
+
+          let obj = {
+            '患者姓名': name,
+            '项目名称': item_name,
+            '数量': count,
+            '单价': price,
+            '费用': pay_sumamt,
+            '费用总额':total,
+          }
+          list.push(obj)
+        }
+        import('@/vendor/Export2Excel').then(excel => {
+          const tHeader = [ '患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+          const filterVal = [ '患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+          const data = this.formatJson(filterVal, list)
+          excel.export_json_to_excel1({
+            header: tHeader,
+            data,
+            filename: '明细',
+            ref:this.$refs['table'].$el
+          })
+        })
+
+      }, formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+      }, getTotal(param) {
+        const { columns, data } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+            return
+          }
+          console.log(data)
+          const values = data.map(item => Number(item[column.property]))
+          if (column.property === 'total') {
+            // sums[index] = values.reduce((prev, curr) => {
+            //   const value = Number(curr)
+            //   if (!isNaN(value)) {
+            //     return prev + curr
+            //   } else {
+            //     return prev
+            //   }
+            // }, 0)
+            // sums[index] = sums[index].toFixed(2)
+            let num = 0
+            data.map(item => {
+              num += item.price.toFixed(2)*item.count
+            })
+            sums[index] = num.toFixed(2)
+          } else {
+            sums[index] = ''
+          }
+        })
+
+        return sums
+      },
     },
     created() {
       this.getSummaryDetailList()

src/xt_pages/outpatientTool/components/gather.vue

@@ -1,87 +1,84 @@
 <template>
-    <div class="main-contain outpatientChargesManagement">
-        <div class="position">
-            <bread-crumb :crumbs='crumbs'></bread-crumb>
-        </div>
-        <div class="app-container">
-            <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-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
-                              @keyup.enter.native='searchAction'
-                              class="filter-item"/>
-                    <el-select size="small" v-model="item_type" placeholder="请选择"
-                               style="width:150px;margin-left:10px;" @change="changeItem">
-                        <el-option
-                                label="全部"
-                                value="0">
-                        </el-option>
-                        <el-option
-                                v-for="item,index in items"
-                                :key="index"
-                                :label="item.name"
-                                :value="item.id">
-                        </el-option>
-                    </el-select>
-                    <el-date-picker
-                            v-model="chargeDate"
-                            type="daterange"
-                            value-format="yyyy-MM-dd"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            @change="changeDate"
-                            end-placeholder="结束日期">
-                    </el-date-picker>
-                    <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
-                    <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
-                </div>
-                <div>
-                    <!-- <el-popover
-                      placement="bottom"
-                      width="210"
-                      trigger="click">
-                      <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-                      <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-                      <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
-
-                    </el-popover> -->
-                    <!--<el-button size="small" type="primary" @click="export_detail">报表下载</el-button>-->
-                </div>
-            </div>
-            <el-table :data="tableData" border :row-style="{ color: '#303133' }"
-                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                      show-summary
-                      max-height="600"
-                      :span-method="merge"
-                      :summary-method="getTotal"
-                      highlight-current-row>
-
-                <el-table-column align="center" prop="name" label="患者名字">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
-                </el-table-column>
-                <!--<el-table-column align="center" prop="name" label="患者类型">-->
-                <!--<template slot-scope="scope"></template>-->
-                <!--</el-table-column>-->
-
-                <el-table-column align="center" prop="item_name" label="项目类别">
-                    <template slot-scope="scope">{{scope.row.item_name}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="price" label="费用">
-                    <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="sum" label="费用总额">
-                    <template slot-scope="scope">
-                        <div>{{scope.row.sum.toFixed(2)}}</div>
-                    </template>
-                </el-table-column>
-
-            </el-table>
-        </div>
-
-    </div>
+  <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-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
+                        @keyup.enter.native='searchAction'
+                        placeholder="请输入患者姓名"
+
+                        class="filter-item"/>
+              <el-select size="small" v-model="item_type" placeholder="请选择"
+                          style="width:150px;margin-left:10px;" @change="changeItem">
+                  <el-option
+                          label="全部"
+                          value="0">
+                  </el-option>
+                  <el-option
+                          v-for="item,index in items"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                  </el-option>
+              </el-select>
+              <el-date-picker
+                      v-model="chargeDate"
+                      type="daterange"
+                      value-format="yyyy-MM-dd"
+                      range-separator="至"
+                      start-placeholder="开始日期"
+                      @change="changeDate"
+                      end-placeholder="结束日期">
+              </el-date-picker>
+              <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+              <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+          </div>
+          <div>
+              <!-- <el-popover
+                placement="bottom"
+                width="210"
+                trigger="click">
+                <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+                <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+                <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+
+              </el-popover> -->
+              <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+          </div>
+      </div>
+      <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="tables"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                v-loading="gather_loading"
+                show-summary
+                max-height="600"
+                :span-method="merge"
+                :summary-method="getTotal"
+                highlight-current-row>
+
+          <el-table-column align="center" prop="name" label="患者名字">
+              <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+          <!--<el-table-column align="center" prop="name" label="患者类型">-->
+          <!--<template slot-scope="scope"></template>-->
+          <!--</el-table-column>-->
+
+          <el-table-column align="center" prop="item_name" label="项目类别">
+              <template slot-scope="scope">{{scope.row.item_name}}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="price" label="费用">
+              <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="sum" label="费用总额">
+              <template slot-scope="scope">
+                  <div>{{scope.row.sum.toFixed(2)}}</div>
+              </template>
+          </el-table-column>
+
+      </el-table>
+  </div>
 </template>
 
 
@@ -98,10 +95,12 @@
     },
     data() {
       return {
+        gather_loading:false,
         crumbs: [],
         tempArr: [],
         sameRowArr: [],
         keywords: '',
+        pos:0,
 
         tableData: [],
         chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
@@ -148,6 +147,7 @@
         this.getSummaryDetailList()
       },
       getSummaryDetailList() {
+        this.gather_loading = true
         let start_time = this.chargeDate[0]
         let end_time = this.chargeDate[1]
         let params = {
@@ -158,9 +158,13 @@
         }
         GetSummaryDetail(params).then(response => {
           if (response.data.state == 0) {
+            this.gather_loading = false
+
             this.$message.error(response.data.msg)
             return false
           } else {
+            this.gather_loading = false
+
             let tempPatients = []
             let tempPatientsTwo = []
             this.tableData = []
@@ -264,14 +268,14 @@
                   obj['patient_id'] = tempPatientsTwo[d].patient_id
                   this.tableData.push(obj)
 
-                  obj2['sum'] = price + price2 + price3
+                  obj2['sum'] = 0
                   obj2['price'] = price2
                   obj2['item_name'] = '药品'
                   obj2['name'] = tempPatientsTwo[d].name
                   obj2['patient_id'] = tempPatientsTwo[d].patient_id
                   this.tableData.push(obj2)
 
-                  obj3['sum'] = price + price2 + price3
+                  obj3['sum'] = 0
                   obj3['price'] = price3
                   obj3['item_name'] = '耗材'
                   obj3['name'] = tempPatientsTwo[d].name
@@ -451,23 +455,57 @@
             sums[index] = '合计'
             return
           }
+          console.log(data)
           const values = data.map(item => Number(item[column.property]))
           if (column.property === 'sum') {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr)
               if (!isNaN(value)) {
-                return prev+ curr
+                return prev + curr
               } else {
                 return prev
               }
             }, 0)
             sums[index] = sums[index].toFixed(2)
           } else {
-            sums[index] = '--'
+            sums[index] = ''
           }
         })
 
         return sums
+      }, export_detail() {
+
+        let list = []
+        for (let i = 0; i < this.tableData.length; i++) {
+          let order = this.tableData[i]
+          let name = order.name
+          let item_name = order.item_name
+          let pay_sumamt = order.price.toFixed(2)
+          let total = order.sum.toFixed(2)
+
+
+          let obj = {
+            '患者姓名': name,
+            '项目类别': item_name,
+            '费用': pay_sumamt,
+            '费用总额':total,
+          }
+          list.push(obj)
+        }
+        import('@/vendor/Export2Excel').then(excel => {
+          const tHeader = [ '患者姓名', '项目名称', '费用', '费用总额']
+          const filterVal = [ '患者姓名', '项目名称', '费用', '费用总额']
+          const data = this.formatJson(filterVal, list)
+          excel.export_json_to_excel1({
+            header: tHeader,
+            data,
+            filename: '汇总',
+            ref:this.$refs['tables'].$el
+          })
+        })
+
+      }, formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
       }
     },
     created() {

src/xt_pages/outpatientTool/components/settle.vue

@@ -1,107 +1,104 @@
 <template>
-    <div class="main-contain outpatientChargesManagement">
-        <div class="position">
-            <bread-crumb :crumbs='crumbs'></bread-crumb>
-        </div>
-        <div class="app-container">
-            <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-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
-                              @keyup.enter.native='searchAction'
-                              class="filter-item"/>
-                    <el-select size="small" v-model="item_type" placeholder="请选择"
-                               style="width:150px;margin-left:10px;" @change="changeItem">
-                        <el-option
-                                label="全部"
-                                value="0">
-                        </el-option>
-                        <el-option
-                                v-for="item,index in items"
-                                :key="index"
-                                :label="item.name"
-                                :value="item.id">
-                        </el-option>
-                    </el-select>
-                    <el-date-picker
-                            v-model="chargeDate"
-                            type="daterange"
-                            value-format="yyyy-MM-dd"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            @change="changeDate"
-                            end-placeholder="结束日期">
-                    </el-date-picker>
-                    <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
-                    <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
-                </div>
-                <div>
-                    <!-- <el-popover
-                      placement="bottom"
-                      width="210"
-                      trigger="click">
-                      <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-                      <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-                      <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
-
-                    </el-popover> -->
-                    <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
-                </div>
-            </div>
-            <el-table :data="tableData" border :row-style="{ color: '#303133' }"
-                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                      show-summary
-                      max-height="600"
-                      :span-method="merge"
-                      :summary-method="getTotal"
-                      highlight-current-row>
-
-                <el-table-column align="center" prop="name" label="患者名字">
-                    <template slot-scope="scope">{{ scope.row.other_name }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="item_name" label="结算日期">
-                    <template slot-scope="scope">
-                        {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}
-                    </template>
-                </el-table-column>
-
-                <el-table-column align="center" prop="item_name" label="结算类型">
-                    <template slot-scope="scope">
-                        <div v-if="scope.row.is_medicine_insurance == 0">自费</div>
-                        <div v-if="scope.row.is_medicine_insurance == 1">医保</div>
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="item_name" label="处方类型">
-                    <template slot-scope="scope">
-                        <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
-                        <div v-if="scope.row.med_type == '11'">普通门诊</div>
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="item_name" label="医疗费总额">
-                    <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="item_name" label="基金支付金额">
-                    <template slot-scope="scope">{{scope.row.fund_pay_sumamt}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="item_name" label="个人账户支付金额">
-                    <template slot-scope="scope">{{scope.row.acct_pay}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="item_name" label="个人支付金额">
-                    <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="total" label="费用总额">
-                    <template slot-scope="scope">
-                        <div>{{scope.row.total.toFixed(2)}}</div>
-                    </template>
-                </el-table-column>
-
-            </el-table>
-        </div>
-
-    </div>
+  <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-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
+                        @keyup.enter.native='searchAction'
+                        placeholder="请输入患者姓名"
+
+                        class="filter-item"/>
+              <el-select size="small" v-model="item_type" placeholder="请选择"
+                          style="width:150px;margin-left:10px;" @change="changeItem">
+                  <el-option
+                          label="全部"
+                          value="0">
+                  </el-option>
+                  <el-option
+                          v-for="item,index in items"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                  </el-option>
+              </el-select>
+              <el-date-picker
+                      v-model="chargeDate"
+                      type="daterange"
+                      value-format="yyyy-MM-dd"
+                      range-separator="至"
+                      start-placeholder="开始日期"
+                      @change="changeDate"
+                      end-placeholder="结束日期">
+              </el-date-picker>
+              <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+              <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+          </div>
+          <div>
+              <!-- <el-popover
+                placement="bottom"
+                width="210"
+                trigger="click">
+                <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+                <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+                <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+
+              </el-popover> -->
+              <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+          </div>
+      </div>
+      <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="report-table"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                show-summary
+                v-loading="settle_loading"
+                max-height="600"
+                :span-method="merge"
+                :summary-method="getTotal"
+                highlight-current-row>
+
+          <el-table-column align="center" prop="name" label="患者名字">
+              <template slot-scope="scope">{{ scope.row.other_name }}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="结算日期">
+              <template slot-scope="scope">
+                  {{scope.row.setl_time?scope.row.setl_time.split(" ")[0]:getTimes(scope.row.settle_accounts_date)}}
+              </template>
+          </el-table-column>
+
+          <el-table-column align="center" prop="item_name" label="结算类型">
+              <template slot-scope="scope">
+                  <div v-if="scope.row.is_medicine_insurance == 0">自费</div>
+                  <div v-if="scope.row.is_medicine_insurance == 1">医保</div>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="处方类型">
+              <template slot-scope="scope">
+                  <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
+                  <div v-if="scope.row.med_type == '11'">普通门诊</div>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="医疗费总额">
+              <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="基金支付金额">
+              <template slot-scope="scope">{{scope.row.fund_pay_sumamt}}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="个人账户支付金额">
+              <template slot-scope="scope">{{scope.row.acct_pay}}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="个人支付金额">
+              <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="total" label="费用总额">
+              <template slot-scope="scope">
+                  <div>{{scope.row.total.toFixed(2)}}</div>
+              </template>
+          </el-table-column>
+
+      </el-table>
+  </div>
 </template>
 
 
@@ -118,6 +115,7 @@
     },
     data() {
       return {
+        settle_loading:false,
         crumbs: [],
         tempArr: [],
         sameRowArr: [],
@@ -179,11 +177,15 @@
           type: this.item_type,
           keyword: this.keywords
         }
+        this.settle_loading = true
         GetSummarySettle(params).then(response => {
           if (response.data.state == 0) {
+            this.settle_loading = false
+
             this.$message.error(response.data.msg)
             return false
           } else {
+            this.settle_loading = false
             this.tableData = []
             let data = response.data.data.patients
 
@@ -202,7 +204,15 @@
             for (let i = 0; i < data.length; i++) {
               for (let b = 0; b < data[i].orders.length; b++) {
                 let order = data[i].orders[b]
-                order['total'] = data[i].total
+
+                if(b == 0){
+                  order['total'] = data[i].total
+
+                }else{
+                  order['total'] = 0
+
+                }
+
                 this.tableData.push(order)
 
               }
@@ -282,7 +292,8 @@
             colspan: _col
           }
         }
-      }, getTotal(param) {
+      },
+      getTotal(param) {
         const { columns, data } = param
         const sums = []
         columns.forEach((column, index) => {
@@ -290,6 +301,7 @@
             sums[index] = '合计'
             return
           }
+          console.log(data)
           const values = data.map(item => Number(item[column.property]))
           if (column.property === 'total') {
             sums[index] = values.reduce((prev, curr) => {
@@ -302,7 +314,7 @@
             }, 0)
             sums[index] = sums[index].toFixed(2)
           } else {
-            sums[index] = '--'
+            sums[index] = ''
           }
         })
 
@@ -312,10 +324,24 @@
         let list = []
         for (let i = 0; i < this.tableData.length; i++) {
           let order = this.tableData[i]
-          let name = ''
+          let name = order.other_name
           let time = ''
           let balance_accounts = ""
           let med_type = ""
+          let medfee_sumamt = ""
+          let fund_pay_sumamt = ""
+          let acct_pay = ""
+          let psn_cash_pay = ""
+          let total = ""
+          if(order.setl_time.length == 0){
+
+            time = this.getTimes(order.settle_accounts_date)
+
+          }else {
+
+            time = order.setl_time.split(" ")[0]
+
+          }
 
           if (order.is_medicine_insurance == 0) {
             balance_accounts = '自费'
@@ -333,136 +359,35 @@
             med_type = '普通门诊'
           }
 
-          let number = ''
-
-          let department = ''
-          let doctor_name = ''
-          let order_status = ''
-          let charge_name = ''
-          let insutypeName = ''
-
-
-
-
-
-          if (order.patient != null && order.patient.name.length > 0) {
-            name = order.patient.name
-
-          }
-
-          if (order.p_info != null && order.p_info.department != null && order.p_info.department.name.length > 0) {
-            department = order.p_info.department.name
-
-          }
-
-          if (order.p_info != null && order.p_info.doctor.length > 0) {
-            doctor_name = order.p_info.doctor
-          }
-
-          if (order.creator != null) {
-            charge_name = this.getName(order.creator)
-          }
-          if (order.insutype == '390') {
+          medfee_sumamt = order.medfee_sumamt
+          fund_pay_sumamt = order.fund_pay_sumamt
+          acct_pay = order.acct_pay
+          psn_cash_pay = order.psn_cash_pay
+          total = order.total
 
-            insutypeName = '城乡居民基本医疗保险'
-          } else if (order.insutype == '310') {
-            insutypeName = '职工基本医疗保险'
-
-          }
-
-          if (order.order_status == 1) {
-            order_status = '待结算'
-          }
-
-          if (order.order_status == 2) {
-            order_status = '已结算'
-          }
-
-          if (order.order_status == 3) {
-            order_status = '已退费'
-          }
-
-          if (order.settle_type == 2) {
-            time = this.getTimes(order.settle_start_time)
-          } else {
-            time = this.getTimes(order.settle_accounts_date)
-          }
-
-          var hifmi_pay = 0.00
-
-          if (order.setl_detail.length > 0) {
-            var jsonObj = JSON.parse(order.setl_detail)
-            for (let i = 0; i < jsonObj.length; i++) {
-              if (order.insutype == '310') {
-                if (jsonObj[i].fund_pay_type == '310300') {
-                  hifmi_pay = jsonObj[i].fund_payamt
-                }
-
-              } else if (order.insutype == '390') {
-                if (order.fund_pay_type == '390200') {
-                  hifmi_pay = jsonObj[i].fund_payamt
-                }
-              }
-            }
-          }
-          var hifmi_pay = 0.00
-
-          if (order.setl_detail.length > 0) {
-            var jsonObj = JSON.parse(order.setl_detail)
-            for (let i = 0; i < jsonObj.length; i++) {
-              if (order.insutype == '310') {
-                if (jsonObj[i].fund_pay_type == '310300') {
-                  hifmi_pay = jsonObj[i].fund_payamt
-                }
-              }
-              if (order.insutype == '390') {
-                if (jsonObj[i].fund_pay_type == '390200') {
-                  hifmi_pay = jsonObj[i].fund_payamt
-                }
-              }
-            }
-          }
 
           let obj = {
-            '就诊号': order.mdtrt_id,
             '患者姓名': name,
-            '开处时间': time,
-            '险种类型': insutypeName,
-            '应收金额': order.medfee_sumamt,
-            '实收金额': order.medfee_sumamt,
-            '医保统筹金额': order.hifp_pay,
-            '大额基金金额': order.hifob_pay,
-            '大病基金金额': hifmi_pay,
-            '补充保险基金金额': order.hifes_pay,
-            '医疗救助基金金额': order.maf_pay,
-            '公务员基金': order.cvlserv_pay,
-            '个人支付基金': order.psn_cash_pay,
-            '个人账户支付金额': order.acct_pay,
-            '科室': department,
-            '医生姓名': doctor_name,
-            '收费类别': balance_accounts,
-            '收费者姓名': charge_name,
-            '总金额': order.medfee_sumamt,
-            '现金支付': '',
-            '账户支付': '',
-            '支付宝支付': '',
-            '微信支付': '',
-            '其他支付': '',
-            '收费时间': order.setl_time,
-            '收费状态': order_status,
-            '退费日期': ''
+            '结算日期': time,
+            '结算类型': balance_accounts,
+            '处方类型': med_type,
+            '医疗费总额': medfee_sumamt,
+            '基金支付金额': fund_pay_sumamt,
+            '个人账户支付金额': acct_pay,
+            '个人支付基金': psn_cash_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_excel({
+          excel.export_json_to_excel1({
             header: tHeader,
             data,
-            filename: '消费明细'
+            filename: '结算明细',
+            ref:this.$refs['report-table'].$el
           })
         })
 

src/xt_pages/outpatientTool/summary.vue

@@ -6,15 +6,11 @@
         <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
 
             <div class="mainRight">
-                <div class="mainHeader">
-                    <el-tabs v-model="titleType" @tab-click="handleClick"
-                             style="position: fixed;width: calc(100% - 490px);background:#fff;">
-                        <el-tab-pane label="明细" name="明细"></el-tab-pane>
-                        <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
-                        <el-tab-pane label="结算" name="结算"></el-tab-pane>
-                    </el-tabs>
-
-                </div>
+                <el-tabs v-model="titleType" @tab-click="handleClick">
+                    <el-tab-pane label="明细" name="明细"></el-tab-pane>
+                    <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
+                    <el-tab-pane label="结算" name="结算"></el-tab-pane>
+                </el-tabs>
                 <detail v-if="titleType == '明细'"></detail>
                 <gather v-if="titleType == '汇总'"></gather>
                 <settle v-if="titleType == '结算'"></settle>