From aedad51e0775acd4e46f18ca8aaf27fc9ae221cf Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 13 Jul 2021 22:32:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityGuard/data.js | 82 ++++++++++++++++++++++++++--------------
1 files changed, 53 insertions(+), 29 deletions(-)
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index 1f3d97b..f1f2ecf 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -376,44 +376,45 @@
editDisplay: false,
addDisplay: false
}, {
- label: '单位名称',
- prop: "companyname",
+ label: '工作态度',
+ prop: "workingattitude",
formslot: true,
}, {
- label: '部门',
- prop: "department",
+ label: '工作成效',
+ prop: "achievements",
formslot: true,
}, {
- label: '岗位',
- prop: "post",
- formslot: true,
+ label: '表现',
+ prop: "score",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=scoreType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择表现",
+ trigger: "blur"
+ }]
}, {
- label: '岗位职责',
- prop: "responsibilities",
- formslot: true,
-}, {
- label: '入职时间',
+ label: '时间',
type: 'date',
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
- prop: "entryTime",
+ prop: "time",
formslot: true,
}, {
- label: '离职时间',
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- prop: "departureTime",
- formslot: true,
-}, {
- label: '离职原因',
- prop: "leaving",
+ label: '服务公司',
+ prop: "departmentName",
formslot: true,
}]
export var securityFormPageColumn = [{
- label: "用户姓名",
+ label: "姓名",
prop: "realName",
search: true,
searchSpan: 4,
@@ -423,7 +424,19 @@
label: "性别",
prop: "sex",
type: "select",
- slot: true,
+ dicData: [{
+ label: "男",
+ value: 1,
+ },
+ {
+ label: "女",
+ value: 2,
+ },
+ {
+ label: "未知",
+ value: 3,
+ },
+ ],
display: false
},
@@ -478,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",
@@ -495,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