diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue
index d338026..734e9a4 100644
--- a/src/views/consume/gold/coinConsumeDetail.vue
+++ b/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({
diff --git a/src/views/recharge/gold/coinRechargeDetail.vue b/src/views/recharge/gold/coinRechargeDetail.vue
index e300374..b7dca12 100644
--- a/src/views/recharge/gold/coinRechargeDetail.vue
+++ b/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) => {
diff --git a/src/views/refund/gold/coinRefundDetail.vue b/src/views/refund/gold/coinRefundDetail.vue
index 18d60ca..7bfb3d9 100644
--- a/src/views/refund/gold/coinRefundDetail.vue
+++ b/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({
diff --git a/src/views/usergold/gold/clientCountBalance.vue b/src/views/usergold/gold/clientCountBalance.vue
index cdac5d7..f07355b 100644
--- a/src/views/usergold/gold/clientCountBalance.vue
+++ b/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 () {
所属地区：
{
// 存储地区选择变化
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 () {
所属地区：