From 415bf078cb4f9615e9090663b7880e35817fd036 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 11 五月 2024 18:54:26 +0800
Subject: [PATCH] 最新版本

---
 admin/src/utils/form.js |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/admin/src/utils/form.js b/admin/src/utils/form.js
index 52ef5cf..bb53d89 100644
--- a/admin/src/utils/form.js
+++ b/admin/src/utils/form.js
@@ -1,7 +1,7 @@
 // 楠岃瘉鎵嬫満鍙风爜
 export function checkMobile (rule, value, callback) {
   if (value == null || value.trim() === '') {
-    callback()
+    callback(new Error('璇疯緭鍏ユ纭殑鎵嬫満鍙�'))
     return
   }
   if (!/^1\d{10}$/.test(value)) {
@@ -24,8 +24,7 @@
   callback()
 }
 
-
-export function numRule(rule, value, callback) {
+export function numRule (rule, value, callback) {
   // debugger
   if (value == null || value < 0 || !value) {
     callback(new Error())
@@ -33,7 +32,7 @@
     callback()
   }
 }
-export function arrayRule(rule, value, callback) {
+export function arrayRule (rule, value, callback) {
   // debugger
   if (value == null || value.length <= 0 || !value) {
     callback(new Error())
@@ -69,13 +68,31 @@
     }
     return
   }
-  let re = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/
+  const re = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/
   var result = re.test(value)
-  if(!result) {
+  if (!result) {
     callback(new Error('璇疯緭鍏ユ纭殑绀句細淇$敤浠g爜'))
   } else {
     callback()
   }
 }
-
-
+export function validIdCardNo (rule, value, callback) {
+  const pattern = /^[1-9]\d{5}(18|19|20)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/
+  if (value == null || value.trim() ==='') {
+    callback(new Error('璇疯緭鍏ヨ韩浠借瘉鍙�'))
+  } else if (!pattern.test(value)) {
+    callback(new Error('璇疯緭鍏ユ纭殑韬唤璇佸彿'))
+  } else {
+    callback()
+  }
+}
+export function validIdCardNoNew (rule, value, callback) {
+  const pattern = /^[1-9]\d{5}(18|19|20)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/
+  if (value == null || value.trim() ==='') {
+    callback()
+  } else if (!pattern.test(value)) {
+    callback(new Error('璇疯緭鍏ユ纭殑韬唤璇佸彿'))
+  } else {
+    callback()
+  }
+}

--
Gitblit v1.9.3