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

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -53,10 +53,10 @@
       <el-form-item label="医疗类别：">
         <el-select v-model="form.medical_care" placeholder="请选择" style="width:100%;">
           <el-option
-            v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
+            v-for="(item,index) in medical_care"
             :key="index"
-            :label="item.name"
-            :value="item.id">
+            :label="item.label"
+            :value="item.value">
           </el-option>
         </el-select>
       </el-form-item>
@@ -204,6 +204,22 @@
           {value: 16, label: "门诊慢性病"},
           {value: 21, label: "普通住院"},
         ],
+        medical_care:[
+          {value: 11, label: "普通门诊"},
+          {value: 12, label: '家庭通道'},
+          {value: 13, label: "门诊大病"},
+          {value: 14, label: "重疾特药"},
+          {value: 15, label: "门诊慢病"},
+          {value: 16, label: "门诊特检"},
+          {value: 17, label: "健康体检"},
+          {value: 18, label: "预防接种"},
+          {value: 19, label: "门诊输血"},
+          {value: 91, label: "新冠肺炎门诊"},
+        ],
+
+
+
+
         form: {
           id: '',
           settlement_value: '',

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -0,0 +1,345 @@
+<template>
+    <div>
+        <template>
+            <el-button
+                    style="position:fixed;right:25px;z-index:999"
+                    :loading="loading"
+                    size="small"
+                    icon="el-icon-printer"
+                    @click="printThisPage"
+                    type="primary"
+            >打印</el-button
+            >
+        </template>
+
+        <div class='dialysisPage' style="padding-top:40px;">
+            <!--<printOne :info="info"></printOne>-->
+            <print-one :info="info"></print-one>
+        </div>
+    </div>
+</template>
+
+<script>
+
+
+  import { parseTime } from "@/utils";
+  import { getDialysisRecord } from "@/api/dialysis";
+  import { getDataConfig } from "@/utils/data";
+  import { jsGetAge, uParseTime } from "@/utils/tools";
+  import axios from 'axios'
+  import BreadCrumb from "@/xt_pages/components/bread-crumb";
+  import print from "print-js";
+  import printOne from "./newTreatTemplate/printOne"
+  export default {
+    name: "newStatementPrintTwo",
+    components: {
+      BreadCrumb,
+      printOne
+    },
+    props:{
+      paramsObj:Object
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '门诊医生站' },
+          { path: false, name: '打印' }
+        ],
+        record_date:"",
+        patientTableData:[],
+        advicePrint:[],
+        hisPatient:{},
+        patient:{},
+        search_input:"",
+        loading:false,
+        patient_id:0,
+        prescription_id:0,
+        ids:'',
+        info:null,
+      };
+    },
+    methods:{
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000);
+        this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
+
+        const style =
+          '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
+        printJS({
+          printable: "statement-print",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
+
+        // if (this.org_template_info.template_id == 1) {
+        //   printJS({
+        //     printable: "dialysis-print-box",
+        //     type: "html",
+        //     style: style,
+        //     scanStyles: false
+        //   });
+        // }
+      },
+
+      searchAction(){
+
+      },
+      getInfo(obj) {
+        if (this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9504) {
+          var that = this
+          axios.get('http://127.0.0.1:9532/sz/api/settle/query', {
+            params: obj
+          })
+            .then(function (response) {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                if (response.data.data.failed_code == -10) {
+                  that.$message.error(response.data.data.msg)
+
+                } else {
+
+                  console.log("～～～～")
+                  that.info = response.data.data.result
+                  console.log(that.info)
+
+                  that.info['org_code'] = response.data.data.org_code
+                  that.info['patient_name'] = response.data.data.patient_name
+                  that.info['doctor_code'] = response.data.data.doctor_code
+                  that.info['doctor_name'] = response.data.data.doctor_name
+
+                  that.info['org_name'] = that.$store.getters.xt_user.org.org_name
+                  console.log("～～～～" + that.info)
+
+                  var name_arr = []
+                  var spec_arr = []
+                  var count_arr = []
+                  var price_arr = []
+                  var total_arr = []
+                  for (let i = 0; i < that.info.transBody.outputlist1.length; i++) {
+                    name_arr.push(that.info.transBody.outputlist1[i].ake006)
+                    spec_arr.push(that.info.transBody.outputlist1[i].aka074)
+                    count_arr.push(that.info.transBody.outputlist1[i].akc226)
+                    price_arr.push(that.info.transBody.outputlist1[i].akc225)
+                    total_arr.push(that.info.transBody.outputlist1[i].akc264)
+                  }
+
+                  console.log("～～～" + that.info)
+
+                  that.info['name_arr'] = name_arr
+                  that.info['spec_arr'] = spec_arr
+                  that.info['count_arr'] = count_arr
+                  that.info['price_arr'] = price_arr
+                  that.info['total_arr'] = total_arr
+                  that.info['record_date'] = obj.record_time
+
+                  console.log("～～" + that.info)
+
+                }
+              }
+            })
+            .catch(function (error) {
+
+            });
+        }
+      }
+
+    },
+
+    created() {
+      this.getInfo(this.paramsObj)
+    },
+    watch:{
+      paramsObj:{//深度监听，可监听到对象、数组的变化
+        handler(val, oldVal){
+          this.paramsObj = val
+          this.getInfo(this.paramsObj)
+
+        },
+        deep:true
+      }
+    }
+
+  };
+</script>
+
+<style>
+    .dialysis-print-order {
+        width: 960px;
+        margin: 0 auto;
+    }
+
+    .dialysis-print-order .order-yy-name {
+        margin: auto;
+        text-align: center;
+        font-size: 20px;
+        letter-spacing: 5px;
+    }
+
+    .dialysis-print-order .order-title {
+        margin: auto;
+        font-weight: 600;
+        text-align: center;
+        font-size: 22px;
+        padding: 10px;
+    }
+
+    .dialysis-print-order .table-box {
+        width: 100%;
+        line-height: 23px;
+        font-size: 14px;
+    }
+
+    .dialysis-print-order .print-table {
+        width: 100%;
+        text-align: center;
+        border-collapse: collapse;
+        line-height: 40px;
+        font-size: 14px;
+        border-color: #000;
+    }
+
+    .dialysis-print-order .print-table-no {
+        width: 100%;
+        text-align: center;
+        border-collapse: collapse;
+        font-size: 14px;
+    }
+
+    .dialysis-print-order .under-line {
+        border-bottom: 1px solid #999;
+        width: 95%;
+        text-align: center;
+        margin-left: 2px;
+    }
+
+    .dialysis-print-order .title-box {
+        text-align: center;
+        font-size: 16px;
+    }
+
+    .dialysis-print-order .radio-lebel-box {
+        font-weight: 400;
+        cursor: pointer;
+    }
+
+    .dialysis-print-order .radio-no {
+        opacity: 0;
+        outline: none;
+        position: absolute;
+        margin: 0;
+        width: 0;
+        height: 0;
+        z-index: -1;
+    }
+
+    .dialysis-print-order .radio-inner {
+        white-space: nowrap;
+        cursor: pointer;
+        outline: none;
+        display: inline-block;
+        line-height: 1;
+        position: relative;
+        vertical-align: middle;
+    }
+
+    .dialysis-print-order .radio-fang {
+        display: inline-block;
+        position: relative;
+        border: 1px solid #000;
+        box-sizing: border-box;
+        width: 14px;
+        height: 14px;
+        background-color: #fff;
+        z-index: 1;
+        transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
+        background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+    }
+
+    .dialysis-print-order .is-checked-radio::after {
+        content: "√";
+        font-size: 15px;
+    }
+
+    .dialysis-print-order .print-table-no tr td {
+        padding: 8px 5px;
+        line-height: 25px;
+    }
+
+    .dialysis-print-order .print-table tr td {
+        padding: 1px 1px;
+        /*line-height: 25px;*/
+    }
+
+    .es-img {
+        height: 30px;
+    }
+
+    .advice-name {
+        text-align: left;
+    }
+
+    .advice-children {
+        display: flex;
+    }
+
+    .title-box-pro {
+        border: 0 #fff;
+        line-height: 25px;
+        height: 25px;
+        text-align: left;
+        padding-left: 10px !important;
+    }
+    .title-box-pro-tr {
+        border: 0 #fff;
+    }
+    .text-align-left {
+        text-align: left !important;
+        padding-left: 10px !important;
+        font-size: 14px !important;
+        line-height: 25px;
+    }
+    .print-table-tr-new td {
+        line-height: 20px !important;
+    }
+    .border-top-solid {
+        border: solid 1px #000;
+    }
+    .print-template-two tr {
+        line-height: 30px;
+    }
+
+    .table-box1 {
+        border: 1px solid #000;
+        width: 100%;
+        line-height: 30px;
+        font-size: 14px;
+        border-collapse: collapse;
+    }
+    .table-box1 tr {
+        border-bottom: 1px solid #000;
+    }
+</style>
+
+<style lang="scss">
+
+    .newContainer{
+    .dialysisPage::-webkit-scrollbar {
+        height: 15px;
+    }
+
+    .el-date-editor{
+    .el-input__inner{
+        padding-right:0px;
+    }
+    }
+    .el-table td, .el-table th{
+        text-align: center;
+    }
+    }
+    .newContainer::-webkit-scrollbar{
+        height: 15px !important;
+    }
+</style>

