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

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -1227,7 +1227,7 @@ export default {
         this.check = response.data.data.check
         this.xtdate = response.data.data.xtdate
         this.predialysis = response.data.data.PredialysisEvaluation
-         console.log("透前评估",this.predialysis)
+         // console.log("透前评估",this.predialysis)
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
           this.predialysis.blood_access_part_opera_id
         )

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -584,7 +584,7 @@
                         </td>
                         <td v-if="org_id != 9836">{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
                         <td v-if="org_id == 9836">{{ monitor.temperature ? monitor.temperature : "" }}</td>
-                        <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}
+                        <td>{{ monitor.conductivity ? monitor.conductivity : "" }}
                         </td>
                         <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
                           {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
@@ -1266,114 +1266,114 @@ export default {
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
       },
-      org_id:0,
+      org_id: 0
     }
   },
   methods: {
-    checkData(){
-      if(this.receiverTreatmentAccess.way == 0){
+    checkData() {
+      if (this.receiverTreatmentAccess.way == 0) {
         this.$message.error('入科方式未填')
-      }else if(this.predialysis.symptom_before_dialysis == ""){
+      } else if (this.predialysis.symptom_before_dialysis == '') {
         this.$message.error('透前症状未填')
-      }else if(this.predialysis.temperature == ""){
+      } else if (this.predialysis.temperature == '') {
         this.$message.error('透前体温未填')
-      }else if(this.predialysis.pulse_frequency == ""){
+      } else if (this.predialysis.pulse_frequency == '') {
         this.$message.error('透前脉搏未填')
-      }else if(this.predialysis.breathing_rate == ""){
+      } else if (this.predialysis.breathing_rate == '') {
         this.$message.error('透前呼吸频率未填')
-      }else if(this.predialysis.systolic_blood_pressure == 0 || this.predialysis.diastolic_blood_pressure == 0){
+      } else if (this.predialysis.systolic_blood_pressure == 0 || this.predialysis.diastolic_blood_pressure == 0) {
         this.$message.error('透前血压未填完整')
-      }else if(this.predialysis.puncture_way == ''){
+      } else if (this.predialysis.puncture_way == '') {
         this.$message.error('穿刺方式未填')
-      }else if(this.predialysis.puncture_needle == ''){
+      } else if (this.predialysis.puncture_needle == '') {
         this.$message.error('穿刺针未填')
-      }else if(this.predialysis.blood_access_part_id == '' && this.predialysis.blood_access_part_opera_name == ''){
+      } else if (this.predialysis.blood_access_part_id == '' && this.predialysis.blood_access_part_opera_name == '') {
         this.$message.error('血管通路未填')
-      }else if(this.predialysis.internal_fistula == ''){
+      } else if (this.predialysis.internal_fistula == '') {
         this.$message.error('透前内瘘未填')
-      }else if(this.predialysis.catheter == ''){
+      } else if (this.predialysis.catheter == '') {
         this.$message.error('透前导管未填')
-      }else if(this.prescription.mode_id == ""){
+      } else if (this.prescription.mode_id == '') {
         this.$message.error('透析方式未填')
-      }else if(this.prescription.displace_liqui_part == 0){
+      } else if (this.prescription.displace_liqui_part == 0) {
         this.$message.error('置换方式未填')
-      }else if(this.prescription.displace_liqui_value == 0){
+      } else if (this.prescription.displace_liqui_value == 0) {
         this.$message.error('置换量未填')
-      }else if(this.prescription.blood_flow_volume == 0){
+      } else if (this.prescription.blood_flow_volume == 0) {
         this.$message.error('血流量未填')
-      }else if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
+      } else if (this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0) {
         this.$message.error('透析时间未填')
-      }else if(this.prescription.dialyzer_perfusion_apparatus == "" && this.prescription.dialysis_dialyszers == ""){
+      } else if (this.prescription.dialyzer_perfusion_apparatus == '' && this.prescription.dialysis_dialyszers == '') {
         this.$message.error('透析器未填')
-      }else if(this.prescription.dialysis_irrigation == ""){
+      } else if (this.prescription.dialysis_irrigation == '') {
         this.$message.error('灌流器未填')
-      }else if(this.prescription.plasma_separator == ""){
+      } else if (this.prescription.plasma_separator == '') {
         this.$message.error('血浆分离器未填')
-      }else if(this.prescription.bilirubin_adsorption_column == ""){
+      } else if (this.prescription.bilirubin_adsorption_column == '') {
         this.$message.error('胆红素吸附柱未填')
-      }else if(this.predialysis.weight_before == 0){
+      } else if (this.predialysis.weight_before == 0) {
         this.$message.error('透前体重未填')
-      }else if(this.predialysis.dry_weight == 0){
+      } else if (this.predialysis.dry_weight == 0) {
         this.$message.error('干体重未填')
-      }else if(this.prescription.target_ultrafiltration == 0){
+      } else if (this.prescription.target_ultrafiltration == 0) {
         this.$message.error('计划超滤量未填')
-      }else if(this.prescription.calcium == 0){
+      } else if (this.prescription.calcium == 0) {
         this.$message.error('钙未填')
-      }else if(this.prescription.sodium == 0){
+      } else if (this.prescription.sodium == 0) {
         this.$message.error('钠未填')
-      }else if(this.prescription.kalium == 0){
+      } else if (this.prescription.kalium == 0) {
         this.$message.error('钾未填')
-      }else if(this.prescription.bicarbonate == 0){
+      } else if (this.prescription.bicarbonate == 0) {
         this.$message.error('碳酸氢根未填')
-      }else if(this.prescription.dialysate_flow == 0){
+      } else if (this.prescription.dialysate_flow == 0) {
         this.$message.error('透析液流量未填')
-      }else if(this.prescription.anticoagulant == 0){
+      } else if (this.prescription.anticoagulant == 0) {
         this.$message.error('抗凝剂未填')
-      }else if(this.prescription.anticoagulant_gaimingcheng == "" && this.prescription.anticoagulant == 5){
+      } else if (this.prescription.anticoagulant_gaimingcheng == '' && this.prescription.anticoagulant == 5) {
         this.$message.error('钙名称未填')
-      }else if(this.prescription.anticoagulant_gaijiliang == "" && this.prescription.anticoagulant == 5){
+      } else if (this.prescription.anticoagulant_gaijiliang == '' && this.prescription.anticoagulant == 5) {
         this.$message.error('钙剂量未填')
-      }else if(this.afterdialysis.temperature == 0){
+      } else if (this.afterdialysis.temperature == 0) {
         this.$message.error('透后体温未填')
-      }else if(this.afterdialysis.pulse_frequency == 0){
+      } else if (this.afterdialysis.pulse_frequency == 0) {
         this.$message.error('透后脉搏未填')
-      }else if(this.afterdialysis.breathing_rate == 0){
+      } else if (this.afterdialysis.breathing_rate == 0) {
         this.$message.error('透后呼吸频率未填')
-      }else if(this.afterdialysis.systolic_blood_pressure == 0 || this.afterdialysis.diastolic_blood_pressure == 0){
+      } else if (this.afterdialysis.systolic_blood_pressure == 0 || this.afterdialysis.diastolic_blood_pressure == 0) {
         this.$message.error('透后血压未填完整')
-      }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
+      } else if (this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0) {
         this.$message.error('实际治疗时间未填')
-      }else if(this.afterdialysis.cruor == ""){
+      } else if (this.afterdialysis.cruor == '') {
         this.$message.error('透析器凝血未填')
-      }else if(this.afterdialysis.internal_fistula == ''){
+      } else if (this.afterdialysis.internal_fistula == '') {
         this.$message.error('透后内瘘未填')
-      }else if(this.afterdialysis.catheter == ''){
+      } else if (this.afterdialysis.catheter == '') {
         this.$message.error('透后导管未填')
-      }else if(this.afterdialysis.weight_after == 0){
+      } else if (this.afterdialysis.weight_after == 0) {
         this.$message.error('透后体重未填')
-      }else if(this.afterdialysis.weight_loss == 0){
+      } else if (this.afterdialysis.weight_loss == 0) {
         this.$message.error('透后体重减少未填')
-      }else if(this.afterdialysis.dialysis_intakes == 0){
+      } else if (this.afterdialysis.dialysis_intakes == 0) {
         this.$message.error('透析中入量未填')
-      }else if(this.afterdialysis.actual_ultrafiltration == 0){
+      } else if (this.afterdialysis.actual_ultrafiltration == 0) {
         this.$message.error('实际超滤量未填')
-      }else if(this.summary.dialysis_summary == ""){
+      } else if (this.summary.dialysis_summary == '') {
         this.$message.error('透析小结未填')
-      }else if(this.dialysisOrder.puncture_nurse == 0){
+      } else if (this.dialysisOrder.puncture_nurse == 0) {
         this.$message.error('穿刺护士未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      } else if (this.dialysisOrder.start_nurse == 0) {
         this.$message.error('治疗护士未填')
-      }else if(this.dialysisOrder == null && this.check.creater == 0){
+      } else if (this.dialysisOrder == null && this.check.creater == 0) {
         this.$message.error('核对人员未填')
-      }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
+      } 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){
+      } else if (this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0) {
         this.$message.error('核对人员未填')
-      }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse != this.check.creater && this.dialysisOrder.start_nurse != this.check.modifier && this.check.creater == 0){
+      } else if (this.dialysisOrder != null && this.dialysisOrder.start_nurse != this.check.creater && this.dialysisOrder.start_nurse != this.check.modifier && this.check.creater == 0) {
         this.$message.error('核对人员未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
+      } else if (this.dialysisOrder.finish_nurse == 0) {
         this.$message.error('下机护士未填')
-      }else if(this.prescription.creater == 0){
+      } else if (this.prescription.creater == 0) {
         this.$message.error('医生签名未填')
       }
     },
