Merge branch 'dev-用户反馈' into dev

src/views/modules/partymember/icpartyorgtree.vue

@@ -35,7 +35,7 @@
                              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 != '6'"
-                          @click="handleLook(scope.row.agencyPids, scope.row.id, scope.row)"
+                          @click="handleLook(scope.row.agencyPids, scope.row.id, scope.row,scope.row.agencyId)"
                           type="text"
                           size="small"
                           class="div-table-button--detail">{{'查看党员'}}</el-button>
@@ -304,10 +304,11 @@
         }).catch(() => {})
       },
       // 查看党员
-      handleLook(agencyPids, id, row) {
+      handleLook(agencyPids, id, row,agencyId) {
+        console.log(row);
         this.lookMemberShow = true
         this.$nextTick(() => {
-            this.$refs.ref_table_Member.initForm(agencyPids.split(':')[agencyPids.split(':').length - 1], id)
+            this.$refs.ref_table_Member.initForm(agencyPids.split(':')[agencyPids.split(':').length - 1], id,agencyId)
         })
       },
       lookMemberClose () {
@@ -315,6 +316,7 @@
       },
       lookMemberCancle () {
         this.lookMemberShow = false
+        this.$refs.ref_table_Member.searchForm = {}
       },
       lookMemberOk () {
         this.lookMemberShow = false

src/views/modules/partymember/lookMember.vue

@@ -307,6 +307,7 @@
 import axios from 'axios'
 import { mapGetters } from 'vuex'
 import crateForm from '../communityParty/members/crateForm.vue'
+import { requestGet } from '../../../js/dai/request'
 export default {
   data () {
     return {
@@ -434,7 +435,7 @@ export default {
     crateForm
   },
   methods: {
-    initForm (agencyId, id) {
+    initForm (agencyId, id,agencyIds) {
       this.agencyId = agencyId
       this.searchForm.partyOrgId = id
       this.partyOrgId = id
@@ -445,7 +446,7 @@ export default {
       this.pageLoading = true
 
       this.getTableData()
-      this.getGridList('query')
+      this.getGridList('query',agencyIds)
     },
     // 取消
     handleCancle () {
@@ -695,20 +696,18 @@ export default {
     },
     async getGridList (type, agencyId) {
       // addorupdate  query
-      await this.$http
+      let url = "/resi/partymember/icPartyOrg/getSearchTreelist"
-        .get('/resi/partymember/icPartyOrg/getSearchTreelist', { params: { agencyId: agencyId } })
+      let params = {
-        .then(({ data: res }) => {
+        agencyId: agencyId 
-          if (res.code !== 0) {
+      }
-            return this.$message.error(res.msg)
+      const {data , msg,code } = await requestGet(url,params)
+      if (code !== 0) {
+            return this.$message.error(msg)
           } else {
-            console.log('获取查询详情成功', res.data)
+            console.log('获取查询详情成功', data)
-
+            this.optionsG = this.deepArrTOnull(data)
-            this.optionsG = this.deepArrTOnull(res.data)
           }
-        })
+     
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
     },
     deepArrTOnull (arr) {
       let a = []