src/xt_pages/outpatientCharges/newTreatTemplate/printOne.vue

@@ -0,0 +1,311 @@
+<template>
+    <div>
+        <div id='prescription-print' class="prescription-print">
+            <div>
+                <div class="printTitle">&nbsp血液透析中心医药费收据及收费项目清单</div>
+                <div class="infoMain">
+                    <div class="infoP">医院(药店)编号：{{info.org_code}}</div>
+                    <div class="infoP">名称：{{info.org_name}}</div>
+                    <div class="infoP">医生工号：{{info.doctor_code}}</div>
+                    <div class="infoP">门诊流水号：{{info.transBody.akc190}}</div>
+                    <div class="infoP">科别: 全科</div>
+                    <div class="infoP">处方单据号：</div>
+                    <div class="infoP">姓名：{{info.patient_name}}</div>
+                    <div class="infoP">医疗账号：</div>
+                    <div class="infoP">医疗类别：普通</div>
+                </div>
+                <div class="chargeBox">
+                    <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
+                        <div class="chargeUl" style="width:20%;">
+                            <p style="width:50%;border-right:1px solid #000;">费用类型</p>
+                            <p style="width:50%;border-right:1px solid #000;">金额</p>
+                        </div>
+                        <div class="chargeUl" style="width:80%;">
+                            <p style="width:40%;border-right:1px solid #000;">明细名称</p>
+                            <p style="width:15%;border-right:1px solid #000;">规格</p>
+                            <p style="width:15%;border-right:1px solid #000;">数量</p>
+                            <p style="width:15%;border-right:1px solid #000;">单价</p>
+                            <p style="width:15%;">金额</p>
+                        </div>
+                    </div>
+                    <div style="display:flex;justify-content: space-between;">
+                        <div style="width:20%;">
+                            <div class="chargeUl" v-for="(item,index) in info.transBody.outputlist2" :key="index">
+                                <p style="width:50%;">{{getItemName(item.aka111)}}</p>
+                                <p style="width:50%;">{{item.bka058}}</p>
+                            </div>
+                            <div class="chargeUl" style="border-top:1px solid #000;">
+                                <p style="width:50%;">费用合计</p>
+                                <p style="width:50%;">{{info.transBody.akc264}}</p>
+                            </div>
+                            <div class="chargeUl" style="border-top:1px solid #000;">
+                                <p style="width:50%;">记账支付</p>
+                                <p style="width:50%;">{{info.transBody.akb068}}</p>
+                            </div>
+                            <div class="chargeUl" style="border-top:1px solid #000;">
+                                <p style="width:50%;">个人账号</p>
+                                <p style="width:50%;">{{info.transBody.akc266}}</p>
+                            </div>
+                            <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
+                                <p style="width:50%;">现金支付</p>
+                                <p style="width:50%;">{{info.transBody.akb067}}</p>
+                            </div>
+                        </div>
+                        <div style="width:80%;display:flex;height:300px;">
+
+                            <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
+                                <p v-for="(item,i) in info.name_arr" :key="i" class="chargeP">
+                                    {{item}}</p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p v-for="(item,y) in info.spec_arr" :key="y" class="chargeP">
+                                    {{item}}</p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p v-for="(item,z) in info.count_arr" :key="z" class="chargeP">
+                                    {{item}}次</p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p v-for="(item,f) in info.price_arr" :key="f" class="chargeP">{{item}}</p>
+                            </div>
+                            <div style="width:15%;text-align:center;">
+                                <p v-for="(item,d) in info.total_arr" :key="d" class="chargeP">{{item}}</p>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="moneyBox">
+                    <p>实收金：{{info.transBody.akc264}}</p>
+                    <p>记账前金额：{{0.00}}</p>
+                    <p>扣款金额：{{0.00}}</p>
+                    <p>记账后金额：{{0.00}}</p>
+                    <p>找赎金：{{0.00}}</p>
+                </div>
+                <div class="actionBar">
+                    <div>收费员：{{info.doctor_name}}</div>
+                    <div>日期：{{info.record_date}}</div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+</template>
+<script>
+  import axios from 'axios'
+  import { getChargePrint } from '@/api/project/project'
+
+  export default {
+    data() {
+      return {
+        list: {},
+        prescription: [],
+        patient: {},
+        orgname: '',
+
+        result: {},
+        org_code: '',
+        patient_name: '',
+        doctor_code: '',
+        doctor_name: '',
+
+        name_arr: [],
+        spec_arr: [],
+        count_arr: [],
+        price_arr: [],
+        total_arr: []
+
+      }
+    },
+    props: {
+      info: Object
+    },
+    methods: {
+      getItemName(number) {
+        switch (number) {
+          case '01':
+            return '床位费'
+            break
+          case '02':
+            return '西药费'
+
+            break
+          case '03':
+            return '中药费'
+
+            break
+          case '04':
+            return '中成药费'
+
+            break
+          case '05':
+            return '中草药费'
+
+            break
+          case '06':
+            return '检查费'
+
+            break
+          case '07':
+            return '治疗费'
+
+            break
+          case '08':
+            return '放射费'
+
+            break
+          case '09':
+            return '手术费'
+
+            break
+          case '10':
+            return '化验费'
+
+            break
+          case '11':
+            return '输血费'
+
+            break
+          case '12':
+            return '输氧费'
+
+            break
+          case '13':
+            return '其它费'
+
+            break
+          case '14':
+            return '麻醉费'
+
+            break
+          case '15':
+            return '材料费'
+
+            break
+          case '16':
+            return '特殊检查费'
+
+            break
+          case '17':
+            return '特殊治疗费'
+
+            break
+          case '18':
+            return '诊疗费(诊查费)'
+
+            break
+          case '19':
+            return '护理费'
+
+            break
+          case '20':
+            return '诊金'
+
+            break
+          case '21':
+            return '检查费（CT）'
+
+            break
+          case '22':
+            return '检查费（MRT）'
+
+            break
+          case '23':
+            return '检查费（其他）'
+
+            break
+          case '24':
+            return '特需服务费'
+
+            break
+          case '25':
+            return '杂费'
+
+            break
+          case '26':
+            return '挂号费'
+            break
+
+        }
+
+      },
+    },
+    created() {
+
+
+    },
+
+  }
+</script>
+
+
+<style lang="scss" scoped>
+    .prescription-print {
+        -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+        -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+        margin-bottom: 20px;
+        padding: 20px 10px;
+    }
+
+    .printTitle {
+        font-size: 22px;
+        text-align: center;
+        font-weight: bold;
+    }
+
+    .infoMain {
+        display: flex;
+        flex-wrap: wrap;
+        padding: 0 10px;
+        margin-top: 10px;
+    }
+
+    .infoMain .infoP {
+        width: 33%;
+        line-height: 24px;
+    }
+
+    .chargeBox {
+        border: 1px solid #000;
+    }
+
+    .chargeUl {
+        display: flex;
+        justify-content: space-between;
+        text-align: center;
+    }
+
+    .chargeUl p {
+        height: 40px;
+        line-height: 40px;
+    }
+
+    .chargeP {
+        height: 40px;
+        line-height: 40px;
+    }
+
+    .moneyBox {
+        display: flex;
+        justify-content: space-between;
+        padding: 0 10px;
+        background: #eee;
+        height: 40px;
+        align-items: center;
+        border: 1px solid #000;
+        border-top: none
+    }
+
+    .actionBar {
+        display: flex;
+        justify-content: space-between;
+        line-height: 24px;
+        padding: 0 10px;
+    }
+
+    .actionBar div {
+        width: 150px;
+    }
+</style>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -76,6 +76,10 @@
                         >
                             退费
                         </el-button>
