chenlianjie #16

Merged
chenlianjie merged 5 commits from chenlianjie into master 1 year ago
  1. 4
      src/views/order/orderList.vue
  2. 5
      src/views/order/orderRefundList.vue
  3. 10
      src/views/product/productList/index.vue
  4. 2
      src/views/statistics/searchStatisticsList.vue

@ -65,7 +65,7 @@
</el-table-column> </el-table-column>
<el-table-column label="订单金额" min-width="60" align="center"> <el-table-column label="订单金额" min-width="60" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.integral }}</span> <span>¥ {{ scope.row.marketPrice }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="支付积分" min-width="80" align="center"> <el-table-column label="支付积分" min-width="80" align="center">
@ -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
orderInfoApi.exportExcel(searchParam).then(res => { orderInfoApi.getByPage(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

@ -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
orderInfoApi.exportExcel(searchParam).then(res => { orderInfoApi.getRefundOrder(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
@ -259,7 +259,8 @@ export default {
this.$message.success('导出成功') this.$message.success('导出成功')
URL.revokeObjectURL(link.href) // URL.revokeObjectURL(link.href) //
}) })
// const res = await orderInfoApi.getByPage(searchParam)
// tmpData = res.data.list
import('@/vendor/Export2Excel').then(excel => { import('@/vendor/Export2Excel').then(excel => {
const data = this.formatJson(this.valColumn, tmpData) const data = this.formatJson(this.valColumn, tmpData)
excel.export_json_to_excel({ excel.export_json_to_excel({

@ -71,14 +71,14 @@
empty-text="暂无数据" empty-text="暂无数据"
> >
<el-table-column type="selection" width="60" :reserve-selection="true"> </el-table-column> <el-table-column type="selection" width="60" :reserve-selection="true"> </el-table-column>
<el-table-column label="编号"> <el-table-column label="编号" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.id }}</span> <span>{{ scope.row.id }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="商品类型"> <el-table-column label="商品类型" min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.productType ? '平台' : '店铺' }}</span> <span>{{ scope.row.productType == '1' ? '平台' : '店铺' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="商品图" min-width="90"> <!-- <el-table-column label="商品图" min-width="90">
@ -88,7 +88,7 @@
</div> </div>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="商品名称" min-width="200" align="center"> <el-table-column label="商品名称" min-width="180" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.productName }}</span> <span>{{ scope.row.productName }}</span>
</template> </template>
@ -99,7 +99,7 @@
<span>货号{{ scope.row.productNum }}</span> <span>货号{{ scope.row.productNum }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标签" min-width="100"> <el-table-column label="标签" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
上架 上架

@ -215,7 +215,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 => { marketingApi.getByPageNew(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

Loading…
Cancel
Save