Merge branch 'dev-220411' into test

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 {

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 {

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="handleCancleLook" />
 
   </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,18 @@ 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)
+    },
+    handleCancleLook() {
+      this.lookInfo.userId = ''
+      this.lookInfo.gridName = ''
+      this.showedPeopleMoreInfo = false;
     },
     async handleEdit (row) {
       this.disabled = false

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">

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"