Browse Source

Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release

pull/114/head
zhangtao 1 year ago
parent
commit
3c0710c324
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      src/views/task-manage/components/DrawComp.vue
  2. +2
    -2
      src/views/user-manage/tools/form.js

+ 1
- 1
src/views/task-manage/components/DrawComp.vue View File

@@ -73,7 +73,7 @@
ref="formRefOrder"
:model="form.userForm"
:rules="form.userRulesOrder"
:label-width="85"
:label-width="95"
label-placement="left"
require-mark-placement="left"
>

+ 2
- 2
src/views/user-manage/tools/form.js View File

@@ -21,7 +21,7 @@ export const form = reactive({
// { required: true, message: '请输入联系电话', type: 'string', trigger: 'blur' },
{ required: true, message: '请输入正确的联系电话', pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|166|17[3678]|18[0-9]|14[57])[0-9]{8}$/, trigger: 'blur' }
],
roleId: [{ required: true, type: 'number', message: '请选择身份', trigger: 'blur' }],
roleId: [{ required: true, type: 'number', message: '请选择角色', trigger: 'blur' }],
username: [{ required: true, message: '账号为英文和数字', pattern: /^[a-zA-Z0-9]+$/, trigger: 'blur' }],
password: [{ required: true, message: '密码为6到20位的大小写英文和数字组成的', pattern: /^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$)([^\u4e00-\u9fa5\s]){6,20}$/, trigger: 'blur' }],
type: [{ required: true, type: 'number', message: '请选择是否为管理员', trigger: 'blur' }]
@@ -29,7 +29,7 @@ export const form = reactive({
formItem: [
{ type: 'input', key: 'realname', label: '姓名', props: { maxlength: '5', placeholder: '请输入姓名', clearable: true }},
{ type: 'input', key: 'mobile', label: '联系电话', props: { maxlength: '20', placeholder: '请输入联系电话', clearable: true }},
{ type: 'select', key: 'roleId', label: '身份选择', props: { options: roleOptions, clearable: true }},
{ type: 'select', key: 'roleId', label: '角色选择', props: { placeholder: '请选择角色', options: roleOptions, clearable: true }},
{ type: 'input', key: 'username', label: '帐号', props: { maxlength: '20', placeholder: '请输入帐号', clearable: true }},
{ type: 'input', key: 'password', label: '初始密码', props: { maxlength: '20', placeholder: '请输入初始密码', clearable: true }},
{ type: 'radio', key: 'type', label: '管理员', options: TYPE_OPTIONS }

Loading…
Cancel
Save