+
+
+                        <el-button size="small" @click="sz_open(10)" type="primary">打印</el-button>
+
                     </div>
 
 
@@ -98,11 +102,11 @@
 
                     <!-- <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
                     <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button> -->
-                    <el-button size="small" @click="open(3)" type="primary">打印</el-button>
 
 
-                    <div v-if="this.$store.getters.xt_user.org_id != 9504 && this.$store.getters.xt_user.org_id != 9538">
 
+                    <div v-if="this.$store.getters.xt_user.org_id != 9504 && this.$store.getters.xt_user.org_id != 9538">
+                        <el-button size="small" @click="open(3)" type="primary">打印</el-button>
                         <el-button v-loading="loadingone" size="small"
                                    @click="open(6)"
                                    type="primary">挂号
@@ -345,7 +349,17 @@
                 :visible.sync="statementVisible">
             <statementPrint ref="print" :paramsObj='orderObj'></statementPrint>
         </el-dialog>
+
+        <el-dialog
+                class="centerDialog"
+                width="1200px"
+                title="打印"
+                :visible.sync="newStatementVisible">
+            <new-statement-print-two :params-obj="newOrderObj"></new-statement-print-two>
+            <!--<newStatementPrint ref="print" :paramsObj='newOrderObj'></newStatementPrint>-->
+        </el-dialog>
     </div>
