From 0450d4dca0c99f694ea804ec2008b0766e6d6dd4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 22 Nov 2021 14:54:49 +0800
Subject: [PATCH] 保安员管理公安管理员新增审查状态查询
---
src/views/securityGuard/securityGuard.vue | 64 ++++++++++++++++++---
src/views/securityGuard/data.js | 81 +++++++-------------------
2 files changed, 78 insertions(+), 67 deletions(-)
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index 998d85b..b23b603 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -473,21 +473,6 @@
searchLabelWidth: 50,
display: false
},
- // {
- // label: "温馨提示",
- // prop: "realName1",
- // hide: true,
- // addDisplay: true,
- // editDisplay: false,
- // span: 24,
- // value: "账号为身份证号码，密码为身份证后六位",
-
- // addDisabled: true
- // // search: true,
- // // searchSpan: 3,
- // // width: 60,
- // // searchLabelWidth: 50,
- // },
{
label: "所属保安公司",
searchLabelWidth: "110",
@@ -506,22 +491,6 @@
search: true,
minWidth: 260
},
- // {
- // label: "所属保安公司",
- // searchLabelWidth: "110",
- // prop: "deptName",
- // // type: "tree",
- // // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- // // props: {
- // // label: "title",
- // // value: "id",
- // // },
- // // slot: true,
- // // searchSpan: 5,
- // display: false,
- // // search: true,
- // minWidth: 260
- // },
{
label: "性别",
prop: "sexs",
@@ -628,22 +597,6 @@
hide: true,
display: false
},
- // {
- // label: "是否派遣",
- // prop: "dispatch",
- // // hide: true,
- // type: 'select',
- // // display: false,
- // dicData: [
- // {
- // label: '未派遣',
- // value: 1
- // }, {
- // label: '已派遣',
- // value: 0
- // }
- // ]
- // },
{
label: '是否派遣',
prop: 'dispatch',
@@ -680,12 +633,6 @@
},
],
display: false,
- // dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
- // props: {
- // label: "dictValue",
- // value: "dictKey"
- // },
- // type: "select",
rules: [{
required: true,
message: "请选择",
@@ -696,11 +643,6 @@
{
label: "是否制证",
prop: "userType",
- // dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
- // props: {
- // label: "dictValue",
- // value: "dictKey",
- // },
type: "select",
slot: true,
search: true,
@@ -761,4 +703,27 @@
trigger: "blur"
}]
},
+ {
+ label: "审查状态",
+ prop: "examinationType",
+ type: "select",
+ display: false,
+ searchSpan: 3,
+ search: false,
+ hide: true,
+ width: 80,
+ dicData: [{
+ label: "全部",
+ value: 6,
+ },
+ {
+ label: "正常",
+ value: "0",
+ },
+ {
+ label: "异常",
+ value: 1,
+ }
+ ],
+ },
]
\ No newline at end of file
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 06c6867..044ffc9 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -76,13 +76,12 @@
>证书制证申请
</el-button>
<el-button
- type="primary"
+ type="warning"
size="small"
plain
- v-if="permission.securityGuard_escort_personnel_import"
- icon="el-icon-collection-tag"
- @click="handleEscortPersonnelImport"
- >押运人员批量导入
+ icon="el-icon-download"
+ @click="handleExportSecurityInfo"
+ >保安信息导出
</el-button>
<el-button
@@ -417,6 +416,7 @@
import {getToken} from "@/util/auth";
import {securityFormPageColumn} from "./data";
import {mapState} from "vuex";
+import Qs from "qs";
//加载指纹类
import Client from "./Client";
@@ -1234,7 +1234,7 @@
beforeCreate() {
},
created() {
- console.log(this.userInfo, 9999);
+ // console.log(this.userInfo, 9999);
if (this.userInfo.role_name == "办证管理员") {
this.search["userType"] = 7;
this.search["hold"] = "1";
@@ -1671,6 +1671,46 @@
});
});
},
+ //保安员信息导出
+ handleExportSecurityInfo() {
+ this.$confirm("是否导出保安员信息数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ //获取查询条件
+ // const { releaseTimeRange } = this.search;
+ // if (releaseTimeRange) {
+ // this.search["startTime"] = releaseTimeRange[0];
+ // this.search["endTime"] = releaseTimeRange[1];
+ // }
+ var data = {
+ cardid:this.search.cardid,
+ deptId:this.search.deptId,
+ hold:this.search.hold,
+ realName: this.search.realName,
+ securitynumber: this.search.securitynumber,
+ status: this.search.status,
+ userType: this.search.startTime,
+ };
+ //导出
+ if (this.userInfo.role_name == "保安公司管理员") {
+ //如果是保安公司管理员
+ data["deptId"] = this.userInfo.dept_id;
+ }
+ if (this.userInfo.role_name == "培训公司管理员") {
+ //如果是培训公司管理员
+ data["trainingUnitId"] = this.userInfo.Id;
+ }
+ if (this.userInfo.role_name == "公安管理员") {
+ //如果是公安管理员
+ data["jurisdiction"] = this.userInfo.jurisdiction;
+ }
+ //序列号url形式，用&拼接
+ data = Qs.stringify(data);
+ window.open(`/api/blade-user/export-security-info?${this.website.tokenHeader}=${getToken()}&`+data);
+ });
+ },
rowSave(row, done, loading) {
// var dom = document.getElementById("zhiwenOur");
// window.frames["iframe的name值"].document.getElementById("iframe中控件的ID").click();
@@ -2040,7 +2080,7 @@
);
importColumn.action =
"/api/blade-user/import-security?deptId=" + this.deptIds;
- } else if (roleAlias == "公安管理员") {
+ } else if (roleAlias == "公安管理员" || roleAlias == "administrator") {
params["jurisdiction"] = that.userInfo.jurisdiction;
var columnDept = that.findObject(that.option.column, "deptId");
columnDept.dicUrl =
@@ -2050,9 +2090,14 @@
ColumnDeptUpdate.dicUrl =
"/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
that.userInfo.jurisdiction;
+
+ //审查状态查询开启
+ var columnExaminationType = that.findObject(that.option.column, "examinationType");
+ columnExaminationType.search = true;
+ columnExaminationType.hide = false;
} else if (roleAlias == "培训公司管理员") {
- //如果是保安公司管理员
- params["trainingUnitId"] = that.userInfo.dept_id;
+ //如果是培训公司管理员
+ // params["trainingUnitId"] = that.userInfo.dept_id;
var columnDept2 = that.findObject(that.option.column, "deptId");
columnDept2.dicUrl =
"/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
@@ -2074,6 +2119,7 @@
"/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
}
+
let values = {
...params,
};
--
Gitblit v1.9.3