提交代码

src/xt_pages/hospitalStation/batchStatementTemplate/hospitalBatchPrint.vue

@@ -124,7 +124,7 @@
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '21'">普通住院</td>
 
         <td>结算时间</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time.split(' ')[0]}}</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.order.setl_time.split(' ')[0]}}</td>
       </tr>
       <tr>
         <td colspan="12" style="text-align:left;padding-left:10px;">

src/xt_pages/hospitalStation/hospitalBatchStatementPrint.vue

@@ -197,54 +197,112 @@ export default {
             return false
           } else {
             let infos = []
+            console.log(response.data.data.infos)
             for(var i  = 0; i < response.data.data.infos.length; i++){
+              let tempInfo = {}
               var info = response.data.data.infos[i]
-              that.info['patient'] = info.patient
-              that.info['diagnosis'] = info.diagnosis
-              that.info['p_admin'] = info.printor_admin
-              that.info['charge_admin'] = info.charge_admin
-              that.info['fixmedins_name'] = info.org_name
-              that.info['fixmedins_code'] = info.org_code
-              that.info['order'] = info.order
-              that.info['date'] = info.date
-              that.info['number'] = info.number
-              that.info['order_infos'] = info.order_infos
-              that.info['diagnosis'] = info.diagnosis
-              that.info['dia_config'] = info.dia_config
-              that.info['doctor_info'] = info.doctor_info
-              that.info['bed_cost_total'] = info.bedCostTotal
-              that.info['bed_cost_self_total'] = info.bedCostSelfTotal
-              that.info['bed_cost_part_self_total'] = info.bedCostPartSelfTotal
-              that.info['operation_cost_total'] = info.operationCostTotal
-              that.info['operation_cost_self_total'] = info.operationCostSelfTotal
-              that.info['operation_cost_part_self_total'] = info.operationCostPartSelfTotal
-              that.info['other_cost_total'] = info.otherCostTotal
-              that.info['other_cost_self_total'] = info.otherCostSelfTotal
-              that.info['other_cost_part_self_total'] = info.otherCostPartSelfTotal
-              that.info['material_cost_total'] = info.materialCostTotal
-              that.info['material_cost_self_total'] = info.materialCostSelfTotal
-              that.info['material_cost_part_self_total'] = info.materialCostPartSelfTotal
-              that.info['western_medicine_cost_total'] = info.westernMedicineCostTotal
-              that.info['western_medicine_cost_self_total'] = info.westernMedicineCostSelfTotal
-              that.info['western_medicine_cost_part_self_total'] = info.westernMedicineCostPartSelfTotal
-              that.info['chinese_traditional_medicine_cost_total'] = info.chineseTraditionalMedicineCostTotal
-              that.info['chinese_traditional_medicine_cost_self_total'] = info.chineseTraditionalMedicineCostSelfTotal
-              that.info['chinese_traditional_medicine_cost_part_self_total'] = info.chineseTraditionalMedicineCostPartSelfTotal
-              that.info['check_cost_total'] = info.checkCostTotal
-              that.info['check_cost_self_total'] = info.checkCostSelfTotal
-              that.info['check_cost_part_self_total'] = info.checkCostPartSelfTotal
-              that.info['laboratory_cost_total'] = info.laboratoryCostTotal
-              that.info['laboratory_cost_self_total'] = info.laboratoryCostSelfTotal
-              that.info['laboratory_cost_part_self_total'] = info.laboratoryCostPartSelfTotal
-              that.info['treat_cost_total'] = info.treatCostTotal
-              that.info['treat_cost_self_total'] = info.treatCostSelfTotal
-              that.info['treat_cost_part_self_total'] = info.treatCostPartSelfTotal
-              that.info['date'] = info.date
-              that.info['number'] = info.number
-              that.info['order_infos'] = info.order_infos
-              that.info['diagnosis'] = info.diagnosis
-              that.info['his'] = info.his_hospital
-              infos.push(that.info)
+              console.log("info1")
+              console.log(info)
+              tempInfo["patient"] = info.patient
+              console.log("info2")
+              console.log(info.patient)
+
+              tempInfo["diagnosis"] = info.diagnosis
+              console.log("info3")
+              console.log(info.diagnosis)
+
+              tempInfo["p_admin"] = info.printor_admin
+              console.log("info4")
+              console.log( info.printor_admin)
+              tempInfo['charge_admin'] = info.charge_admin
+              console.log("info5")
+              console.log( info.charge_admin)
+              tempInfo['fixmedins_name'] = info.org_name
+              console.log("info6")
+              console.log( info.org_name)
+              tempInfo['fixmedins_code'] = info.org_code
+              console.log("info7")
+              console.log( info.org_code)
+              tempInfo['order'] = info.order
+              console.log("info8")
+              console.log( info.order)
+              tempInfo['date'] = info.date
+              console.log("info9")
+              console.log( info.date)
+              tempInfo['number'] = info.number
+              console.log("info10")
+              console.log( info.number)
+              tempInfo['order_infos'] = info.order_infos
+              console.log("info11")
+              console.log( info.order_infos)
+              tempInfo['diagnosis'] = info.diagnosis
+              console.log("info12")
+              console.log( info.diagnosis)
+              tempInfo['dia_config'] = info.dia_config
+              console.log("info13")
+              console.log( info.dia_config)
+              tempInfo['doctor_info'] = info.doctor_info
+              console.log("info14")
+              console.log( info.doctor_info)
+              tempInfo['bed_cost_total'] = info.bedCostTotal
+              console.log("info15")
+              console.log( info.bedCostTotal)
+              tempInfo['bed_cost_self_total'] = info.bedCostSelfTotal
+              console.log("info16")
+              console.log( info.bedCostSelfTotal)
+              tempInfo['bed_cost_part_self_total'] = info.bedCostPartSelfTotal
+              console.log("info17")
+              console.log( info.bedCostPartSelfTotal)
+              tempInfo['operation_cost_total'] = info.operationCostTotal
+              console.log("info18")
+              console.log( info.operationCostTotal)
+              tempInfo['operation_cost_self_total'] = info.operationCostSelfTotal
+              console.log("info19")
+              console.log( info.operationCostSelfTotal)
+              tempInfo['operation_cost_part_self_total'] = info.operationCostPartSelfTotal
+              console.log("info20")
+              console.log( info.operationCostPartSelfTotal)
+              tempInfo['other_cost_total'] = info.otherCostTotal
+              console.log("info21")
+              console.log( info.otherCostTotal)
+              tempInfo['other_cost_self_total'] = info.otherCostSelfTotal
+              console.log("info22")
+              console.log( info.otherCostSelfTotal)
+              tempInfo['other_cost_part_self_total'] = info.otherCostPartSelfTotal
+              console.log("info23")
+              console.log( info.otherCostPartSelfTotal)
+              tempInfo['material_cost_total'] = info.materialCostTotal
+              console.log("info24")
+              console.log( info.materialCostTotal)
+              tempInfo['material_cost_self_total'] = info.materialCostSelfTotal
+              console.log("info25")
+              console.log( info.materialCostSelfTotal)
+              tempInfo['material_cost_part_self_total'] = info.materialCostPartSelfTotal
+              console.log("info26")
+              console.log( info.materialCostPartSelfTotal)
+              tempInfo['western_medicine_cost_total'] = info.westernMedicineCostTotal
+              console.log("info27")
+              console.log( info.westernMedicineCostTotal)
+              tempInfo['western_medicine_cost_self_total'] = info.westernMedicineCostSelfTotal
+              console.log("info28")
+              console.log( info.westernMedicineCostSelfTotal)
+              tempInfo['western_medicine_cost_part_self_total'] = info.westernMedicineCostPartSelfTotal
+              console.log("info29")
+              console.log( info.westernMedicineCostPartSelfTotal)
+              tempInfo['chinese_traditional_medicine_cost_total'] = info.chineseTraditionalMedicineCostTotal
+              tempInfo['chinese_traditional_medicine_cost_self_total'] = info.chineseTraditionalMedicineCostSelfTotal
+              tempInfo['chinese_traditional_medicine_cost_part_self_total'] = info.chineseTraditionalMedicineCostPartSelfTotal
+              tempInfo['check_cost_total'] = info.checkCostTotal
+              tempInfo['check_cost_self_total'] = info.checkCostSelfTotal
+              tempInfo['check_cost_part_self_total'] = info.checkCostPartSelfTotal
+              tempInfo['laboratory_cost_total'] = info.laboratoryCostTotal
+              tempInfo['laboratory_cost_self_total'] = info.laboratoryCostSelfTotal
+              tempInfo['laboratory_cost_part_self_total'] = info.laboratoryCostPartSelfTotal
+              tempInfo['treat_cost_total'] = info.treatCostTotal
+              tempInfo['treat_cost_self_total'] = info.treatCostSelfTotal
+              tempInfo['treat_cost_part_self_total'] = info.treatCostPartSelfTotal
+              tempInfo['his'] = info.his_hospital
+              infos.push(tempInfo)
             }
             that.infos = infos
             console.log(infos)

src/xt_pages/outpatientCharges/summary.vue

@@ -436,6 +436,19 @@
           :paramsObj="settlementObj"
       ></settlement-print>
     </el-dialog>
+
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="settlementVisible"
+    >
+      <settlement-print
+        ref="print"
+        :paramsObj="settlementObj"
+      ></settlement-print>
+    </el-dialog>
+
   </div>
 </template>