+
 </template>
 
 
@@ -375,10 +389,12 @@
   import ChargeDialog from './components/chargeDialog'
   import MonthPrescriptionTable from './components/monthPrescriptionTable'
   import ChargeMonthPrescriptionTable from './components/chargeMonthPrescriptionTable'
+  import NewStatementPrintTwo from './newStatementPrintTwo'
 
   const moment = require('moment')
   export default {
     components: {
+      NewStatementPrintTwo,
       ChargeMonthPrescriptionTable,
       MonthPrescriptionTable,
       ChargeDialog,
@@ -469,7 +485,10 @@
         treatVisible: false,
         orderObj: {},
         paramsObj: {},
+        newOrderObj:{},
         statementVisible: false,
+        newStatementVisible: false,
+
         sick: [],
         diagnoses: [],
 
@@ -2543,6 +2562,17 @@
               })
               .catch(function(error) {
               })
+
+          case 10:
+            this.newStatementVisible = true
+            let obj = {
+              record_time: this.record_date,
+              patient_id: this.patient_id,
+              prescription_id: this.prescription_id,
+              order_id: this.order.id
+            }
+            this.newOrderObj = obj
+            // this.$refs.print.getInfo(this.order.id)
             break
 
         }

src/xt_pages/outpatientCharges/treatTemplate/printOne.vue

@@ -1,182 +1,186 @@
 <template>
