Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue

@@ -340,7 +340,7 @@
 <script>
 import { getWindowList, saveWorkman } from "@/services/dept";
 import { modelList } from "@/services/basicsetFun";
-// import { changePhone, changeLandline } from "@/utils/validate";
+import { changePhone } from "@/utils/validate";
 export default {
   props: {
     editVisible: {
@@ -440,7 +440,7 @@ export default {
         // windowId: [
         //   { required: true, message: "窗口不能为空", trigger: "change" },
         // ],
-        // mobile: [{ required: false, validator: changePhone, trigger: "blur" }],
+        mobile: [{ required: true, validator: changePhone, trigger: "blur" }],
         // phone: [
         //   { required: false, validator: changeLandline, trigger: "blur" },
         // ],

base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue

@@ -373,7 +373,7 @@
 import { changeAccount, changePassWord } from "@/utils/validate";
 import { getWindowList, saveWorkman } from "@/services/dept";
 import { modelList } from "@/services/basicsetFun";
-// import { changePhone, changeLandline } from "@/utils/validate";
+import { changePhone } from "@/utils/validate";
 import local from "@/utils/local";
 export default {
   props: {
@@ -481,7 +481,7 @@ export default {
         loginPwd: [
           { required: true, validator: changePassWord, trigger: "blur" },
         ],
-        // mobile: [{ required: false, validator: changePhone, trigger: "blur" }],
+        mobile: [{ required: true, validator: changePhone, trigger: "blur" }],
         // phone: [
         //   { required: false, validator: changeLandline, trigger: "blur" },
         // ],

base-manager-ui/admin/src/utils/validate.js

@@ -65,7 +65,7 @@ export const changePassWord = (rule, value, callback) => {
 // 验证手机号码
 export const changePhone = (rule, value, callback) => {
   if (!value) {
-    // callback(new Error("请输入手机号"));
+    callback(new Error("请输入手机号"));
     callback();
   } else if (!/^1[3-9]\d{9}$/.test(value)) {
     callback(new Error("手机号码格式不正确"));