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; } @@ -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"> + @@ -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