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

shuishen

2021-11-12 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906

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

 src/api/accreditationRecords/accreditationRecords.js

@@ -1,14 +1,13 @@
import request from '@/router/axios';

export const getList = (current, size, params, deptId) => {
export const getList = (current, size, params) => {
    return request({
        url: '/api/accreditationRecords/page',
        method: 'get',
        params: {
            ...params,
            current,
            size,
            deptId,
            ...params
        }
    })
}

 src/views/accreditationRecords/accreditationRecords.vue

@@ -137,7 +137,7 @@
            editDisplay: false,
            viewDisplay: false,
            search: true,
            searchSpan:6,
            searchSpan:5,
            rules: [
              {
                required: true,
@@ -202,7 +202,7 @@
            prop: "idCardNo",
            search: true,
            searchLabelWidth: 90,
            searchSpan: 5,
            searchSpan: 4,
          },
          {
            label: "年龄",
@@ -220,23 +220,34 @@
            search: true,
            searchLabelWidth: 90,
            minWidth: 105,
            searchSpan: 4,
            searchSpan: 3,
            addDisplay: false,
            editDisplay: false,
            // hide: true,
          },

          // {
          //   label: "申请人",
          //   prop: "createUser",
          {
            label: "申请人",
            prop: "applyName",
          //   search: true,
          //   searchLabelWidth: 90,
          //   minWidth: 105,
            searchLabelWidth: 90,
            width: 80,
          //   searchSpan: 4,
          //   addDisplay: false,
          //   editDisplay: false,
          //   // hide: true,
          // },
            addDisplay: false,
            editDisplay: false,
            // hide: true,
          },
          {
            label: "申请人所在单位",
            prop: "applyUnit",
            search: true,
            searchLabelWidth: 120,
            minWidth: 105,
            searchSpan: 4,
            addDisplay: false,
            editDisplay: false,
            // hide: true,
          },
          {
            label: "申请时间",
            prop: "createTime",
@@ -448,17 +459,20 @@
        window.localStorage.getItem("saber-userInfo")
      ).content.dept_id;

      //获取当前用户部门信息，判断是否为公安，如果是公安，则只能查看公告信息
      var that = this;
      getDept(this.deptId).then((res) => {
        var deptCategory = res.data.data.deptCategory;
        deptCategory == 1
          ? (that.deptCategory = true)
          : (that.deptCategory = false);

        const { releaseTimeRange } = this.query;
        params["jurisdiction"] = this.jurisdiction;
        params["type"] = 1;
        if (this.userInfo.role_name == "保安公司管理员") {
          //如果是保安公司管理员
          params["deptId"] = this.userInfo.dept_id;
        }
        if (this.userInfo.role_name == "培训公司管理员") {
          //如果是培训公司管理员
          params["createUser"] = this.userInfo.Id;
        }
        if (this.userInfo.role_name == "公安管理员") {
          //如果是公安管理员
          params["jurisdiction"] = this.userInfo.jurisdiction;
        }
        let values = {
          ...params,
        };
@@ -478,7 +492,6 @@
          this.data = data.records;
          this.loading = false;
          this.selectionClear();
        });
      });
    },
    //保安员证信息导出

 src/views/accreditationRecords/accreditationRecordsPaper.vue

@@ -47,15 +47,19 @@
              type="primary"
              size="small"
              plain
              
              v-if="permission.accreditationRecords_batch_audit"
              icon="el-icon-collection-tag"
              @click="handleSecurityAudit"
              >批量审批
        </el-button>
        <!-- v-if="permission.securityGuard_security_audit" -->
      </template>
      <template slot-scope="{ row }" slot="category">
        <el-tag>{{ row.categoryName }}</el-tag>
      </template>
      <template slot-scope="{ row }" slot="userType">
            {{
              row.userType == 6 ? "已制证" : row.userType == 7 ? "未制证" : ""
            }}
      </template>
      <template slot-scope="{ type, size, row }" slot="menu">
        <el-button
