admin/smartDriveEEFront
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加数据类型的查询条件

Browse Source
This commit is contained in:
zhonghua.li
2026-04-25 17:59:06 +08:00
parent edb8bd5f47
commit d29190fbac
3 changed files with 113 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/views/lb-business/daily-report/index.vue
View File

@@ -2,9 +2,6 @@
<div class="app-container">
<el-card class="filter-container" shadow="never">
<el-form :model="queryParams" :inline="true" label-width="100px">
<el-form-item label="租户ID">
<el-input v-model="queryParams.tenantId" clearable placeholder="请输入租户ID" style="width: 180px" />
</el-form-item>
<el-form-item label="用户ID">
<el-input v-model="queryParams.userId" clearable placeholder="请输入用户ID" style="width: 180px" />
</el-form-item>
@@ -12,7 +9,10 @@
<el-input v-model="queryParams.nickname" clearable placeholder="请输入昵称" style="width: 180px" />
</el-form-item>
<el-form-item label="数据类型">
<el-input v-model="queryParams.dataType" clearable placeholder="请输入数据类型" style="width: 180px" />
<el-select v-model="queryParams.dataType" clearable placeholder="请选择数据类型" style="width: 180px">
<el-option label="详情" value="report_detail" />
<el-option label="汇总" value="report_sum" />
</el-select>
</el-form-item>
<el-form-item label="报表开始">
<el-date-picker
@@ -34,26 +34,6 @@
style="width: 200px"
/>
</el-form-item>
<el-form-item label="创建开始">
<el-date-picker
v-model="queryParams.createdStartTime"
type="datetime"
clearable
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="创建开始时间"
style="width: 200px"
/>
</el-form-item>
<el-form-item label="创建结束">
<el-date-picker
v-model="queryParams.createdEndTime"
type="datetime"
clearable
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="创建结束时间"
style="width: 200px"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-delete" @click="resetQuery">清空</el-button>
@@ -67,21 +47,19 @@
<el-card class="table-container" shadow="never">
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="租户ID" prop="tenantId" min-width="140" show-overflow-tooltip />
<el-table-column label="用户ID" prop="userId" min-width="140" show-overflow-tooltip />
<el-table-column label="报表日期" prop="reportDate" min-width="170">
<template slot-scope="scope">
{{ formatDate(scope.row.reportDate) }}
</template>
</el-table-column>
<el-table-column label="昵称" prop="nickname" min-width="120" />
<el-table-column label="昨日买入金额" prop="yestodaySellAmt" min-width="130" />
<el-table-column label="当日卖出金额" prop="dailySellAmt" min-width="130" />
<el-table-column label="当日买入金额" prop="dailyBuyAmt" min-width="130" />
<el-table-column label="服务费" prop="serviceAmt" min-width="100" />
<el-table-column label="抵扣金额" prop="dikouAmt" min-width="110" />
<el-table-column label="差额" prop="diffAmt" min-width="100" />
<el-table-column label="抵扣金额" prop="dikouAmt" min-width="110" />
<el-table-column label="数据类型" prop="dataType" min-width="100" />
<el-table-column label="报表日期" prop="reportDate" min-width="170">
<template slot-scope="scope">
{{ formatDateTime(scope.row.reportDate) }}
</template>
</el-table-column>
<el-table-column label="描述" prop="descContent" min-width="140" show-overflow-tooltip />
<el-table-column label="创建时间" prop="createdAt" min-width="170">
<template slot-scope="scope">
@@ -204,6 +182,23 @@ import {
updateLbDailyUserTradeReport
} from '@/api/lb-daily-user-trade-report'
function formatDateTimeForQuery(date) {
const year = date.getFullYear()
const month = String(date.getMonth() + 1).padStart(2, '0')
const day = String(date.getDate()).padStart(2, '0')
return `${year}-${month}-${day} 00:00:00`
}
function getDefaultReportRange() {
const today = new Date()
const yesterday = new Date(today)
yesterday.setDate(yesterday.getDate() - 1)
return {
reportStartTime: formatDateTimeForQuery(yesterday),
reportEndTime: formatDateTimeForQuery(today)
}
}
export default {
name: 'LbDailyReport',
data() {
@@ -218,14 +213,10 @@ export default {
queryParams: {
current: 1,
size: 10,
tenantId: '',
userId: '',
dataType: '',
nickname: '',
reportStartTime: '',
reportEndTime: '',
createdStartTime: '',
createdEndTime: ''
...getDefaultReportRange()
},
form: {
id: '',
@@ -276,14 +267,11 @@ export default {
const params = {
current: this.queryParams.current,
size: this.queryParams.size,
tenantId: this.queryParams.tenantId || undefined,
userId: this.queryParams.userId || undefined,
dataType: this.queryParams.dataType || undefined,
nickname: this.queryParams.nickname || undefined,
reportStartTime: this.queryParams.reportStartTime || undefined,
reportEndTime: this.queryParams.reportEndTime || undefined,
createdStartTime: this.queryParams.createdStartTime || undefined,
createdEndTime: this.queryParams.createdEndTime || undefined
reportEndTime: this.queryParams.reportEndTime || undefined
}
Object.keys(params).forEach((key) => {
if (params[key] === undefined || params[key] === '') delete params[key]
@@ -298,14 +286,10 @@ export default {
this.queryParams = {
current: 1,
size: 10,
tenantId: '',
userId: '',
dataType: '',
nickname: '',
reportStartTime: '',
reportEndTime: '',
createdStartTime: '',
createdEndTime: ''
...getDefaultReportRange()
}
this.fetchList()
},
@@ -441,6 +425,15 @@ export default {
const minutes = String(date.getMinutes()).padStart(2, '0')
const seconds = String(date.getSeconds()).padStart(2, '0')
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
},
formatDate(dateTime) {
if (!dateTime) return '-'
const date = new Date(String(dateTime).replace('T', ' '))
if (Number.isNaN(date.getTime())) return String(dateTime)
const year = date.getFullYear()
const month = String(date.getMonth() + 1).padStart(2, '0')
const day = String(date.getDate()).padStart(2, '0')
return `${year}-${month}-${day}`
}
}
}