liuyg
2021-10-25 e75feee9d0cbd99cf727b1ea9b8598fe4af0d8b0
保安员新增年龄限制
2 files modified
36 ■■■■ changed files
src/views/exam/performance.vue 20 ●●●●● patch | view | raw | blame | history
src/views/securityGuard/securityGuard.vue 16 ●●●● patch | view | raw | blame | history
src/views/exam/performance.vue
@@ -1,8 +1,8 @@
/*
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-07-18 19:44:47
 * @Last Modified by: liu
 * @Last Modified time: 2021-10-25 15:10:09
 * menu-name 成绩管理
 */
<template>
@@ -38,7 +38,15 @@
              {{ row.allGrade == -1 ? "" : row.allGrade }}
            </template>
            <template slot-scope="{ row }" slot="qualified">
              {{ row.qualified == -1 ? "" : row.qualified==0?"合格":row.qualified==1?"不合格":'' }}
              {{
                row.qualified == -1
                  ? ""
                  : row.qualified == 0
                  ? "合格"
                  : row.qualified == 1
                  ? "不合格"
                  : ""
              }}
            </template>
            <!-- 自定义按钮 -->
@@ -84,7 +92,6 @@
            title="实操成绩导入"
            append-to-body
            :visible.sync="excelBox"
            width="555px"
          >
            <avue-form
@@ -214,7 +221,7 @@
                trigger: "blur",
              },
            ],
            width:160
            width: 160,
          },
          {
            label: "所属公司",
@@ -541,9 +548,8 @@
              that.questionBankLoading = false;
              that.questionBankSelectionClear();
            });
        })
      });
      });
    },
    questionBankSelectionClear() {
      this.questionBankSelectionList = [];
src/views/securityGuard/securityGuard.vue
@@ -335,13 +335,25 @@
    //     callback();
    //   }
    // };
    var date = new Date();
    let year = date.getFullYear(),
      oldyear;
    const validatePassCardid = (rule, value, callback) => {
      var test = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/g;
      if (!test.test(value) && value.length < 17) {
      var test =
        /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
      if (!test.test(value)) {
        callback(new Error("请输入正确身份证号码"));
      } else {
        //加入校验18岁到60岁的
        oldyear = +value.slice(6, 10);
        if (year - oldyear < 18 || year - oldyear > 60) {
          // callback(new Error("根据国家要求,需在18岁至60岁"));
          callback(new Error("年龄不符"));
        } else {
        callback();
      }
      }
    };
    const validatePassPhone = (rule, value, callback) => {
      var test = /^(13[0-9]|14[0-9]|15[0-9]|17[0-9]|18[0-9])\d{8}$/g;