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/summary.vue

@@ -104,7 +104,7 @@
                             结算单
                         </el-button>
                         <el-button size="mini" type="primary" v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106" @click="settlementPrint(scope.row)">结算单</el-button>
-                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">
+                        <el-button size="mini" type="primary" @click="toRefund(scope.row)">
                             退费
                         </el-button>
                         <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button>
@@ -247,7 +247,7 @@
         }
 
       },toRefund(row){
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
           var that = this;
           this.$confirm('是否退费', '退费', {
             confirmButtonText: '确 定',
@@ -362,6 +362,7 @@
               let balance_accounts = '';
 
               let order_status = '';
+              let charge_name = '';
 
               if (order.his_patient != null && order.his_patient.number.length > 0) {
                 number = order.his_patient.number
@@ -392,6 +393,11 @@
                 doctor_name = order.p_info.doctor
               }
 
+              if (order.creator != null) {
+                charge_name = this.getName(order.creator)
+              }
+
+
               if (order.order_status == 1) {
                 order_status = '待结算'
               }
@@ -409,25 +415,33 @@
                 '患者姓名': name,
                 '应收金额': order.medfee_sumamt,
                 '实收金额': order.medfee_sumamt,
+                '医保统筹金额': order.fund_pay_sumamt,
+                '大额基金金额': order.hifob_pay,
+                '大病基金金额': order.hifmi_pay,
+                '补充保险基金金额': order.hifes_pay,
+                '医疗救助基金金额': order.maf_pay,
+                '公务员基金': order.cvlserv_pay,
+                '个人支付基金': order.psn_cash_pay,
+                '个人账户支付金额': order.acct_pay,
                 '科室': department,
                 '医生姓名': doctor_name,
                 '收费类别': balance_accounts,
-                '收费者姓名': doctor_name,
+                '收费者姓名': charge_name,
                 '总金额': order.medfee_sumamt,
                 '现金支付': '',
                 '账户支付': '',
                 '支付宝支付': '',
                 '微信支付': '',
                 '其他支付': '',
-                '收费日期': '',
+                '收费时间': order.setl_time,
                 '收费状态': order_status,
                 '退费日期': ''
               };
               list.push(obj)
             }
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
-              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
+              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '医保统筹金额', '大额基金金额', '大病基金金额', '补充保险基金金额', '医疗救助基金金额', '公务员基金', '个人支付基金', '个人账户支付金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费时间', '收费状态', '退费日期'];
+              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '医保统筹金额', '大额基金金额', '大病基金金额', '补充保险基金金额', '医疗救助基金金额', '公务员基金', '个人支付基金', '个人账户支付金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费时间', '收费状态', '退费日期'];
               const data = this.formatJson(filterVal, list);
               excel.export_json_to_excel({
                 header: tHeader,