From 6a776e79e75569a8db226ed3dce2c78a3f9c0701 Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Sun, 17 Aug 2025 14:28:54 +0800 Subject: [PATCH] fix and feat isshowemployeedata and roleMarket's optimized --- src/views/consume/bean/articleVideo.vue | 2 +- src/views/consume/gold/coinConsumeDetail.vue | 25 ++++++++++++---- src/views/permissions/rolePermission.vue | 15 +++++----- src/views/recharge/gold/coinRechargeDetail.vue | 41 +++++++++++++------------- src/views/refund/gold/coinRefundDetail.vue | 21 +++++++++---- src/views/usergold/gold/clientCountBalance.vue | 16 ++++++++-- src/views/usergold/gold/clientCountDetail.vue | 22 ++++++++++---- 7 files changed, 93 insertions(+), 49 deletions(-) diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue index 6eec541..73ce677 100644 --- a/src/views/consume/bean/articleVideo.vue +++ b/src/views/consume/bean/articleVideo.vue @@ -595,4 +595,4 @@ const getTagText = (state) => { display: flex; margin-top: 20px; } - + \ No newline at end of file diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue index 73d6f5a..0eddd07 100644 --- a/src/views/consume/gold/coinConsumeDetail.vue +++ b/src/views/consume/gold/coinConsumeDetail.vue @@ -36,6 +36,10 @@ const defaultTime = [ /* ====================数据================================= */ + +// 新增复选框状态，默认不勾选 +const showEmployeeData = ref(false) + //这是获取用户信息的接口 const adminData = ref({}) // 充值明细表格 @@ -205,7 +209,8 @@ const ConsumeSelectBy = async function (val) { consumeUser: { ...consumeUser.value, sortField: sortField.value, - sortOrder: sortOrder.value + sortOrder: sortOrder.value, + flag: showEmployeeData.value ? 0 : 1 // 新增 flag 参数 } } }) @@ -214,7 +219,7 @@ const ConsumeSelectBy = async function (val) { // 合计数的接口 // 复制一份 detail.value 并移除排序字段和排序方式 - const detailWithoutSort = {...consumeUser.value} + const detailWithoutSort = {...consumeUser.value,flag: showEmployeeData.value ? 0 : 1} delete detailWithoutSort.sortField delete detailWithoutSort.sortOrder @@ -226,6 +231,7 @@ const ConsumeSelectBy = async function (val) { totalGoldSearch.value.market = consumeUser.value.market totalGoldSearch.value.goodsName = consumeUser.value.goodsName totalGoldSearch.value.jwcode = consumeUser.value.jwcode + totalGoldSearch.value.flag = showEmployeeData.value ? 1 : 0 // 新增 flag 参数 // const resultTotalGold = await request({ // url: '/consume/statsGold', @@ -431,7 +437,9 @@ const exportExcel = async function () { endTime: consumeUser.value.endTime || '', goodsName: consumeUser.value.goodsName || '', sortField: sortField.value || '', - sortOrder: sortOrder.value || '' + sortOrder: sortOrder.value || '', + flag: showEmployeeData.value ? 0 : 1 // 新增 flag 参数 + } } const res = await API({url: '/export/exportConsume', data: params}) @@ -572,7 +580,7 @@ const getMarket = async function () { - +
商品名称：
- + 所属地区： - +
消耗平台：
+ +
+ 员工数据 +
+ diff --git a/src/views/permissions/rolePermission.vue b/src/views/permissions/rolePermission.vue index c39ffc3..ce14486 100644 --- a/src/views/permissions/rolePermission.vue +++ b/src/views/permissions/rolePermission.vue @@ -344,11 +344,11 @@ const getLists = async function () { addRole.value.market = '' } else { addRoleMarket.value = []; - addRole.value.market = '' + addRole.value.market = '' } } else { - ElMessage.error('该上级角色无所属地区') - console.log('该上级角色无所属地区'); + ElMessage.error('该上级角色无归属地区') + console.log('该上级角色无归属地区'); } console.log('addRoleMarket.value', addRoleMarket.value); @@ -629,7 +629,7 @@ const Rolerules = reactive({ {min: 2, max: 20, message: '角色名称长度应在2-20个字符之间', trigger: 'blur'} ], market: [ - {required: true, message: '请选择所属地区', trigger: 'change'} + {required: true, message: '请选择归属地区', trigger: 'change'} ], grade: [ {required: true, message: '请输入优先级', trigger: 'blur'}, @@ -768,10 +768,11 @@ onMounted(async function () { :value="item.value"> - - + + + (此地区无实际意义，仅用于各分部负责人查看其地区角色) - + { if (rechargeUser.value.jwcode) { rechargeUser.value.jwcode = rechargeUser.value.jwcode.replace(/\s/g, ''); @@ -333,19 +336,15 @@ const get = async function (val) { url: '/recharge/selectBy', data: { ...getObj.value, - rechargeUser: { ...rechargeUser.value } + rechargeUser: { ...rechargeUser.value, flag: showEmployeeData.value ? 0 : 1 }//新增flag参数 } }) // 复制一份 rechargeUser.value 并移除排序字段和排序方式 - const detailWithoutSort = ref({ - market: rechargeUser.value.market, - activity: rechargeUser.value.activity, - adminId: rechargeUser.value.adminId, - startTime: rechargeUser.value.startTime, - endTime: rechargeUser.value.endTime, - jwcode: rechargeUser.value.jwcode, - goodsName: rechargeUser.value.goodsName, - payPlatform: rechargeUser.value.payPlatform + const detailWithoutSort = ref({ + ...rechargeUser.value, + sortField: undefined, + sortOrder: undefined, + flag: showEmployeeData.value ? 1 : 0 // 新增 flag 参数 }) const resultTotalGold = await API({ url: '/recharge/statsGold', @@ -489,13 +488,9 @@ const handleSortChange = (column) => { const exportExcel = async function () { const params = { - rechargeUser: { - jwcode: rechargeUser.value.jwcode || '', - market: rechargeUser.value.market || '', - payPlatform: rechargeUser.value.payPlatform || '', - activity: rechargeUser.value.activity || '', - startTime: rechargeUser.value.startTime || '', - endTime: rechargeUser.value.endTime || '' + rechargeUser: { + ...rechargeUser.value, + flag: showEmployeeData.value ? 0 : 1 }, page: getObj.value.pageNum, size: total.value @@ -601,7 +596,7 @@ const getTagText = (state) => { - +
活动名称： @@ -609,14 +604,14 @@ const getTagText = (state) => {
- +
所属地区：
- +
充值方式： @@ -624,7 +619,11 @@ const getTagText = (state) => {
- + +
+ 员工数据 +
+ diff --git a/src/views/refund/gold/coinRefundDetail.vue b/src/views/refund/gold/coinRefundDetail.vue index fd26a3c..0760d98 100644 --- a/src/views/refund/gold/coinRefundDetail.vue +++ b/src/views/refund/gold/coinRefundDetail.vue @@ -8,6 +8,9 @@ import request from '@/util/http.js' import { reverseMarketMapping } from "@/utils/marketMap.js"; import dayjs from "dayjs"; +const showEmployeeData = ref(false) + + const defaultTime = [ new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59), @@ -157,11 +160,13 @@ const getSelectBy = async function (val) { url: '/refund/selectBy', data: { ...getObj.value, - refundUser: { ...refundUser.value } + refundUser: { ...refundUser.value, flag: showEmployeeData.value ? 0 : 1 } } }) // 复制一份 refundUser.value 并移除排序字段和排序方式 - const detailWithoutSort = { ...refundUser.value } + const detailWithoutSort = { ...refundUser.value, + flag: showEmployeeData.value ? 1 : 0 + } delete detailWithoutSort.sortField delete detailWithoutSort.sortOrder @@ -368,6 +373,7 @@ const exportExcel = async function () { startTime: refundUser.value.startTime || '', endTime: refundUser.value.endTime || '', goodsName: refundUser.value.goodsName || '', + flag: showEmployeeData.value ? 0 : 1 }, page: getObj.pageNum, size: total.value @@ -520,7 +526,7 @@ const getMarket = async function () { - +
商品名称： @@ -528,12 +534,12 @@ const getMarket = async function () {
- + 所属地区： - +
退款类型： @@ -542,6 +548,11 @@ const getMarket = async function () {
+ +
+ 员工数据 +
+ diff --git a/src/views/usergold/gold/clientCountBalance.vue b/src/views/usergold/gold/clientCountBalance.vue index 4117e9f..ab2f072 100644 --- a/src/views/usergold/gold/clientCountBalance.vue +++ b/src/views/usergold/gold/clientCountBalance.vue @@ -6,6 +6,10 @@ import moment from 'moment' import API from '@/util/http.js' import {reverseMarketMapping} from "@/utils/marketMap.js"; +//新增员工数据复选框 +const showEmployeeData = ref(false) + + // 变量 //这是获取用户信息的接口 const adminData = ref({}) @@ -104,7 +108,7 @@ const get = async function (val) { const result = await API({ url: '/goldDetail/getGold', method: 'post', - data: {...getObj.value, user: {...user.value}} + data: {...getObj.value, user: {...user.value, UserFlag: showEmployeeData.value? 0 : 1}} }) console.log('响应数据', result) tableData.value = result.data.list @@ -116,7 +120,8 @@ const get = async function (val) { url: '/goldDetail/goldTotal', data: { jwcode: user.value.jwcode, - markets: user.value.markets + markets: user.value.markets, + UserFlag: showEmployeeData.value? 1 : 0 } }) // 判断精网号是否存在，假设精网号不存在时 result.data.list 为空数组 @@ -244,8 +249,10 @@ const exportExcel = async function () { const params = { user: { jwcode: user.value.jwcode || '', - markets: user.value.markets || [] + markets: user.value.markets || [], + UserFlag: showEmployeeData.value? 0 : 1 } + } const res = await API({url: '/goldDetail/exportGold', data: params}) if (res.code === 200) { @@ -402,6 +409,9 @@ const format3 = (num) => { @change="handleMarketChange" /> +
+ 员工数据 +
查询 重置 diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue index 2932b63..9a2da6e 100644 --- a/src/views/usergold/gold/clientCountDetail.vue +++ b/src/views/usergold/gold/clientCountDetail.vue @@ -7,6 +7,10 @@ import API from '@/util/http.js' import {reverseMarketMapping} from "../../../utils/marketMap.js"; import dayjs from "dayjs"; +//新增复选框员工数据 +const showEmployeeData = ref(false) + + // 标记当前激活的时间范围按钮 const activeTimeRange = ref('') const defaultTime = [ @@ -166,7 +170,7 @@ const get = async function (val) { const result = await API({ url: '/goldDetail/getGoldDetail', method: 'post', - data: {...getObj.value, goldDetail: {...goldDetail.value}} + data: {...getObj.value, goldDetail: {...goldDetail.value, UserFlag: showEmployeeData.value? 0 : 1}} }) console.log('响应数据', result) tableData.value = result.data.list @@ -187,7 +191,7 @@ const get = async function (val) { url: '/goldDetail/getTotal', method: 'post', data: { - goldDetail: {...goldDetail.value}, + goldDetail: {...goldDetail.value, UserFlag: showEmployeeData.value? 1 : 0}, /* jwcode: goldDetail.value.jwcode || '', payPlatform: goldDetail.value.payPlatform || '', type: goldDetail.value.type || '', @@ -328,7 +332,8 @@ const exportExcel = async function () { startTime: goldDetail.value.startTime || '', endTime: goldDetail.value.endTime || '', sortField: goldDetail.value.sortField || '', - sortOrder: goldDetail.value.sortOrder || '' + sortOrder: goldDetail.value.sortOrder || '', + UserFlag: showEmployeeData.value ? 0 : 1 // 新增 UserFlag 参数 }, } @@ -500,7 +505,7 @@ const format3 = (num) => { - +
平台信息： {
- +
数量更新类型： @@ -517,7 +522,7 @@ const format3 = (num) => {
- +
所属地区： { />
+ +
+ 员工数据 +
+