@@ -1544,7 +1544,7 @@ export default {
         this.check = response.data.data.check
         this.xtdate = response.data.data.xtdate
         this.predialysis = response.data.data.PredialysisEvaluation
-        console.log("透前评估",this.predialysis)
+        console.log('透前评估', this.predialysis)
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
           this.predialysis.blood_access_part_opera_id
         )
@@ -1664,7 +1664,7 @@ export default {
         }
 
         this.advices = response.data.data.advices
-        console.log("医嘱数据2222222222",this.advices)
+        console.log('医嘱数据2222222222', this.advices)
         this.monitors = response.data.data.monitors
         this.summary = response.data.data.summary
         this.org_template_info = response.data.data.org_template_info
@@ -1993,8 +1993,8 @@ export default {
       'hemodialysis',
       'vascular_access_desc'
     )
-     this.org_id = this.$store.getters.xt_user.org.id
-     console.log("=====",this.org_id)
+    this.org_id = this.$store.getters.xt_user.org.id
+    console.log('=====', this.org_id)
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/outpatientCharges/summary.vue

@@ -7,8 +7,8 @@
             <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">-->
-                        <!--导出-->
+                    <!--@click="Action">-->
+                    <!--导出-->
                     <!--</el-button>-->
                     <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
                               @keyup.enter.native='searchAction'
