From b6d70fd9329b1c5fee415713e7ca5d9dcab66526 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 02 Mar 2022 09:01:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/licenseApproval/securityTraining.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index 91d41d9..7356edc 100644
--- a/src/views/licenseApproval/securityTraining.vue
+++ b/src/views/licenseApproval/securityTraining.vue
@@ -37,7 +37,7 @@
size="small"
icon="el-icon-delete"
plain
- v-if="permission.permit_delete"
+ v-if="permission.licenseApproval_securityTraining_delete"
@click="handleDelete"
>删 除
</el-button>
@@ -48,6 +48,7 @@
:size="size"
:type="type"
class="zhengJian-icon"
+ v-if="permission.licenseApproval_securityTraining_upload"
@click.stop="handleCredentials(row)"
>附件
</el-button>
@@ -56,7 +57,7 @@
:size="size"
:type="type"
@click.stop="rowDel(row)"
- v-if="row.type == '2' && userData == '0'"
+ v-if="row.type == '2' && userData == '0' && permission.licenseApproval_securityTraining_audit"
>许可审批
</el-button>
<el-button
@@ -64,7 +65,7 @@
:size="size"
:type="type"
@click.stop="viewLicense(row)"
- v-if="row.type == '0'"
+ v-if="row.type == '0' && permission.licenseApproval_securityTraining_print"
>打印许可证
</el-button>
</template>
@@ -274,10 +275,10 @@
...mapGetters(["permission", "userInfo"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.permit_add, false),
- viewBtn: this.vaildData(this.permission.permit_view, true),
- delBtn: this.vaildData(this.permission.permit_delete, false),
- editBtn: this.vaildData(this.permission.permit_edit, false)
+ addBtn: this.vaildData(this.permission.licenseApproval_securityTraining_add, false),
+ viewBtn: this.vaildData(this.permission.licenseApproval_securityTraining_view, true),
+ delBtn: this.vaildData(this.permission.licenseApproval_securityTraining_delete, false),
+ editBtn: this.vaildData(this.permission.licenseApproval_securityTraining_edit, false)
};
},
ids() {
@@ -299,7 +300,7 @@
return;
}
var gonganj = "";
- if (this.userInfo.role_name == "公安管理员") {
+ if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {
let test = /派出所$/g;
if (test.test(this.userInfo.list.name)) {
gonganj = "2";
--
Gitblit v1.9.3