diff --git a/src/views/companyUserList/CompanyUserList.vue b/src/views/companyUserList/CompanyUserList.vue index b1ef1b6..d897bca 100644 --- a/src/views/companyUserList/CompanyUserList.vue +++ b/src/views/companyUserList/CompanyUserList.vue @@ -6,8 +6,13 @@ - - + + + + + + + @@ -23,7 +28,7 @@
- 新增 +
@@ -45,9 +50,8 @@ - - - 编辑 + + 查看 @@ -81,34 +85,46 @@ export default { return parseInt(index) + 1 } }, { - title: '用户名', + title: '姓名', align: 'center', + width: 140, dataIndex: 'name', scopedSlots: { customRender: 'text' } - }, - { - title: '用户账号', + }, { + title: '性别', align: 'center', - dataIndex: 'username', + width: 80, + dataIndex: 'gender_dictText', scopedSlots: { customRender: 'text' } - }, - { + }, { + title: '职务', + align: 'center', + width: 280, + dataIndex: 'post', + scopedSlots: { customRender: 'text' } + }, { title: '手机号', align: 'center', + width: 140, dataIndex: 'phone', scopedSlots: { customRender: 'text' } - }, - { + }, { + title: '创建时间', + align: 'center', + width: 200, + dataIndex: 'createTime', + scopedSlots: { customRender: 'text' } + }, { title: '操作', dataIndex: 'action', align: 'center', fixed: 'right', - width: 130, + width: 160, scopedSlots: { customRender: 'action' } } ], url: { - list: '/payCaseCommitteeSubitem/payCaseCommitteeSubitem/findTwo' + list: '/company/payContactsManagement/listByCompany' } } }, diff --git a/src/views/companyUserList/modules/CompanyUserModal.vue b/src/views/companyUserList/modules/CompanyUserModal.vue index 1a034ba..6144a71 100644 --- a/src/views/companyUserList/modules/CompanyUserModal.vue +++ b/src/views/companyUserList/modules/CompanyUserModal.vue @@ -4,8 +4,7 @@ :width="width" :visible="visible" :confirmLoading="confirmLoading" - switchFullscreen - @ok="handleOk" + :footer="null" @cancel="handleCancel" cancelText="关闭"> @@ -168,7 +167,7 @@ export default { this.model = Object.assign({}, record) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model)) + this.form.setFieldsValue(pick(this.model, 'company', 'name', 'gender', 'post', 'phone', 'email', 'contactAddress', 'postalCode', 'remarks')) }) }, /**