From 00dd76958aaa756268cc2eab85528a4a09c97522 Mon Sep 17 00:00:00 2001
From: yangying <2505594512@qq.com>
Date: Fri, 3 Apr 2020 09:43:07 +0800
Subject: [PATCH] =?UTF-8?q?#1.=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=A1=B5=E9=9D=A2=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=A0=A1=E9=AA=8C=E3=80=82=20#2.=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=83=A8=E5=88=86,=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=AE=A1=E7=90=86=E8=83=BD=E5=88=9B=E5=BB=BA=E7=9B=B8?=
 =?UTF-8?q?=E5=90=8C=E5=90=8D=E5=AD=97=E9=83=A8=E9=97=A8=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin/dept.js          |  8 ++++++++
 src/const/crud/admin/user.js   | 22 ++++++++++++++++------
 src/views/admin/dept/index.vue | 20 +++++++++++++++++++-
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/api/admin/dept.js b/src/api/admin/dept.js
index e26e4290..57272029 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 1d1e2a1a..4f94de4d 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 2414af60..add8ae10 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: {
-- 
Gitee