|
|
@ -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" |
|
|
|