更新

admin/src/views/tcm/diagnosis/add.vue

@@ -557,7 +557,7 @@ const validatePhone = (rule: any, value: any, callback: any) => {
 
 const validateIdCard = (rule: any, value: any, callback: any) => {
     if (!value) {
-        callback(new Error('请输入身份证号'))
+        callback()
         return
     }
     if (!/^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/.test(value)) {
@@ -569,7 +569,7 @@ const validateIdCard = (rule: any, value: any, callback: any) => {
 
 const formRules = {
     patient_name: [{ required: true, message: '请输入患者姓名', trigger: 'blur' }],
-    id_card: [{ required: true, validator: validateIdCard, trigger: 'blur' }],
+    id_card: [{ validator: validateIdCard, trigger: 'blur' }],
     phone: [{ required: true, validator: validatePhone, trigger: 'blur' }],
     gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
     age: [{ required: true, message: '请输入年龄', trigger: 'blur' }],

admin/src/views/tcm/diagnosis/edit.vue

@@ -1143,7 +1143,7 @@ const validateIdCard = (rule: any, value: any, callback: any) => {
     // 使用原始数据进行验证
     const idCardToValidate = originalIdCard.value || value
     if (!idCardToValidate) {
-        callback(new Error('请输入身份证号'))
+        callback()
         return
     }
     if (!/^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/.test(idCardToValidate)) {
@@ -1155,7 +1155,7 @@ const validateIdCard = (rule: any, value: any, callback: any) => {
 
 const formRules = {
     patient_name: [{ required: true, message: '请输入患者姓名', trigger: 'blur' }],
-    id_card: [{ required: true, validator: validateIdCard, trigger: 'blur' }],
+    id_card: [{ validator: validateIdCard, trigger: 'blur' }],
     phone: [{ required: true, validator: validatePhone, trigger: 'blur' }],
     gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
     age: [{ required: true, message: '请输入年龄', trigger: 'blur' }],

server/app/adminapi/validate/tcm/DiagnosisValidate.php

@@ -27,7 +27,7 @@ class DiagnosisValidate extends BaseValidate
     protected $rule = [
         'id' => 'require|checkDiagnosis',
         'patient_name' => 'require|length:1,50',
-        'id_card' => 'require|length:15,18',
+        'id_card' => 'length:15,18',
         'phone' => 'require|mobile',
         'gender' => 'require|in:0,1',
         'age' => 'require|number|between:0,150',