From 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Nov 2021 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/accreditationRecords/accreditationRecords.vue | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/src/views/accreditationRecords/accreditationRecords.vue b/src/views/accreditationRecords/accreditationRecords.vue
index b480b43..3c9f9c5 100644
--- a/src/views/accreditationRecords/accreditationRecords.vue
+++ b/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",
- // search: true,
- // searchLabelWidth: 90,
- // minWidth: 105,
- // searchSpan: 4,
- // addDisplay: false,
- // editDisplay: false,
- // // hide: true,
- // },
+ {
+ label: "申请人",
+ prop: "applyName",
+ // search: true,
+ searchLabelWidth: 90,
+ width: 80,
+ // searchSpan: 4,
+ 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,
};
@@ -479,7 +493,6 @@
this.loading = false;
this.selectionClear();
});
- });
},
//保安员证信息导出
handleExport() {
--
Gitblit v1.9.3