From 41ee42f81c4158f7738d5be62565b1386ca92f10 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Wed, 25 May 2022 17:11:26 +0800
Subject: [PATCH] bug

---
 .../modules/partymember/icpartyorg-add-or-update.vue  | 11 ++++-------
 src/views/modules/partymember/icpartyorgtree.vue      |  7 ++++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue
index 127119b3..ffa947d1 100644
--- a/src/views/modules/partymember/icpartyorg-add-or-update.vue
+++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue
@@ -162,11 +162,13 @@
                             this.initMap()
                             if(this.dataForm.orgId) {
                                 this.dataForm.mySelectOrg = this.dataForm.orgId
+                                this.dataForm.orgPid = this.dataForm.orgId
+                                this.dataForm.orgPids = this.dataForm.orgPids + ':' + this.dataForm.orgId
+                                console.log(this.dataForm.orgPid)
+                                console.log(this.dataForm.orgPids)
                             } else {
                                 this.dataForm.mySelectOrg = ''
                             }
-
-                            this.orgListTreeSetDefaultHandle()
                         }
                     })
                 })
@@ -301,11 +303,6 @@
                 }).catch(() => {
                 })
             },
-            // 上级党组织树, 设置默认值
-            orgListTreeSetDefaultHandle() {
-                this.dataForm.orgPid = '0'
-                this.dataForm.orgPidName = '一级组织'
-            },
             // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
             initMap () {
             document.getElementById('app').innerHTML = ''
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 0d680287..5b44d05c 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -23,8 +23,8 @@
                           type="text"
                           size="small"
                           class="div-table-button--detail">{{'查看党员'}}</el-button>
-                <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
-                          @click="addOrUpdateHandle('', scope.row.id)"
+                <el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '5'"
+                          @click="addOrUpdateHandle('', scope.row.id, scope.row.orgPids)"
                           type="text"
                           size="small"
                           class="div-table-button--add">新增下级</el-button>
@@ -106,12 +106,13 @@
         this.tableLoading = false
       },
       // 新增 / 修改
-      addOrUpdateHandle (id, orgId) {
+      addOrUpdateHandle (id, orgId, orgPids) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
           this.$refs.addOrUpdate.dataForm.id = id
           // 新增下级需要传
           this.$refs.addOrUpdate.dataForm.orgId = orgId // 党组织
+          this.$refs.addOrUpdate.dataForm.orgPids = orgPids
           
           this.$refs.addOrUpdate.init()
         })