From d3b2a8aef1d7941b0e5847070765e4db056d027b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Dec 2021 20:22:53 +0800
Subject: [PATCH] 车辆，装备，枪支权限修改
---
src/views/securityEquipment/car.vue | 5 +++--
package.json | 3 ++-
src/views/securityEquipment/gun.js | 4 +++-
src/views/securityEquipment/gun.vue | 3 ++-
src/views/securityEquipment/equipments.vue | 3 ++-
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index 87d57b6..6465980 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"classlist-polyfill": "^1.2.0",
"crypto-js": "^4.0.0",
"element-ui": "^2.15.1",
+ "jquery": "^3.6.0",
"js-base64": "^2.5.1",
"js-cookie": "^2.2.0",
"js-md5": "^0.7.3",
@@ -55,4 +56,4 @@
"git add"
]
}
-}
\ No newline at end of file
+}
diff --git a/src/views/securityEquipment/car.vue b/src/views/securityEquipment/car.vue
index 06f51f1..7584e7e 100644
--- a/src/views/securityEquipment/car.vue
+++ b/src/views/securityEquipment/car.vue
@@ -161,7 +161,8 @@
var that = this;
if (
this.userInfo.role_name == "装备管理员" ||
- this.userInfo.role_name == "保安公司管理员"
+ this.userInfo.role_name == "保安公司管理员" ||
+ this.userInfo.role_name == "分公司管理员"
) {
this.useifid = this.userInfo.dept_id;
}
@@ -340,7 +341,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(
diff --git a/src/views/securityEquipment/equipments.vue b/src/views/securityEquipment/equipments.vue
index 7639113..185189e 100644
--- a/src/views/securityEquipment/equipments.vue
+++ b/src/views/securityEquipment/equipments.vue
@@ -160,7 +160,8 @@
var that = this;
if (
this.userInfo.role_name == "装备管理员" ||
- this.userInfo.role_name == "保安公司管理员"
+ this.userInfo.role_name == "保安公司管理员" ||
+ this.userInfo.role_name == "分公司管理员"
) {
this.useifid = this.userInfo.dept_id;
}
diff --git a/src/views/securityEquipment/gun.js b/src/views/securityEquipment/gun.js
index 05f4a1e..ee32524 100644
--- a/src/views/securityEquipment/gun.js
+++ b/src/views/securityEquipment/gun.js
@@ -125,6 +125,7 @@
labelWidth: 160,
// search: true,
type: "date",
+ row: true,
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
searchSpan: 4,
@@ -134,5 +135,6 @@
message: "请输入有效日期",
trigger: "blur"
}]
- }
+ },
+
]
\ No newline at end of file
diff --git a/src/views/securityEquipment/gun.vue b/src/views/securityEquipment/gun.vue
index a22acae..2ca47de 100644
--- a/src/views/securityEquipment/gun.vue
+++ b/src/views/securityEquipment/gun.vue
@@ -141,7 +141,8 @@
var that = this;
if (
this.userInfo.role_name == "装备管理员" ||
- this.userInfo.role_name == "保安公司管理员"
+ this.userInfo.role_name == "保安公司管理员" ||
+ this.userInfo.role_name == "分公司管理员"
) {
this.useifid = this.userInfo.dept_id;
}
--
Gitblit v1.9.3