diff --git a/src/views/dataBoard/renfang/resi/classNew.vue b/src/views/dataBoard/renfang/resi/classNew.vue index b18cb00fc..4c63034f2 100644 --- a/src/views/dataBoard/renfang/resi/classNew.vue +++ b/src/views/dataBoard/renfang/resi/classNew.vue @@ -282,7 +282,7 @@ export default { }, { label: "90岁及以上", - value: ["90", "139"], + value: ["90", "200"], }, ], oldAllList: [ @@ -328,7 +328,7 @@ export default { }, { label: "90岁及以上", - value: ["90", "139"], + value: ["90", "200"], }, ], oldAllList1: [ @@ -350,7 +350,7 @@ export default { }, { label: "80岁及以上", - value: ["80", "139"], + value: ["80", "200"], }, ], colList: [ @@ -450,7 +450,7 @@ export default { url: "/actual/base/peopleRoomOverview/postPageList", }, ], - oldValsss: ["60", "69"], + oldValsss: null, jzVal: "", searchParams: {}, unemploymentArr: [], @@ -486,61 +486,93 @@ export default { if (query.olds) { const olds = this.oldList.filter((item) => query.olds == item.label)[0]; this.changeOld(olds.value); + setTimeout(() => { this.oldValsss = olds.value; + this.searchParams = { + resideSituation: null, + }; }, 200); - this.searchParams = { - resideSituation: null, - }; } if (query.qingk) { - this.searchParams = { - resideSituation: query.qingk, - }; - this.oldValsss = undefined; + setTimeout(() => { + const olds = this.resideArr.filter( + (item) => query.qingk == item.label + )[0]; + this.oldValsss = null; + this.searchParams = { + resideSituation: olds.value, + }; + }, 200); } } if (type == "dibao") { if (query.lowIncomeType) { - this.searchParams = { - lowIncomeType: query.lowIncomeType, // 低保类型 - lowIncomeReason: null, // 低保原因 - }; + setTimeout(() => { + const lowIncomeType = this.lowIncomeTypeArr.filter( + (item) => query.lowIncomeType == item.label + )[0]; + this.oldValsss = null; + this.searchParams = { + lowIncomeType: lowIncomeType.value, // 低保类型 + lowIncomeReason: null, // 低保原因 + }; + }, 200); } if (query.lowIncomeReason) { - this.searchParams = { - lowIncomeType: null, // 低保类型 - lowIncomeReason: query.lowIncomeReason, // 低保原因 - }; + setTimeout(() => { + const lowIncomeReason = this.lowIncomeReasonArr.filter( + (item) => query.lowIncomeReason == item.label + )[0]; + this.oldValsss = null; + this.searchParams = { + lowIncomeType: null, // 低保类型 + lowIncomeReason: lowIncomeReason.value, // 低保原因 + }; + }, 200); } } if (type == "shiye") { if (query.olds) { - const olds = this.oldAllList1.filter((item) => query.olds == item.label)[0]; + const olds = this.oldAllList1.filter( + (item) => query.olds == item.label + )[0]; this.changeOld(olds.value); setTimeout(() => { this.oldValsss = olds.value; + this.searchParams = { + employmentWish: null, // 就业愿望 + unemploymentReason: null, // 失业原因 + }; }, 200); - this.searchParams = { - employmentWish: null, // 就业愿望 - unemploymentReason: null, // 失业原因 - }; } if (query.employmentWish) { - this.searchParams = { - employmentWish: query.employmentWish, // 就业愿望 - unemploymentReason: null, // 失业原因 - startAge: null, - endAge: null, - }; + setTimeout(() => { + const employmentWish = this.careerArr.filter( + (item) => query.employmentWish == item.label + )[0]; + this.searchParams = { + employmentWish: employmentWish.value, // 就业愿望 + unemploymentReason: null, // 失业原因 + startAge: null, + endAge: null, + }; + this.oldValsss = null; + }, 200); } - if (query.unemploymentReason) { - this.searchParams = { - employmentWish: null, // 就业愿望 - unemploymentReason: query.unemploymentReason, // 失业原因 - startAge: null, - endAge: null, - }; + if (query.unemploymentReason || query.unemploymentReason == "") { + setTimeout(() => { + const unemploymentReason = this.unemploymentArr.filter( + (item) => query.unemploymentReason == item.label + )[0]; + this.searchParams = { + employmentWish: null, // 就业愿望 + unemploymentReason: unemploymentReason.value, // 失业原因 + startAge: null, + endAge: null, + }; + this.oldValsss = null; + }, 200); } } if (type == "dangyuan") { @@ -554,9 +586,15 @@ export default { }, 200); } if (query.cultureLevel) { - this.searchParams = { - cultureLevel: query.cultureLevel, // 志愿者类型 - }; + setTimeout(() => { + const cultureLevel = this.PostDictonArr.filter( + (item) => query.cultureLevel == item.label + )[0]; + this.searchParams = { + cultureLevel: cultureLevel.value, // 志愿者类型 + }; + this.oldValsss = null; + }, 200); } } if (type == "zhiyuanzhe") { @@ -567,12 +605,21 @@ export default { this.changeOld(olds.value); setTimeout(() => { this.oldValsss = olds.value; + this.searchParams = { + gategoryCode: null, // 志愿者类型 + }; }, 200); } if (query.gategoryCode) { - this.searchParams = { - gategoryCode: query.gategoryCode, // 志愿者类型 - }; + setTimeout(() => { + const gategoryCode = this.volunteerArr.filter( + (item) => query.gategoryCode == item.label + )[0]; + this.oldValsss = null; + this.searchParams = { + gategoryCode: gategoryCode.value, // 志愿者类型 + }; + }, 200); } } if ( @@ -581,9 +628,12 @@ export default { type == "jineng" || type == "gangwei" ) { - this.searchParams = { - serviceOrgName: null, // 服务方名称 - }; + setTimeout(() => { + this.searchParams = { + serviceOrgName: null, // 服务方名称 + }; + this.oldValsss = null; + }, 200); } if (!query.olds) { this.getList(); @@ -666,7 +716,7 @@ export default { methods: { changeOld(e) { if (!e) { - this.oldValsss = undefined; + this.oldValsss = null; const searchParams = { startAge: null, endAge: null, @@ -735,7 +785,11 @@ export default { const sourceType = ["公共服务", "共性需求", "政策找人", "服务找人"]; this.loading = true; let params = {}; - if (this.oldValsss && this.oldValsss != "" && this.oldValsss.length != 0) { + if ( + this.oldValsss && + this.oldValsss != "" && + this.oldValsss.length != 0 + ) { params = { startAge: this.oldValsss[0], endAge: this.oldValsss[1],