Merge remote-tracking branch 'origin/dev' into dev

src/views/system/teacherInfo/index.vue

@@ -630,8 +630,8 @@ export default {
     //验证身份证
     var isCardId = (rule, value, callback) => {
       if (!value) {
-        return new Error("请输入身份证号)");
-      } else {
+        return callback();
+      }  else {
         const reg =
           /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/;
         const card = reg.test(value);
@@ -754,7 +754,7 @@ export default {
           { required: true, message: "请输入教师名称", trigger: "blur" },
         ],
         cardNo: [
-          { required: true, message: "请输入证件号", trigger: "blur" },
+          {  message: "", trigger: "blur" },
           { validator: isCardId, trigger: "blur" },
         ],
         classInfoList: [