-    <div id='prescription-print' class="prescription-print">
-        <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 9538">
-            <div class="printTitle">{{orgname}}&nbsp;&nbsp;医药费收据及收费项目清单</div>
-            <div class="infoMain">
-                <div class="infoP">医院(药店)编号：{{org_code}}</div>
-                <div class="infoP">名称：{{orgname}}</div>
-                <div class="infoP">医生工号：{{doctor_code}}</div>
-                <div class="infoP">门诊流水号：{{result.transBody.akc190}}</div>
-                <div class="infoP">科别：{{全科}}</div>
-                <div class="infoP">处方单据号：</div>
-                <div class="infoP">姓名：{{patient_name}}</div>
-                <div class="infoP">医疗账号：</div>
-                <div class="infoP">医疗类别：普通</div>
-            </div>
-            <div class="chargeBox">
-                <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
-                    <div class="chargeUl" style="width:20%;">
-                        <p style="width:50%;border-right:1px solid #000;">费用类型</p>
-                        <p style="width:50%;border-right:1px solid #000;">金额</p>
-                    </div>
-                    <div class="chargeUl" style="width:80%;">
-                        <p style="width:40%;border-right:1px solid #000;">明细名称</p>
-                        <p style="width:15%;border-right:1px solid #000;">规格</p>
-                        <p style="width:15%;border-right:1px solid #000;">数量</p>
-                        <p style="width:15%;border-right:1px solid #000;">单价</p>
-                        <p style="width:15%;">金额</p>
-                    </div>
+    <div>
+        <div id='prescription-print' class="prescription-print">
+            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 9538">
+                <div class="printTitle">{{orgname}}&nbsp;&nbsp;医药费收据及收费项目清单</div>
+                <div class="infoMain">
+                    <div class="infoP">医院(药店)编号：{{org_code}}</div>
+                    <div class="infoP">名称：{{orgname}}</div>
+                    <div class="infoP">医生工号：{{doctor_code}}</div>
+                    <div class="infoP">门诊流水号：{{result.transBody.akc190}}</div>
+                    <div class="infoP">科别：{{全科}}</div>
+                    <div class="infoP">处方单据号：</div>
+                    <div class="infoP">姓名：{{patient_name}}</div>
+                    <div class="infoP">医疗账号：</div>
+                    <div class="infoP">医疗类别：普通</div>
                 </div>
-                <div style="display:flex;justify-content: space-between;">
-                    <div style="width:20%;">
-                        <div class="chargeUl" v-for="(item,index) in result.transBody.outputlist2" :key="index">
-                            <p style="width:50%;">{{getItemName(item.aka111)}}</p>
-                            <p style="width:50%;">{{item.bka058}}</p>
-                        </div>
-                        <div class="chargeUl" style="border-top:1px solid #000;">
-                            <p style="width:50%;">费用合计</p>
-                            <p style="width:50%;">{{result.transBody.akc264}}</p>
-                        </div>
-                        <div class="chargeUl" style="border-top:1px solid #000;">
-                            <p style="width:50%;">记账支付</p>
-                            <p style="width:50%;">{{result.transBody.akb068}}</p>
-                        </div>
-                        <div class="chargeUl" style="border-top:1px solid #000;">
-                            <p style="width:50%;">个人账号</p>
-                            <p style="width:50%;">{{result.transBody.akc264}}</p>
+                <div class="chargeBox">
+                    <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
+                        <div class="chargeUl" style="width:20%;">
+                            <p style="width:50%;border-right:1px solid #000;">费用类型</p>
+                            <p style="width:50%;border-right:1px solid #000;">金额</p>
                         </div>
-                        <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
-                            <p style="width:50%;">现金支付</p>
-                            <p style="width:50%;">{{result.transBody.akb067}}</p>
+                        <div class="chargeUl" style="width:80%;">
+                            <p style="width:40%;border-right:1px solid #000;">明细名称</p>
+                            <p style="width:15%;border-right:1px solid #000;">规格</p>
+                            <p style="width:15%;border-right:1px solid #000;">数量</p>
+                            <p style="width:15%;border-right:1px solid #000;">单价</p>
+                            <p style="width:15%;">金额</p>
                         </div>
                     </div>
-                    <div style="width:80%;display:flex;height:300px;">
-
-                        <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
-                            <p v-for="(item,i) in name_arr" :key="i" class="chargeP">
-                                {{item}}</p>
-                        </div>
-                        <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                            <p v-for="(item,y) in spec_arr" :key="y" class="chargeP">
-                                {{item}}</p>
-                        </div>
-                        <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                            <p v-for="(item,z) in count_arr" :key="z" class="chargeP">
-                                {{item}}次</p>
+                    <div style="display:flex;justify-content: space-between;">
+                        <div style="width:20%;">
+                            <div class="chargeUl" v-for="(item,index) in result.transBody.outputlist2" :key="index">
+                                <p style="width:50%;">{{getItemName(item.aka111)}}</p>
+                                <p style="width:50%;">{{item.bka058}}</p>
+                            </div>
+                            <div class="chargeUl" style="border-top:1px solid #000;">
+                                <p style="width:50%;">费用合计</p>
+                                <p style="width:50%;">{{result.transBody.akc264}}</p>
+                            </div>
+                            <div class="chargeUl" style="border-top:1px solid #000;">
+                                <p style="width:50%;">记账支付</p>
+                                <p style="width:50%;">{{result.transBody.akb068}}</p>
+                            </div>
+                            <div class="chargeUl" style="border-top:1px solid #000;">
+                                <p style="width:50%;">个人账号</p>
+                                <p style="width:50%;">{{result.transBody.akc264}}</p>
+                            </div>
+                            <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
+                                <p style="width:50%;">现金支付</p>
+                                <p style="width:50%;">{{result.transBody.akb067}}</p>
+                            </div>
                         </div>
