diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 60e4b748c..721c3bf75 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -302,6 +302,7 @@ export default { let constForm = { ...form, GRID_ID: '', + GRID_IDS: '', VILLAGE_ID: '', BUILD_ID: '', UNIT_ID: '', @@ -341,7 +342,9 @@ export default { form: { ...form, AGENCY_ID: '', + AGENCY_IDS: '', GRID_ID: '', + GRID_IDS:'', VILLAGE_ID: '', BUILD_ID: '', UNIT_ID: '', @@ -381,7 +384,7 @@ export default { }, queryType:{ - 'AGENCY_ID':'like' + 'AGENCY_ID':'list_equal' } } }, @@ -518,17 +521,22 @@ export default { handleChangeAgency(val) { let obj = this.$refs["myCascader"].getCheckedNodes()[0].data if (obj) { + //市北定制化需求,组织与网格多选 if(obj.level === 'grid'){ - this.form.GRID_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; + // this.form.GRID_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; + this.form.GRID_IDS = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; this.form.AGENCY_ID='' }else{ - this.form.AGENCY_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; + this.form.AGENCY_IDS = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; + // this.form.AGENCY_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; this.form.GRID_ID = '' } }else{ - this.form.AGENCY_ID='' - this.form.GRID_ID = '' + // this.form.AGENCY_ID='' + // this.form.GRID_ID = '' + this.form.AGENCY_IDS='' + this.form.GRID_IDS = '' } this.form.VILLAGE_ID = '' @@ -641,8 +649,8 @@ export default { const { user } = this.$store.state this.$http .post('/gov/org/icneighborhood/neighborhoodoption', { - gridId: this.form.GRID_ID, - agencyId: this.form.AGENCY_ID, + gridIds: this.form.GRID_IDS, + agencyIds: this.form.AGENCY_IDS, // agencyId: user.agencyId }) .then(({ data: res }) => { diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 750e0087c..85d4d8fc2 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -656,14 +656,9 @@ export default { handleSearchFrom () { let arr = []; this.searchList.forEach((item) => { - const arr1 = - this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch(); + const arr1 = this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch(); arr = arr.concat(arr1); - // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`]) }); - console.log("search-----refs", this.$refs); - - console.log("search-----arr", arr); this.currentPage = 1; this.conditions = arr; this.getTableData(); @@ -675,10 +670,6 @@ export default { this.getTableData(); }, resetSearchForm (formName) { - // for(const n in this.form) { - // this.form[n] = '' - // } - // this.handleSearch() this.searchList.forEach((item) => { this.$refs[`resiSearch${item.itemGroupId}`][0].resetForm(); // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`]) @@ -1246,15 +1237,12 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - console.log("获取查询详情成功--sss", res); - res.data.forEach((item) => { item.queryItemList.forEach((n) => { if (n.optionSourceType === "remote") { this.getOptionsList(n.optionSourceValue).then((res) => { n.options = this.getTreeData(res); }); - // console.log('') } else if (n.itemType == "radio" && n.options.length == 0) { n.options = [ {