diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 6a4237c51..425acbde7 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -738,22 +738,18 @@ export default { } }, confirmBatch() { - if (this.selection.length > 0) { - this.$confirm("是否确认信息", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + this.$confirm("是否确认信息", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.confirresiBatch(); }) - .then(() => { - this.confirresiBatch(); - }) - .catch((err) => { - if (err == "cancel") { - } - }); - } else { - this.$message.warning("请先选择要确认信息的居民"); - } + .catch((err) => { + if (err == "cancel") { + } + }); }, handleSizeChange(val) { console.log(`每页 ${val} 条`); @@ -1093,26 +1089,27 @@ export default { }, async confirresiBatch() { - if (this.selection.length === 0) - return this.$message.error("请选择之后进行操作"); - let orgId = this.selection.map((item) => item.resiId); - console.log(this.selection); + let _obj = JSON.parse(JSON.stringify(this.$refs.myResiSearch.form)); + _obj.attentionCrowds = _obj.attentionCrowds.flat(); + const url = `/actual/base/residentCategoryUpdateInfo/unchangeMultiUpdate`; - let parm = { - orgId:orgId, - orgType: "agency", - pageNo: 1, - pageSize: 100 - - }; - const { data, code, msg } = await requestPost(url, parm); - console.log(data, "data"); - if (code !== 0) { - return this.$message.error(msg); - } else { - this.$message.success("确认成功"); - this.handleSearchFrom(); - } + + let params = { + pageNo: 1, + pageSize: 100, + ..._obj, + }; + + console.log(params); + + const { data, code, msg } = await requestPost(url, params); + console.log(data, "data"); + if (code !== 0) { + return this.$message.error(msg); + } else { + this.$message.success("确认成功"); + this.handleSearchFrom(); + } }, async deleteresiBatch() { diff --git a/src/views/modules/portrayal/house/index.vue b/src/views/modules/portrayal/house/index.vue index 954ace650..05a91b9f4 100644 --- a/src/views/modules/portrayal/house/index.vue +++ b/src/views/modules/portrayal/house/index.vue @@ -301,7 +301,7 @@ export default { // this.$router.push({ name: 'add-resi' }); this.$router.push({ name: "add-resi", - params: { agencyId: "1673584241869238273",gridId: "1673585475279826946",villageId:"1673600667388780545",buildId:"1673600667527192577",unitId:"1673600667577524226",homeId:"1673600737530126338"}, + params: {gridId: this.houseDetailObj.gridId,villageId:this.houseDetailObj.neighborHoodId,buildId:this.houseDetailObj.buildingId,unitId:this.houseDetailObj.buildingUnitId,homeId:this.houseDetailObj.id}, }); },