From 3c60dd4745fe26e4812eff8f6fd37665d535817e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 15 Apr 2022 15:24:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequ/cpts/people-more.vue            | 2 +-
 src/views/modules/visual/basicinfo/cpts/people-more.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index c2d9a6d1..00f8f915 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -23,7 +23,7 @@
               <span>{{ xiaoquName }}</span>
             </div>
             <div class="item" v-if="index == 0">
-              <span class="item-field">所属楼宇：</span>
+              <span class="item-field">所属楼栋：</span>
               <span>{{ louName }}-{{ danyuanName }}</span>
             </div>
             <div class="item" v-if="index == 0">
diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue
index b5a1ca9a..bd8bb9f0 100644
--- a/src/views/modules/visual/basicinfo/cpts/people-more.vue
+++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue
@@ -27,7 +27,7 @@
             </div>
             <div class="item"
                  v-if="index == 0">
-              <span class="item-field">所属楼宇：</span>
+              <span class="item-field">所属楼栋：</span>
               <span>{{ louName }}-{{ danyuanName }}</span>
             </div>
             <div class="item"

From 8dca2f19906400e37d541587cfc1ea48342eefdf Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 15 Apr 2022 15:37:41 +0800
Subject: [PATCH 2/3] dd

---
 src/views/components/editResi.vue |  4 ++--
 src/views/components/resiForm.vue |  4 ++--
 src/views/modules/base/resi.vue   | 25 ++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index eb57496a..8459e87c 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -803,7 +803,7 @@ export default {
   }
 }
 .resi-cell-value .resi-cell-input {
-    max-width: 180px;
+    max-width: 190px;
 }
 
 </style>
@@ -841,7 +841,7 @@ export default {
     }
   }
   .resi-cell-select {
-    width: 180px;
+    width: 190px;
     box-sizing: border-box;
     margin-right: 10px;
     &-middle {
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index a6a4df46..9ebcf9c7 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -759,7 +759,7 @@ export default {
   }
 }
 .resi-cell-value .resi-cell-input {
-    max-width: 180px;
+    max-width: 190px;
 }
 .resi-cell-value {
   :deep .el-col {
@@ -787,7 +787,7 @@ export default {
     }
   }
   .resi-cell-select {
-    width: 180px;
+    width: 190px;
     box-sizing: border-box;
     margin-right: 10px;
     &-middle {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 575ecace..29c48f3c 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -259,6 +259,10 @@
                @closed="diaClose">
       <resi-change-record ref="ref_changerecord"></resi-change-record>
     </el-dialog>
+    <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
+                 :userId="lookInfo.userId"
+                 :gridName="lookInfo.gridName"
+                 @close="showedPeopleMoreInfo = false" />
 
   </div>
 </template>
@@ -272,6 +276,7 @@ import axios from 'axios'
 import { mapGetters } from 'vuex'
 import resiTransfer from '../../components/resiTransfer.vue'
 import resiChangeRecord from '../../components/resiChangeRecord.vue'
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
 
 export default {
   components: {
@@ -279,7 +284,8 @@ export default {
     resiForm,
     editResi,
     resiTransfer,
-    resiChangeRecord
+    resiChangeRecord,
+    peopleMore
   },
   data () {
     return {
@@ -297,6 +303,8 @@ export default {
       isIndeterminate: false,
       dialogEditVisible: false,
       dialogVisible: false,
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
       currentPage: 1,
       pageSize: 20,
@@ -324,6 +332,10 @@ export default {
 
       tranferShow: false,
       changeRecordShow: false,
+      lookInfo: {
+        userId: '',
+        gridName: ''
+      }
     }
   },
   props: {
@@ -696,10 +708,13 @@ export default {
       console.log(tab, event)
     },
     async handleLook (row) {
-      this.disabled = true
-      this.editAgencyId = row.ORG_ID
-      await this.getFormList('edit')
-      this.getrowInfo(row.icResiUserId)
+      this.lookInfo.userId = row.icResiUserId
+      this.lookInfo.gridName = row.GRID_ID
+      this.showedPeopleMoreInfo = true;
+      // this.disabled = true
+      // this.editAgencyId = row.ORG_ID
+      // await this.getFormList('edit')
+      // this.getrowInfo(row.icResiUserId)
     },
     async handleEdit (row) {
       this.disabled = false

From 1d3692917f53cc39e15906fd3ca5450561c851ab Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 15 Apr 2022 15:39:09 +0800
Subject: [PATCH 3/3] dd

---
 src/views/modules/base/resi.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 29c48f3c..979d2997 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -262,7 +262,7 @@
     <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
                  :userId="lookInfo.userId"
                  :gridName="lookInfo.gridName"
-                 @close="showedPeopleMoreInfo = false" />
+                 @close="handleCancleLook" />
 
   </div>
 </template>
@@ -716,6 +716,11 @@ export default {
       // await this.getFormList('edit')
       // this.getrowInfo(row.icResiUserId)
     },
+    handleCancleLook() {
+      this.lookInfo.userId = ''
+      this.lookInfo.gridName = ''
+      this.showedPeopleMoreInfo = false;
+    },
     async handleEdit (row) {
       this.disabled = false
       this.editAgencyId = row.ORG_ID