Browse Source

地区 查询问题

zhangrenyuan/feature-20250728113353-金币前端三期
lihui 2 weeks ago
parent
commit
349e3f7aa7
  1. 2
      src/views/consume/gold/coinConsumeDetail.vue
  2. 4
      src/views/recharge/gold/coinRechargeDetail.vue
  3. 2
      src/views/refund/gold/coinRefundDetail.vue
  4. 33
      src/views/usergold/gold/clientCountBalance.vue
  5. 33
      src/views/usergold/gold/clientCountDetail.vue

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

@ -167,7 +167,7 @@ const ConsumeSelectBy = async function (val) {
console.log('搜索参数2', consumeUser.value)
// POST
if (consumeUser.value.market === '总部' || consumeUser.value.market === '研发部') {
if (consumeUser.value.market === '9' || consumeUser.value.market === '9999') {
consumeUser.value.market = '';
}
const result = await request({

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

@ -304,7 +304,7 @@ const get = async function (val) {
rechargeUser.value.sortOrder = sortOrder.value
console.log('搜索参数', getObj.value)
// POST
if (rechargeUser.value.market === '总部' || rechargeUser.value.market === '研发部') {
if (rechargeUser.value.market === '9' || rechargeUser.value.market === '9999') {
rechargeUser.value.market = '';
}
const result = await API({
@ -437,7 +437,7 @@ onMounted(async function () {
})
//
const sortField = ref()
const sortOrder = ref(1)
const sortOrder = ref()
//
const handleSortChange = (column) => {

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

@ -129,7 +129,7 @@ const getSelectBy = async function (val) {
refundUser.value.sortOrder = sortOrder.value
console.log('搜索参数', getObj.value)
// POST
if (refundUser.value.market === '总部' || refundUser.value.market === '研发部') {
if (refundUser.value.market === '9' || refundUser.value.market === '9999') {
refundUser.value.market = '';
}
const result = await API({

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

@ -23,7 +23,7 @@ const getAdminData = async function () {
//
const isLoadingmarket = ref(false);
const market = ref("")
const markets = ref([])
//
@ -52,7 +52,7 @@ const total = ref(100)
const getTime = ref([])
// User
const user = ref({
market: "",
markets: [],
})
//
const getAllObj = ref({})
@ -86,8 +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 = '';
// markets''''
if (user.value.markets.includes('9') || user.value.markets.includes('9999')) {
user.value.markets = [];
}
const result = await API({
url: '/goldDetail/getGold',
@ -104,7 +105,7 @@ const get = async function (val) {
url: '/goldDetail/goldTotal',
data: {
jwcode: user.value.jwcode,
market: user.value.market
markets: user.value.markets
}
})
// result.data.list
@ -166,7 +167,7 @@ const search = function () {
}
//
const reset = function () {
user.value = {market: ""}
user.value = {markets: []}
sortField.value = ''
sortOrder.value = ''
get()
@ -216,7 +217,7 @@ const exportExcel = async function () {
const params = {
user: {
jwcode: user.value.jwcode || '',
market: user.value.market || ""
markets: user.value.markets || []
}
}
const res = await API({url: '/goldDetail/exportGold', data: params})
@ -300,14 +301,18 @@ const getTagText = (state) => {
}
//
const selectedMarketPath = ref("")
const handleMarketChange = (value) => {
if (value && value.length > 0) {
const lastValue = value[value.length - 1]
user.value.market = reverseMarketMapping[lastValue]
const lastValue = value[value.length - 1];
//
const marketValue = reverseMarketMapping[lastValue];
user.value.markets = Array.isArray(marketValue) ? marketValue : [marketValue];
} else {
user.value.market = ''
// []
user.value.markets = [];
}
}
};
//
const getMarket = async function () {
try {
@ -337,8 +342,8 @@ const getMarket = async function () {
});
};
//
market.value = transformTree(result.data)
console.log('转换后的地区树==============', market.value)
markets.value = transformTree(result.data)
console.log('转换后的地区树==============', markets.value)
} catch (error) {
console.log('请求失败', error)
}
@ -359,7 +364,7 @@ const getMarket = async function () {
<el-text class="mx-1" size="large">所属地区</el-text>
<el-cascader
v-model="selectedMarketPath"
:options="market"
:options="markets"
placeholder="请选择所属地区"
clearable
style="width:180px"

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

@ -92,7 +92,7 @@ const type = [
//
//
const isLoadingmarket = ref(false);
const market = ref("")
const markets = ref([])
//
@ -109,7 +109,7 @@ const total = ref(100)
const getTime = ref([])
// goldDetail
const goldDetail = ref({
market: "",
markets: [],
})
//
const getObj = ref({
@ -146,8 +146,11 @@ 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 = '';
// markets''''
console.log('goldDetail.value.markets:', goldDetail.value.markets)
if (goldDetail.value.markets.includes('9') || goldDetail.value.markets.includes('9999')) {
goldDetail.value.markets = [];
}
const result = await API({
url: '/goldDetail/getGoldDetail',
@ -207,7 +210,7 @@ const reset = function () {
delete goldDetail.value.startTime
delete goldDetail.value.endTime
// delete goldDetail.value.markets
goldDetail.value.market = ""
goldDetail.value.markets = []
delete sortField.value
delete sortOrder.value
getTime.value = []
@ -307,7 +310,7 @@ const exportExcel = async function () {
jwcode: goldDetail.value.jwcode || '',
payPlatform: goldDetail.value.payPlatform || '',
type: goldDetail.value.type || '',
market: goldDetail.value.market || "",
markets: goldDetail.value.markets || [],
startTime: goldDetail.value.startTime || '',
endTime: goldDetail.value.endTime || '',
sortField: goldDetail.value.sortField || '',
@ -418,14 +421,18 @@ const getTagText = (state) => {
//
const selectedMarketPath = ref("")
const handleMarketChange = (value) => {
if (value && value.length > 0) {
const lastValue = value[value.length - 1]
goldDetail.value.market = reverseMarketMapping[lastValue]
const lastValue = value[value.length - 1];
//
const marketValue = reverseMarketMapping[lastValue];
goldDetail.value.markets = Array.isArray(marketValue) ? marketValue : [marketValue];
} else {
goldDetail.value.market = ''
// [""]
goldDetail.value.markets = [];
}
}
};
//
const getMarket = async function () {
try {
@ -455,8 +462,8 @@ const getMarket = async function () {
});
};
//
market.value = transformTree(result.data)
console.log('转换后的地区树==============', market.value)
markets.value = transformTree(result.data)
console.log('转换后的地区树==============', markets.value)
} catch (error) {
console.log('请求失败', error)
}
@ -498,7 +505,7 @@ const getMarket = async function () {
<el-text class="mx-1" size="large">所属地区</el-text>
<el-cascader
v-model="selectedMarketPath"
:options="market"
:options="markets"
placeholder="请选择所属地区"
clearable
style="width:180px"

Loading…
Cancel
Save