1 reset清空搜索的时候保留维度和默认搜索 2 每次刷新search字段顺序都不同
This commit is contained in:
@@ -147,6 +147,7 @@ const { wsCache } = useCache()
|
|||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const message = useMessage() // 消息弹窗
|
const message = useMessage() // 消息弹窗
|
||||||
const { mergeLocaleMessage, t } = useI18n() // 国际化
|
const { mergeLocaleMessage, t } = useI18n() // 国际化
|
||||||
|
const defualtSearch=ref<any>({})
|
||||||
const transferFields={
|
const transferFields={
|
||||||
'zoneName':'salezonename',
|
'zoneName':'salezonename',
|
||||||
'saleTypeName':'saletypename',
|
'saleTypeName':'saletypename',
|
||||||
@@ -388,6 +389,7 @@ const initTable = async () => {
|
|||||||
}else{
|
}else{
|
||||||
tableSearch.value[config.prop]=item.searchDefaultValue
|
tableSearch.value[config.prop]=item.searchDefaultValue
|
||||||
}
|
}
|
||||||
|
defualtSearch.value[config.prop]=tableSearch.value[config.prop]
|
||||||
}
|
}
|
||||||
|
|
||||||
if(['年','年度','年份','月','月度','月份','年月'].includes(item.fieldName)&&config.search){
|
if(['年','年度','年份','月','月度','月份','年月'].includes(item.fieldName)&&config.search){
|
||||||
@@ -432,11 +434,10 @@ const initTable = async () => {
|
|||||||
const arr=[...new Set(res.records.map(item=>item[transferFields[config.prop]?transferFields[config.prop]:config.prop]))]
|
const arr=[...new Set(res.records.map(item=>item[transferFields[config.prop]?transferFields[config.prop]:config.prop]))]
|
||||||
return arr.map(item=>({label:item,value:item}))
|
return arr.map(item=>({label:item,value:item}))
|
||||||
}
|
}
|
||||||
let data = await ReportApi.getTableList(jkTableDicFields[item.fieldName],{pageSize: 50, pageNo:1})
|
ReportApi.getTableList(jkTableDicFields[item.fieldName],{pageSize: 50, pageNo:1}).then(res=>{
|
||||||
|
config.dicData=formatterData(res)
|
||||||
|
})
|
||||||
config.formatterDic=formatterData
|
config.formatterDic=formatterData
|
||||||
config.page=1
|
|
||||||
config.total=data.total
|
|
||||||
config.dicData=formatterData(data)
|
|
||||||
searchReportSlots.value.push(config.prop)
|
searchReportSlots.value.push(config.prop)
|
||||||
// config.multiple?tableSearch.value[config.prop]=item.searchDefaultValue?item.searchDefaultValue.split(','):[]:''
|
// config.multiple?tableSearch.value[config.prop]=item.searchDefaultValue?item.searchDefaultValue.split(','):[]:''
|
||||||
}
|
}
|
||||||
@@ -833,7 +834,10 @@ const searchChange = async (params?, done?) => {
|
|||||||
}
|
}
|
||||||
const resetChange = () => {
|
const resetChange = () => {
|
||||||
return new Promise(async (resolve) => {
|
return new Promise(async (resolve) => {
|
||||||
tableSearch.value = {}
|
tableSearch.value = {
|
||||||
|
'Group by':tableSearch.value['Group by']||[],
|
||||||
|
...defualtSearch.value
|
||||||
|
}
|
||||||
if (tablePage.value) tablePage.value['currentPage'] = 1
|
if (tablePage.value) tablePage.value['currentPage'] = 1
|
||||||
await getTableData()
|
await getTableData()
|
||||||
resolve(true)
|
resolve(true)
|
||||||
|
|||||||
Reference in New Issue
Block a user