-                        <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                            <p v-for="(item,f) in price_arr" :key="f" class="chargeP">{{item}}</p>
-                        </div>
-                        <div style="width:15%;text-align:center;">
-                            <p v-for="(item,d) in total_arr" :key="d" class="chargeP">{{item}}</p>
+                        <div style="width:80%;display:flex;height:300px;">
+
+                            <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
+                                <p v-for="(item,i) in name_arr" :key="i" class="chargeP">
+                                    {{item}}</p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p v-for="(item,y) in spec_arr" :key="y" class="chargeP">
+                                    {{item}}</p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p v-for="(item,z) in count_arr" :key="z" class="chargeP">
+                                    {{item}}次</p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p v-for="(item,f) in price_arr" :key="f" class="chargeP">{{item}}</p>
+                            </div>
+                            <div style="width:15%;text-align:center;">
+                                <p v-for="(item,d) in total_arr" :key="d" class="chargeP">{{item}}</p>
+                            </div>
                         </div>
                     </div>
-                </div>
 
+                </div>
+                <div class="moneyBox">
+                    <p>实收金：{{result.transBody.akc264}}</p>
+                    <p>记账前金额：{{0.00}}</p>
+                    <p>扣款金额：{{0.00}}</p>
+                    <p>记账后金额：{{0.00}}</p>
+                    <p>找赎金：{{0.00}}</p>
+                </div>
+                <div class="actionBar">
+                    <div>收费员：{{doctor_name}}</div>
+                    <div>日期：{{this.$route.query.record_date}}</div>
+                </div>
             </div>
-            <div class="moneyBox">
-                <p>实收金：{{result.transBody.akc264}}</p>
-                <p>记账前金额：{{0.00}}</p>
-                <p>扣款金额：{{0.00}}</p>
-                <p>记账后金额：{{0.00}}</p>
-                <p>找赎金：{{0.00}}</p>
-            </div>
-            <div class="actionBar">
-                <div>收费员：{{doctor_name}}</div>
-                <div>日期：{{this.$route.query.record_date}}</div>
-            </div>
-        </div>
 
-        <div v-else>
-            <div class="printTitle">{{orgname}}&nbsp;&nbsp;医药费收据及收费项目清单</div>
-            <div class="infoMain">
-                <div class="infoP">医院(药店)编号：</div>
-                <div class="infoP">名称：{{orgname}}</div>
-                <div class="infoP">医生工号：</div>
-                <div class="infoP">门诊流水号：</div>
-                <div class="infoP">科别：{{list.p_info.departments?list.p_info.departments:''}}</div>
-                <div class="infoP">处方单据号：</div>
-                <div class="infoP">姓名：{{patient.name}}</div>
-                <div class="infoP">医疗账号：</div>
-                <div class="infoP">医疗类别：普通</div>
-            </div>
-            <div class="chargeBox">
-                <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
-                    <div class="chargeUl" style="width:20%;">
-                        <p style="width:50%;border-right:1px solid #000;">费用类型</p>
-                        <p style="width:50%;border-right:1px solid #000;">金额</p>
-                    </div>
-                    <div class="chargeUl" style="width:80%;" >
-                        <p style="width:40%;border-right:1px solid #000;">明细名称</p>
-                        <p style="width:15%;border-right:1px solid #000;">规格</p>
-                        <p style="width:15%;border-right:1px solid #000;">数量</p>
-                        <p style="width:15%;border-right:1px solid #000;">单价</p>
-                        <p style="width:15%;">金额</p>
-                    </div>
+            <div v-else>
+                <div class="printTitle">{{orgname}}&nbsp;&nbsp;医药费收据及收费项目清单</div>
+                <div class="infoMain">
+                    <div class="infoP">医院(药店)编号：</div>
+                    <div class="infoP">名称：{{orgname}}</div>
+                    <div class="infoP">医生工号：</div>
+                    <div class="infoP">门诊流水号：</div>
+                    <div class="infoP">科别：{{list.p_info.departments?list.p_info.departments:''}}</div>
+                    <div class="infoP">处方单据号：</div>
+                    <div class="infoP">姓名：{{patient.name}}</div>
+                    <div class="infoP">医疗账号：</div>
+                    <div class="infoP">医疗类别：普通</div>
                 </div>
-                <div style="display:flex;justify-content: space-between;">
-                    <div style="width:20%;">
-                        <div class="chargeUl" v-for="(item,index) in 1" :key="index">
-                            <p style="width:50%;">材料费</p>
-                            <p style="width:50%;"></p>
-                        </div>
-                        <div class="chargeUl" style="border-top:1px solid #000;">
-                            <p style="width:50%;">费用合计</p>
-                            <p style="width:50%;">{{list.order_info.medfee_sumamt?list.order_info.medfee_sumamt:''}}</p>
-                        </div>
-                        <div class="chargeUl" style="border-top:1px solid #000;">
-                            <p style="width:50%;">记账支付</p>
-                            <p style="width:50%;"></p>
+                <div class="chargeBox">
+                    <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
+                        <div class="chargeUl" style="width:20%;">
+                            <p style="width:50%;border-right:1px solid #000;">费用类型</p>
+                            <p style="width:50%;border-right:1px solid #000;">金额</p>
                         </div>