@@ -434,7 +434,7 @@
           settle_type: row.settle_type,
           start_time: row.settle_start_time,
           end_time: row.settle_end_time,
-          balance_accounts_type:row.his_patient.balance_accounts_type
+          balance_accounts_type: row.his_patient.balance_accounts_type
         }
         this.orderObj = obj
 
@@ -478,11 +478,11 @@
               }
 
               if (order.his_patient != null) {
-                if (order.his_patient.balance_accounts_type == 1) {
+                if (order.his_patient.balance_accounts_type == 2) {
                   balance_accounts = '自费'
                 }
 
-                if (order.his_patient.balance_accounts_type == 2) {
+                if (order.his_patient.balance_accounts_type == 1) {
                   balance_accounts = '医保'
                 }
               }
@@ -532,34 +532,41 @@
 
               var hifmi_pay = 0.00
 
-              if (order.setl_detail.length > 0) {
+              console.log(order.setl_detail)
+              if (order.setl_detail && 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
+                console.log(jsonObj)
+                if (jsonObj != null) {
+
+                  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) {
+              console.log(order.setl_detail)
+              if (order.setl_detail && 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 (jsonObj != null) {
+                  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
+                    if (order.insutype == '390') {
+                      if (jsonObj[i].fund_pay_type == '390200') {
+                        hifmi_pay = jsonObj[i].fund_payamt
+                      }
                     }
                   }
                 }
@@ -636,7 +643,7 @@
         this.page = 1
         this.keywords = ''
         this.getHisOrderList()
-      },Action(){
+      }, Action() {
         getAllOrders().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -646,42 +653,40 @@
             let list = []
             for (let i = 0; i < response.data.data.order.length; i++) {
 
-
               var hifmi_pay = 0.00
               for (let b = 0; b < order.order_info.length; b++) {
-                let item_name = ""
-                let item_code = ""
-                let price = ""
-                let unit = ""
-                let spec = ""
-                let time = ""
-                let name = ""
-                let selfpay_prop = ""
-                if(order.order_info[b].advice.id == 0 && order.order_info[b].project.id > 0){
+                let item_name = ''
+                let item_code = ''
+                let price = ''
+                let unit = ''
+                let spec = ''
+                let time = ''
+                let name = ''
+                let selfpay_prop = ''
+                if (order.order_info[b].advice.id == 0 && order.order_info[b].project.id > 0) {
                   item_name = order.order_info[b].project.project.project_name
-                  item_code =  order.order_info[b].project.project.medical_code
+                  item_code = order.order_info[b].project.project.medical_code
                   price = order.order_info[b].pric
                   unit = order.order_info[b].project.project.unit
-                }else if(order.order_info[b].advice.id > 0 && order.order_info[b].project.id == 0){
+                } else if (order.order_info[b].advice.id > 0 && order.order_info[b].project.id == 0) {
                   item_name = order.order_info[b].advice.advice_name
-                  item_code =  order.order_info[b].advice.drug.medical_insurance_number
+                  item_code = order.order_info[b].advice.drug.medical_insurance_number
                   price = order.order_info[b].pric
                   unit = order.order_info[b].advice.prescribing_number_unit
 
-
                 }
                 selfpay_prop = order.order_info[b].selfpay_prop
 
                 let obj = {
                   '项目名称': item_name,
-                  '项目编码': "",
+                  '项目编码': '',
                   '医保编码': item_code,
                   '零售价': price,
                   '单位': unit,
-                  '规格': "",
+                  '规格': '',
                   '收费时间': time,
                   '报销比例': selfpay_prop,
-                  '患者名称': name,
+                  '患者名称': name
                 }
 
                 list.push(obj)
@@ -701,7 +706,6 @@
           }
         })
 
-
       },
       searchAction() {
         this.page = 1

src/xt_pages/outpatientTool/components/detail.vue

@@ -3,95 +3,95 @@
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </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>
+        <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>
-            <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="患者名字">
-                    <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="name" label="项目名称">
-                    <template slot-scope="scope">{{scope.row.item_name}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="数量">
-                    <template slot-scope="scope">{{scope.row.count}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="单价">
-                    <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="费用">
-                    <template slot-scope="scope">
-                        <div>{{(scope.row.price.toFixed(2)*scope.row.count).toFixed(2)}}</div>
-                    </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>
+        <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="患者名字">
+                <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="name" label="项目名称">
+                <template slot-scope="scope">{{scope.row.item_name}}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="数量">
+                <template slot-scope="scope">{{scope.row.count}}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="单价">
+                <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="费用">
+                <template slot-scope="scope">
+                    <div>{{(scope.row.price.toFixed(2)*scope.row.count).toFixed(2)}}</div>
+                </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> -->
 </template>
@@ -110,9 +110,9 @@
     },
     data() {
       return {
-        detail_loading:false,
+        detail_loading: false,
         tempArr: [],
-        pos:0,
+        pos: 0,
 
         sameRowArr: [],
         keywords: '',
@@ -122,7 +122,7 @@
         items: [
           { id: 1, name: '药品' },
           { id: 2, name: '项目' },
-          { id: 3, name: '耗材' },
+          { id: 3, name: '耗材' }
 
         ]
 
@@ -217,14 +217,13 @@
                     // 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{
+                    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'] = ""
+                      newObj['item_name'] = ''
                     }
 
-
                   }
                   if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
                     newObj['type'] = 2
@@ -233,10 +232,8 @@
                     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+" ）"
-
+                      newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name + '（ ' + orders[b].order_info[c].project.good_info.specification_name + ' ）'
 
                     }
                   }
@@ -246,7 +243,6 @@
               tempPatientsTwo.push(obj)
             }
 
-
             for (let d = 0; d < tempPatientsTwo.length; d++) {
               tempPatientsTwo[d]['new_order_info'] = []
               let project = []
@@ -269,6 +265,9 @@
                     count = count + tempPatientsTwo[d].order_info[a].count
                   }
                 }
+
+
+
                 obj['price'] = project[i].price
                 obj['type'] = project[i].type
                 obj['item_name'] = project[i].item_name
@@ -287,6 +286,7 @@
                     count = count + tempPatientsTwo[d].order_info[a].count
                   }
                 }
