From 0ca506ec6d9c20e03dbd21c788e5dcb57cb80868 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 20 May 2022 14:08:04 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=80=E5=B1=9E=E5=85=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../icpartymemberpayrecorddetail.vue          | 37 ++++++++++++++++++-
 .../partymember/icpartymemberpoint.vue        |  5 ++-
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
index 307a3b6a..0c932945 100644
--- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
@@ -3,6 +3,15 @@
     <div class="mod-rent__rentDeath} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item  prop="mySelectOrg" label="所属党组织">
+          <el-cascader
+                  v-model="mySelectOrg"
+                  :options="orgList"
+                  placeholder="请选择党组织"
+                  :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
+                  @change="handleChangeOrg"
+                  clearable />
+        </el-form-item>
         <el-form-item label="姓名"
                       prop="name">
           <el-input v-model="dataForm.name"
@@ -121,7 +130,8 @@
         idCard: '',
         mobile: '',
         year: '',
-        month: ''
+        month: '',
+        orgId: ''
       },
         monthArr: [
             { dictValue: '01', dictName: '一月' },
@@ -136,18 +146,24 @@
             { dictValue: '10', dictName: '十月' },
             { dictValue: '11', dictName: '十一月' },
             { dictValue: '12', dictName: '十二月' }
-        ]
+        ],
+        mySelectOrg: '',
+        orgList: [],
     }
   },
   components: {
     AddOrUpdate
   },
+  created() {
+      this.getOrgList()
+  },
   methods: {
       resetForm(formName) {
           for(const n in this.dataForm) {
               this.dataForm[n] = ''
           }
           this.getDataList()
+          this.mySelectOrg = ''
       },
       yearChangeHandler(){
           if(this.dataForm.year === '' || this.dataForm.year === null){
@@ -164,6 +180,23 @@
           this.currentPage = val
           this.getDataList()
       },
+      // 获取党组织列表
+      getOrgList() {
+          return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: localStorage.getItem('agencyId')}}).then(({data: res}) => {
+              if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+              }
+              this.orgList = res.data
+          }).catch(() => {})
+      },
+      // 党组织选中事件
+      handleChangeOrg(e) {
+          if (this.mySelectOrg.length > 0 && this.mySelectOrg) {
+              this.dataForm.orgId = this.mySelectOrg[this.mySelectOrg.length - 1]
+          } else {
+              this.dataForm.orgId = ''
+          }
+      }
   }
 }
 </script>
diff --git a/src/views/modules/partymember/icpartymemberpoint.vue b/src/views/modules/partymember/icpartymemberpoint.vue
index 0c13c7d5..65896a7a 100644
--- a/src/views/modules/partymember/icpartymemberpoint.vue
+++ b/src/views/modules/partymember/icpartymemberpoint.vue
@@ -3,12 +3,12 @@
     <div class="mod-rent__rentDeath} resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item  prop="mySelectOrg" label="上级组织">
+      <el-form-item  prop="mySelectOrg" label="所属党组织">
           <el-cascader
               style="width:300px"
               v-model="mySelectOrg"
               :options="orgList"
-              placeholder="请选择上级组织"
+              placeholder="请选择党组织"
               :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
               @change="handleChangeOrg"
               clearable />
@@ -122,6 +122,7 @@
                   this.dataForm[n] = ''
               }
               this.getDataList()
+              this.mySelectOrg = ''
           },
           handleSizeChange (val) {
               console.log(`每页 ${val} 条`)

From 9f7982ef4566aeebfa5eed145bf42a7a6d261466 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 20 May 2022 14:31:53 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/partymember/icpartyorg-add-or-update.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue
index a84bcd85..951b09ad 100644
--- a/src/views/modules/partymember/icpartyorg-add-or-update.vue
+++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue
@@ -235,7 +235,13 @@
                     if (res.code !== 0) {
                         return this.$message.error(res.msg)
                     }
+                    console.log(':::::::::', JSON.stringify(res.data))
+                    
                     this.orgList = res.data
+                    this.orgList.unshift({
+                        partyOrgName: '一级组织',
+                        id: '0'
+                    });
                 }).catch(() => {
                 })
             },

From f2b1302ade134bb92deecc694fb7844f6c29a575 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 20 May 2022 15:53:12 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=80=E5=B1=9E=E5=85=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partymember/icpartymemberpayrecorddetail.vue   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
index 0c932945..59843d63 100644
--- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
@@ -8,7 +8,7 @@
                   v-model="mySelectOrg"
                   :options="orgList"
                   placeholder="请选择党组织"
-                  :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
+                  :props="{ label: 'partyOrgName', value: 'partyOrgCode' }"
                   @change="handleChangeOrg"
                   clearable />
         </el-form-item>
@@ -186,7 +186,7 @@
               if (res.code !== 0) {
                   return this.$message.error(res.msg)
               }
-              this.orgList = res.data
+              this.orgList = this.deepArrTOnull(res.data)
           }).catch(() => {})
       },
       // 党组织选中事件
