From be08ecc9bfd2bde31bb1647969143355b4ac3d21 Mon Sep 17 00:00:00 2001
From: duanliangtao <48194157+duanliangtao@users.noreply.github.com>
Date: Sat, 15 Jun 2024 14:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=A0=E8=AF=AF=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E4=BC=A0=E9=94=99?=
 =?UTF-8?q?=E4=B8=8E=E9=80=9A=E8=BF=87=E6=88=BF=E5=B1=8B=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=97=B6=E6=88=BF=E5=B1=8B=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue             | 65 ++++++++++-----------
 src/views/modules/portrayal/house/index.vue |  2 +-
 2 files changed, 32 insertions(+), 35 deletions(-)

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},
           });
     },