1. 修复和新增导出

package.json

@@ -53,6 +53,7 @@
     "jsencrypt": "3.0.0-rc.1",
     "moment": "^2.30.1",
     "nprogress": "0.2.0",
+    "qs": "^6.12.1",
     "quill": "1.3.7",
     "scp2": "^0.5.0",
     "screenfull": "5.0.2",

src/main.js

@@ -12,7 +12,7 @@ import store from './store'
 import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
-import { download } from '@/utils/request'
+import { download,downloadGet } from '@/utils/request'
 
 import './assets/icons' // icon
 import './permission' // permission control
@@ -55,6 +55,7 @@ Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
+Vue.prototype.downloadGet = downloadGet
 Vue.prototype.handleTree = handleTree
 
 // 全局组件挂载

src/utils/request.js

@@ -6,6 +6,7 @@ import errorCode from '@/utils/errorCode'
 import { tansParams, blobValidate } from "@/utils/ruoyi";
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
+import qs from 'qs';
 
 let downloadLoadingInstance;
 // 是否显示重新登录
@@ -149,4 +150,30 @@ export function download(url, params, filename, config) {
   })
 }
 
+// 通用下载方法
+export function downloadGet(url, params={}, filename, config) {
+  downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+  return service.get(url + '?' + (params?qs.stringify(params):''), {
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    responseType: 'blob',
+    ...config
+  }).then(async (data) => {
+    const isBlob = blobValidate(data);
+    if (isBlob) {
+      const blob = new Blob([data])
+      saveAs(blob, filename)
+    } else {
+      const resText = await data.text();
+      const rspObj = JSON.parse(resText);
+      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+      Message.error(errMsg);
+    }
+    downloadLoadingInstance.close();
+  }).catch((r) => {
+    console.error(r)
+    Message.error('下载文件出现错误，请联系管理员！')
+    downloadLoadingInstance.close();
+  })
+}
+
 export default service

src/views/tourism/financialManagement/balanceChangeDetails.vue

@@ -125,7 +125,7 @@
     components: {detailsBox},
     data() {
       return {
-        title: "门票退款管理",// 通用标题
+        title: "余额变动明细",// 通用标题
         configPermi: {
           add: [''], // 新增权限
           details: [''], // 详情权限
@@ -139,7 +139,7 @@
           delect: '', // 删除地址
           upload: '',// 导入地址
           download:'', // 下载模板地址
-          export: '',// 导出地址
+          export: '/member/memberBalanceRecord/exportExcel',// 导出地址
           edit: '', // 编辑地址
         },
         // 遮罩层
@@ -261,12 +261,16 @@
       /** 导出按钮操作 */
       handleExport() {
         let params = JSON.parse(JSON.stringify({
-            ...this.queryParams,
-            createBeginTime: this.queryParams.time&&this.queryParams.time[0]?this.queryParams.time[0]:null,
-            createEndTime: this.queryParams.time&&this.queryParams.time[1]?this.queryParams.time[1]:null,
+          ...this.queryParams
         }))
+        if(this.queryParams.time && this.queryParams.time.length>0) {
+          params['createBeginTime'] = this.queryParams.time[0]
+          params['createEndTime'] = this.queryParams.time[1]
+        } 
         delete params.time;
-        this.download(this.configUrl.export, {
+        delete params.pageSize;
+        delete params.pageNum;
+        this.downloadGet(this.configUrl.export, {
           ...params
         }, `${this.title }_${new Date().getTime()}.xlsx`)
       },

src/views/tourism/marketingActivities/detailsBox/couponManagementDetails.vue

@@ -44,11 +44,11 @@
                   <el-form-item label="" prop="buyAmount">
                     <span>{{ form.buyAmount }}</span>
                   </el-form-item>
-                  <span>,减</span>
+                  <span>,{{ form.type == 1 ? '减':'打' }}</span>
                   <el-form-item label="" prop="quota">
                     <span>{{ form.quota }}</span>
                   </el-form-item>
-                  <span>{{ form.type == 1 ? '元':'折' }}</span>
+                  <span>{{ form.type == 1 ? '元':'%' }}</span>
                 </div>
               </el-form-item>
               <el-form-item label="发放数量：" prop="issuseNum">
@@ -329,7 +329,7 @@ export default {
             ...res.data,
             grantTime: [res.data.issuseStartDate,res.data.issuseEndDate], // 发放时间段
             imag: res.data.imag?res.data.imag.split(','):[],
-            quota: res.data.type == 1?res.data.quota:(res.data.quota)*10
+            quota: res.data.type == 1?res.data.quota:(res.data.quota)
           }
           if(obj.useType == 1) {
             obj['useDate'] = [res.data.useStartDate,res.data.useEndDate] // 使用指定时间

src/views/tourism/marketingActivities/formBox/couponManagementForm.vue

@@ -48,7 +48,7 @@
                   <el-form-item label="" prop="quota">
                     <el-input-number v-model="form.quota" controls-position="right" :min="0" placeholder="请输入"></el-input-number>
                   </el-form-item>
-                  <span>{{ form.type == 1 ? '元':'折' }}</span>
+                  <span>{{ form.type == 1 ? '元':'%' }}</span>
                 </div>
               </el-form-item>
               <el-form-item label="发放数量：" prop="issuseNum">
@@ -374,7 +374,7 @@ export default {
             ...res.data,
             grantTime: [res.data.issuseStartDate,res.data.issuseEndDate], // 发放时间段
             imag: res.data.imag?res.data.imag.split(','):[],
-            quota: res.data.type == 1?res.data.quota:(res.data.quota)*10
+            quota: res.data.type == 1?res.data.quota:res.data.quota
           }
           if(obj.useType == 1) {
             obj['useDate'] = [res.data.useStartDate,res.data.useEndDate] // 使用指定时间
@@ -458,7 +458,7 @@ export default {
           if(this.form.type == 1){
             param['quota'] = this.form.quota
           }else {
-            param['quota'] = (this.form.quota)/10
+            param['quota'] = this.form.quota
           }
           delete param.grantTime
           delete param.useDate
@@ -598,7 +598,7 @@ export default {
       return {
         disabledDate: (time) => {
           if(useType == 1 && datas && datas.length>0) {
-            let now = new Date(moment(datas[1]).startOf('day').format('YYYY-MM-DD HH:mm:ss'))
+            let now = new Date(datas[1]) //  moment(datas[1]).startOf('day').format('YYYY-MM-DD HH:mm:ss')
             return time.getTime() > now.getTime();
           }else {
             return false
@@ -611,7 +611,7 @@ export default {
       return {
         disabledDate: (time) => {
           if(datas && datas.length>0) {
-            let now = new Date(moment(datas[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'))
+            let now = new Date(moment(datas[0])) // moment(datas[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss')
             return time.getTime() < now.getTime()
           }else {
             return false