@@ -196,6 +196,16 @@
           } else {
               this.dataForm.orgId = ''
           }
+      },
+      deepArrTOnull(arr) {
+          let a = []
+          a = arr.map(item => {
+              return {
+                  ...item,
+                  children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+              }
+          })
+          return a
       }
   }
 }

From 10538579d682a9847e2a9d12123ba73e3763802a Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 20 May 2022 15:54:19 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=80=E5=B1=9E=E5=85=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/partymember/icpartymemberpayrecorddetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
index 59843d63..f6893f47 100644
--- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
@@ -8,7 +8,7 @@
                   v-model="mySelectOrg"
                   :options="orgList"
                   placeholder="请选择党组织"
-                  :props="{ label: 'partyOrgName', value: 'partyOrgCode' }"
+                  :props="{ label: 'partyOrgName', value: 'id' }"
                   @change="handleChangeOrg"
                   clearable />
         </el-form-item>

From 6e45284fa6c9ed0413d23e5c14aaf4428184c519 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 20 May 2022 16:20:11 +0800
Subject: [PATCH 5/7] =?UTF-8?q?,=20=E6=94=B9:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partymember/icpartyorg-add-or-update.vue  | 20 +++++++++----------
 src/views/modules/partymember/lookMember.vue  |  4 ++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue
index 951b09ad..d7e4bdec 100644
--- a/src/views/modules/partymember/icpartyorg-add-or-update.vue
+++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue
@@ -163,7 +163,7 @@
                             this.getInfo()
                         } else {
                             if(this.dataForm.orgPids) {
-                                this.dataForm.mySelectOrg = this.dataForm.orgPids.split(',')
+                                this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':')
                             } else {
                                 this.dataForm.mySelectOrg = ''
                             }
@@ -234,9 +234,7 @@
                 return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => {
                     if (res.code !== 0) {
                         return this.$message.error(res.msg)
-                    }
-                    console.log(':::::::::', JSON.stringify(res.data))
-                    
+                    }                    
                     this.orgList = res.data
                     this.orgList.unshift({
                         partyOrgName: '一级组织',
@@ -251,7 +249,7 @@
                     this.dataForm.orgPid = this.dataForm.mySelectOrg[this.dataForm.mySelectOrg.length - 1]
                     this.dataForm.orgPids = ''
                     this.dataForm.mySelectOrg.forEach(element => {
-                        this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ',' + element : element
+                        this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + element : element
                     });
                 } else {
                     this.dataForm.orgPid = ''
@@ -265,7 +263,7 @@
                     this.dataForm.agencyId = this.dataForm.maSelectAgency[this.dataForm.maSelectAgency.length - 1]
                     this.dataForm.agencyPids = ''
                     this.dataForm.maSelectAgency.forEach(element => {
-                        this.dataForm.agencyPids = this.dataForm.agencyPids ? this.dataForm.agencyPids + ',' + element : element
+                        this.dataForm.agencyPids = this.dataForm.agencyPids ? this.dataForm.agencyPids + ':' + element : element
                     });
                 } else {
                     this.dataForm.agencyId = ''
@@ -283,11 +281,11 @@
                         ...res.data
                     }
                     // 党组织组织
-                    this.dataForm.mySelectOrg = this.dataForm.orgPids.split(',')
-                    console.log(this.dataForm.orgPids.split(','))
+                    this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':')
+                    console.log(this.dataForm.orgPids.split(':'))
                     // 行政组织
-                    this.dataForm.maSelectAgency = this.dataForm.agencyPids.split(',')
-                    console.log(this.dataForm.agencyPids.split(','))
+                    this.dataForm.maSelectAgency = this.dataForm.agencyPids.split(':')
+                    console.log(this.dataForm.agencyPids.split(':'))
                     
                 }).catch(() => {
                 })
