Merge remote-tracking branch 'origin/master'

src/modules/invoice/views/List.vue

@@ -37,7 +37,7 @@
           >
           </el-date-picker>
         </template>
-        <el-row>
+        <el-row style="margin-bottom: 20px">
           <el-button type="primary" @click="isHandleSelection">分配票据跟进人</el-button>
           <el-button type="primary" @click="deposit">发票充值</el-button>
         </el-row>
@@ -68,9 +68,10 @@ import AppList from '@/components/base/AppList.vue'
 import AppCard from '@/components/base/AppCard.vue'
 import DistributionDialog from '../components/DistributionDialog.vue'
 // 接口
-import { getInvoiceList, getCondition, deposit, downloadInvoices } from '../api'
+import { getInvoiceList, getCondition, deposit } from '../api'
 import XLSX from 'xlsx'
 import fileDownload from 'js-file-download'
+import queryString from 'query-string'
 
 export default {
   components: { AppCard, AppList, DistributionDialog },
@@ -110,7 +111,17 @@ export default {
       return {
         remote: {
           httpRequest: getInvoiceList,
-          params: { invoice_haoma: '', name: '', txn_id: '', invoice_type: '', invoice_color_type: '', sales_rep_user_id: '', can_add_invoice: '', firstDate: '', lastDate: '' },
+          params: {
+            invoice_haoma: '',
+            name: '',
+            txn_id: '',
+            invoice_type: '',
+            invoice_color_type: '',
+            sales_rep_user_id: '',
+            can_add_invoice: '',
+            firstDate: '',
+            lastDate: ''
+          },
           beforeRequest: this.beforeRequest,
           callback(data) {
             data.forEach(item => {
@@ -207,10 +218,8 @@ export default {
   methods: {
     // 发票列表下载
     downloadInvoices() {
-      downloadInvoices(this.tableOptions.remote.params).then(res => {
-        console.log(res)
-        fileDownload(res, '发票列表.xlsx')
-      })
+      const params = queryString.stringify(this.tableOptions.remote.params)
+      window.open(`/api/finance/v1/invoices/download?${params}`)
     },
     // 发票充值
     deposit() {