From a6810bf6a2db02fa855e7e18a8f97bb354e892e5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 13 Jul 2021 22:32:20 +0800
Subject: [PATCH] 1.保安员管理修改 2.组织机构修改
---
src/views/securityGuard/securityGuard.vue | 68 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 4c85429..0eeaef8 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -227,7 +227,7 @@
saveOrUpdateUserPractitionersInfo,
} from "@/api/system/user";
import { getList } from "@/api/securityGuard/securityGuard";
-import { getDeptTree, getDeptLazyTree } from "@/api/system/dept";
+import { getDeptLazyTree } from "@/api/system/dept";
import { getRoleTree } from "@/api/system/role";
import { getPostList } from "@/api/system/post";
import { mapGetters } from "vuex";
@@ -269,6 +269,8 @@
currentPage: 1,
total: 0,
},
+ roleId: "1412226235153731586",
+ deptId: "1413470343230877697",
platformPage: {
pageSize: 10,
currentPage: 1,
@@ -335,11 +337,12 @@
icon: "el-icon-user-solid",
column: [
{
- label: "所属组织机构",
+ label: "所属保安公司",
prop: "deptId",
type: "tree",
- // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+ dicUrl:
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
props: {
label: "title",
value: "id",
@@ -349,7 +352,7 @@
rules: [
{
required: true,
- message: "请选择组织机构",
+ message: "请选择保安公司",
trigger: "blur",
},
],
@@ -387,12 +390,12 @@
],
},
{
- label: "用户姓名",
+ label: "姓名",
prop: "realName",
rules: [
{
required: true,
- message: "请输入用户姓名",
+ message: "请输入姓名",
trigger: "blur",
},
{
@@ -403,11 +406,11 @@
],
},
{
- label: "用户编号",
+ label: "编号",
prop: "code",
},
{
- label: "用户昵称",
+ label: "昵称",
prop: "name",
},
{
@@ -464,6 +467,23 @@
required: false,
message: "请选择所属岗位",
trigger: "click",
+ },
+ ],
+ },
+ {
+ label: "是否持证",
+ prop: "hold",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ type: "select",
+ rules: [
+ {
+ required: true,
+ message: "请选择",
+ trigger: "blur",
},
],
},
@@ -541,7 +561,7 @@
valueFormat: "yyyy-MM-dd",
},
{
- label: "用户性别",
+ label: "性别",
prop: "sex",
type: "select",
slot: true,
@@ -561,7 +581,7 @@
],
},
{
- label: "用户生日",
+ label: "生日",
type: "date",
prop: "birthday",
},
@@ -677,19 +697,19 @@
display: false,
},
{
- label: "用户姓名",
+ label: "姓名",
prop: "realName",
search: true,
display: false,
},
{
- label: "用户平台",
+ label: "平台",
prop: "userTypeName",
slot: true,
display: false,
},
{
- label: "用户平台",
+ label: "平台",
type: "select",
dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
props: {
@@ -704,13 +724,13 @@
rules: [
{
required: true,
- message: "请选择用户平台",
+ message: "请选择平台",
trigger: "blur",
},
],
},
{
- label: "用户拓展",
+ label: "拓展",
prop: "userExt",
type: "textarea",
minRows: 8,
@@ -841,10 +861,10 @@
const column = this.findObject(this.option.group, "roleId");
column.dicData = res.data.data;
});
- getDeptTree(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "deptId");
- column.dicData = res.data.data;
- });
+ // getDeptTree(tenantId).then((res) => {
+ // const column = this.findObject(this.option.group, "deptId");
+ // column.dicData = res.data.data;
+ // });
getPostList(tenantId).then((res) => {
const column = this.findObject(this.option.group, "postId");
column.dicData = res.data.data;
@@ -970,7 +990,7 @@
);
},
rowDel(row) {
- this.$confirm("确定将选择用户登记离职?", {
+ this.$confirm("确定将选择保安登记离职?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@@ -1010,7 +1030,7 @@
this.$message.warning("请选择至少一条数据");
return;
}
- this.$confirm("确定将选择用户注销?", {
+ this.$confirm("确定将选择保安注销?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@@ -1075,7 +1095,7 @@
done();
},
handleExport() {
- this.$confirm("是否导出用户数据?", "提示", {
+ this.$confirm("是否导出保安数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@@ -1143,6 +1163,8 @@
};
values = {
...params,
+ deptId: this.deptId,
+ roleId: this.roleId,
...this.query,
};
this.loading = true;
--
Gitblit v1.9.3