1

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/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

@@ -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">
@@ -54,6 +55,10 @@
             <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>
 
@@ -79,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>
@@ -107,6 +112,8 @@
       return {
         detail_loading:false,
         tempArr: [],
+        pos:0,
+
         sameRowArr: [],
         keywords: '',
         tableData: [],
@@ -207,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
@@ -217,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)
@@ -226,7 +245,7 @@
               }
               tempPatientsTwo.push(obj)
             }
-            console.log(tempPatientsTwo)
+
 
             for (let d = 0; d < tempPatientsTwo.length; d++) {
               tempPatientsTwo[d]['new_order_info'] = []
@@ -283,7 +302,10 @@
             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))
                 }
               }
@@ -293,7 +315,11 @@
             for (let i = 0; i < tempPatientsTwo.length; i++) {
               console.log(tempPatientsTwo[i].total)
               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,
@@ -302,7 +328,12 @@
                     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)
                 }
@@ -442,6 +473,7 @@
             colspan: _col
           }
         }
+<<<<<<< HEAD
       }, export_detail() {
 
         let list = []
@@ -479,6 +511,34 @@
 
       }, 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)
+          } else {
+            sums[index] = ''
+          }
+        })
+
+        return sums
+>>>>>>> 217aeb893378e63b858282bbb055562ea21ad31b
       }
     },
     created() {

src/xt_pages/outpatientTool/components/gather.vue

@@ -98,6 +98,7 @@
         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')],
@@ -265,14 +266,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
@@ -452,6 +453,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) => {
@@ -464,7 +466,7 @@
             }, 0)
             sums[index] = sums[index].toFixed(2)
           } else {
-            sums[index] = '--'
+            sums[index] = ''
           }
         })
 

src/xt_pages/outpatientTool/components/settle.vue

@@ -202,7 +202,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 +290,8 @@
             colspan: _col
           }
         }
-      }, getTotal(param) {
+      },
+      getTotal(param) {
         const { columns, data } = param
         const sums = []
         columns.forEach((column, index) => {
@@ -290,6 +299,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 +312,7 @@
             }, 0)
             sums[index] = sums[index].toFixed(2)
           } else {
-            sums[index] = '--'
+            sums[index] = ''
           }
         })