caoliancun/PointsMall_Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'chenlianjie' (#14) from chenlianjie into master

Browse Source 
Reviewed-on: #14
This commit was merged in pull request #14.
This commit is contained in:
陈连杰
2024-02-02 01:10:41 +00:00
parent 692520b4b3 64b0519cdc
commit d80f76e266
3 changed files with 99 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/order/orderInfo.js
View File

@@ -79,9 +79,8 @@ export default {
exportExcel(page) { exportExcel(page) {
// 导出 // 导出
return request({ return request({
url: `/${service_name}/${group_name}/export`, url: `/${service_name}/${group_name}/exportWeb`,
method: 'post', method: 'post',
notEncrypt: true,
data: page, data: page,
responseType: 'blob' responseType: 'blob'
}) })

2
src/views/order/orderList.vue
View File

@@ -283,7 +283,7 @@ export default {
const searchParam = { ...this.page } const searchParam = { ...this.page }
searchParam.pageSize = endIndex searchParam.pageSize = endIndex
searchParam.currentPage = this.output.startPage searchParam.currentPage = this.output.startPage
inspectionApi.exportExcel(searchParam).then(res => { orderInfoApi.exportExcel(searchParam).then(res => {
const link = document.createElement('a') const link = document.createElement('a')
// 创建Blob对象，设置文件类型 // 创建Blob对象，设置文件类型
const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型 const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型

4
src/views/order/orderRefundList.vue
View File

@@ -11,7 +11,7 @@
<el-date-picker v-model="page.params.refundTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"> </el-date-picker> <el-date-picker v-model="page.params.refundTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="处理状态："> <el-form-item label="处理状态：">
<el-select v-model="page.params.refundstatus" placeholder="状态" clearable @keyup.enter.native="getList"> <el-select v-model="page.params.refundStatus" placeholder="状态" clearable @keyup.enter.native="getList">
<el-option label="待处理" value="0" /> <el-option label="待处理" value="0" />
<el-option label="已处理" value="1" /> <el-option label="已处理" value="1" />
<el-option label="已拒绝" value="-1" /> <el-option label="已拒绝" value="-1" />
@@ -247,7 +247,7 @@ export default {
const searchParam = { ...this.page } const searchParam = { ...this.page }
searchParam.pageSize = endIndex searchParam.pageSize = endIndex
searchParam.currentPage = this.output.startPage searchParam.currentPage = this.output.startPage
inspectionApi.exportExcel(searchParam).then(res => { orderInfoApi.exportExcel(searchParam).then(res => {
const link = document.createElement('a') const link = document.createElement('a')
// 创建Blob对象，设置文件类型 // 创建Blob对象，设置文件类型
const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型 const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型