From c2e4ed1a6e3a14406db471304360cd45ac8177d1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 11 八月 2023 18:46:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web_standard/src/components/ext/OperaCompanyUserExtWindow.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/web_standard/src/components/ext/OperaCompanyUserExtWindow.vue b/web_standard/src/components/ext/OperaCompanyUserExtWindow.vue
index b41e9f0..74a2b3f 100644
--- a/web_standard/src/components/ext/OperaCompanyUserExtWindow.vue
+++ b/web_standard/src/components/ext/OperaCompanyUserExtWindow.vue
@@ -45,7 +45,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { treeComList, allList } from '@/api/ext/companyUserExt'
-
+import { validateSpecialKey } from '@/assets/js/validate'
export default {
name: 'OperaCompanyUserExtWindow',
extends: BaseOpera,
@@ -71,9 +71,10 @@
{ pattern: /^[0-9]+$/, message: '鍙彲浠ヨ緭鍏ユ暟瀛�', trigger: 'change' }
],
empNo: [
- { required: true, message: '璇疯緭鍏ュ伐鍙�', trigger: 'blur' },
+ // { required: true, message: '璇疯緭鍏ュ伐鍙�', trigger: 'blur' },
{ max: 20, message: '杈撳叆瀛楁暟涓嶈秴杩�20', trigger: 'blur' },
- { pattern: /^[0-9a-zA-Z]+$/, message: '鍙彲浠ヨ緭鍏ユ暟瀛楀拰瀛楁瘝', trigger: 'change' }
+ { validator: validateSpecialKey, message: '鍙彲浠ヨ緭鍏ユ暟瀛椼�佸瓧姣嶆垨鑰呰嫳鏂囧瓧绗�', trigger: 'blur' },
+ // { pattern: /^[0-9a-zA-Z]+$/, trigger: 'change' }
],
departmentId: [
{ required: true, message: '璇烽�夋嫨閮ㄩ棬', trigger: 'blur' }
--
Gitblit v1.9.3