From 151b06663aeae27a84b7655ecb10aed2b8780638 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 27 May 2022 17:40:03 +0800
Subject: [PATCH 1/2] dd

---
 src/views/modules/visual/communityParty/community.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 6193082e7..ac60395b7 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -1256,7 +1256,7 @@ export default {
   }
 }
 .table-h {
-  height: 300px;
+  height: calc(100vh - 630px);
 }
 .calc-h {
   height: calc(100vh - 240px);

From a8ab3d45f559ed64c3349fa95b8668d5ccb377f4 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 30 May 2022 13:51:41 +0800
Subject: [PATCH 2/2] dd

---
 src/views/modules/base/resi.vue                        | 3 ++-
 src/views/modules/communityParty/members/crateForm.vue | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index f1f84829a..10efef011 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -849,7 +849,8 @@ export default {
           childGroup.itemList.forEach(async (item) => {
             if (item.optionSourceType === 'remote') {
               await this.getOptionsList(item.optionSourceValue).then((res) => {
-                item.options = res
+                item.options = this.getTreeData(res)
+                
               })
               // console.log('')
             }
diff --git a/src/views/modules/communityParty/members/crateForm.vue b/src/views/modules/communityParty/members/crateForm.vue
index 81543a215..e0269b0aa 100644
--- a/src/views/modules/communityParty/members/crateForm.vue
+++ b/src/views/modules/communityParty/members/crateForm.vue
@@ -93,7 +93,7 @@
       <el-form-item label="备注" prop="remark">
         <el-input v-model="form.remark" :autosize="{ minRows: 4, maxRows: 10}" :disabled="disabled" type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input>
       </el-form-item>
-      <div :style="'width:' + formItemWd" >
+      <div >
         <div style="margin-top: 20px; text-align: center;">
             <el-button size="small" @click="handleCancle">取消</el-button>
             <el-button
@@ -241,6 +241,7 @@ export default {
           this.form = { ...val }
           console.log('val----------in', val)
           this.partyOrgs = val.orgPids.split(':')
+          console.log('partyOrgs-----', this.partyOrgs)
           this.partymenberid = val.id
         }
       },
@@ -305,6 +306,9 @@ export default {
             if (icResiUserId) {
               this.form.address = address
               this.isAuto = true
+            } else {
+              this.form.address = ''
+              this.isAuto = false
             }
             
           }