Browse Source

fix: 消耗明细筛选空格问题(HomilyChart等)

lihui/feature-20250623144029-金币前端lihui
lihui 3 weeks ago
parent
commit
8af33b9964
  1. 125
      src/views/consume/coinConsumeDetail.vue

125
src/views/consume/coinConsumeDetail.vue

@ -1,6 +1,6 @@
<script setup> <script setup>
import { computed, onMounted, ref } from 'vue'
import { dayjs, ElMessage } from 'element-plus'
import {computed, onMounted, ref} from 'vue'
import {dayjs, ElMessage} from 'element-plus'
import request from '@/util/http' import request from '@/util/http'
import API from '@/util/http' import API from '@/util/http'
// //
@ -67,17 +67,21 @@ const consumePlatform = [
}, },
{ {
value: 'Homily Chart',
label: 'Homily Chart'
value: 'HomilyChart',
label: 'HomilyChart'
}, },
{ {
value: 'Homily Link',
label: 'Homily Link'
value: 'HomilyLink',
label: 'HomilyLink'
}, },
{ {
value: 'ERP', value: 'ERP',
label: 'ERP' label: 'ERP'
}
},
{
value: '其他',
label: '其他'
},
] ]
// //
@ -167,7 +171,7 @@ const ConsumeSelectBy = async function (val) {
// //
// detail.value // detail.value
const detailWithoutSort = { ...consumeUser.value }
const detailWithoutSort = {...consumeUser.value}
delete detailWithoutSort.sortField delete detailWithoutSort.sortField
delete detailWithoutSort.sortOrder delete detailWithoutSort.sortOrder
@ -271,14 +275,14 @@ const reset = function () {
const getToday = function () { const getToday = function () {
const today = new Date() const today = new Date()
const startTime = new Date( const startTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
today.getFullYear(),
today.getMonth(),
today.getDate()
) )
const endTime = new Date( const endTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
) )
getTime.value = [startTime, endTime] getTime.value = [startTime, endTime]
console.log('getTime', getTime.value) console.log('getTime', getTime.value)
@ -289,14 +293,14 @@ const getYesterday = function () {
const yesterday = new Date() const yesterday = new Date()
yesterday.setDate(yesterday.getDate() - 1) yesterday.setDate(yesterday.getDate() - 1)
const startTime = new Date( const startTime = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
) )
const endTime = new Date( const endTime = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
) )
getTime.value = [startTime, endTime] getTime.value = [startTime, endTime]
console.log('getTime', getTime.value) console.log('getTime', getTime.value)
@ -306,14 +310,14 @@ const getYesterday = function () {
const get7Days = function () { const get7Days = function () {
const today = new Date() const today = new Date()
const startTime = new Date( const startTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
) )
const endTime = new Date( const endTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
) )
getTime.value = [startTime, endTime] getTime.value = [startTime, endTime]
console.log('getTime', getTime.value) console.log('getTime', getTime.value)
@ -378,19 +382,19 @@ const handleSortChange = (column) => {
} }
const exportExcel = async function () { const exportExcel = async function () {
const params = { const params = {
consumUser :{
jwcode:consumeUser.value.jwcode || '',
payPlatform:consumeUser.value.payPlatform || '',
market:consumeUser.value.market || '',
startTime:consumeUser.value.startTime || '',
endTime:consumeUser.value.endTime || '',
goodsName:consumeUser.value.goodsName || ''
consumUser: {
jwcode: consumeUser.value.jwcode || '',
payPlatform: consumeUser.value.payPlatform || '',
market: consumeUser.value.market || '',
startTime: consumeUser.value.startTime || '',
endTime: consumeUser.value.endTime || '',
goodsName: consumeUser.value.goodsName || ''
}, },
page:getObj.pageNum,
size:getObj.pageSize
page: getObj.pageNum,
size: getObj.pageSize
} }
const res = await API({ url: '/export/exportConsume', data: params })
if (res.code === 200) {
const res = await API({url: '/export/exportConsume', data: params})
if (res.code === 200) {
ElMessage.success('导出成功') ElMessage.success('导出成功')
} }
} }
@ -439,7 +443,7 @@ onMounted(async function () {
<div class="head-card-element"> <div class="head-card-element">
<el-text size="large">精网号</el-text> <el-text size="large">精网号</el-text>
<el-input v-model="consumeUser.jwcode" placeholder="请输入精网号" size="large" style="width: 240px" <el-input v-model="consumeUser.jwcode" placeholder="请输入精网号" size="large" style="width: 240px"
clearable>
clearable>
</el-input> </el-input>
</div> </div>
</el-col> </el-col>
@ -447,26 +451,28 @@ onMounted(async function () {
<div class="head-card-element"> <div class="head-card-element">
<el-text class="mx-1" size="large">商品名称</el-text> <el-text class="mx-1" size="large">商品名称</el-text>
<el-select v-model="consumeUser.goodsName" placeholder="请选择商品名称" size="large" style="width: 180px" <el-select v-model="consumeUser.goodsName" placeholder="请选择商品名称" size="large" style="width: 180px"
clearable>
clearable>
<!-- 修改 v-for 绑定逻辑 --> <!-- 修改 v-for 绑定逻辑 -->
<el-option v-for="(item, index) in goods" :key="index" :label="item" :value="item" />
<el-option v-for="(item, index) in goods" :key="index" :label="item" :value="item"/>
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="head-card-element"> <div class="head-card-element">
<el-text class="mx-1" size="large">所属地区</el-text> <el-text class="mx-1" size="large">所属地区</el-text>
<el-select v-model="consumeUser.market" placeholder="请选择所属地区" size="large" style="width: 180px" clearable>
<el-option v-for="(item, index) in market" :key="index" :label="item" :value="item" />
<el-select v-model="consumeUser.market" placeholder="请选择所属地区" size="large" style="width: 180px"
clearable>
<el-option v-for="(item, index) in market" :key="index" :label="item" :value="item"/>
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="head-card-element"> <div class="head-card-element">
<el-text class="mx-1" size="large">消耗平台</el-text> <el-text class="mx-1" size="large">消耗平台</el-text>
<el-select v-model="consumeUser.payPlatform" placeholder="请选择消耗平台" size="large" style="width: 180px"
clearable>
<el-option v-for="item in consumePlatform" :key="item.value" :label="item.label" :value="item.value" />
<el-select v-model="consumeUser.payPlatform" placeholder="请选择消耗平台" size="large"
style="width: 180px"
clearable>
<el-option v-for="item in consumePlatform" :key="item.value" :label="item.label" :value="item.value"/>
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
@ -476,7 +482,7 @@ onMounted(async function () {
<div class="head-card-element"> <div class="head-card-element">
<el-text class="mx-1" size="large">消费时间</el-text> <el-text class="mx-1" size="large">消费时间</el-text>
<el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间" <el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间"
end-placeholder="结束时间" />
end-placeholder="结束时间"/>
<el-button style="margin-left: 10px" @click="getToday()"> <el-button style="margin-left: 10px" @click="getToday()">
</el-button> </el-button>
<el-button @click="getYesterday()"></el-button> <el-button @click="getYesterday()"></el-button>
@ -509,16 +515,16 @@ onMounted(async function () {
<el-table-column type="index" label="序号" width="100px" fixed="left"> <el-table-column type="index" label="序号" width="100px" fixed="left">
<template #default="scope"> <template #default="scope">
<span>{{ <span>{{
scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
}}</span>
scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- 固定姓名列 --> <!-- 固定姓名列 -->
<el-table-column prop="name" label="姓名" width="150px" fixed="left" />
<el-table-column prop="name" label="姓名" width="150px" fixed="left"/>
<!-- 固定精网号列 --> <!-- 固定精网号列 -->
<el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
<el-table-column prop="market" label="所属地区" width="110px" />
<el-table-column prop="goodsName" label="商品" width="160px" show-overflow-tooltip />
<el-table-column prop="jwcode" label="精网号" width="110px" fixed="left"/>
<el-table-column prop="market" label="所属地区" width="110px"/>
<el-table-column prop="goodsName" label="商品" width="160px" show-overflow-tooltip/>
<el-table-column prop="payPlatform" label="消费平台" width="120px"> <el-table-column prop="payPlatform" label="消费平台" width="120px">
<template #default="scope"> <template #default="scope">
<!-- 使用非严格相等比较 --> <!-- 使用非严格相等比较 -->
@ -536,8 +542,8 @@ onMounted(async function () {
<template #default="scope"> <template #default="scope">
{{ {{
(scope.row.taskGold + (scope.row.taskGold +
scope.row.freeGold +
scope.row.permanentGold) / 100
scope.row.freeGold +
scope.row.permanentGold) / 100
}} }}
</template> </template>
</el-table-column> </el-table-column>
@ -558,17 +564,18 @@ onMounted(async function () {
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
<el-table-column prop="adminName" label="提交人" width="110px" />
<el-table-column prop="createTime" label="消费时间" sortable="custom" width="180px" />
<el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip/>
<el-table-column prop="adminName" label="提交人" width="110px"/>
<el-table-column prop="createTime" label="消费时间" sortable="custom" width="180px"/>
</el-table> </el-table>
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<div class="pagination"> <div class="pagination">
<el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]" <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
@current-change="handleCurrentChange"></el-pagination>
layout="total, sizes, prev, pager, next, jumper" :total="total"
@size-change="handlePageSizeChange"
@current-change="handleCurrentChange"></el-pagination>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>

Loading…
Cancel
Save