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/dispatch/dispatchChildoperable.vue | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 7cfd404..b07e07c 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -12,6 +12,7 @@
:data="data"
:page.sync="page"
ref="crudrec1"
+ :permission="permissionList"
v-model="form"
:table-loading="loading"
:before-open="beforeOpen"
@@ -40,6 +41,7 @@
} from "@/api/dispatch/dispatch";
import { update, getSecurityDispatcherTree } from "@/api/system/user";
import { mapState } from "vuex";
+import { mapGetters } from "vuex";
export default {
data() {
@@ -320,7 +322,7 @@
column.value = that.userInfo.dept_id;
this.useifid = this.userInfo.dept_id;
this.initData(2);
- } else if (roleName == "公安管理员" || roleName == "administrator") {
+ } else if (roleName == "公安管理员" || roleName == "administrator" || roleName == "民警") {
var columnDept = that.findObject(that.option.column, "deptId");
columnDept.dicUrl =
"/api/blade-system/dept/security_lazy-tree?jurisdiction=" +
@@ -336,7 +338,15 @@
}
},
computed: {
- // },
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.dispatchChildoperable_add, false),
+ viewBtn: this.vaildData(this.permission.dispatchChildoperable_view, true),
+ delBtn: this.vaildData(this.permission.dispatchChildoperable_delete, false),
+ editBtn: this.vaildData(this.permission.dispatchChildoperable_edit, false)
+ };
+ },
ids1() {
let ids1 = [];
this.selectionList1.forEach(ele => {
@@ -556,7 +566,7 @@
values["deptId"] = this.useifid;
}
//公安局进入
- if (this.userInfo.role_name == "公安管理员") {
+ if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {
values["jurisdiction"] = this.userInfo.jurisdiction;
}
getdata1(
--
Gitblit v1.9.3