From ef46e4b78e81418a831d4f7f21eb24d2fd4d35e1 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 25 Dec 2021 15:08:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityEquipment/car.vue | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/views/securityEquipment/car.vue b/src/views/securityEquipment/car.vue
index 06f51f1..5e6bdce 100644
--- a/src/views/securityEquipment/car.vue
+++ b/src/views/securityEquipment/car.vue
@@ -159,20 +159,37 @@
this.option.height = this.windowHeight - 320;
}
var that = this;
+ var roleName = this.userInfo.role_name;
if (
- this.userInfo.role_name == "装备管理员" ||
- this.userInfo.role_name == "保安公司管理员"
+ roleName == "装备管理员" ||
+ roleName == "保安公司管理员" ||
+ roleName == "保安" ||
+ roleName == "分公司管理员"
) {
+ //查询保安单位信息（包含子级）
+ const column = this.findObject(this.option.column, "deptId");
+ column.addDisplay = true;
+ column.editDisplay = true;
+ // column.search = false;
+ //默认全部展开
+ column.defaultExpandAll = true;
+ column.dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?deptId=" +
+ this.userInfo.dept_id;
+ //赋值
+ column.value = that.userInfo.dept_id;
this.useifid = this.userInfo.dept_id;
- }
- //公安局进入
- if (this.userInfo.role_name == "公安管理员") {
- that.option.column[4].dicUrl =
- "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+ } else if (roleName == "公安管理员" || roleName == "administrator") {
+ var columnDept = that.findObject(that.option.column, "deptId");
+ columnDept.dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?jurisdiction=" +
that.userInfo.jurisdiction;
} else {
- that.option.column[4].dicUrl =
- "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
+ //查询保安单位信息（包含子级）
+ const column = this.findObject(this.option.column, "deptId");
+ // column.search = false;
+ //默认全部展开
+ column.dicUrl = "/api/blade-system/dept/security_lazy-tree";
}
},
methods: {
@@ -340,7 +357,7 @@
params["jurisdiction"] = that.userInfo.jurisdiction;
}
//保安公司进入
- if (this.userInfo.role_name == "保安公司管理员") {
+ if (this.userInfo.role_name == "保安公司管理员" || this.userInfo.role_name == "分公司管理员") {
params["deptId"] = that.userInfo.dept_id;
//导入action 修改
const importColumn = that.findObject(
--
Gitblit v1.9.3