Merge branch 'feature/dev_party_mange' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into feature/dev_party_mange

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="{ label: 'partyOrgName', value: 'id' }"
+                  @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,33 @@
           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 = this.deepArrTOnull(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 = ''
+          }
+      },
+      deepArrTOnull(arr) {
+          let a = []
+          a = arr.map(item => {
+              return {
+                  ...item,
+                  children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+              }
+          })
+          return a
+      }
   }
 }
 </script>

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} 条`)

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" 
+        <el-form class="form"
-                 :model="dataForm" 
+                 :model="dataForm"
-                 :rules="dataRule" 
+                 :rules="dataRule"
-                 ref="dataForm" 
+                 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:'',
+                    agencyName:''
-                    delFlag: '',
-                    revision: '',
-                    createdBy: '',
-                    createdTime: '',
-                    updatedBy: '',
-                    updatedTime: '',
                 },
                 orgListVisible: false,
                 agencyListVisible:false,
@@ -146,7 +140,7 @@
         mounted () {
             setTimeout(() => {
                 this.initMap()
-            }, 500);
+            }, 800);
         },
         methods: {
             init() {
@@ -163,11 +157,11 @@
                             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 = ''
                             }
-                            
+
                             this.orgListTreeSetDefaultHandle()
                         }
                     })
@@ -236,6 +230,10 @@
                         return this.$message.error(res.msg)
                     }
                     this.orgList = res.data
+                    this.orgList.unshift({
+                        partyOrgName: '一级组织',
+                        id: '0'
+                    });
                 }).catch(() => {
                 })
             },
@@ -245,7 +243,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 = ''
@@ -259,7 +257,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 = ''
@@ -277,12 +275,10 @@
                         ...res.data
                     }
                     // 党组织组织
-                    this.dataForm.mySelectOrg = this.dataForm.orgPids.split(',')
+                    this.dataForm.mySelectOrg = this.dataForm.orgPids
-                    console.log(this.dataForm.orgPids.split(','))
                     // 行政组织
-                    this.dataForm.maSelectAgency = this.dataForm.agencyPids.split(',')
+                    this.dataForm.maSelectAgency = this.dataForm.agencyId
-                    console.log(this.dataForm.agencyPids.split(','))
+
-                    
                 }).catch(() => {
                 })
 
@@ -313,7 +309,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() 构造函数创建地图
@@ -392,7 +388,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);

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 () {

src/views/modules/partymember/lookMember.vue

@@ -54,10 +54,8 @@ export default {
   },
   components: {},
   methods: {
-    initForm (orgPids) {
+    initForm (agencyId) {
-      if (orgPids.split(',').length > 0) {
+      this.orgPids = agencyId
-        this.orgPids = orgPids.split(',')[orgPids.split(',').length - 1]
-      }
       this.tableLoading = true
       this.loadTable()
     },