huangqizhen
/
gold-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix:筛选问题 时间边界问题

zhangrenyuan/feature-20250728113353-金币前端三期
lihui 2 weeks ago
parent
d512c4f609
commit
ffe7138a27
1 changed files with 319 additions and 315 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 110
      src/views/audit/beanAudit.vue

110
src/views/audit/beanAudit.vue
View File

@ -3,12 +3,12 @@
<el-row style="margin-bottom: 10px">
<el-col :span="6">
<el-text size="large">精网号：</el-text>
<el-input v-model="searchForm.jwcode" placeholder="请输入精网号" style="width: 240px" clearable />
<el-input v-model="searchForm.jwcode" placeholder="请输入精网号" style="width: 240px" clearable/>
</el-col>
<el-col :span="6">
<el-text size="large">所属地区：</el-text>
<el-select v-model="searchForm.market" placeholder="请选择" style="width: 240px" clearable>
<el-option v-for="item in marketOptions" :key="item" :label="item" :value="item" />
<el-option v-for="item in marketOptions" :key="item" :label="item" :value="item"/>
</el-select>
</el-col>
</el-row>
@ -19,13 +19,16 @@
<el-text size="large" style="width: 80px">充值时间：</el-text>
<el-date-picker v-model="dateRange" type="datetimerange" range-separator="至"
start-placeholder="开始时间" end-placeholder="结束时间" style="width: 400px"
@change="handleDatePickerChange" />
@change="handleDatePickerChange" :default-time="defaultTime"/>
<el-button @click="getToday()" style="margin-left: 10px"
:type="activeTimeRange === 'today' ? 'primary' : ''"> 今</el-button>
:type="activeTimeRange === 'today' ? 'primary' : ''"> 今
</el-button>
<el-button @click="getYesterday()" style="margin-left: 10px"
:type="activeTimeRange === 'yesterday' ? 'primary' : ''"> 昨</el-button>
:type="activeTimeRange === 'yesterday' ? 'primary' : ''"> 昨
</el-button>
<el-button @click="get7Days()" style="margin-left: 10px"
:type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
:type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天
</el-button>
<el-button type="success" @click="resetSearch">重置</el-button>
<el-button type="primary" @click="handleSearch">查询</el-button>
</div>
@ -49,17 +52,17 @@
</div>
<el-table :data="tableData" height="540px" @sort-change="handleSortChange">
<el-table-column prop="id" label="序号" width="80" />
<el-table-column prop="name" label="姓名" width="120" show-overflow-tooltip />
<el-table-column prop="jwcode" label="精网号" width="120" />
<el-table-column prop="market" label="所属地区" width="120" />
<el-table-column prop="permanentBean" label="付费金豆" width="120" sortable="custom" />
<el-table-column prop="freeBean" label="免费金豆" width="120" sortable="custom" />
<el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip />
<el-table-column prop="submitName" label="提交人" width="120" />
<el-table-column prop="id" label="序号" width="80"/>
<el-table-column prop="name" label="姓名" width="120" show-overflow-tooltip/>
<el-table-column prop="jwcode" label="精网号" width="120"/>
<el-table-column prop="market" label="所属地区" width="120"/>
<el-table-column prop="permanentBean" label="付费金豆" width="120" sortable="custom"/>
<el-table-column prop="freeBean" label="免费金豆" width="120" sortable="custom"/>
<el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip/>
<el-table-column prop="submitName" label="提交人" width="120"/>
<el-table-column v-if="checkTab === 'reject'" prop="reason" label="驳回理由" width="120"
show-overflow-tooltip />
<el-table-column v-if="checkTab !== 'pending'" prop="auditName" label="审核人" width="120" />
show-overflow-tooltip/>
<el-table-column v-if="checkTab !== 'pending'" prop="auditName" label="审核人" width="120"/>
<el-table-column prop="createTime" label="提交时间" width="180" sortable="custom">
<template #default="{ row }">
{{ moment(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
@ -90,7 +93,8 @@
</el-table-column>
</el-table>
<el-pagination style="margin-top:20px" v-model:current-page="pagination.pageNum"
v-model:page-size="pagination.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="stats.num"
v-model:page-size="pagination.pageSize" layout="total, sizes, prev, pager, next, jumper"
:total="stats.num"
@size-change="handlePageSizeChange" @current-change="handleCurrentChange"></el-pagination>
</el-card>
@ -98,7 +102,7 @@
<el-form>
<el-form-item label="驳回理由" required>
<el-input v-model="reason" type="textarea" :rows="4" placeholder="请输入驳回理由" maxlength="200"
show-word-limit />
show-word-limit/>
</el-form-item>
</el-form>
<template #footer>
@ -109,20 +113,25 @@
</template>
</el-dialog>
</template>
<script setup lang="ts">
import { onMounted, ref } from 'vue'
import { ElMessage } from 'element-plus'
<script setup>
import {onMounted, ref} from 'vue'
import {ElMessage} from 'element-plus'
import API from '@/util/http'
import moment from 'moment'
import { useAdminStore } from "@/store/index.js";
import { storeToRefs } from "pinia";
import {useAdminStore} from "@/store/index.js";
import {storeToRefs} from "pinia";
const defaultTime = [
new Date(2000, 1, 1, 0, 0, 0),
new Date(2000, 2, 1,23 , 59, 59),
]
const adminStore = useAdminStore();
const { adminData, menuTree } = storeToRefs(adminStore);
import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
const {adminData, menuTree} = storeToRefs(adminStore);
import {permissionMapping, findMenuById} from "@/utils/menuTreePermission.js"
import dayjs from "dayjs";
const tableData = ref([])
const marketOptions = ref([])
const dateRange = ref<Date[]>([])
const dateRange = ref([])
const activeTimeRange = ref('')
const activeName = ref('wait')
const sortField = ref('')
@ -166,29 +175,25 @@ const showRejectDialog = (row) => {
}
const getmarkets = async () => {
try {
const result = await API({ url: '/beanConsume/getDept', data: {} })
const result = await API({url: '/beanConsume/getDept', data: {}})
marketOptions.value = result.data || []
} catch (error) {
console.error('获取地区列表失败', error)
}
}
const handleSortChange = (column) => {
if (column.prop === 'sumGold') {
sortField.value = 'sum_gold'
} else if (column.prop === 'permanentGold') {
sortField.value = 'permanent_gold'
} else if (column.prop === 'freeGold') {
sortField.value = 'freeGold'
} else if (column.prop === 'taskGold') {
sortField.value = 'task_gold'
if (column.prop === 'permanentBean') {
sortField.value = 'permanentBean'
} else if (column.prop === 'freeBean') {
sortField.value = 'freeBean'
} else if (column.prop === 'createTime') {
sortField.value = 'create_time'
sortField.value = 'createTime'
} else if (column.prop === 'auditTime') {
sortField.value = 'audit_time'
sortField.value = 'auditTime'
} else {
sortField.value = ''
}
sortOrder.value = column.order === 'ascending' ? 'asc' : 'desc'
sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
console.log('排序字段：', sortField.value)
console.log('排序方式：', sortOrder.value)
get()
@ -223,12 +228,12 @@ const get = async function () {
}
}
console.log('看看传给后端的参数：', params)
const res = await API({ url: '/beanAudit/selectBy', data: params })
const res = await API({url: '/beanAudit/selectBy', data: params})
tableData.value = res.data.list || []
} catch (error) {
console.error('获取数据失败', error)
}
}else{
} else {
ElMessage.error('无此权限')
}
}
@ -258,7 +263,7 @@ const getStats = async () => {
} catch (error) {
console.log('请求失败', error)
}
}else{
} else {
ElMessage.error('无此权限')
}
}
@ -270,7 +275,7 @@ const handleApprove = async (row) => {
id: row.id,
auditName: adminData.value.name,
}
await API({ url: '/beanAudit/status1', data: params })
await API({url: '/beanAudit/status1', data: params})
ElMessage.success('审核通过成功')
get()
getStats()
@ -296,7 +301,7 @@ const handleReject = async () => {
auditName: adminData.value.adminName,
reason: reason.value
}
await API({ url: '/beanAudit/status2', data: params })
await API({url: '/beanAudit/status2', data: params})
ElMessage.success('驳回成功')
rejectDialogVisible.value = false
get()
@ -310,9 +315,9 @@ const handleReject = async () => {
}
}
const getToday = function () {
const today = new Date()
const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate())
const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1)
const today = dayjs()
const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
dateRange.value = [startTime, endTime]
console.log('dateRange', dateRange.value)
activeTimeRange.value = 'today'
@ -321,10 +326,9 @@ const getToday = function () {
getStats()
}
const getYesterday = function () {
const yesterday = new Date()
yesterday.setDate(yesterday.getDate() - 1)
const startTime = new Date(yesterday.getFullYear(), yesterday.getMonth(), yesterday.getDate())
const endTime = new Date(yesterday.getFullYear(), yesterday.getMonth(), yesterday.getDate() + 1)
const today = dayjs()
const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
dateRange.value = [startTime, endTime]
console.log('dateRange', dateRange.value)
activeTimeRange.value = 'yesterday'
@ -333,9 +337,9 @@ const getYesterday = function () {
getStats()
}
const get7Days = function () {
const today = new Date()
const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 6)
const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1)
const today = dayjs()
const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
dateRange.value = [startTime, endTime]
console.log('dateRange', dateRange.value)
activeTimeRange.value = '7days'

Write Preview
Loading…
Cancel
Save