From 675bb66afa9f203e195486e45489a85bdd0bd092 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 14 Jul 2021 11:17:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityGuard/data.js | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index e4a83c9..f1f2ecf 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -414,7 +414,7 @@
export var securityFormPageColumn = [{
- label: "用户姓名",
+ label: "姓名",
prop: "realName",
search: true,
searchSpan: 4,
@@ -491,12 +491,12 @@
display: false
},
{
- label: "组织机构名称",
+ label: "保安公司名称",
searchLabelWidth: "110",
// prop: "deptName",
prop: "deptId",
type: "tree",
- dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+ dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
label: "title",
value: "id",
@@ -508,10 +508,21 @@
width: 260
},
{
- label: "岗位",
- prop: "postName",
+ label: "是否持证",
+ prop: "hold",
slot: true,
- display: false
+ display: false,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ type: "select",
+ rules: [{
+ required: true,
+ message: "请选择",
+ trigger: "blur"
+ }],
},
// {
// label: "入职时间",
--
Gitblit v1.9.3