diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js index d4f097c..0b87901 100644 --- a/pages/resiAndHouse/resiAndHouse.js +++ b/pages/resiAndHouse/resiAndHouse.js @@ -158,15 +158,15 @@ Page({ getUnitoption(val){ getNextTree({ level:val[0].level, id: val[0].id ||val[0].agencyId}).then(res => { if (res.data.length > 0) { - if(res.data[0].level!='unit' ||res.data[0].level=='unit' ){ + if(res.data[0].level!='unit' || res.data[0].level=='unit' ){ this.setData({ tempList:this.data.tempList.concat([res.data[0]]) }) this.getUnitoption(res.data) } - let unitId = this.data.tempList.filter(item=>item.level == 'unit')[0].id + let unitId = this.data.tempList.filter(item=>item.level == 'unit')[0]?.id this.setData({ - cascaderNameFw:this.data.tempList.map(item=>item.label).join(','), + cascaderNameFw:this.data.tempList.map(item=>item.label).splice(0,this.data.tempList.length-1).join(','), 'params1.searchOrgIdPath':unitId, 'params.orgId':unitId }) @@ -191,6 +191,7 @@ Page({ this.setData({ angencyFwList: arr, }) + this.getTableFwData() } }) }, @@ -385,7 +386,7 @@ Page({ pageNo: 1, tableFwData: [] }) - this.getTableFwData() + this.getUnitoption(this.data.angencyFwList) } }, handelClickShowTree() {