From d6b1363a1dfe12de9a1a2f2e8d6f3a88d558e13c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 25 Feb 2022 15:39:50 +0800
Subject: [PATCH] 通知通告页面，保安公司4个页面，心理咨询，成绩查询，培训报名列表修改
---
src/views/securityUnit/localCompany.vue | 3 +--
src/views/securityUnit/transRegionalcompany.vue | 3 +--
src/views/recruitmentManagement/index.vue | 12 +++++++++++-
src/views/securityUnit/selfRecruitedSecurityGuard.vue | 2 +-
src/views/talk/talk.vue | 6 +++++-
src/views/trainExam/singleperformance.vue | 4 ++++
src/views/desk/notice.vue | 4 +++-
src/views/trainingRegistration/index.vue | 4 ++++
src/views/securityUnit/securityTraining.vue | 3 +--
9 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index ddcf661..4cf4bd3 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -406,10 +406,12 @@
this.userInfo.role_name == "装备管理员"
) {
params["deptId"] = this.userInfo.dept_id;
+ }else{
+ params["jurisdiction"] = this.userInfo.jurisdiction;
}
const { releaseTimeRange } = this.query;
- params["jurisdiction"] = this.jurisdiction;
+
params["type"] = 1;
let values = {
...params
diff --git a/src/views/recruitmentManagement/index.vue b/src/views/recruitmentManagement/index.vue
index c0c6704..15bf01e 100644
--- a/src/views/recruitmentManagement/index.vue
+++ b/src/views/recruitmentManagement/index.vue
@@ -12,6 +12,7 @@
:data="data"
:page.sync="page"
ref="crudrec"
+ :permission="permissionList"
@on-load="onLoad"
:table-loading="loading"
@row-save="rowSave"
@@ -28,6 +29,7 @@
size="small"
plain
icon="el-icon-delete"
+ v-if="permission.recruitment_delete"
@click="handleDelete"
>删 除
</el-button>
@@ -97,7 +99,15 @@
}
},
computed: {
- ...mapGetters(["userInfo"]),
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.recruitment_add, false),
+ viewBtn: this.vaildData(this.permission.recruitment_view, true),
+ delBtn: this.vaildData(this.permission.recruitment_delete, false),
+ editBtn: this.vaildData(this.permission.recruitment_edit, false)
+ };
+ },
ids() {
let ids = [];
this.selectionList.forEach(ele => {
diff --git a/src/views/securityUnit/localCompany.vue b/src/views/securityUnit/localCompany.vue
index 66c2803..f7a236c 100644
--- a/src/views/securityUnit/localCompany.vue
+++ b/src/views/securityUnit/localCompany.vue
@@ -587,8 +587,7 @@
});
},
onLoad(page, params = {}) {
- if (this.userInfo.role_id == "1414840172333842433") {
- console.log("是公安add jurisdiction");
+ if(this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警" || this.userInfo.role_name == "administrator"){
params["jurisdiction"] = this.userInfo.jurisdiction;
}
params["stats"] = "2";
diff --git a/src/views/securityUnit/securityTraining.vue b/src/views/securityUnit/securityTraining.vue
index 5283491..a2c78e5 100644
--- a/src/views/securityUnit/securityTraining.vue
+++ b/src/views/securityUnit/securityTraining.vue
@@ -572,8 +572,7 @@
});
},
onLoad(page, params = {}) {
- if (this.userInfo.role_id == "1414840172333842433") {
- console.log("是公安add jurisdiction");
+ if(this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警" || this.userInfo.role_name == "administrator"){
params["jurisdiction"] = this.userInfo.jurisdiction;
}
params["stats"] = 1;
diff --git a/src/views/securityUnit/selfRecruitedSecurityGuard.vue b/src/views/securityUnit/selfRecruitedSecurityGuard.vue
index 0b449d5..ace56ba 100644
--- a/src/views/securityUnit/selfRecruitedSecurityGuard.vue
+++ b/src/views/securityUnit/selfRecruitedSecurityGuard.vue
@@ -543,7 +543,7 @@
});
},
onLoad(page, params = {}) {
- if (this.userInfo.role_id == "1414840172333842433") {
+ if(this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警" || this.userInfo.role_name == "administrator"){
params["jurisdiction"] = this.userInfo.jurisdiction;
}
if (this.userInfo.role_name == "培训公司管理员") {
diff --git a/src/views/securityUnit/transRegionalcompany.vue b/src/views/securityUnit/transRegionalcompany.vue
index 49387bc..f7a3c56 100644
--- a/src/views/securityUnit/transRegionalcompany.vue
+++ b/src/views/securityUnit/transRegionalcompany.vue
@@ -570,8 +570,7 @@
});
},
onLoad(page, params = {}) {
- if (this.userInfo.role_id == "1414840172333842433") {
- console.log("是公安add jurisdiction");
+ if(this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警" || this.userInfo.role_name == "administrator"){
params["jurisdiction"] = this.userInfo.jurisdiction;
}
params["stats"] = 4;
diff --git a/src/views/talk/talk.vue b/src/views/talk/talk.vue
index ae084b1..3624ea2 100644
--- a/src/views/talk/talk.vue
+++ b/src/views/talk/talk.vue
@@ -322,8 +322,12 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
+ if(this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警" || this.userInfo.role_name == "administrator"){
+ params["jurisdiction"] = this.userInfo.jurisdiction;
+ }else{
+ params["deptid"] = this.userInfo.dept_id;
+ }
this.loading = true;
- // console.log(1);
getList(
page.currentPage,
page.pageSize,
diff --git a/src/views/trainExam/singleperformance.vue b/src/views/trainExam/singleperformance.vue
index 28b2525..deeef57 100644
--- a/src/views/trainExam/singleperformance.vue
+++ b/src/views/trainExam/singleperformance.vue
@@ -624,6 +624,10 @@
//如果是培训公司管理员
params["trainUnitId"] = that.userInfo.dept_id;
}
+ if (roleAlias == "公安管理员" || roleAlias == "民警") {
+ //如果公安
+ params["jurisdiction"] = that.userInfo.jurisdiction;
+ }
that.questionBankLoading = false;
params["examType"] = 2;
if (this.sort) {
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index 50f5ee5..a3a234e 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -657,6 +657,10 @@
//如果是培训公司管理员
params["trainingUnitId"] = that.userInfo.dept_id;
}
+ if (roleAlias == "公安管理员" || roleAlias == "民警") {
+ //如果公安
+ params["jurisdiction"] = that.userInfo.jurisdiction;
+ }
// params["isExam"] = 1;
getdata(
page.currentPage,
--
Gitblit v1.9.3