From d5c74cdcca0e49806d61667a0bd0b93eb85d10dc Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 10 Jun 2022 14:48:05 +0800
Subject: [PATCH] dd

---
 src/views/components/editResi.vue             |  2 +-
 src/views/components/resiForm.vue             | 31 ++++++++++++++++---
 src/views/modules/base/resi.vue               |  8 +++--
 .../modules/communityParty/members/index.vue  |  2 +-
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 542b5841..751bde6c 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -348,7 +348,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 5c5f6680..db3d6ac9 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -296,8 +296,11 @@ export default {
     }
     let initForm = (obj, arr) => {
       let _form = {}
-      console.log('formInfo---arr', arr)
+      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
       }
@@ -355,6 +358,8 @@ export default {
     }
     return {
       openSearch: false,
+      isParty: false,
+      partyInfo: [],
       fixedForm: {
         GRID_ID: '',
         VILLAGE_ID: '',
@@ -533,7 +538,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 })
+          
         }
       })
     },
@@ -672,7 +680,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 }) => {
@@ -680,10 +688,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'
-            else this.form.IS_PARTY = '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 10efef01..e290da0d 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.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/index.vue b/src/views/modules/communityParty/members/index.vue
index 3077d9d7..55fae06d 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)