处理bug

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -138,11 +138,11 @@
                         >退号
                         </el-button>
 
-                        <el-button
-                        v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"
-                        size="small" @click="open(11)" type="primary"
-                        >撤销明细
-                        </el-button>
+                        <!--<el-button-->
+                        <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"-->
+                        <!--size="small" @click="open(11)" type="primary"-->
+                        <!--&gt;撤销明细-->
+                        <!--</el-button>-->
 
                     </div>
                     <!--<el-button size="small" @click="query" type="primary"-->

src/xt_pages/outpatientCharges/summary.vue

@@ -51,7 +51,7 @@
                       <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
                     </el-popover> -->
-                    <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+                    <el-button size="small" type="primary" @click="export_detail" v-loading="loading">报表下载</el-button>
                 </div>
             </div>
             <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
@@ -193,6 +193,7 @@
     },
     data() {
       return {
+        loading:false,
         orderObj: {},
         statementVisible: false,
         statementVisible9504: false,
@@ -229,6 +230,7 @@
         })
       },
       getName(admin_user_id) {
+
         for (let i = 0; i < this.adminUserOptions.length; i++) {
           if (this.adminUserOptions[i].id == admin_user_id) {
             return this.adminUserOptions[i].name
@@ -320,12 +322,14 @@
           start_time: this.start_time,
           end_time: this.end_time
         }
+        this.loading = true
         getExportConsumeDetailList(params).then(response => {
           if (response.data.state == 0) {
+            this.loading = false
             this.$message.error(response.data.msg)
             return false
           } else {
-
+            this.loading = false
             let list = []
             for (let i = 0; i < response.data.data.order.length; i++) {
               let order = response.data.data.order[i]
@@ -333,6 +337,8 @@
               let name = ''
               let department = ''
               let doctor_name = ''
+              let charge_name = ''
+              let time =''
               let balance_accounts = ''
 
               let order_status = ''
@@ -366,6 +372,12 @@
                 doctor_name = order.p_info.doctor
               }
 
+              if (order.creator != null) {
+                charge_name =  this.getName(order.creator)
+              }
+
+
+
               if (order.order_status == 1) {
                 order_status = '待结算'
               }
@@ -378,30 +390,39 @@
                 order_status = '已退费'
               }
 
+
               let obj = {
                 '就诊号': number,
                 '患者姓名': name,
                 '应收金额': order.medfee_sumamt,
-                '实收金额': order.medfee_sumamt,
+                '实收金额': order.psn_cash_pay,
+                '医保统筹金额': 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,

src/xt_pages/outpatientRegistration/index.vue

@@ -688,7 +688,7 @@
             cb([])
           }
         })
-      }, 
+      },
       readingSZ() {
         var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
@@ -1000,7 +1000,7 @@
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9990) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9990) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
@@ -1055,6 +1055,7 @@
 
                 })
             } else {
+              var that = this
               saveHisPatient(params).then(response => {
                 if (response.data.state == 1) {
                   var patient = response.data.data.patient