diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index d3b243f5f..db0aba95f 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -237,6 +237,7 @@
                       :options="n.options"
                       :props="{ checkStrictly: true }"
                       :disabled="disabled"
+                      :props="{ emitPath: false }"
                       clearable
                       size="small"
                       class="resi-cell-select">
@@ -348,7 +349,7 @@ export default {
         _form = { ...obj }
         // return _form
       }
-      const itemTypes = ['cascader', 'daterange', 'timerange']
+      const itemTypes = ['daterange', 'timerange']
       arr.forEach(item => {
         if (item.multiSelect || itemTypes.includes(item.itemType)) {
           if (item.columnValue && item.columnValue.indexOf(',') > -1) _form[item.columnName] = item.columnValue.split(',')
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 7246d608c..505fe55c0 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -198,6 +198,7 @@
                       v-else-if="n.itemType === 'cascader'"
                       v-model.trim="form[n.columnName]"
                       :options="n.options"
+                      :props="{ emitPath: false }"
                       clearable
                       size="small"
                       class="resi-cell-select">
@@ -295,16 +296,28 @@ export default {
     }
     let initForm = (obj, arr) => {
       let _form = {}
-      console.log('formInfo---arr', arr)
-      if (Object.keys(obj).length > 0) {
-        _form = { ...obj }
-        return _form
-      }
+      console.log('formInfo---obj', obj)
+      // if (Object.keys(obj).length > 0) {
+      //   for(const n in obj) {
+      //     if (obj[n] == null) obj[n] = ''
+      //   }
+      //   _form = { ...obj }
+      //   return _form
+      // }
+      const len = Object.keys(obj).length
       arr.forEach(item => {
-
-        if (item.multiSelect) _form[item.columnName] = []
-        else if (item.itemType == 'radio' && item.defaultValue == '0') _form[item.columnName] = item.defaultValue
-        else _form[item.columnName] = ''
+        if (len) {
+          if (obj[item.columnName]) {
+            _form[item.columnName] = obj[item.columnName]
+            item.isChange = true
+          }
+          
+        } else {
+          if (item.multiSelect) _form[item.columnName] = []
+          else if (item.itemType == 'radio' && item.defaultValue == '0') _form[item.columnName] = item.defaultValue
+          else _form[item.columnName] = ''
+        }
+        
 
         // if (item.optionSourceType === 'remote') {
         //   this.getOptionsLists(item.optionSourceValue).then(res => {
@@ -339,9 +352,10 @@ export default {
     let rules = initRules(this.formList)
     console.log('rulessss', rules)
     let tempFormList = [ ...this.formList ].map(item => {
+      const isChange = (item.itemType == 'radio' && item.defaultValue == '0') && true
       return {
         ...item,
-        isChange: (item.itemType == 'radio' && item.defaultValue == '0') ? true : false
+        isChange: isChange || item.isChange || false
       }
     })
     let constForm = {
@@ -354,6 +368,8 @@ export default {
     }
     return {
       openSearch: false,
+      isParty: false,
+      partyInfo: [],
       fixedForm: {
         GRID_ID: '',
         VILLAGE_ID: '',
@@ -532,7 +548,10 @@ export default {
         // console.log('columnName', item.columnName, columnName)
         if (item.columnName === columnName && item.itemType === 'radio' && item.childGroup) {
           console.log('columnName', item.columnName, columnName)
-          this.$emit('changegroup', { value, childGroup: item.childGroup })
+          if (this.isParty) {
+            this.$emit('changegroup', { value, partyInfo: this.partyInfo, childGroup: item.childGroup })
+          } else this.$emit('changegroup', { value, childGroup: item.childGroup })
+          
         }
       })
     },
@@ -671,7 +690,7 @@ export default {
       if (this.supportAdd) newForm = this.handlerMuscForm()
       return newForm
     },
-    validateIdcard (idCard) {
+    validateIdcard (idCard, type) {
       this.$http
         .post('/epmetuser/icresiuser/getUserRoleByIdCard', { idCard })
         .then(({ data: res }) => {
@@ -679,8 +698,23 @@ export default {
             return this.$message.error(res.msg)
           } else {
             console.log('获取查询详情成功', res.data)
+            
             if (res.data.isVolunteer == '1') this.form.IS_VOLUNTEER = '1'
             else this.form.IS_VOLUNTEER = '0'
+            
+            if (res.data.isPartyMember == '1') {
+              this.form.IS_PARTY = '1'
+               this.isParty = true
+              this.partyInfo = res.data.detail.ic_party_member
+            } else this.form.IS_PARTY = '0'
+
+            // if (type == 'vol') {
+            //   this.isParty = false
+              
+            // } else if (res.data.isPartyMember == '1' && val == 'party') {
+            //   this.isParty = true
+            // }
+
           }
         })
         .catch(() => {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 10efef011..5700c7756 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -202,6 +202,7 @@
                            :name="'group' + item.groupId">
                 <resi-form :ref="'group' + item.groupId"
                            :columns="3"
+                           :form-info="item.formInfo && item.formInfo "
                            :support-add="item.supportAdd"
                            :form-id="item.columnName"
                            :form-list="item.itemList" />
@@ -832,7 +833,7 @@ export default {
     },
     async handleChangeGroup (val) {
       console.log('changeguoprrrrr----', val)
-      let { childGroup, value } = val
+      let { childGroup, value, partyInfo } = val
       
       let hasT = false
       let i = 0
@@ -855,7 +856,10 @@ export default {
               // console.log('')
             }
           })
-          list.push(childGroup)
+          if (partyInfo && partyInfo.length > 0 && childGroup.tableName == 'ic_party_member') {
+            list.push({...childGroup, formInfo: partyInfo[0] })
+          } else list.push(childGroup)
+          
         }
       } else {
         // console.log('changegroup----000', value)
diff --git a/src/views/modules/communityParty/members/cpts/record.vue b/src/views/modules/communityParty/members/cpts/record.vue
index cc7d8795a..188001175 100644
--- a/src/views/modules/communityParty/members/cpts/record.vue
+++ b/src/views/modules/communityParty/members/cpts/record.vue
@@ -54,8 +54,8 @@
             <el-date-picker
               v-if="scope.row.isEdit"
               v-model="scope.row.timeRange"
-              type="daterange"
-              value-format="yyyy-MM-dd"
+              type="monthrange"
+              value-format="yyyy-MM"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -64,7 +64,7 @@
             <div v-else class="div-content">{{ scope.row.startDate + ' - ' + scope.row.endDate }}</div>
           </template>
         </el-table-column>
-        <el-table-column v-if="btnType == 'add'" label="操作" align="center" width="120">
+        <el-table-column v-if="!disabled" label="操作" align="center" width="120">
           <template slot-scope="scope">
             <template v-if="scope.row.isEdit">
               <el-button
@@ -80,7 +80,7 @@
                 class="btn-color-edit"
                 >取消</el-button>
             </template>
-            <!-- <template v-else>
+            <template v-else>
               <el-button
                 @click="handleChange(scope.row, 'edit')"
                 type="text"
@@ -101,7 +101,7 @@
                   >删除</el-button
                 >
               </el-popconfirm>
-            </template> -->
+            </template>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/communityParty/members/crateForm.vue b/src/views/modules/communityParty/members/crateForm.vue
index e0269b0aa..8f8ac56df 100644
--- a/src/views/modules/communityParty/members/crateForm.vue
+++ b/src/views/modules/communityParty/members/crateForm.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="dialog-h-content scroll-h pd0">
     <el-form label-width="120px" :model="form" :inline="true" 
-      :disabled="disabled":rules="rules" ref="ruleForm" 
+      :disabled="disabled" :rules="rules" ref="ruleForm" 
       class="form-wr">
       <div class="flex-div">
         <el-form-item label="所属党组织" prop="sszb" class="wd50">
           <el-cascader
-                v-model="partyOrgs"
+                v-model="form.sszb"
                 :options="partyList"
                 :props="partyProps"
                 clearable
@@ -188,7 +188,8 @@ export default {
       partymenberid: '',
       partyProps: {
         label: 'partyOrgName',
-        value: 'id'
+        value: 'id',
+        emitPath: false
       },
       zwList: [
         {
@@ -216,11 +217,11 @@ export default {
         address: '',
         rdsj: '',
         sszb: '',
-        isLd: '',
+        isLd: '0',
         ldzh: '',
-        partyZw: '',
-        isDyzxh: '',
-        isMxx: '',
+        partyZw: '0',
+        isDyzxh: '0',
+        isMxx: '0',
         culture: '',
         remark: ''
       },
@@ -239,7 +240,9 @@ export default {
       handler(val) {
         if (Object.keys(val).length > 0) {
           this.form = { ...val }
+          if (val.icResiUserId || val.icResiUser) this.isAuto = true
           console.log('val----------in', val)
+          console.log('isAuto----------in', this.isAuto)
           this.partyOrgs = val.orgPids.split(':')
           console.log('partyOrgs-----', this.partyOrgs)
           this.partymenberid = val.id
@@ -250,6 +253,7 @@ export default {
   },
   created() {
     this.getEduList()
+    console.log('partyList', this.partyList)
   },
   mounted() {
     const w = document.getElementsByClassName('dialog-h-content')[0]
@@ -265,10 +269,10 @@ export default {
     },
     handlePartyChange(val) {
       console.log('val------pp', val)
-      if (val.length > 0) {
-        const i = val.length - 1
-        this.form.sszb = val[i]
-      } else this.form.sszb = ''
+      // if (val.length > 0) {
+      //   const i = val.length - 1
+      //   this.form.sszb = val[i]
+      // } else this.form.sszb = ''
     },
     handleValidBlur(n) {
       if (!isCard(this.form.idCard)) return
diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index 3077d9d71..55fae06d5 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -751,7 +751,7 @@ export default {
       console.log('user---ppp', user)
       // addorupdate  query
       await this.$http
-        .get('/resi/partymember/icPartyOrg/getTreelist', { params: {agencyId: agencyId || user.agencyId} })
+        .get('/resi/partymember/icPartyOrg/getSearchTreelist', { params: {agencyId: agencyId || user.agencyId} })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
index dc685a44e..c785eae2c 100644
--- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
@@ -4,13 +4,28 @@
       <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
+          <!-- <el-cascader
                   v-model="mySelectOrg"
                   :options="orgList"
                   placeholder="请选择党组织"
                   :props="{ label: 'partyOrgName', value: 'id' }"
                   @change="handleChangeOrg"
-                  clearable />
+                  clearable /> -->
+          <el-cascader
+            class="list_item_width_1"
+            size="small"
+            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">
@@ -44,19 +59,20 @@
           <el-date-picker
                   v-model="dataForm.year"
                   type="year"
+                  size="small"
                   placeholder="选择年"
                   value-format="yyyy"
                   @change="yearChangeHandler">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="" prop="month">
-          <el-select v-model="dataForm.month" placeholder="选择月份" clearable :disabled="dataForm.year === '' || dataForm.year === null">
+          <el-select v-model="dataForm.month" placeholder="选择月份" size="small" clearable :disabled="dataForm.year === '' || dataForm.year === null">
             <el-option v-for="item in monthArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()" size="small">{{ $t('query') }}</el-button>
+          <el-button class="diy-button--search" @click="getDataList()" size="small">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
@@ -73,7 +89,7 @@
         <div class="resi-row-btn">
           <el-button type="warning" size="small" :loading="exportBtn" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
         </div>
-      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <el-table class="resi-table" :height="tableHeight" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
         <el-table-column label="序号" header-align="center" align="center" width="50px">
           <template slot-scope="scope">
@@ -114,7 +130,7 @@
   import axios from 'axios'
   import mixinViewModule from '@/mixins/view-module'
   import AddOrUpdate from './icpartymemberpayrecorddetail-add-or-update'
-
+  import { mapGetters } from 'vuex'
     export default {
   mixins: [mixinViewModule],
   data () {
@@ -125,6 +141,7 @@
         deleteURL: '/resi/partymember/icPartyMemberPayRecordDetail',
         deleteIsBatch: true
       },
+      searchH: 0,
       exportBtn: false,
       exportBtnTitle: '导出',
       dataForm: {
@@ -157,6 +174,20 @@
   components: {
     AddOrUpdate
   },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 270 + this.iframeHeigh
+      const _h = this.clientHeight - 270 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.searchH = this.$refs.searchCard.$el.offsetHeight
+      console.log('tableHeight', this.tableHeight)
+    })
+  },
   created() {
       this.getOrgList()
   },
@@ -222,7 +253,7 @@
       },
       // 获取党组织列表
       getOrgList() {
-          return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: localStorage.getItem('agencyId')}}).then(({data: res}) => {
+          return this.$http.get('/resi/partymember/icPartyOrg/getSearchTreelist', {params: {agencyId: localStorage.getItem('agencyId')}}).then(({data: res}) => {
               if (res.code !== 0) {
                   return this.$message.error(res.msg)
               }
diff --git a/src/views/modules/partymember/icpartymemberpoint.vue b/src/views/modules/partymember/icpartymemberpoint.vue
index 6180d89cb..310d1e328 100644
--- a/src/views/modules/partymember/icpartymemberpoint.vue
+++ b/src/views/modules/partymember/icpartymemberpoint.vue
@@ -10,8 +10,9 @@
       >
         <el-form-item prop="mySelectOrg" label="所属党组织">
           <el-cascader
-            style="width: 300px"
+            class="list_item_width_1"
             v-model="mySelectOrg"
+            size="small"
             :options="orgList"
             placeholder="请选择党组织"
             :props="{
@@ -57,8 +58,10 @@
         <br />
         <el-form-item label="评分年度" prop="year">
           <el-date-picker
+            class="list_item_width_1"
             v-model="dataForm.year"
             type="year"
+            size="small"
             placeholder="选择年"
             value-format="yyyy"
           >
@@ -241,17 +244,27 @@ export default {
       this.currentPage = val
       this.getDataList()
     },
+    deepArrTOnull(arr) {
+      let a = []
+      a = arr.map(item => {
+        return {
+          ...item,
+          children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+        }
+      })
+      return a
+    },
     // 获取党组织列表
     getOrgList() {
       return this.$http
-        .get('/resi/partymember/icPartyOrg/getTreelist', {
+        .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
           params: { agencyId: localStorage.getItem('agencyId') }
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
-          this.orgList = res.data
+          this.orgList = this.deepArrTOnull(res.data)
         })
         .catch(() => {})
     },
diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue
index 1a2676e75..7453fdaac 100644
--- a/src/views/modules/partymember/icpartyorg-add-or-update.vue
+++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue
@@ -8,7 +8,7 @@
                  @keyup.enter.native="dataFormSubmitHandle()"
                  :label-width="$i18n.locale === 'en-US' ? '120px' : '100px'">
             <el-form-item prop="partyOrgType" label="党组织类型">
-                <el-select :disabled="dataForm.id ? true : false" v-model="dataForm.partyOrgType" @change="changePartyOrgType" clearable placeholder="请选择党组织类型">
+                <el-select :disabled="dataForm.id || dataForm.orgId ? true : false" v-model="dataForm.partyOrgType" @change="changePartyOrgType" clearable placeholder="请选择党组织类型">
                     <el-option
                     v-for="item in partyOrgTypeList"
                     :key="item.value"
@@ -32,9 +32,10 @@
                     :props="{ emitPath:false, checkStrictly: true, label: 'name', value: 'id', children: 'children' }"
                     :disabled="dataForm.id ? true : false"
                     :show-all-levels="false"
+                    @change="changeAgencyOrg"
                     clearable />
             </el-form-item>
-            <el-form-item  prop="mySelectOrg" label="上级党组织">
+            <el-form-item v-if="!dataForm.sjdzzName"  prop="mySelectOrg" label="上级党组织">
                 <el-cascader
                     style="width:300px"
                     v-model="dataForm.mySelectOrg"
@@ -45,6 +46,9 @@
                     :disabled="dataForm.id || dataForm.orgId ? true : false"
                     clearable />
             </el-form-item>
+            <el-form-item v-if="dataForm.sjdzzName" label="上级党组织">
+                <el-input :disabled="true" v-model="dataForm.sjdzzName" style="width:300px"></el-input>
+            </el-form-item>
             <el-form-item label="党组织介绍" prop="introduction">
                 <el-input style="width:300px" v-model="dataForm.introduction" type="textarea" maxlength="500" placeholder="党组织介绍"></el-input>
             </el-form-item>
@@ -129,7 +133,8 @@
                     staffId:'',
                     orgPidName: '',
                     agencyName:'',
-                    pid: ''
+                    pid: '',
+                    sjdzzName: '' // 新增下级上级党组织名字
                 },
                 orgListVisible: false,
                 agencyListVisible:false,
@@ -151,27 +156,40 @@
                 this.agencyId = localStorage.getItem('agencyId')
                 this.dataForm.customerId = localStorage.getItem('customerId')
                 this.dataForm.staffId = localStorage.getItem('staffId')
+                //设置党组织类型
+                
                 this.$nextTick(() => {
                     this.$refs['dataForm'].resetFields()
                     this.dataForm.latitude = ''
-                    //设置党组织类型
-                    this.setPartyOrgType()
-                    this.getOrgList().then(() => {
-                        if (this.dataForm.id) {
-                            this.getInfo()
-                        } else {
-                            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.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId
-                                console.log(this.dataForm.orgPid)
-                                console.log(this.dataForm.orgPids)
-                            } else {
-                                this.dataForm.mySelectOrg = ''
+                    if (this.dataForm.id) {
+                        this.getInfo()
+                    } else {
+                        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.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId
+                            this.dataForm.partyOrgType = this.dataForm._partyOrgType
+                            if (this.dataForm.partyOrgType === '0') { // 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部
+                                this.dataForm.partyOrgType = '1'
+                            } else if (this.dataForm.partyOrgType === '1') {
+                                this.dataForm.partyOrgType = '2'
+                            } else if (this.dataForm.partyOrgType === '2') {
+                                this.dataForm.partyOrgType = '3'
+                            } else if (this.dataForm.partyOrgType === '3') {
+                                this.dataForm.partyOrgType = '4'
+                            } else if (this.dataForm.partyOrgType === '4') {
+                                this.dataForm.partyOrgType = '5'
                             }
+                            console.log(this.dataForm.orgPid)
+                            console.log(this.dataForm.orgPids)
+                            // this.getOrgList()
+                        } else {
+                            this.dataForm.mySelectOrg = ''
                         }
-                    })
+                    }
+
+                    this.setPartyOrgType()
                 })
             },
             //设置组织类型
@@ -216,30 +234,37 @@
                     ]
                 }
             },
+            // 选中行政组织
+            changeAgencyOrg () {
+                console.log(this.dataForm.agencyId)
+                this.getOrgList()
+            },
             // 选中组织类型 组织类型为支部时不需要选择行政组织
             changePartyOrgType(value){
                 if(value != '5'){ // 支部
                     this.dataForm.agencyId = ''
                     this.dataForm.agencyPids = ''
                 }
-                this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
-                    }
-                    this.agencyOrgList = this.removeEmptyChildren(res.data)
-                }).catch(() => {})
+                //根据组织类型获取行政组织
+                this.getInfoAgencyLisy()
+                // this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => {
+                //     if (res.code !== 0) {
+                //         return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+                //     }
+                //     this.agencyOrgList = this.removeEmptyChildren(res.data)
+                // }).catch(() => {})
             },
             // 获取党组织列表
             getOrgList() {
-                return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId, orgPid: this.dataForm.id ? this.dataForm.pid : ''}}).then(({data: res}) => {
+                this.$http.get('/resi/partymember/icPartyOrg/getParentOrgList', {params: {agencyId: this.dataForm.agencyId, partyOrgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
                     if (res.code !== 0) {
                         return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
                     }        
                     this.orgList = this.removeEmptyChildren(res.data)
-                    this.orgList.unshift({
-                        partyOrgName: '一级组织',
-                        id: '0'
-                    });
+                    // this.orgList.unshift({
+                    //     partyOrgName: '一级组织',
+                    //     id: '0'
+                    // });
                 }).catch(() => {
                 })
             },
@@ -282,23 +307,20 @@
                     this.dataForm.mySelectOrg = this.dataForm.orgPid
                     // 行政组织
                     this.dataForm.agencyId = this.dataForm.agencyId
+                    //根据组织类型获取行政组织
+                    this.getInfoAgencyLisy()
+                    this.getOrgList()
+                    console.log(':::::', JSON.stringify(this.dataForm))
                     this.initMap()
                 }).catch(() => {
                 })
-
-                //根据组织类型获取行政组织
-                this.getInfoAgencyLisy()
             },
             getInfoAgencyLisy(){
-                this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType',
-                    {params:
-                            {agencyId: this.agencyId,
-                                orgType:this.dataForm.partyOrgType}
-                    }).then(({data: res}) => {
+                this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
                     if (res.code !== 0) {
                         return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
                     }
-                    this.agencyOrgList = res.data
+                    this.agencyOrgList = this.removeEmptyChildren(res.data)
                 }).catch(() => {
                 })
             },
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 1e132a6fa..6c8db18d2 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -7,7 +7,7 @@
       </div>
       <!-- 列表表格 -->
       <el-table
-          class="table"
+          class="resi-table"
           v-loading="tableLoading"
           :data="tableData"
           :default-expand-all="true"
@@ -24,12 +24,12 @@
                           size="small"
                           class="div-table-button--detail">{{'查看党员'}}</el-button>
                 <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)"
+                          @click="addOrUpdateHandle('', scope.row.id, scope.row.orgPids, '', scope.row.partyOrgType, scope.row.partyOrgName)"
                           type="text"
                           size="small"
                           class="div-table-button--add">新增下级</el-button>
                 <el-button  v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
-                          @click="addOrUpdateHandle(scope.row.id, '', '', scope.row.pid)"
+                          @click="addOrUpdateHandle(scope.row.id, '', '', scope.row.pid, '', '')"
                           type="text"
                           size="small"
                           class="div-table-button--edit">修改</el-button>
@@ -37,7 +37,7 @@
                             @click="deleteAgency(scope.row.id)"
                             type="text"
                             size="small"
-                            class="div-table-button--edit">删除</el-button>
+                            class="btn-color-del">删除</el-button>
               </template>
           </el-table-column>
       </el-table>
@@ -47,7 +47,7 @@
                 :close-on-click-modal="false"
                 :close-on-press-escape="false"
                 :title="memberTitle"
-                width="850px"
+                width="1050px"
                 top="5vh"
                 class="dialog-h"
                 @closed="lookMemberClose">
@@ -106,8 +106,7 @@
         this.tableLoading = false
       },
       // 新增 / 修改
-      addOrUpdateHandle (id, orgId, orgPids, pid) {
-        console.log('pid:::::', pid)
+      addOrUpdateHandle (id, orgId, orgPids, pid, partyOrgType, partyOrgName) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
           this.$refs.addOrUpdate.dataForm.id = id
@@ -115,7 +114,8 @@
           this.$refs.addOrUpdate.dataForm.orgId = orgId // 党组织
           this.$refs.addOrUpdate.dataForm.orgPids = orgPids
           this.$refs.addOrUpdate.dataForm.pid = pid
-          
+          this.$refs.addOrUpdate.dataForm._partyOrgType = partyOrgType
+          this.$refs.addOrUpdate.dataForm.sjdzzName = partyOrgName
           this.$refs.addOrUpdate.init()
         })
       },
diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue
index 4d2197a8f..92259bd3a 100644
--- a/src/views/modules/partymember/lookMember.vue
+++ b/src/views/modules/partymember/lookMember.vue
@@ -1,36 +1,262 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <div>
-        <div class="div_table">
-          <el-table ref="ref_table"
-                    :data="tableData"
-                    border
-                    v-loading="tableLoading"
-                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                    style="width: 100%"
-                    highlight-current-row>
-            <el-table-column prop="name"
-                            label="姓名">
-            </el-table-column>
-            <el-table-column prop="mobile"
-                            label="联系方式">
+      <div v-if="pageLoading" class="resi-container">
+        <el-card ref="searchCard" class="search-card">
+          <div class="">
+            <el-form ref="searchForm" :inline="true" :model="searchForm" size="small" label-width="100px" class="demo-form-inline">
+              <div>
+                <el-form-item label="所属党组织" prop="partyOrgId">
+                  <!-- <el-select v-model="searchForm.partyOrgId" filterable placeholder="请选择" clearable>
+                    <el-option
+                      v-for="item in optionsG"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option> -->
+                  <!-- </el-select> -->
+                  <el-cascader
+                    v-model="partyOrgRange"
+                    :options="optionsG"
+                    :props="partyProps"
+                    clearable
+                    @change="handlePartyChange"></el-cascader>
+                </el-form-item>
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="searchForm.name" placeholder="请输入" class="input-width" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="手机号" prop="mobile">
+                  <el-input v-model="searchForm.mobile" placeholder="请输入" class="input-width" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="身份证" prop="idCard">
+                  <el-input v-model="searchForm.idCard" placeholder="请输入" class="input-width" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="地址" prop="address">
+                  <el-input v-model="searchForm.address" placeholder="请输入" class="input-width" clearable></el-input>
+                </el-form-item>
+              </div>
+              <div>
+                <el-form-item label="流动党员" prop="isLd">
+                  <el-select v-model="searchForm.isLd" filterable placeholder="请选择" clearable>
+                    <el-option label="是" value="1" />
+                    <el-option label="否" value="0" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="流动党员证号" prop="ldzh">
+                  <el-input v-model="searchForm.ldzh" placeholder="请输入" class="input-width" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="职务" prop="partyZw">
+                  <el-select v-model="searchForm.partyZw" filterable placeholder="请选择" clearable>
+                    <el-option
+                      v-for="item in zwList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="是否缴费" prop="isPay">
+                  <el-select v-model="searchForm.isPay" filterable placeholder="请选择" clearable>
+                    <el-option label="是" value="1" />
+                    <el-option label="否" value="0" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="党员中心户" prop="isDyzxh">
+                  <el-select v-model="searchForm.isDyzxh" filterable placeholder="请选择" clearable>
+                    <el-option label="是" value="1" />
+                    <el-option label="否" value="0" />
+                  </el-select>
+                </el-form-item>
+              </div>
+              <el-form-item label="免学习" prop="isMxx">
+                <el-select v-model="searchForm.isMxx" filterable placeholder="请选择" clearable>
+                  <el-option label="是" value="1" />
+                  <el-option label="否" value="0" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="最近一次缴费时间"
+                            label-width="130px"
+                            prop="startTime">
+                <el-date-picker v-model="timeRangePay"
+                                size="small"
+                                type="daterange"
+                                value-format="yyyy-MM-dd"
+                                @change="handleTimeChangePay"
+                                range-separator="至"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间">
+                </el-date-picker>
+
+              </el-form-item>
+              <el-form-item label="入党时间"
+                            prop="startTime">
+                <el-date-picker v-model="timeRange"
+                                size="small"
+                                type="daterange"
+                                value-format="yyyy-MM-dd"
+                                @change="handleTimeChange"
+                                range-separator="至"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间">
+                </el-date-picker>
+
+              </el-form-item>
+              <el-form-item>
+                <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
+                <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-card>
+        <el-card class="resi-card-table">
+          <el-table
+            :data="tableData"
+            row-key="id"
+            v-loading="tableLoading"
+            border
+            :height="tableHeight"
+            :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+            style="width: 100%"
+            class="resi-table"
+          >
+            <el-table-column label="序号" type="index" align="center" width="50">
             </el-table-column>
-            <el-table-column prop="idCard"
-                            label="身份证号">
+            <el-table-column
+              prop="name"
+              label="姓名"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="idCard"
+              label="身份证号"
+              align="center"
+              min-width="180"
+            />
+            <el-table-column
+              prop="mobile"
+              label="手机号"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="rdsj"
+              label="入党时间"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="sszb"
+              label="所属党组织"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="ldzh"
+              label="流动党员证号"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="partyZw"
+              label="职务"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="address"
+              label="地址"
+              align="center"
+              show-overflow-tooltip
+              min-width="180"
+            />
+            <el-table-column
+              prop="isPay"
+              label="是否缴费"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="payDate"
+              label="最近一次缴费时间"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="culture"
+              label="文化程度"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="point"
+              label="量化积分"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="activityPoint"
+              label="活跃积分"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="volunteerCategory"
+              label="志愿者类别"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="remark"
+              label="备注"
+              align="center"
+              min-width="180"
+            />
+              <!-- <template slot-scope="scope">
+                <div class="div-content">{{ handleFilterSpan(scope.row, item) }}</div>
+              </template> -->
+            <!-- </el-table-column> -->
+            <el-table-column fixed="right" label="操作" align="center" width="200">
+              <template slot-scope="scope">
+                <el-button
+                  @click="handleLook(scope.row)"
+                  type="text"
+                  size="small"
+                  class="btn-color-look"
+                  >查看</el-button
+                >
+              </template>
             </el-table-column>
           </el-table>
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page.sync="pageNo"
-            :page-sizes="[20, 50, 100, 200]"
-            :page-size="parseInt(pageSize)"
-            layout="sizes, prev, pager, next, total"
-            :total="total"
-          >
-          </el-pagination>
-        </div>
+          <div>
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page.sync="currentPage"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="pageSize"
+              layout="sizes, prev, pager, next, total"
+              :total="total"
+            >
+            </el-pagination>
+          </div>
+        </el-card>
+
+        <el-dialog
+          title="党员信息"
+          :visible.sync="dialogVisible"
+          width="60%"
+          top="5vh"
+          class="dialog-h"
+          append-to-body
+          :close-on-click-modal="false"
+          :before-close="handlerCancle"
+        >
+          <crate-form v-if="dialogVisible" :info="detailInfo" :partyList="optionsG" 
+          :disabled="disabled"
+          @saveBase="handleSearch" @cancle="handlerCancle" />
+        </el-dialog>
+
       </div>
     </div>
     <div class="div_btn">
@@ -41,68 +267,347 @@
 </template>
 
 <script>
+import axios from 'axios'
 import { mapGetters } from 'vuex'
-import { requestPost } from "@/js/dai/request";
+import crateForm from '../communityParty/members/crateForm.vue'
 export default {
   data () {
     return {
-      btnDisable: false,
-      // 列表相关
-      tableData: [],
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+      importBtnTitle: '导入',
+      importLoading: false,
+      exportBtn: false,
+      exportBtnTitle: '导出',
       tableLoading: false,
-      agencyId: '',
-      partyOrgId: '',
-      pageNo: 1,
+      btnLoading: false,
+      uploading: false,
+      disabled: false,
+      pageLoading: false,
+      dialogVisible: false,
+      currentPage: 1,
       pageSize: 20,
-      total: 1,
+      total: null,
+      tableData: [],
+      searchH: 0,
+      unloadPencent: 0,
+      addLevel: '1',
+      addType: 'add',
+      value: '',
+      optionsEditG: [],
+      optionsG: [],
+      optionsC: [],
+      optionsEditC: [],
+      options: [
+        {
+          label: '是',
+          value: 1
+        },{
+          label: '否',
+          value: 2
+        }
+      ],
+      zwList: [
+        {
+          label: '普通党员',
+          value: '0'
+        },
+        {
+          label: '支部书记',
+          value: '1'
+        },
+        {
+          label: '支部委员',
+          value: '2'
+        },
+        {
+          label: '党委委员',
+          value: '3'
+        },
+      ],
+      demandOptions: [],
+      tableHeader: [
+        {
+          label: '党员姓名',
+          columnName: 'name',
+          align: 'center',
+          width: '160',
+          options: []
+        }, {
+          label: '所属网格',
+          align: 'center',
+          columnName: 'gridName',
+          width: '200',
+          options: []
+        }, {
+          label: '分类类别',
+          align: 'center',
+          columnName: 'categoryName',
+          width: '160',
+          options: []
+        }, {
+          label: '主要事迹',
+          columnName: 'mainDeed',
+          align: 'center',
+          width: '',
+          options: []
+        }
+      ],
+      partyOrgRange: [],
+      timeRangePay: [],
+      timeRange: [],
+      customerId: '',
+      partyOrgId: '', // 上一个页面传过来的
+      searchForm: {
+        partyOrgId: '',
+        mobile: '',
+        idCard: '',
+        name: '',
+        address: '',
+        isLd: '',
+        ldzh: '',
+        partyZw: '',
+        isDyzxh: '',
+        isMxx: '',
+        culture: '',
+        isPay: '',
+        rdsjStartDate: '',
+        rdsjEndDate: '',
+        payStatrDate: '',
+        payEndDate: ''
+      },
+      detailInfo: {},
+      partyProps: {
+        label: 'partyOrgName',
+        value: 'id',
+        checkStrictly: true 
+      }
     }
   },
   props: {
   },
   computed: {
-    ...mapGetters(['clientHeight', 'iframeHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const _h = this.clientHeight - 280 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
+  components: {
+    crateForm
   },
-  components: {},
   methods: {
     initForm (agencyId, id) {
       this.agencyId = agencyId
+      this.searchForm.partyOrgId = id
       this.partyOrgId = id
+      console.log('this.searchForm.partyOrgId:::::', this.searchForm.partyOrgId)
       this.tableLoading = true
-      this.loadTable()
+
+
+      this.pageLoading = true
+
+      this.getTableData()
+      this.getGridList('query')
     },
     // 取消
     handleCancle () {
       this.$emit('lookMemberCancle')
     },
-    // 查询列表
-    async loadTable () {
-      let params = {
-        agencyId: this.agencyId,
-        partyOrgId: this.partyOrgId,
-        pageNo: this.pageNo,
-        pageSize: this.pageSize
+
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getTableData()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.currentPage = val
+      this.getTableData()
+    },
+    handlePartyChange(val) {
+      console.log('val------pp', val)
+      this.searchForm.partyOrgId = val[val.length - 1]
+    },
+    handleFilterSpan(row, item) {
+      let _val = ''
+      if (item.options && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label
+        })
       }
-      const url = `/resi/partymember/icPartyMember/page`
-      const { data, code, internalMsg, msg } = await requestPost(url, params)
-      this.tableLoading = false
-      if (code !== 0) {
-        return this.$message.error(internalMsg ? internalMsg : msg ? msg : '查询失败')
+      return _val || row[item.columnName]
+    },
+    handleTimeChange (val) {
+      if (val.length > 0) {
+        this.searchForm.rdsjStartDate = val[0]
+        this.searchForm.rdsjEndDate = val[1]
+      } else {
+        this.searchForm.rdsjStartDate = ''
+        this.searchForm.rdsjEndDate = ''
+      }
+
+    },
+    handleTimeChangePay (val) {
+      if (val.length > 0) {
+        this.searchForm.payStatrDate = val[0]
+        this.searchForm.payEndDate = val[1]
+      } else {
+        this.searchForm.payStatrDate = ''
+        this.searchForm.payEndDate = ''
       }
-      if (code === 0) {
-        this.tableData =  data.list ? data.list : []
-        this.total = data.total || 0;
+
+    },
+    handleProgress(event, file, fileList) {
+      console.log('percentage', event, file.percentage)
+      this.uploading = true
+      this.unloadPencent = Number(file.percentage.toFixed(0))
+    },
+    download (data, fileName) {
+      console.log('data', data)
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName)
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a')
+        document.body.appendChild(a)
+        a.style = 'display: none'
+        var url = window.URL.createObjectURL(csvData)
+        a.href = url
+        a.download = fileName
+        a.click()
+        a.remove()
+        window.URL.revokeObjectURL(url)
       }
     },
-    handleSizeChange (val) {
-        console.log(`每页 ${val} 条`)
-        this.pageSize = val
-        this.loadTable()
+
+    handleSearch(val) {
+      console.log('searchhh--', val)
+      this.currentPage = 1
+      this.getTableData()
+    },
+    resetForm(formName) {
+      this.timeRangePay = []
+      this.timeRange = []
+      this.searchForm.payStatrDate = ''
+      this.searchForm.payEndDate = ''
+      this.searchForm.rdsjStartDate = ''
+      this.searchForm.rdsjEndDate = ''
+      this.$refs[formName].resetFields()
+      this.searchForm.partyOrgId = this.partyOrgId
+      this.handleSearch()
     },
-    handleCurrentChange (val) {
-      console.log(`当前页: ${val}`);
-        this.pageNo = val;
-        this.loadTable();
+
+
+    handlerCancle() {
+      this.detailInfo = {}
+      this.disabled = false
+      this.dialogVisible = false
     },
+    async handleLook(row) {
+      this.disabled = true
+      await this.getDetail(row.id)
+    },
+
+    
+    async getDetail(id) {
+      let params = {
+        id,
+      }
+      this.$http
+        .post(`/resi/partymember/icPartyMember/${id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.detailInfo = { ...res.data }
+            this.dialogVisible = true
+          }
+        })
+        .catch((err) => {
+          console.log('row4', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    async getGridList(type, agencyId) {
+      // addorupdate  query
+      await this.$http
+        .get('/resi/partymember/icPartyOrg/getSearchTreelist', { params: {agencyId: agencyId} })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            
+            this.optionsG = this.deepArrTOnull(res.data)
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    deepArrTOnull(arr) {
+      let a = []
+      a = arr.map(item => {
+        return {
+          ...item,
+          children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+        }
+      })
+      return a
+    },
+    async getCateList(type) {
+      const params = {
+        customerId: this.customerId,
+        type
+      }
+      // addorupdate  query
+      await this.$http
+        .post('/resi/partymember/stylecategorydict/select-list', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            
+            if (type === 'query') this.optionsC = res.data
+            else this.optionsEditC = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async getTableData() {
+      this.tableLoading = true
+      let params = {
+        ...this.searchForm,
+        agencyId: this.agencyId,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize
+      }
+      await this.$http
+        .post('/resi/partymember/icPartyMember/page', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.tableData = res.data.list
+            this.total = res.data.total
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      this.tableLoading = false
+    }
   },
 }
 </script>
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index 49d0755de..4ebad94fb 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -484,20 +484,9 @@ export default {
       if (Array.isArray(options)) {
         let valueArr = value.split(",");
         if (type == "cascader") {
-          if (valueArr.length > 0) {
-            let level1 = options.find((item) => item.value == valueArr[0]);
-            if (level1) {
-              if (valueArr.length > 1 && level1.children) {
-                let level2 = level1.children.find(
-                  (item) => item.value == valueArr[1]
-                );
-                if (level2) {
-                  return level1.label + "-" + level2.label;
-                }
-              }
-              return level1.label;
-            }
-          }
+          let finalValue = [];
+          this.getNodePath(options, value, finalValue);
+          return finalValue.join("-");
         } else {
           return valueArr
             .map((val) => {
@@ -513,6 +502,24 @@ export default {
       return "--";
     },
 
+    getNodePath(node, val, path) { // node:所有数据，val:后台返回的id, path:要渲染的数组id
+      for (let i = 0; i < node.length; i++) {
+        const ele = node[i];
+        if (ele.value === val) {
+          path.push(ele.label);
+          return path
+        } else if (ele.children && ele.children.length > 0) {
+          if (ele.children.some(row => row.value === val)) {
+            path.unshift(ele.label);
+            this.getNodePath(ele.children,val,path);
+          } else {
+            this.getNodePath(ele.children,val,path);
+          }
+        }
+      }
+      return path;
+    },
+
     //加载组织数据
     async getField() {
       const url = "/oper/customize/icform/getcustomerform";
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 79f533a5c..50c7c96c3 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -360,6 +360,12 @@ export default {
       // this.pieEduOptions.series[1].width = 400
       this.clickEduPie(0)
       let fun = params => {
+        console.log('params------c', params)
+        if (params.seriesIndex == 0 || params.seriesIndex == 2) {
+          this.unitType = ''
+          this.getUnitList(this.agencyId)
+          return
+        }
         this.clickEduPie(params.dataIndex)
       }
       this.$refs.eduChart.handleClick(fun)
@@ -368,6 +374,7 @@ export default {
 
     },
     clickEduPie (seriesIndex) {
+      
       let _code = ''
       let isClick = false
       this.partyItem.forEach((element, index) => {
@@ -517,14 +524,45 @@ export default {
       if (code === 0) {
         this.showMap = false
         this.unitTotal = data.total
+        this.unitTableData = []
         this.unitTableData = data.list.map((item, index) => {
           return {
             ...item,
-            index: index + 1
+            urlIndex: index
           }
         })
-        const url = require('../../../../assets/img/shuju/measure/other.png')
-        this.iconUrlArray = [url]
+        this.unitTableData.forEach(item => {
+
+          if (item.type === '楼宇党建') {
+            item.urlIndex = 0
+          } else if (item.type === '两新组织') {
+            item.urlIndex = 1
+          } else if (item.type === '区域单位党建') {
+            item.urlIndex = 2
+          } else if (item.type === '机关直属部门') {
+            item.urlIndex = 3
+          } else if (item.type === '社会团体') {
+            item.urlIndex = 4
+          } else if (item.type === '民办非企业单位') {
+            item.urlIndex = 5
+          } else if (item.type === '基金会') {
+            item.urlIndex = 6
+          } else if (item.type === '其他') {
+            item.urlIndex = 7
+          }
+        });
+        // const url = require('../../../../assets/img/shuju/measure/other.png')
+        // this.iconUrlArray = [url]
+        this.iconUrlArray = [
+          require('../../../../assets/img/shuju/measure/lxdj.png'),//楼宇党建
+          require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织
+          require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建
+          require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门
+          require('../../../../assets/img/shuju/measure/other.png'),//社会团体
+          require('../../../../assets/img/shuju/measure/minban.png'),//民办
+          require('../../../../assets/img/shuju/measure/jijin.png'),//基金
+          require('../../../../assets/img/shuju/measure/qita.png')//其他
+        ]
 
         this.showMap = true
         //第一次加载完置为false
@@ -655,24 +693,24 @@ export default {
         // this.cateInfo = data
         const colorItem = {
           0: {
-            color: 'rgba(250, 32, 10, 1)',
+            color: '#FA200A',
             icon: require('../../../../assets/img/shuju/measure/lxdj.png')
           },
           1: {
-            color: 'rgba(251, 177, 4, 1)',
+            color: '#FBB104',
             icon: require('../../../../assets/img/shuju/measure/lxzz.png')
           },
           2: {
-            color: 'rgba(80, 194, 237, 1)',
+            color: '#50C2ED',
             icon: require('../../../../assets/img/shuju/measure/qydw.png')
           },
           3: {
-            color: 'rgba(65, 181, 104, 1)',
+            color: '#41B568',
             icon: require('../../../../assets/img/shuju/measure/jgzs.png')
           },
           4: {
-            color: 'rgba(192, 21, 195, 1)',
-            icon: require('../../../../assets/img/shuju/measure/qita.png')
+            color: '#0189d5',
+            icon: require('../../../../assets/img/shuju/measure/other.png')
           },
           5: {
             color: '#ee7801',
@@ -683,18 +721,22 @@ export default {
             icon: require('../../../../assets/img/shuju/measure/jijin.png')
           },
           7: {
-            color: '#0189d5',
-            icon: require('../../../../assets/img/shuju/measure/other.png')
+            color: '#C015C3', // 
+            
+            icon: require('../../../../assets/img/shuju/measure/qita.png')
           }
         }
         this.partyItem = data.map((item, index) => {
           return {
             ...item,
-            ...colorItem[index],
+            itemStyle: {
+              ...colorItem[item.code]
+            },
             name: item.label,
             isClick: false
           }
         })
+        console.log('this.partyItem----', this.partyItem)
         this.totalCount = 0
         data.forEach(item => {
           this.totalCount += Number(item.value)
@@ -869,18 +911,18 @@ export default {
             item.urlIndex = 7
           }
         });
-        const url = require('../../../../assets/img/shuju/measure/other.png')
-        // this.iconUrlArray = [
-        //   require('../../../../assets/img/shuju/measure/lxdj.png'),//楼宇党建
-        //   require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织
-        //   require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建
-        //   require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门
-        //   require('../../../../assets/img/shuju/measure/qita.png'),//社会团体
-        //   require('../../../../assets/img/shuju/measure/minban.png'),//民办
-        //   require('../../../../assets/img/shuju/measure/jijin.png'),//基金
-        //   require('../../../../assets/img/shuju/measure/other.png')//其他
-        // ]
-        this.iconUrlArray = [url, url, url, url, url, url, url, url]
+        // const url = require('../../../../assets/img/shuju/measure/other.png')
+        this.iconUrlArray = [
+          require('../../../../assets/img/shuju/measure/lxdj.png'),//楼宇党建
+          require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织
+          require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建
+          require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门
+          require('../../../../assets/img/shuju/measure/qita.png'),//社会团体
+          require('../../../../assets/img/shuju/measure/minban.png'),//民办
+          require('../../../../assets/img/shuju/measure/jijin.png'),//基金
+          require('../../../../assets/img/shuju/measure/other.png')//其他
+        ]
+        // this.iconUrlArray = [url, url, url, url, url, url, url, url]
 
 
         //第一次加载完置为false
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index bd73c11ca..4be1b3cc1 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -5,14 +5,14 @@
         <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
           网格党建平面图&nbsp;&nbsp;
-          <el-cascader 
+          <!-- <el-cascader 
             v-model="selectAgency"
             :options="propTree" 
             :props="{ checkStrictly: true }" 
             :show-all-levels="false"
             :getCheckedNodes="getCheckedNodes" 
             @change="handleCascader">
-          </el-cascader>
+          </el-cascader> -->
         </div> 
       </div>
       <div class="card-echart">
@@ -148,7 +148,8 @@ export default {
   },
   async mounted() {
     await nextTick(100);
-    await this.getAgencyList()
+    // await this.getAgencyList()
+    await this.getWorkUserInfo()
     this.agencyId  = this.$store.state.user.agencyId
     this.getEduCount(this.$store.state.user.agencyId) // 饼状统计图
     this.getEduList() // 左下角列表数据
@@ -164,7 +165,6 @@ export default {
       require('../../../../assets/img/shuju/measure/other.png')
     ]
     await this.loadOrgData()
-    await this.getWorkUserInfo()
     // this.loadMap()
     this.getMapData()
     // this.isfirstInit = false
@@ -362,8 +362,8 @@ export default {
       // this.$refs.pieChart.hideLoading()
       this.$refs.eduChart.setOption(this.pieEduOptions)
       if (this.noEduInit) {
-        const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
-        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        // const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+        // const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
         this.pageNo = 1
         this.pageSize = 10;
         this.eduList = []
@@ -462,7 +462,7 @@ export default {
           return {
             ...item,
             color: "#00E5ED",
-            fillColor: "rgba(0, 229, 237, 0.16)"
+            fillColor: "rgba(0, 229, 237, 0)"
           }
         })
 
@@ -489,7 +489,7 @@ export default {
           if (!data.level) {
             this.agencyInfo.level = 'street'
           }
-
+          this.agencyInfo.agencyLevel = this.agencyInfo.level
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg)
diff --git a/src/views/modules/visual/communityParty/memberInfo.vue b/src/views/modules/visual/communityParty/memberInfo.vue
index 1b07df9c1..dedf9f32c 100644
--- a/src/views/modules/visual/communityParty/memberInfo.vue
+++ b/src/views/modules/visual/communityParty/memberInfo.vue
@@ -13,7 +13,7 @@
         <div class="list-wr info-h">
           <div class="list-left info-scroll">
             <div v-for="(item, index) in list" :key="item.id" class="left-item" 
-            :class="current == index &&'left-item-on'" @click="handleTabs(item, index)">
+            :class="current == index ? 'active-item' : ''" @click="handleTabs(item, index)">
               <div class="item-title">{{ item.content }}</div>
               <div class="item-time">{{ item.reportTime }}</div>
             </div>
@@ -219,7 +219,7 @@ export default {
 }
 .list-wr {
   display: flex;
-  padding: 0 32px;
+  // padding: 0 32px;
   
 }
 .list-left {
@@ -230,9 +230,13 @@ export default {
   flex-shrink: 0;
   border-right: 1px dashed  #1257c9;
   overflow: auto;
+  .active-item {
+      border: 1px solid #0063FE !important;
+      box-shadow: 0px 0px 10px #0063fe inset;
+    }
   .left-item {
-    padding: 10px 0;
-    border-right: 1px dashed  #1257c9;
+    padding: 10px 0px 10px 10px;
+    // border-right: 1px dashed  #1257c9;
     cursor: pointer;
     .item-title {
       font-size: 16px;
diff --git a/src/views/modules/visual/communityParty/options.js b/src/views/modules/visual/communityParty/options.js
index ba0ddd334..a969472cc 100644
--- a/src/views/modules/visual/communityParty/options.js
+++ b/src/views/modules/visual/communityParty/options.js
@@ -1,11 +1,11 @@
 
 export function pieOption (_charts) {
-  const center= ['50%', '50%']
+  const center= ['60%', '50%']
     return {
       title: {
         text: '0',
         top: 125,
-        left: 196,
+        left: 235,
         textAlign: 'center',
         textStyle: {
           width: '100%',
@@ -87,8 +87,8 @@ export function pieOption (_charts) {
             alignTo: 'edge',
             // formatter: '{a|{c}}\n\n{name|{b}}',
             formatter: '{a|{c}}\n{r|}\n{name|{b}}',
-            minMargin: 5,
-            edgeDistance: 1,
+            // minMargin: 5,
+            edgeDistance: 20,
             lineHeight: 15,
             color: '#fff',
             fontSize: 12,
@@ -114,13 +114,13 @@ export function pieOption (_charts) {
           labelLine: {
             show: false,
             smooth: 0.2,
-            length: 30,
-            length2: 0,
+            length: 20,
+            length2: 10,
             maxSurfaceAngle: 80
           },
           labelLayout: function (params) {
             
-            const isLeft = params.labelRect.x < _charts.getWidth() / 2;
+            const isLeft = params.labelRect.x < _charts.getWidth() / 3;
             const points = params.labelLinePoints;
             // Update the end point.
             if (points) {
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index b5b0e541a..49a84ac4a 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -311,6 +311,11 @@ export default {
       this.pieAgeOptions = pieOption(this.pieAgeChartS)
       this.clickAgePie(0)
       let fun = params => {
+        if (params.seriesIndex == 0 || params.seriesIndex == 2) {
+          this.ageCode = ''
+          this.getAgeList()
+          return
+        }
         this.clickAgePie(params.dataIndex)
       }
       this.$refs.ageChart.handleClick(fun)
@@ -359,6 +364,11 @@ export default {
       // this.pieEduOptions.series[1].width = 400
       this.clickEduPie(0)
       let fun = params => {
+        if (params.seriesIndex == 0 || params.seriesIndex == 2) {
+          this.eduCode = ''
+          this.getEduList()
+          return
+        }
         this.clickEduPie(params.dataIndex)
       }
       this.$refs.eduChart.handleClick(fun)
@@ -743,7 +753,8 @@ export default {
     async getPartyOggList(node, resolve) {
       // const url = "/gov/org/customeragency/staffinagencylist";
       // const url = '/gov/org/customeragency/agencygridtree'
-      const url = '/resi/partymember/icPartyOrg/getTreelist'
+      // const url = '/resi/partymember/icPartyOrg/getTreelist'
+      const url ='/resi/partymember/icPartyOrg/getSearchTreelist'
       let params = {
         agencyId: this.$store.state.user.agencyId,
       };
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index cee896a67..ebebad7ae 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -355,8 +355,9 @@ const vueGis = {
     loadPolIcon(feature) {
       polIconSource.clear();
       let polyIconFeatures = [];
-      console.log("feature-----", feature);
-      feature.forEach((oneIcon) => {
+      // console.log('feature-----', feature)
+      feature.forEach(oneIcon => {
+
         var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
         // var center = getCenter(extent);   //获取边界区域的中心位置
         //添加标注
@@ -371,7 +372,7 @@ const vueGis = {
             id: oneIcon.id_,
           },
         });
-        // console.log('oneIcon----', oneIcon)
+        // console.log('oneIcon----ddd', oneIcon)
         let polyIconStyle = new Style({
           image: new Icon({
             // anchor: [0.5, 0.5],
@@ -405,14 +406,14 @@ const vueGis = {
               info: { ...oneIcon },
             },
           });
+          // console.log('oneIcon----', this.iconUrlArray[oneIcon.urlIndex])
           let iconStyle = new Style({
             image: new Icon({
               // anchor: [0.5, 0.5],
               // imgSize: [32, 32],
               // scale: 0.5,
-              src:
-                (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) ||
-                this.iconUrlArray[0],
+              // src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0]
+              src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index &&this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0]
             }),
             // text: createTextStyle(oneIcon)
           });
@@ -646,13 +647,17 @@ const vueGis = {
         };
       })();
 
-      // select = new Select({
-      //   style: overlayStyle
-      // });
-      // 有BUG 加入多边形选中样式时，如果同时存在icon层和多边形层，点击icon会使icon消失 ---zhaotongyao 2022.06.01
+      select = new Select({
+        style: overlayStyle
+      });
 
-      map.addLayer(polygonLayer);
-      // map.addInteraction(select);
+
+      map.addLayer(polygonLayer)
+      if (this.$route.path == '/main-shuju/visual-communityParty-gridParty' || this.$route.path == '/main-shuju/visual-communityParty-community') { // 2022.6.9 网格党建平面图 联建单位分析页面 点位点击以后会消失，屏蔽这段代码以后可以解决
+         console.log('去掉默认点击')
+      } else {
+          map.addInteraction(select);
+      }
     },
 
     //初始化多边形icon图层