@@ -76,6 +80,7 @@
        <el-button
          :type="type"
          :size="size"
          v-if="permission.accreditationRecords_audit"
          icon="el-icon-folder-checked"
          @click="handleAudit(row)"
          >审核
@@ -84,10 +89,10 @@
          icon="el-icon-edit"
          :size="size"
          :type="type"
          v-if="permission.securityGuard_paper"
          v-if="permission.accreditationRecords_paper"
          :disabled="row.auditStatus != 2"
          @click.stop="certificateClick(row)"
          >纸质证书制作
          >证书打印
        </el-button>
        <!-- v-if="permission.paper_audit_check" -->
      </template>
@@ -571,7 +576,7 @@
      return {
        addBtn: this.vaildData(null, false),
        viewBtn: this.vaildData(
          this.permission.accreditationRecords_view,
          this.permission.accreditationRecords_paper_view,
          false
        ),
        delBtn: this.vaildData(null, false),
@@ -591,6 +596,15 @@
  },
  mounted() {
    this.getDeptInfo(this.userInfo.dept_id);
    // if (this.userInfo.roleName == "办证管理员") {
    //   this.search["userType"] = 7;
    // }
  },
  created() {
    if (this.userInfo.role_name == "办证管理员") {
      this.questionBankSearch["userType"] = 7;
      this.questionBankSearch["auditStatus"] = 2;
    }
  },
  methods: {
    //获取当前用户部门信息
@@ -654,7 +668,7 @@
        this.certificateObj.registered == "" ||
        this.certificateObj.registered == null
      ) {
        this.$message({ message: "请完善住址信息", type: "warning" });
        this.$message({ message: "请完善身份证住址信息", type: "warning" });
        return;
      }
      //更新发证时间
@@ -897,21 +911,26 @@
      this.onLoad(this.page, this.query);
    },
    onLoad(page, params = {}) {
      params = this.questionBankSearch;
      this.deptId = JSON.parse(
        window.localStorage.getItem("saber-userInfo")
      ).content.dept_id;

      //获取当前用户部门信息，判断是否为公安，如果是公安，则只能查看公告信息
      var that = this;
      getDept(this.deptId).then((res) => {
        var deptCategory = res.data.data.deptCategory;
        deptCategory == 1
          ? (that.deptCategory = true)
          : (that.deptCategory = false);

        const { releaseTimeRange } = this.query;
        params["jurisdiction"] = this.jurisdiction;
        // params["jurisdiction"] = this.jurisdiction;
        params["type"] = 2;
        if (this.userInfo.role_name == "保安公司管理员") {
          //如果是保安公司管理员
          params["deptId"] = this.userInfo.dept_id;
        }
        if (this.userInfo.role_name == "培训公司管理员") {
          //如果是培训公司管理员
          params["createUser"] = this.userInfo.Id;
        }
        if (this.userInfo.role_name == "公安管理员") {
          //如果是公安管理员
          params["jurisdiction"] = this.userInfo.jurisdiction;
        }
        let values = {
          ...params,
        };
@@ -931,7 +950,6 @@
          this.data = data.records;
          this.loading = false;
          this.selectionClear();
        });
      });
    },
    //保安员证信息导出

 src/views/securityGuard/securityGuard.vue

@@ -70,7 +70,7 @@
              type="primary"
              size="small"
              plain
              v-if="permission.securityGuard_security_apply"
              v-if="permission.securityGuard_security_paper_apply"
              icon="el-icon-collection-tag"
              @click="handleSecurityPaperApply"
              >证书制证申请
@@ -920,12 +920,12 @@
                prop: "address",
              },
              {
                label: "住址",
                label: "身份证住址",
                prop: "registered",
                rules: [
                  {
                    required: true,
                    message: "请输入住址",
                    message: "请输入身份证住址",
                    trigger: "click",
                  },
                ],
@@ -1462,7 +1462,7 @@
        this.certificateObj.registered == "" ||
        this.certificateObj.registered == null
      ) {
        this.$message({ message: "请完善住址信息", type: "warning" });
        this.$message({ message: "请完善身份证住址信息", type: "warning" });
        return;
      }
      //更新发证时间