Browse Source

refactor: 优化 地区筛选 总部 、 研发 置空

zhangrenyuan/feature-20250728113353-金币前端三期
lihui 2 weeks ago
parent
commit
4499310a19
  1. 4
      src/views/audit/gold/rechargeAudit.vue
  2. 4
      src/views/audit/gold/refundAudit.vue
  3. 5
      src/views/consume/gold/coinConsumeDetail.vue
  4. 4
      src/views/permissions/userPermission.vue
  5. 3
      src/views/recharge/gold/addCoinRecharge.vue
  6. 3
      src/views/recharge/gold/coinRechargeDetail.vue
  7. 5
      src/views/refund/gold/coinRefundDetail.vue
  8. 4
      src/views/usergold/gold/clientCountBalance.vue
  9. 18
      src/views/usergold/gold/clientCountDetail.vue

4
src/views/audit/gold/rechargeAudit.vue

@ -318,7 +318,9 @@ const getRecharge = async function (val) {
}
console.log('搜索参数', getObj.value)
if (rechargeAudit.value.market === '总部' || rechargeAudit.value.market === '研发部') {
rechargeAudit.value.market = '';
}
const result = await request({
url: '/audit/selectRecharge',
data: {

4
src/views/audit/gold/refundAudit.vue

@ -315,6 +315,9 @@ const get = async function (val) {
searchForm.value.startTime = ''
searchForm.value.endTime = ''
}
if (searchForm.value.market === '总部' || searchForm.value.market === '研发部') {
searchForm.value.market = '';
}
const params = {
pageNum: pagination.value.pageNum,
pageSize: pagination.value.pageSize,
@ -325,6 +328,7 @@ const get = async function (val) {
}
}
console.log('看看传给后端的参数:', params)
const res = await API({url: '/audit/selectRefund', data: params})
tableData.value = res.list || []
pagination.value.total = res.total || 0

5
src/views/consume/gold/coinConsumeDetail.vue

@ -166,9 +166,12 @@ const ConsumeSelectBy = async function (val) {
console.log('搜索参数1', getObj.value)
console.log('搜索参数2', consumeUser.value)
// POST
if (consumeUser.value.market === '总部' || consumeUser.value.market === '研发部') {
consumeUser.value.market = '';
}
const result = await request({
url: '/consume/selectBy',
data: {
pageNum: getObj.value.pageNum,

4
src/views/permissions/userPermission.vue

@ -130,6 +130,10 @@ const getPermission = async function (val) {
getObj.value.pageNum = val
}
console.log('搜索参数', getObj.value, admin.value)
if (admin.value.market === '总部' || admin.value.market === '研发部') {
admin.value.market = '';
}
const result = await request({
url: '/permission/getPermission',
data: {

3
src/views/recharge/gold/addCoinRecharge.vue

@ -331,8 +331,6 @@ const user = ref({})
const getUser = async function (jwcode) {
trimJwCode();
try {
const result = await API({
url: '/user/selectUser',
data: {
@ -341,6 +339,7 @@ const getUser = async function (jwcode) {
})
if (result.code === 0) {
ElMessage.error(result.msg);
} else if (result.data === null) {

3
src/views/recharge/gold/coinRechargeDetail.vue

@ -304,6 +304,9 @@ const get = async function (val) {
rechargeUser.value.sortOrder = sortOrder.value
console.log('搜索参数', getObj.value)
// POST
if (rechargeUser.value.market === '总部' || rechargeUser.value.market === '研发部') {
rechargeUser.value.market = '';
}
const result = await API({
url: '/recharge/selectBy',
data: {

5
src/views/refund/gold/coinRefundDetail.vue

@ -113,7 +113,6 @@ const getSelectBy = async function (val) {
getObj.value.pageNum = val
}
// todo
//
if (getTime.value != null) {
if (getTime.value.startTime != '' && getTime.value.endTime != '') {
@ -125,12 +124,14 @@ const getSelectBy = async function (val) {
refundUser.value.endTime = ''
}
// todo
//
refundUser.value.sortField = sortField.value
refundUser.value.sortOrder = sortOrder.value
console.log('搜索参数', getObj.value)
// POST
if (refundUser.value.market === '总部' || refundUser.value.market === '研发部') {
refundUser.value.market = '';
}
const result = await API({
url: '/refund/selectBy',
data: {

4
src/views/usergold/gold/clientCountBalance.vue

@ -86,7 +86,9 @@ const get = async function (val) {
console.log('最终请求参数', JSON.stringify(requestData, null, 2)); //
//console.log('', requestData);
if (user.value.market === '总部' || user.value.market === '研发部') {
user.value.market = '';
}
const result = await API({
url: '/goldDetail/getGold',
method: 'post',

18
src/views/usergold/gold/clientCountDetail.vue

@ -11,7 +11,7 @@ import dayjs from "dayjs";
const activeTimeRange = ref('')
const defaultTime = [
new Date(2000, 1, 1, 0, 0, 0),
new Date(2000, 2, 1,23 , 59, 59),
new Date(2000, 2, 1, 23, 59, 59),
]
//
const handleDatePickerChange = () => {
@ -28,7 +28,7 @@ const totalGoldTotal = ref(0)
const adminData = ref({})
const getAdminData = async function () {
try {
const result = await API({ url: '/admin/userinfo', data: {} })
const result = await API({url: '/admin/userinfo', data: {}})
adminData.value = result
console.log('请求成功', result)
console.log('管理员用户信息', adminData.value)
@ -95,7 +95,6 @@ const isLoadingmarket = ref(false);
const market = ref("")
//
const tableData = ref([])
//
@ -147,6 +146,9 @@ const get = async function (val) {
const requestData = {...getObj.value, goldDetail: {...goldDetail.value}};
console.log('最终请求参数', JSON.stringify(requestData, null, 2)); //
if (goldDetail.value.market === '总部' || goldDetail.value.market === '研发部') {
goldDetail.value.market = '';
}
const result = await API({
url: '/goldDetail/getGoldDetail',
method: 'post',
@ -227,7 +229,7 @@ const search = function () {
const getToday = function () {
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')
const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
getTime.value = [startTime, endTime]
activeTimeRange.value = 'today' //
@ -305,7 +307,7 @@ const exportExcel = async function () {
jwcode: goldDetail.value.jwcode || '',
payPlatform: goldDetail.value.payPlatform || '',
type: goldDetail.value.type || '',
market: goldDetail.value.market ||"",
market: goldDetail.value.market || "",
startTime: goldDetail.value.startTime || '',
endTime: goldDetail.value.endTime || '',
sortField: goldDetail.value.sortField || '',
@ -414,7 +416,6 @@ const getTagText = (state) => {
}
//
const selectedMarketPath = ref("")
const handleMarketChange = (value) => {
@ -510,7 +511,8 @@ const getMarket = async function () {
<div class="head-card-element">
<el-text class="mx-1" size="large">更新时间</el-text>
<el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间"
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange" :default-time="defaultTime"/>
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"
:default-time="defaultTime"/>
<el-button @click="getToday()" style="margin-left: 10px"
:type="activeTimeRange === 'today' ? 'primary' : ''">
</el-button>
@ -616,7 +618,7 @@ const getMarket = async function () {
<!-- 导出列表弹窗 -->
<el-dialog v-model="exportListVisible" title="导出列表" width="80%">
<el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
<el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
<el-table-column prop="fileName" label="文件名"/>
<el-table-column prop="state" label="状态">
<template #default="scope">

Loading…
Cancel
Save