diff --git a/src/views/system/user/UserModal.vue b/src/views/system/user/UserModal.vue index 1dff3d0..e52000a 100644 --- a/src/views/system/user/UserModal.vue +++ b/src/views/system/user/UserModal.vue @@ -132,3 +132,10 @@ } }); + diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts index 3497753..dbcc7a3 100644 --- a/src/views/system/user/user.data.ts +++ b/src/views/system/user/user.data.ts @@ -116,20 +116,9 @@ export const userFormSchema: FormSchema[] = [ show: false }, { - field: 'nickName', - label: '用户昵称', + field: 'casUserId', + label: 'SSO用户', component: 'Input', - required: true, - colProps: { - span: 12 - } - }, - { - field: 'avatar', - label: '头像', - component: 'Input', - defaultValue: 'https://godolphinx.org/dolphin1024x1024.png', - show: false }, { field: 'deptId', @@ -148,87 +137,6 @@ export const userFormSchema: FormSchema[] = [ span: 12 } }, - { - field: 'phone', - label: '手机号', - component: 'Input', - rules: [ - { - required: true, - message: '请输入手机号!', - }, - { - pattern: new RegExp('^1[3|4|5|6|7|8|9][0-9]\\d{8}$'), - message: '请输入正确的手机号码!', - validateTrigger: 'blur' - } - ] - }, - { - field: 'email', - label: '邮箱', - component: 'Input', - rules: [ - { - required: true, - message: '请输入邮箱!', - }, - { - type: 'email', - message: '请输入正确的邮箱地址!', - validateTrigger: ['blur', 'change'] - } - ] - }, - { - field: 'userName', - label: '用户名', - component: 'Input', - required: true, - colProps: { - span: 12 - } - }, - { - field: 'password', - label: '密码', - component: 'InputPassword', - colProps: { - span: 12 - }, - rules: [ - { - required: true, - whitespace: true, - message: '请输入密码!', - }, - { - pattern: new RegExp('[^\\u4e00-\\u9fa5]+'), - type: 'string', - message: '密码不能输入汉字!', - }, - { - min: 6, - max: 32, - message: '长度必需在6-32之间!', - } - ] - }, - { - field: 'sex', - label: '性别', - component: 'Select', - required: true, - componentProps: { - options: [ - { label: '男', value: '0' }, - { label: '女', value: '1' } - ] - }, - colProps: { - span: 12 - } - }, { field: 'status', label: '状态', @@ -297,16 +205,5 @@ export const userFormSchema: FormSchema[] = [ }, ifShow: ({ values }) => values.userType == SystemUserType.CUSTOMER_SERVICE, required: true, - }, - { - label: '备注', - field: 'remarks', - component: 'InputTextArea', - componentProps: { - rows: 6 - }, - colProps: { - span: 24 - } } ];