diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js index 0864023..d4f097c 100644 --- a/pages/resiAndHouse/resiAndHouse.js +++ b/pages/resiAndHouse/resiAndHouse.js @@ -259,12 +259,13 @@ Page({ }, onChangeJm(e) { const { value, tabIndex, selectedOptions } = e.detail; - if (tabIndex > 0 && selectedOptions[selectedOptions.length - 1].level != 'house') { - const level = selectedOptions[selectedOptions.length - 1].level - const orgId = selectedOptions[selectedOptions.length - 1].id + if (tabIndex > 0 ) { + const level = selectedOptions[selectedOptions.length - 1].level; + const orgId = selectedOptions[selectedOptions.length - 1].id; + const cascaderName = selectedOptions.map(item=>item.label).join(''); this.setData({ searchOrgIdPath:orgId, - cascaderName:selectedOptions.map(item=>item.label).join(','), + cascaderName, tableData:[], pageNo: 1, }) @@ -300,10 +301,11 @@ Page({ onFinishJm(e) { this.setData({ pageNo: 1, - searchOrgIdPath: e.detail.selectedOptions[e.detail.selectedOptions.length - 1].agencyId, - cascaderName: e.detail.selectedOptions.map(item => item.agencyName).join(','), + searchOrgIdPath: e.detail.selectedOptions[e.detail.selectedOptions.length - 1].id, + cascaderName: e.detail.selectedOptions.map(item => item.label).join(','), tableData: [] }) + this.getTableData() this.getAllOrgCategoryCount() }, onChangeFw(e) {