From 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Nov 2021 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityGuard/securityGuard.vue | 88 ++++++++++++++++++++++++++++++++++----------
1 files changed, 68 insertions(+), 20 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 1b3912b..2de38c8 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -66,6 +66,15 @@
@click="handleSecurityApply"
>上岗证制证申请
</el-button>
+ <el-button
+ type="primary"
+ size="small"
+ plain
+ v-if="permission.securityGuard_security_paper_apply"
+ icon="el-icon-collection-tag"
+ @click="handleSecurityPaperApply"
+ >证书制证申请
+ </el-button>
<el-button
type="danger"
@@ -526,7 +535,7 @@
res: "data",
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/blade-user/import-user?deptId=" + this.deptIds,
+ action: "/api/blade-user/import-security?deptId=" + this.deptIds,
},
{
label: "模板下载",
@@ -911,15 +920,15 @@
prop: "address",
},
{
- label: "住址",
+ label: "身份证住址",
prop: "registered",
- // rules: [
- // {
- // required: true,
- // message: "请输入住址",
- // trigger: "click",
- // },
- // ],
+ rules: [
+ {
+ required: true,
+ message: "请输入身份证住址",
+ trigger: "click",
+ },
+ ],
},
{
label: "所属辖区",
@@ -947,13 +956,13 @@
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
- // rules: [
- // {
- // required: true,
- // message: "请输入入职时间",
- // trigger: "click",
- // },
- // ],
+ rules: [
+ {
+ required: true,
+ message: "请输入入职时间",
+ trigger: "click",
+ },
+ ],
},
{
label: "性别",
@@ -1083,7 +1092,7 @@
res: "data",
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/blade-user/import-user",
+ action: "/api/blade-user/import-security",
},
// {
// label: "数据覆盖",
@@ -1176,7 +1185,7 @@
"excelForm.isCovered"() {
if (this.excelForm.isCovered !== "") {
const column = this.findObject(this.excelOption.column, "excelFile");
- column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
+ column.action = `/api/blade-user/import-security?isCovered=${this.excelForm.isCovered}`;
}
},
},
@@ -1453,7 +1462,7 @@
this.certificateObj.registered == "" ||
this.certificateObj.registered == null
) {
- this.$message({ message: "请完善住址信息", type: "warning" });
+ this.$message({ message: "请完善身份证住址信息", type: "warning" });
return;
}
//更新发证时间
@@ -1575,6 +1584,45 @@
const data = {
ids: str,
createUser: this.userInfo.user_id,
+ type:1
+ };
+ return securityApply(data);
+ })
+ .then(() => {
+ // this.$refs.crud.toggleSelection();
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
+ },
+ //证书制证申请
+ handleSecurityPaperApply() {
+ if (this.choiceList.length === 0) {
+ this.$message.warning("请勾选至少一位持证保安员");
+ return;
+ }
+ this.$confirm(
+ "共选择制证申请人数" + this.choiceList.length + "人,确定申请制证?",
+ {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }
+ )
+ .then(() => {
+ let cho = this.choiceList;
+ let str = "";
+ for (let k in cho) {
+ str += cho[k].id;
+ if (k != cho.length - 1) {
+ str += ",";
+ }
+ }
+ const data = {
+ ids: str,
+ createUser: this.userInfo.user_id,
+ type:2
};
return securityApply(data);
})
@@ -1951,7 +1999,7 @@
"excelFile"
);
importColumn.action =
- "/api/blade-user/import-user?deptId=" + this.deptIds;
+ "/api/blade-user/import-security?deptId=" + this.deptIds;
} else if (roleAlias == "公安管理员") {
params["jurisdiction"] = that.userInfo.jurisdiction;
var columnDept = that.findObject(that.option.column, "deptId");
--
Gitblit v1.9.3