From aa9f98d8fd29b2e3db0169ac8e408b9ed8e82fea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 23 Nov 2021 22:26:08 +0800
Subject: [PATCH] 保安审查修改，报名清册修改
---
src/views/securityGuard/securityGuard.vue | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 3342769..1226b6c 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -1836,10 +1836,11 @@
row.fingerprint = zhiwen.imgBMP;
row.myPicture = zhiwen.featuredata;
}
- // console.log(row);
- // return;
+
//是否是身份证自动识别进入
- row["cell"] = this.nowCell;
+ if (row.cell != "2") {
+ row["cell"] = this.nowCell;
+ }
update(row).then(
() => {
this.initFlag = false;
@@ -2037,8 +2038,8 @@
);
},
openClosegroup(val) {
- let ql = /realName|nation|cardid|registered|sex/;
- // let ql = /realName|nation|cardid|registered/;
+ // let ql = /realName|nation|cardid|registered|sex/;
+ let ql = /realName|nation|cardid|registered/;
for (let k in this.option.group) {
for (let i in this.option.group[k].column) {
if (ql.test(this.option.group[k].column[i].prop)) {
@@ -2101,10 +2102,10 @@
this.intTime = setInterval(function () {
if (!that.haveCardid) {
//定时读卡
- console.log(that.haveCardid);
+ // console.log(that.haveCardid);
let result = CertCtl.readCert();
// console.log(result);
- console.log("通过读取");
+ // console.log("通过读取");
if (result == "") {
console.log("未启动读卡插件!");
that.closeSFZ();
@@ -2134,7 +2135,7 @@
console.log("读卡器未连接");
that.closeSFZ();
} else {
- console.log("无卡片提醒-1", resultObj.errorMsg);
+ // console.log("无卡片提醒-1", resultObj.errorMsg);
//无卡片提醒
// that.closeSFZ();
}
@@ -2250,6 +2251,18 @@
roleIds.forEach((roleId) => {
getRoleDetail(roleId).then((res) => {
var roleAlias = res.data.data.roleAlias;
+ if (roleAlias == "保安公司管理员") {
+ that.option.group[1].column[4].dicData = [
+ {
+ label: "是",
+ value: "1",
+ },
+ {
+ label: "否",
+ value: "2",
+ },
+ ];
+ }
if (
roleAlias == "保安公司管理员" ||
roleAlias == "保安" ||
--
Gitblit v1.9.3