From 5a3ace296c010b5c11501dedf252e1c144cda9e2 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 06 Dec 2021 13:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises_ys
---
src/views/securityGuard/securityGuard.vue | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index b2dd0dd..580c187 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -430,7 +430,6 @@
total: 0,
},
query2: {},
- data1: [],
data2: [],
option2: {
card: true,
@@ -706,7 +705,7 @@
ratio: 0.1,
},
action: "/api/blade-resource/oss/endpoint/put-file",
- tip: "只能上传jpg/png，且不超过500kb",
+ tip: "只能上传jpg/png指纹信息，且不超过500kb",
span: 10,
// row: true,
prop: "fingerprint",
@@ -1042,7 +1041,7 @@
if (!website.tenantMode) {
this.initData(website.tenantId);
}
- console.log(this.search, 111);
+ // console.log(this.search, 111);
this.search["status"] = 1;
},
methods: {
@@ -1370,7 +1369,7 @@
this.$prompt("离职原因", "提示", {
confirmButtonText: "确定离职",
cancelButtonText: "取消",
- inputErrorMessage: "邮箱格式不正确",
+ inputErrorMessage: "",
}).then(({ value }) => {
console.log(value);
row.reasonForLeav = value;
@@ -1660,6 +1659,17 @@
this.platformForm = res.data.data;
});
}
+ if (this.userInfo.role_name == "保安公司管理员") {
+ // console.log("保安公司管理员登入");
+ const deptColumn = this.findObject(
+ this.questionBankOption.column,
+ "deptId"
+ );
+ deptColumn.disabled = true;
+ console.log(this.userInfo.dept_id);
+ this.obj["deptId"] = this.userInfo.dept_id;
+ }
+
done();
},
platformSearchReset() {
--
Gitblit v1.9.3