diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue index 51a424b..ca8808c 100644 --- a/src/views/audit/gold/rechargeAudit.vue +++ b/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: { diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue index 9a137af..8bd493a 100644 --- a/src/views/audit/gold/refundAudit.vue +++ b/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 diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue index 259270f..d338026 100644 --- a/src/views/consume/gold/coinConsumeDetail.vue +++ b/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, diff --git a/src/views/permissions/userPermission.vue b/src/views/permissions/userPermission.vue index fe57750..eb55fa5 100644 --- a/src/views/permissions/userPermission.vue +++ b/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: { diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue index 04b71c7..f507962 100644 --- a/src/views/recharge/gold/addCoinRecharge.vue +++ b/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) { diff --git a/src/views/recharge/gold/coinRechargeDetail.vue b/src/views/recharge/gold/coinRechargeDetail.vue index affc08c..e300374 100644 --- a/src/views/recharge/gold/coinRechargeDetail.vue +++ b/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: { diff --git a/src/views/refund/gold/coinRefundDetail.vue b/src/views/refund/gold/coinRefundDetail.vue index d5f9c2d..18d60ca 100644 --- a/src/views/refund/gold/coinRefundDetail.vue +++ b/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: { diff --git a/src/views/usergold/gold/clientCountBalance.vue b/src/views/usergold/gold/clientCountBalance.vue index a6271e1..cdac5d7 100644 --- a/src/views/usergold/gold/clientCountBalance.vue +++ b/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', diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue index bfce3a9..29071a1 100644 --- a/src/views/usergold/gold/clientCountDetail.vue +++ b/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 () {
更新时间： + end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange" + :default-time="defaultTime"/> 今 @@ -616,7 +618,7 @@ const getMarket = async function () { - +