From 655210976bf91b3db191cdb4708c9cdaba5868d9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 12 Oct 2022 13:56:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/renFangTongJi/cpts/shequtongji.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/renFangTongJi/cpts/shequtongji.vue b/src/views/modules/renFangTongJi/cpts/shequtongji.vue
index f5bfbd123..338af4eaa 100644
--- a/src/views/modules/renFangTongJi/cpts/shequtongji.vue
+++ b/src/views/modules/renFangTongJi/cpts/shequtongji.vue
@@ -28,11 +28,12 @@ export default {
 
       searchParams: [
         {
-          field: "发布范围",
+          field: "选择范围",
           keyName: "org",
           type: "cascader",
           value: "",
-          optionUrl: "/gov/org/customeragency/agencygridtree",
+          //   optionUrl: "/gov/org/customeragency/agencygridtree",
+          optionUrl: "/gov/org/customeragency/my-subagency-list",
           optionUrlParams: {
             agencyId: this.$store.state.user.agencyId,
           },

From c4d833f230753c0bd7f1ad5133d04668cafcdf29 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 12 Oct 2022 14:05:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/renFangTongJi/cpts/shequtongji.vue | 5 +++++
 src/views/modules/renFangTongJi/index.vue            | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/renFangTongJi/cpts/shequtongji.vue b/src/views/modules/renFangTongJi/cpts/shequtongji.vue
index 338af4eaa..91647d995 100644
--- a/src/views/modules/renFangTongJi/cpts/shequtongji.vue
+++ b/src/views/modules/renFangTongJi/cpts/shequtongji.vue
@@ -20,6 +20,10 @@ export default {
       type: String,
       default: "",
     },
+    orgIds: {
+      type: String,
+      default: "",
+    },
   },
 
   data() {
@@ -89,6 +93,7 @@ export default {
   watch: {},
 
   async mounted() {
+    this.searchParams[0].value = this.orgIds;
     this.searchParams[0].supValues[0] = this.orgId;
     if (this.orgId) {
       this.searchParams[0].supValues[1] = "agency";
diff --git a/src/views/modules/renFangTongJi/index.vue b/src/views/modules/renFangTongJi/index.vue
index 42cdb4e2e..c2b03e9a0 100644
--- a/src/views/modules/renFangTongJi/index.vue
+++ b/src/views/modules/renFangTongJi/index.vue
@@ -97,7 +97,11 @@
       top="5vh"
       @close="displayedDetail = false"
     >
-      <shequtongji ref="shequtongji" :orgId="detailOrgId" />
+      <shequtongji
+        ref="shequtongji"
+        :orgId="detailOrgId"
+        :orgIds="[orgId, detailOrgId]"
+      />
     </el-dialog>
   </el-card>
 </template>
@@ -236,6 +240,8 @@ export default {
 
       if (code === 0) {
         const { list } = this;
+        this.orgId = data.orgId;
+        this.orgType = data.orgType;
         let item1 = list.find((item) => item.name == "人口总数");
         item1.num = data.userTotal;
         item1.variation = parseInt(data.userTotalJSY);