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] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E8=AE=B0=E5=BD=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=80=E5=B1=9E=E5=85=9A=E7=BB=84=E7=BB=87=E6=9F=A5?=
 =?UTF-8?q?=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} 条`)