Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-10-21 3f572e4e6114775c3c6918ba8380657c0ade91f4

 src/views/securityGuard/securityGuard.vue

@@ -46,7 +46,7 @@
              icon="el-icon-upload2"
              v-if="permission.securityGuard_import"
              @click="handleImport1"
              >批量导入
              >保安员批量导入
            </el-button>
            <el-button
              type="success"
@@ -311,30 +311,30 @@

export default {
  data() {
    const validatePass = (rule, value, callback) => {
      if (value === "") {
        callback(new Error("请输入密码"));
      } else {
        callback();
      }
    };
    const validatePass2 = (rule, value, callback) => {
      if (value === "") {
        callback(new Error("请再次输入密码"));
      } else if (value !== this.form.password) {
        callback(new Error("两次输入密码不一致!"));
      } else {
        callback();
      }
    };
    const validatePassNumber = (rule, value, callback) => {
      var test = /^[0-9]*$/gm;
      if (!test.test(value)) {
        callback(new Error("请输入数字"));
      } else {
        callback();
      }
    };
    // const validatePass = (rule, value, callback) => {
    //   if (value === "") {
    //     callback(new Error("请输入密码"));
    //   } else {
    //     callback();
    //   }
    // };
    // const validatePass2 = (rule, value, callback) => {
    //   if (value === "") {
    //     callback(new Error("请再次输入密码"));
    //   } else if (value !== this.form.password) {
    //     callback(new Error("两次输入密码不一致!"));
    //   } else {
    //     callback();
    //   }
    // };
    // const validatePassNumber = (rule, value, callback) => {
    //   var test = /^[0-9]*$/gm;
    //   if (!test.test(value)) {
    //     callback(new Error("请输入数字"));
    //   } else {
    //     callback();
    //   }
    // };
    const validatePassCardid = (rule, value, callback) => {
      var test = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/g;
      if (!test.test(value) && value.length < 17) {
@@ -514,49 +514,6 @@
                ],
              },
              {
                label: "登录账号",
                prop: "account",
                editDisabled: true,
                rules: [
                  {
                    required: true,
                    message: "请输入登录账号",
                    trigger: "blur",
                  },
                ],
                // disabled: true,
              },
              {
                label: "密码",
                prop: "password",
                type: "password",
                hide: true,
                editDisplay: false,
                viewDisplay: false,
                rules: [
                  { required: true, validator: validatePass, trigger: "blur" },
                ],
              },
              {
                label: "确认密码",
                prop: "password2",
                type: "password",
                hide: true,
                editDisplay: false,
                viewDisplay: false,
                rules: [
                  { required: true, validator: validatePass2, trigger: "blur" },
                ],
              },
            ],
          },
          {
            label: "详细信息",
            prop: "detailInfo",
            labelWidth: "110",
            icon: "el-icon-s-order",
            column: [
              {
                label: "姓名",
                prop: "realName",
                rules: [
@@ -572,10 +529,88 @@
                  },
                ],
              },
              // {
              //   label: "登录账号",
              //   prop: "account",
              //   editDisabled: true,
              //   rules: [
              //     {
              //       required: true,
              //       message: "请输入登录账号",
              //       trigger: "blur",
              //     },
              //   ],
              //   // disabled: true,
              // },
              // {
              //   label: "密码",
              //   prop: "password",
              //   type: "password",
              //   hide: true,
              //   editDisplay: false,
              //   viewDisplay: false,
              //   rules: [
              //     { required: true, validator: validatePass, trigger: "blur" },
              //   ],
              // },
              // {
              //   label: "确认密码",
              //   prop: "password2",
              //   type: "password",
              //   hide: true,
              //   editDisplay: false,
              //   viewDisplay: false,
              //   rules: [
              //     { required: true, validator: validatePass2, trigger: "blur" },
              //   ],
              // },
            ],
          },
          {
            label: "详细信息",
            prop: "detailInfo",
            labelWidth: "110",
            icon: "el-icon-s-order",
            column: [
              {
                label: "昵称",
                prop: "name",
                label: "身份证号",
                prop: "cardid",
                hide: true,
                overHidden: true,
                rules: [
                  {
                    required: true,
                    message: "请输入身份证号",
                    trigger: "blur",
                  },
                  {
                    required: true,
                    validator: validatePassCardid,
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "手机号码",
                prop: "phone",
                overHidden: true,
                rules: [
                  {
                    required: true,
                    message: "请输入手机号",
                    trigger: "blur",
                  },
                  {
                    required: true,
                    validator: validatePassPhone,
                    trigger: "blur",
                  },
                ],
              },
              // {
              //   label: "昵称",
              //   prop: "name",
              // },
              {
                label: "个人照片",
                type: "upload",
@@ -647,41 +682,6 @@
                label: "保安员证编号",
                prop: "securitynumber",
                hide: true,
              },
              {
                label: "身份证号",
                prop: "cardid",
                hide: true,
                overHidden: true,
                rules: [
                  {
                    required: true,
                    message: "请输入身份证号",
                    trigger: "blur",
                  },
                  {
                    required: true,
                    validator: validatePassCardid,
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "手机号码",
                prop: "phone",
                overHidden: true,
                rules: [
                  {
                    required: true,
                    message: "请输入手机号",
                    trigger: "blur",
                  },
                  {
                    required: true,
                    validator: validatePassPhone,
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "电子邮箱",