@@ -398,7 +396,7 @@
 
             convert (lat, lng) {
                 markers.setGeometries([]);
-                // var input = document.getElementById('location').value.split(',');
+                // var input = document.getElementById('location').value.split(':');
                 let location
                 if (lat && lng) {
                     location = new TMap.LatLng(lat, lng);
diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue
index 8300a4fc..7e32227e 100644
--- a/src/views/modules/partymember/lookMember.vue
+++ b/src/views/modules/partymember/lookMember.vue
@@ -55,8 +55,8 @@ export default {
   components: {},
   methods: {
     initForm (orgPids) {
-      if (orgPids.split(',').length > 0) {
-        this.orgPids = orgPids.split(',')[orgPids.split(',').length - 1]
+      if (orgPids.split(':').length > 0) {
+        this.orgPids = orgPids.split(':')[orgPids.split(':').length - 1]
       }
       this.tableLoading = true
       this.loadTable()

From 0bed14525d6ee249a4dd1b7737cc9868d93cdc9f Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 20 May 2022 16:33:41 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partymember/icpartyorg-add-or-update.vue  | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue
index d7e4bdec..c2837029 100644
--- a/src/views/modules/partymember/icpartyorg-add-or-update.vue
+++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue
@@ -1,10 +1,10 @@
 <template>
     <el-dialog :visible.sync="visible" :title="!dataForm.id ? '新增党组织' : '更新党组织'" :close-on-click-modal="false"
                :close-on-press-escape="false">
-        <el-form class="form" 
-                 :model="dataForm" 
-                 :rules="dataRule" 
-                 ref="dataForm" 
+        <el-form class="form"
+                 :model="dataForm"
+                 :rules="dataRule"
+                 ref="dataForm"
                  @keyup.enter.native="dataFormSubmitHandle()"
                  :label-width="$i18n.locale === 'en-US' ? '120px' : '100px'">
             <el-form-item prop="partyOrgType" label="组织类型">
@@ -127,13 +127,7 @@
                     customerId: '',
                     staffId:'',
                     orgPidName: '',
-                    agencyName:'',
-                    delFlag: '',
-                    revision: '',
-                    createdBy: '',
-                    createdTime: '',
-                    updatedBy: '',
-                    updatedTime: '',
+                    agencyName:''
                 },
                 orgListVisible: false,
                 agencyListVisible:false,
@@ -167,7 +161,7 @@
                             } else {
                                 this.dataForm.mySelectOrg = ''
                             }
-                            
+
                             this.orgListTreeSetDefaultHandle()
                         }
                     })
@@ -234,7 +228,7 @@
                 return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => {
                     if (res.code !== 0) {
                         return this.$message.error(res.msg)
-                    }                    
+                    }
                     this.orgList = res.data
                     this.orgList.unshift({
                         partyOrgName: '一级组织',
@@ -286,7 +280,7 @@
                     // 行政组织
                     this.dataForm.maSelectAgency = this.dataForm.agencyPids.split(':')
                     console.log(this.dataForm.agencyPids.split(':'))
-                    
+
                 }).catch(() => {
                 })
 
@@ -317,7 +311,7 @@
                 document.getElementById('mapSeach_id').style.display = "block"
                 document.getElementById('lon_lat_id').style.display = "block"
             }
-            
+
             // 定义地图中心点坐标
             var center = new window.TMap.LatLng(36.0722275, 120.38945519)
             // 定义map变量，调用 TMap.Map() 构造函数创建地图

From 78975abbd34c8de3d8b48c0c905a3e23cb36a0f4 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 20 May 2022 17:08:29 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/partymember/icpartyorg-add-or-update.vue      | 8 +++-----
 src/views/modules/partymember/icpartyorgtree.vue          | 6 +++---
 src/views/modules/partymember/lookMember.vue              | 6 ++----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue
index c2837029..be97ec4a 100644
--- a/src/views/modules/partymember/icpartyorg-add-or-update.vue
+++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue
@@ -140,7 +140,7 @@
         mounted () {
             setTimeout(() => {
                 this.initMap()
-            }, 500);
+            }, 800);
         },
         methods: {
             init() {
@@ -275,11 +275,9 @@
                         ...res.data
                     }
                     // 党组织组织
-                    this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':')
-                    console.log(this.dataForm.orgPids.split(':'))
+                    this.dataForm.mySelectOrg = this.dataForm.orgPids
                     // 行政组织
-                    this.dataForm.maSelectAgency = this.dataForm.agencyPids.split(':')
-                    console.log(this.dataForm.agencyPids.split(':'))
+                    this.dataForm.maSelectAgency = this.dataForm.agencyId
 
                 }).catch(() => {
                 })
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index e200d548..ea30b440 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -19,7 +19,7 @@
           <el-table-column label="操作" align="center" width="300">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
-                          @click="handleLook(scope.row.orgPids)"
+                          @click="handleLook(scope.row.agencyId)"
                           type="text"
                           size="small"
                           class="div-table-button--detail">{{'查看党员'}}</el-button>
@@ -139,10 +139,10 @@
         }).catch(() => {})
       },
       // 查看党员
-      handleLook(orgPids) {
+      handleLook(agencyId) {
         this.lookMemberShow = true
         this.$nextTick(() => {
-            this.$refs.ref_table_Member.initForm(orgPids)
+            this.$refs.ref_table_Member.initForm(agencyId)
         })
       },
       lookMemberClose () {
diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue
index 7e32227e..96cbe4fa 100644
--- a/src/views/modules/partymember/lookMember.vue
+++ b/src/views/modules/partymember/lookMember.vue
@@ -54,10 +54,8 @@ export default {
   },
   components: {},
   methods: {
-    initForm (orgPids) {
-      if (orgPids.split(':').length > 0) {
-        this.orgPids = orgPids.split(':')[orgPids.split(':').length - 1]
-      }
+    initForm (agencyId) {
+      this.orgPids = agencyId
       this.tableLoading = true
       this.loadTable()
     },