-                        <div class="chargeUl" style="border-top:1px solid #000;">
-                            <p style="width:50%;">个人账号</p>
-                            <p style="width:50%;"></p>
-                        </div>
-                        <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
-                            <p style="width:50%;">现金支付</p>
-                            <p style="width:50%;">{{list.order_info.psn_cash_pay}}</p>
+                        <div class="chargeUl" style="width:80%;">
+                            <p style="width:40%;border-right:1px solid #000;">明细名称</p>
+                            <p style="width:15%;border-right:1px solid #000;">规格</p>
+                            <p style="width:15%;border-right:1px solid #000;">数量</p>
+                            <p style="width:15%;border-right:1px solid #000;">单价</p>
+                            <p style="width:15%;">金额</p>
                         </div>
                     </div>
-                    <div style="width:80%;display:flex;height:300px;">
-
-                        <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
-                            <p v-for="(item,i) in prescription[0].advices" :key="i" class="chargeP">
-                                {{item.advice_name}}</p>
-                        </div>
-                        <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                            <p v-for="(item,y) in prescription[0].advices" :key="y" class="chargeP">
-                                {{item.advice_desc}}</p>
+                    <div style="display:flex;justify-content: space-between;">
+                        <div style="width:20%;">
+                            <div class="chargeUl" v-for="(item,index) in 1" :key="index">
+                                <p style="width:50%;">材料费</p>
+                                <p style="width:50%;"></p>
+                            </div>
+                            <div class="chargeUl" style="border-top:1px solid #000;">
+                                <p style="width:50%;">费用合计</p>
+                                <p style="width:50%;">
+                                    {{list.order_info.medfee_sumamt?list.order_info.medfee_sumamt:''}}</p>
+                            </div>
+                            <div class="chargeUl" style="border-top:1px solid #000;">
+                                <p style="width:50%;">记账支付</p>
+                                <p style="width:50%;"></p>
+                            </div>
+                            <div class="chargeUl" style="border-top:1px solid #000;">
+                                <p style="width:50%;">个人账号</p>
+                                <p style="width:50%;"></p>
+                            </div>
+                            <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
+                                <p style="width:50%;">现金支付</p>
+                                <p style="width:50%;">{{list.order_info.psn_cash_pay}}</p>
+                            </div>
                         </div>
-                        <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                            <p v-for="(item,z) in prescription[0].advices" :key="z" class="chargeP">
-                                {{item.single_dose}}个</p>
-                        </div>
-                        <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                            <p v-for="(item,f) in prescription[0].advices" :key="f" class="chargeP">{{item.price}}</p>
-                        </div>
-                        <div style="width:15%;text-align:center;">
-                            <p v-for="(item,d) in prescription[0].advices" :key="d" class="chargeP">{{item.single_dose *
-                                item.price}}</p>
+                        <div style="width:80%;display:flex;height:300px;">
+
+                            <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
+                                <p v-for="(item,i) in prescription[0].advices" :key="i" class="chargeP">
+                                    {{item.advice_name}}</p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p v-for="(item,y) in prescription[0].advices" :key="y" class="chargeP">
+                                    {{item.advice_desc}}</p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p v-for="(item,z) in prescription[0].advices" :key="z" class="chargeP">
+                                    {{item.single_dose}}个</p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p v-for="(item,f) in prescription[0].advices" :key="f" class="chargeP">
+                                    {{item.price}}</p>
+                            </div>
+                            <div style="width:15%;text-align:center;">
+                                <p v-for="(item,d) in prescription[0].advices" :key="d" class="chargeP">
+                                    {{item.single_dose *
+                                    item.price}}</p>
+                            </div>
                         </div>
                     </div>
-                </div>
 
-            </div>
-            <div class="moneyBox">
-                <p>实收金：{{list.order_info.medfee_sumamt?list.order_info.medfee_sumamt:''}}</p>
-                <p>记账前金额：{{list.order_info.preselfpay_amt?list.order_info.preselfpay_amt:''}}</p>
-                <p>扣款金额：</p>
-                <p>记账后金额：</p>
-                <p>找赎金：</p>
-            </div>
-            <div class="actionBar">
-                <div>收费员：{{}}</div>
-                <div>日期：{{this.$route.query.record_date}}</div>
+                </div>
+                <div class="moneyBox">
+                    <p>实收金：{{list.order_info.medfee_sumamt?list.order_info.medfee_sumamt:''}}</p>
+                    <p>记账前金额：{{list.order_info.preselfpay_amt?list.order_info.preselfpay_amt:''}}</p>
+                    <p>扣款金额：</p>
+                    <p>记账后金额：</p>
+                    <p>找赎金：</p>
+                </div>
+                <div class="actionBar">
+                    <div>收费员：{{}}</div>
+                    <div>日期：{{this.$route.query.record_date}}</div>
+                </div>
             </div>
         </div>
     </div>
 
-
 </template>
 <script>
   import axios from 'axios'
@@ -190,18 +194,17 @@
         patient: {},
         orgname: '',
 
-        result:{},
-        org_code:"",
-        patient_name:"",
-        doctor_code:"",
-        doctor_name:"",
-
-        name_arr:[],
-        spec_arr:[],
-        count_arr:[],
-        price_arr:[],
-        total_arr:[],
+        result: {},
+        org_code: '',
+        patient_name: '',
+        doctor_code: '',
+        doctor_name: '',
 
