订单导出功能

src/api/user.js

@@ -35,7 +35,7 @@ export function getIndex (data) {
 }
 
 // 刷新token
-export function refreshToken(data) {
+export function getRefreshToken(data) {
   return request({
     url: '/api-auth/refreshToken',
     method: 'post',

src/store/modules/user.js

@@ -1,4 +1,4 @@
-import { login, logout, getInfo, refreshToken } from '@/api/user'
+import { login, logout, getInfo } from '@/api/user'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { resetRouter } from '@/router'
 // import qs from 'qs'
@@ -57,9 +57,6 @@ const actions = {
       })
     })
   },
-
-  refreshToken()
-
   // get 获取用户信息
   getInfo ({ commit, state }) {
     return new Promise((resolve, reject) => {

src/views/businessManager/orderManager/income.vue

@@ -36,6 +36,7 @@
           <el-select v-model="searchForm.paymentType"
                      clearable
                      filterable
+                     @clear="onClear('paymentType')"
                      placeholder="交易类型">
             <el-option v-for="(item, index) in orderStatus"
                        :key="index"
@@ -47,6 +48,7 @@
           <el-select v-model="searchForm.paymentStatus"
                      clearable
                      filterable
+                     @clear="onClear('paymentStatus')"
                      placeholder="交易状态">
             <el-option v-for="(item, index) in dealStatus"
                        :key="index"
@@ -173,11 +175,35 @@ export default {
     this.getList()
   },
   methods: {
+    onClear(type) {
+      if(type == 'paymentType') {
+        this.searchForm.paymentType = null
+      } else if(type  == 'paymentStatus') {
+        this.searchForm.paymentStatus = null
+      }
+    },
     onOrderExport() { // 报表导出
         let url = '/api-web/export/orderList'
         let data = {
           orderType: 0
         }
+        let searchForm = this.searchForm
+        if(searchForm.paymentStatus) {
+          data.paymentStatus = searchForm.paymentStatus
+        }
+
+        if(searchForm.paymentType) {
+          data.paymentType = searchForm.paymentType
+        }
+
+        if(searchForm.organId) {
+          data.organId = searchForm.organId
+        }
+
+        if(searchForm.orderStartDate && searchForm.orderEndDate) {
+          data.orderStartDate = searchForm.orderStartDate
+          data.orderEndDate = searchForm.orderEndDate
+        }
         const options = {
           method: 'POST',
           headers: {

vue.config.js

@@ -17,8 +17,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000 
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
-let target = 'http://testadm.dayaedu.com/' //勇哥迁库
-// let target = 'http://192.168.3.27:8000' // 箭河
+// let target = 'http://testadm.dayaedu.com/' //test环境
+let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:18000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服