From d6a8a4a2cf7111b3246942ee81687c3abdb4bb92 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 08 Oct 2021 17:13:58 +0800
Subject: [PATCH] +
---
src/views/securityGuard/securityGuard.vue | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 18bd865..c58388a 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -351,6 +351,8 @@
callback();
}
};
+ console.log(this.userInfo, 123);
+
return {
securityid: "",
excelBox1: false,
@@ -372,7 +374,7 @@
res: "data",
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/blade-user/import-user",
+ action: "/api/blade-user/import-user?deptId=" + this.deptIds,
},
{
label: "模板下载",
@@ -397,12 +399,11 @@
propsHttp: {
res: "data",
},
- tip: "请上传 zip 压缩文件",
+ tip: "请上传 zip 压缩文件,照片文件名以身份证号码命名",
action: "/api/blade-resource/oss/endpoint/put-file-zip",
},
],
},
-
form: {},
search: {},
roleBox: false,
@@ -420,6 +421,7 @@
},
roleId: "1412226235153731586",
deptId: "1413470343230877697",
+ deptIds: "",
platformPage: {
pageSize: 10,
currentPage: 1,
@@ -477,7 +479,7 @@
align: "center",
index: true,
delBtnText: "注销",
- menuWidth: 271,
+ menuWidth: 327,
selection: true,
viewBtn: true,
defaultExpandAll: true,
@@ -613,12 +615,26 @@
{
label: "是否持证",
prop: "hold",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey",
+ // },
type: "select",
+ dicData: [
+ {
+ label: "是",
+ value: "1",
+ },
+ {
+ label: "否",
+ value: "2",
+ },
+ {
+ label: "已吊销",
+ value: "3",
+ },
+ ],
rules: [
{
required: true,
@@ -765,11 +781,13 @@
// value: 3,
// },
],
- rules: [{
+ rules: [
+ {
required: true,
message: "请选择性别",
- trigger: "blur"
- }]
+ trigger: "blur",
+ },
+ ],
},
// {
// label: "生日",
@@ -965,6 +983,7 @@
}
console.log(this.search, 111);
this.search["status"] = 1;
+ this.deptIds = this.userInfo.dept_id;
},
methods: {
handleImport1() {
@@ -1360,6 +1379,14 @@
that.isSecurity = false;
//如果是保安公司管理员
params["deptId"] = that.userInfo.dept_id;
+
+ //导入action 修改
+ const importColumn = that.findObject(
+ that.excelOption1.column,
+ "excelFile"
+ );
+ importColumn.action =
+ "/api/blade-user/import-user?deptId=" + this.deptIds;
} else if (roleAlias == "公安管理员") {
params["jurisdiction"] = that.userInfo.jurisdiction;
var columnDept = that.findObject(that.option.column, "deptId");
--
Gitblit v1.9.3