+        name_arr: [],
+        spec_arr: [],
+        count_arr: [],
+        price_arr: [],
+        total_arr: []
 
       }
     },
@@ -209,115 +212,113 @@
       paramsObj: Object
     },
     methods: {
-      getItemName(number){
+      getItemName(number) {
         switch (number) {
-          case "01":
-            return "床位费"
+          case '01':
+            return '床位费'
             break
-          case "02":
-            return "西药费"
+          case '02':
+            return '西药费'
 
             break
-          case "03":
-            return "中药费"
+          case '03':
+            return '中药费'
 
             break
-          case "04":
-            return "中成药费"
+          case '04':
+            return '中成药费'
 
             break
-          case "05":
-            return "中草药费"
+          case '05':
+            return '中草药费'
 
             break
-          case "06":
-            return "检查费"
+          case '06':
+            return '检查费'
 
             break
-          case "07":
-            return "治疗费"
+          case '07':
+            return '治疗费'
 
             break
-          case "08":
-            return "放射费"
+          case '08':
+            return '放射费'
 
             break
-          case "09":
-            return "手术费"
+          case '09':
+            return '手术费'
 
             break
-          case "10":
-            return "化验费"
+          case '10':
+            return '化验费'
 
             break
-          case "11":
-            return "输血费"
+          case '11':
+            return '输血费'
 
             break
-          case "12":
-            return "输氧费"
-
+          case '12':
+            return '输氧费'
 
             break
-          case "13":
-            return "其它费"
+          case '13':
+            return '其它费'
 
             break
-          case "14":
-            return "麻醉费"
+          case '14':
+            return '麻醉费'
 
             break
-          case "15":
-            return "材料费"
+          case '15':
+            return '材料费'
 
             break
-          case "16":
-            return "特殊检查费"
+          case '16':
+            return '特殊检查费'
 
             break
-          case "17":
-            return "特殊治疗费"
+          case '17':
+            return '特殊治疗费'
 
             break
-          case "18":
-            return "诊疗费(诊查费)"
+          case '18':
+            return '诊疗费(诊查费)'
 
             break
-          case "19":
-            return "护理费"
+          case '19':
+            return '护理费'
 
             break
-          case "20":
-            return "诊金"
+          case '20':
+            return '诊金'
 
             break
-          case "21":
-            return "检查费（CT）"
+          case '21':
+            return '检查费（CT）'
 
             break
-          case "22":
-            return "检查费（MRT）"
+          case '22':
+            return '检查费（MRT）'
 
             break
-          case "23":
-            return "检查费（其他）"
+          case '23':
+            return '检查费（其他）'
 
             break
-          case "24":
-            return "特需服务费"
+          case '24':
+            return '特需服务费'
 
             break
-          case "25":
-            return "杂费"
+          case '25':
+            return '杂费'
 
             break
-          case "26":
-            return "挂号费"
+          case '26':
+            return '挂号费'
             break
 
         }
 
-
       },
       getChargePrint(record_date, patient_id, prescription_id) {
         var params = {
@@ -346,6 +347,7 @@
     created() {
 
       if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 9538) {
+        this.orgname = xtuser.org.org_name
         var form = {
           'order_id': this.paramsObj.order_id,
           'patient_id': this.paramsObj.patient_id,
@@ -364,30 +366,25 @@
               if (response.data.data.failed_code == -10) {
                 that.$message.error(response.data.data.msg)
               } else {
-                this.result = response.data.data.res
-
-                this.org_code = response.data.data.org_code
-                this.patient_name = response.data.data.patient_name
-                this.doctor_code = response.data.data.doctor_code
-                this.doctor_name = response.data.data.doctor_name
-                this.name_arr = []
-                this.spec_arr = []
-                this.count_arr = []
-                this.price_arr = []
-                this.total_arr = []
-                for(let i = 0;i < this.result.transBody.outputlist1.length; i++){
-                  this.name_arr.push(this.result.transBody.outputlist1[i].ake006)
-                  this.spec_arr.push(this.result.transBody.outputlist1[i].aka074)
-                  this.count_arr.push(this.result.transBody.outputlist1[i].akc226)
-                  this.price_arr.push(this.result.transBody.outputlist1[i].akc225)
-                  this.total_arr.push(this.result.transBody.outputlist1[i].akc264)
+                that.result = response.data.data.result
+
+                that.org_code = response.data.data.org_code
+                that.patient_name = response.data.data.patient_name
+                that.doctor_code = response.data.data.doctor_code
+                that.doctor_name = response.data.data.doctor_name
+                that.name_arr = []
+                that.spec_arr = []
+                that.count_arr = []
+                that.price_arr = []
+                that.total_arr = []
+                for (let i = 0; i < that.result.transBody.outputlist1.length; i++) {
+                  that.name_arr.push(that.result.transBody.outputlist1[i].ake006)
+                  that.spec_arr.push(that.result.transBody.outputlist1[i].aka074)
+                  that.count_arr.push(that.result.transBody.outputlist1[i].akc226)
+                  that.price_arr.push(that.result.transBody.outputlist1[i].akc225)
+                  that.total_arr.push(that.result.transBody.outputlist1[i].akc264)
                 }
 
-
-
-
-
-
               }
 
             }