+
                 obj['price'] = advice[i].price
                 obj['type'] = advice[i].type
                 obj['item_name'] = advice[i].item_name
@@ -303,46 +303,47 @@
               let total = 0
               for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
                 let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-                new_name=new_name.replace("（ ","");
-                new_name=new_name.replace(" ）","");
+                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)
+            console.log('tempPatientsTwo', tempPatientsTwo)
             for (let i = 0; i < tempPatientsTwo.length; i++) {
               // console.log(111,tempPatientsTwo[i].total)
-              if(tempPatientsTwo[i].new_order_info.length > 0){
+              if (tempPatientsTwo[i].new_order_info.length > 0) {
 
+                for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
+                  let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+                  console.log('2 ' + new_name)
 
-              for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-                let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-                new_name=new_name.replace("（ ","");
-                new_name=new_name.replace(" ）","");
+                  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,
-                    price: tempPatientsTwo[i].new_order_info[b].price,
-                    type: tempPatientsTwo[i].new_order_info[b].type,
-                    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,
+                  if (new_name.length != 0) {
+                    let obj = {
+                      name: tempPatientsTwo[i].name,
+                      patient_id: tempPatientsTwo[i].patient_id,
+                      price: tempPatientsTwo[i].new_order_info[b].price,
+                      type: tempPatientsTwo[i].new_order_info[b].type,
+                      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
 
+                    }
+
+                    // if(b == 0){
+                    obj['total'] = tempPatientsTwo[i].total
+                    // }else{
+                    //   obj['total'] = 0
+                    // }
+                    this.tableData.push(obj)
                   }
 
-                  // if(b == 0){
-                    obj['total'] =  tempPatientsTwo[i].total
-                  // }else{
-                  //   obj['total'] = 0
-                  // }
-                  this.tableData.push(obj)
                 }
-
-              }
               }
             }
             this.handleSpanTempArr()
@@ -487,29 +488,28 @@
           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 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,
+            '费用总额': 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,
             data,
             filename: '明细',
-            ref:this.$refs['table'].$el
+            ref: this.$refs['table'].$el
           })
         })
 
@@ -537,7 +537,7 @@
             // sums[index] = sums[index].toFixed(2)
             let num = 0
             data.map(item => {
-              num += item.price.toFixed(2)*item.count
+              num += item.price.toFixed(2) * item.count
             })
             sums[index] = num.toFixed(2)
           } else {
@@ -546,7 +546,7 @@
         })
 
         return sums
-      },
+      }
     },
     created() {
       this.getSummaryDetailList()