Merge remote-tracking branch 'origin/master'

smart-office-manager-ui/admin/src/views/workman/drawershow.vue

@@ -104,11 +104,11 @@
                     {required: true,message: "请选择人员所属房间", trigger: "blur" }
                   ],
                   phone: [
-                    {required: true,trigger: "blur" ,validator:phoneReg },
+                    {required: true,trigger: "blur" ,validator: mobileReg},
                     {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
                   ],
                   mobile: [
-                    {required: true,trigger: "blur" ,validator:mobileReg},
+                    {required: true,trigger: "blur" ,validator:phoneReg},
                     {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
                   ],
                     workStatus: [