diff --git a/jshERP-web/src/views/system/UserList.vue b/jshERP-web/src/views/system/UserList.vue index 84ddf008..4b2a4896 100644 --- a/jshERP-web/src/views/system/UserList.vue +++ b/jshERP-web/src/views/system/UserList.vue @@ -130,13 +130,14 @@ dataIndex: 'action', scopedSlots: {customRender: 'action'}, align: "center", - width: 260 + width: 160 }, { title: '登录名称', dataIndex: 'loginName', width: 100, align: "left"}, { title: '用户姓名', dataIndex: 'username', width: 100, align: "left"}, { title: '用户类型', dataIndex: 'userType', width: 80, align: "left" }, { title: '角色', dataIndex: 'roleName', width: 100, align: "left"}, - { title: '机构', dataIndex: 'orgAbr', width: 115, align: "left"}, + { title: '机构', dataIndex: 'orgAbr', width: 140, align: "left"}, + { title: '是否经理', dataIndex: 'leaderFlagStr', width: 80, align: "left"}, { title: '电话号码', dataIndex: 'phonenum', width: 120, align: "left"}, { title: '排序', dataIndex: 'userBlngOrgaDsplSeq', width: 60, align: "left"}, { title: '状态',dataIndex: 'status',width:70,align:"center", diff --git a/jshERP-web/src/views/system/modules/UserModal.vue b/jshERP-web/src/views/system/modules/UserModal.vue index faaa880b..b814f8fb 100644 --- a/jshERP-web/src/views/system/modules/UserModal.vue +++ b/jshERP-web/src/views/system/modules/UserModal.vue @@ -44,6 +44,12 @@ + + + + + + @@ -139,7 +145,7 @@ this.visible = true; this.model = Object.assign({}, record); this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model,'loginName','username','roleId','orgaId','position', + this.form.setFieldsValue(pick(this.model,'loginName','username','roleId','orgaId','position','leaderFlag', 'phonenum','email','userBlngOrgaDsplSeq','description')) autoJumpNextInput('userModal') });