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

shuishen

2021-11-05 d8cb402b82f93279531be6babbb89400a50a178d

 src/views/accreditationRecords/accreditationRecords.vue

@@ -126,7 +126,7 @@
        dialogClickModal: false,
        column: [
          {
            label: "通知时间",
            label: "申请时间",
            prop: "releaseTimeRange",
            type: "datetime",
            format: "yyyy-MM-dd",
@@ -141,7 +141,7 @@
            rules: [
              {
                required: true,
                message: "请输入通知时间",
                message: "请输入申请时间",
                trigger: "blur",
              },
            ],
@@ -187,6 +187,7 @@
              slot: true,
              searchSpan: 5,
              search: true,
              overHidden: true,
              minWidth: 200
          },
          {
@@ -208,6 +209,12 @@
            prop: "age",
          },
          {
            label: "照片",
            prop: "avatar",
            type: "upload",
            listType: "picture-img",
          },
          {
            label: "保安证编号",
            prop: "securityNumber",
            search: true,
@@ -218,6 +225,7 @@
            editDisplay: false,
            // hide: true,
          },

          // {
          //   label: "申请人",
          //   prop: "createUser",
@@ -239,6 +247,33 @@
            addDisplay: false,
            editDisplay: false,
            // hide: true,
          },
          {
            label: "有无照片",
            prop: "isAvatar",
            type: "select",
            search:true,
            searchLabelWidth: 90,
            minWidth: 105,
            searchSpan: 3,
            addDisplay: false,
            editDisplay: false,
            hide: true,
            display: false,
            dicData:[
              {
                label:"全部",
                value:3
              },
              {
                label:"有",
                value:1
              },
              {
                label:"无",
                value:2
              }
            ]
          },
        ],
      },
@@ -454,7 +489,7 @@
        type: "warning",
      }).then(() => {
        //获取查询条件
        console.log(this.questionBankSearch, 456);
        // console.log(this.questionBankSearch, 456);
        const { releaseTimeRange } = this.questionBankSearch;
        if (releaseTimeRange) {
            this.questionBankSearch['startTime'] = releaseTimeRange[0];
@@ -465,22 +500,22 @@
          idCardNo: this.questionBankSearch.idCardNo,
          realName: this.questionBankSearch.realName,
          securityNumber: this.questionBankSearch.securityNumber,
          startTime: this.questionBankSearch.securityName,
          endTime: this.questionBankSearch.examName,
          startTime: this.questionBankSearch.startTime,
          endTime: this.questionBankSearch.endTime,
        };
        //导出
        if (
          this.userInfo.role_name == "保安公司管理员" ||
          this.userInfo.role_name == "保安"
        ) {
          //如果是保安公司管理员
          data["deptId"] = this.userInfo.dept_id;
        }
        // if (
        //   this.userInfo.role_name == "保安公司管理员" ||
        //   this.userInfo.role_name == "保安"
        // ) {
        //   //如果是保安公司管理员
        //   data["deptId"] = this.userInfo.dept_id;
        // }
        if (this.userInfo.role_name == "培训公司管理员") {
          //如果是培训公司管理员
          data["trainUnitId"] = this.userInfo.dept_id;
        }
        data["examType"] = 2;
        // data["examType"] = 2;
        //序列号url形式，用&拼接
        data = Qs.stringify(data);
        window.open(`/api/accreditationRecords/export-security-paper?` + data);