diff --git a/src/api/admin/dept.js b/src/api/admin/dept.js index e26e4290b56df177f0ab23843e8926cdc3b9a825..572720298f252ef151e217ae379b668c916b2e9f 100644 --- a/src/api/admin/dept.js +++ b/src/api/admin/dept.js @@ -62,3 +62,11 @@ export function putObj (obj) { data: obj }) } + +export function getdetails (obj) { + return request({ + url: '/admin/dept/details/' + obj, + method: 'get' + }) +} + diff --git a/src/const/crud/admin/user.js b/src/const/crud/admin/user.js index 1d1e2a1a26a3501c65805007c0a54570a501e59d..4f94de4d15ae270e26453ab8e5d82175ca3314c4 100644 --- a/src/const/crud/admin/user.js +++ b/src/const/crud/admin/user.js @@ -27,6 +27,21 @@ var validateUsername = (rule, value, callback) => { } }) } + +// 设置手机号的验证规则 +const checkPhone = (rule, value, callback) => { + if (!value) { + callback(new Error('请输入联系方式')) + } else { + const reg = /^1[3|4|5|7|8][0-9]\d{8}$/ + if (reg.test(value)) { + callback() + } else { + return callback(new Error('请输入正确的电话')) + } + } +} + export const tableOption = { border: true, index: true, @@ -97,12 +112,7 @@ export const tableOption = { type: 'phone', value: '', span: 24, - rules: [{ - min: 6, - max: 20, - message: '长度在 11 个字符', - trigger: 'blur' - }] + rules: [ {validator: checkPhone, trigger: 'blur' }] }, { label: '角色', prop: 'role', diff --git a/src/views/admin/dept/index.vue b/src/views/admin/dept/index.vue index 2414af60b9d45a0d29bf829f68f03b1f12be3840..add8ae10ad7e49e6ae02992becb6d72c0d3e4fb1 100644 --- a/src/views/admin/dept/index.vue +++ b/src/views/admin/dept/index.vue @@ -109,6 +109,20 @@ import {addObj, delObj, fetchTree, getObj, putObj} from '@/api/admin/dept' import {mapGetters} from 'vuex' + import { getdetails } from '@/api/admin/dept' + + var validatedeptname = (rule, value, callback) => { + getdetails(value).then(response => { + if (window.boxType === 'edit') callback() + let result = response.data.data + if (result !== null) { + callback(new Error('部门已经存在')) + } else { + callback() + } + }) + } + export default { name: 'dept', data() { @@ -137,8 +151,12 @@ {required: true, message: '请输入节点编号', trigger: 'blur'} ], name: [ - {required: true, message: '请输入部门名称', trigger: 'blur'} + { required: true, message: '请输入部门名称', trigger: 'blur' }, + {validator: validatedeptname, trigger: 'blur'} ], + orderNum: [ + { required: false, message: '排序值', trigger: 'blur' }, + ] }, labelPosition: 'right', form: {