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

src/xt_pages/outpatientTool/components/detail.vue

     <div>
         <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
             <div>
-                <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
-                <!--@click="Action">-->
-                <!--导出-->
-                <!--</el-button>-->
+                <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
+                @click="Action">
+                导出
+                </el-button>
                 <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
                           @keyup.enter.native='searchAction'
                           placeholder="请输入患者姓名"
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { GetSummaryDetail } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
+  import axios from 'axios'
+
   // import NewStatementPrint from './newStatementPrint'
   const moment = require('moment')
   export default {
       }
     },
     methods: {
+      Action(){
+        var that = this
+        axios.get('http://127.0.0.1:9531/handelExcel', {
+          params: {}
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+
+
+              return false
+            } else {
+
+              var list = []
+              for(let i = 0; i < response.data.data.list.length; i++){
+                let team =  response.data.data.list[i]
+                for(let b = 0; b < team.list.length; b++){
+                  let name = ""
+                  if(team.list[b].type == 2){
+                    name = team.list[b].project.project_name
+                  }else{
+
+                    name = team.list[b].good_info.good_name
+
+                  }
+
+                  let obj = {
+                    '客户组合编码': team.id,
+                    '客户组合名称': team.project_team,
+                    '客户单项编码': team.list[b].id,
+                    '客户单项名称': name,
+                    '中心组合编码': '',
+                    '中心组合名称': '',
+                    '中心单项编码': '',
+                    '中心单项名称': '',
+                  }
+
+                  list.push(obj)
+                }
+              }
+
+              import('@/vendor/Export2Excel').then(excel => {
+                const tHeader = [ '客户组合编码', '客户组合名称', '客户单项编码', '客户单项名称', '中心组合编码', '中心组合名称', '中心单项编码', '中心单项名称']
+                const filterVal = [ '客户组合编码', '客户组合名称', '客户单项编码', '客户单项名称', '中心组合编码', '中心组合名称', '中心单项编码', '中心单项名称']
+                const data = that.formatJson(filterVal, list)
+                excel.export_json_to_excel({
+                  header: tHeader,
+                  data,
+                  filename: "消费明细"
+                })
+              })
+
+
+            }
+          })
+          .catch(function(error) {
+
+          })
+
+
+
+
+      },formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+      },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
         if (columnIndex === 0) {
           if (rowIndex % 2 === 0) {

src/xt_pages/outpatientTool/components/settle.vue

           <el-table-column align="center" prop="item_name" label="个人支付金额">
               <template slot-scope="scope">{{scope.row.psn_cash_pay.toFixed(2)}}</template>
           </el-table-column>
+
+          <el-table-column align="center" prop="item_name" label="企业补充医疗保险基金支出">
+              <template slot-scope="scope">{{scope.row.hifes_pay.toFixed(2)}}</template>
+          </el-table-column>
+
+
+          <el-table-column align="center" prop="item_name" label="居民大病保险资金支出">
+              <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
+          </el-table-column>
+
           <el-table-column align="center" prop="total" label="费用总额">
               <template slot-scope="scope">
                   <div>{{scope.row.total.toFixed(2)}}</div>
           { id: 1, name: '医保' },
           { id: 2, name: '自费' },
           { id: 3, name: '门诊特殊病' },
-          { id: 4, name: '普通门诊' }
+          { id: 4, name: '普通门诊' },
+          { id: 5, name: '城乡居民基本医疗保险' },
+          { id: 6, name: '职工基本医疗保险' }
+
 
         ]
 
           let fund_pay_sumamt = ""
           let acct_pay = ""
           let psn_cash_pay = ""
+          let hifes_pay = ""
+          let hifmi_pay = ""
           let total = ""
+
           if(order.setl_time.length == 0){
 
             time = this.getTimes(order.settle_accounts_date)
           fund_pay_sumamt = order.fund_pay_sumamt
           acct_pay = order.acct_pay
           psn_cash_pay = order.psn_cash_pay
+          hifes_pay = order.hifes_pay
+          hifmi_pay = order.hifmi_pay
           total = order.total
 
 
             '基金支付金额': fund_pay_sumamt,
             '个人账户支付金额': acct_pay,
             '个人支付基金': psn_cash_pay,
+            '企业补充医疗保险基金支出': hifes_pay,
+            '居民大病保险资金支出': hifmi_pay,
             '费用总额':total,
+
           }
           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_excel1({
             header: tHeader,

src/xt_pages/outpatientTool/fapiao.vue

           .catch(() => {
           })
       },
-
       handleIsUse: function(index, row) {
         this.$confirm('是否开启?', '开启', {
           confirmButtonText: '确定',
           })
 
       },
-
       showDetails: function(index, row) {
         let params = {
           id: row.id
             fapiao_code: val.fapiao_code,
             fapiao_number: val.fapiao_number,
             id: this.editId
-
           }
           modifyFaPiao(params).then(response => {
             if (response.data.state == 0) {
             }
           })
         } else if (val.isCreated == 1) {
+
           //新增
           createFaPiao(val).then(response => {
             if (response.data.state == 0) {
             }
           })
         }
-      },
-      dialogCancle: function() {
+      }, dialogCancle: function() {
         this.$refs.dialog.hide()
-      },
-      showDialog: function() {
+      }, showDialog: function() {
         this.Dialog.formValue = Object.assign(
           {},
           this.Dialog.resetForm
         )
         this.$refs.dialog.show()
         this.Dialog.isCreated = 1
-      },
-      handleSizeChange(val) {
+      }, handleSizeChange(val) {
         this.limit = val
         this.getList()
-      },
-      handleCurrentChange(val) {
+      }, handleCurrentChange(val) {
         this.page = val
         this.getList()
-      },
-      getList() {
+      }, getList() {
         let params = {
           page: this.page,
           limit: this.limit
     .el-table--group {
         border-color: #d0d3da;
     }
-
     .el-table--border::after,
     .el-table--group::after,
     .el-table::before {