From 2c461eb9efb980d55dfd7407ee70088fc90a4a7a Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 08 Feb 2022 14:24:31 +0800
Subject: [PATCH] 保安员详情修改
---
src/views/securityGuard/data.js | 472 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 362 insertions(+), 110 deletions(-)
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index f1f2ecf..f7c35f5 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -10,13 +10,14 @@
}
},
{
- label: "所属保安单位",
- prop: "tenantId",
+ label: "企业名称",
+ prop: "deptId",
type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
+ dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
props: {
- label: "tenantName",
- value: "tenantId"
+ label: "title",
+ value: "id",
},
disabled: true,
span: 24,
@@ -59,6 +60,34 @@
{
label: "民族",
prop: "nation",
+ disabled: true
+ },
+ {
+ label: "是否持证",
+ prop: "hold",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ type: "select",
+ disabled: true
+ },
+ {
+ label: "保安员证编号",
+ prop: "securitynumber",
+ disabled: true
+ },
+ {
+ label: "所属辖区",
+ prop: "jurisdiction",
+ // multiple: true,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-tree",
+ props: {
+ label: "title",
+ value: "id",
+ },
disabled: true
},
{
@@ -291,9 +320,14 @@
editDisplay: false,
addDisplay: false
}, {
- label: '单位名称',
+ label: '企业名称',
prop: "companyname",
formslot: true,
+ rules: [{
+ required: true,
+ message: "请选择企业名称",
+ trigger: "blur"
+ }]
}, {
label: '部门',
prop: "department",
@@ -311,15 +345,25 @@
type: 'date',
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
- prop: "entryTime",
+ prop: "entrytime",
formslot: true,
+ rules: [{
+ required: true,
+ message: "请选择入职时间",
+ trigger: "blur"
+ }]
}, {
label: '离职时间',
type: 'date',
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
- prop: "departureTime",
+ prop: "departuretime",
formslot: true,
+ rules: [{
+ required: true,
+ message: "请选择离职时间",
+ trigger: "blur"
+ }]
}, {
label: '离职原因',
prop: "leaving",
@@ -328,7 +372,7 @@
export var practitionersColumns = [{
width: 200,
- label: '单位名称',
+ label: '企业名称',
prop: "companyname",
formslot: true,
}, {
@@ -369,60 +413,104 @@
formslot: true,
}]
+//表现
export var trackRecordColumn = [{
- label: "id",
- prop: "id",
- hide: true,
- editDisplay: false,
- addDisplay: false
-}, {
- label: '工作态度',
- prop: "workingattitude",
- formslot: true,
-}, {
- label: '工作成效',
- prop: "achievements",
- formslot: true,
-}, {
- label: '表现',
- prop: "score",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=scoreType",
- props: {
- label: "dictValue",
- value: "dictKey"
+ label: "id",
+ prop: "id",
+ hide: true,
+ editDisplay: false,
+ addDisplay: false
+ }, {
+ label: '时间',
+ type: 'date',
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ prop: "time",
+ formslot: true,
},
- dataType: "number",
- slot: true,
- rules: [{
- required: true,
- message: "请选择表现",
- trigger: "blur"
- }]
-}, {
- label: '时间',
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- prop: "time",
- formslot: true,
-}, {
- label: '服务公司',
- prop: "departmentName",
- formslot: true,
-}]
+ // {
+ // label: '工作态度',
+ // prop: "workingattitude",
+ // formslot: true,
+ // },
+ {
+ label: '工作表现',
+ prop: "achievements",
+ formslot: true,
+ }, {
+ label: '表现评定',
+ prop: "score",
+ type: "select",
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=scoreType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ dicData: [{
+ label: "优秀",
+ value: 0
+ },
+ {
+ label: "良好",
+ value: 1
+ },
+ {
+ label: "一般",
+ value: 2
+ },
+ {
+ label: "差",
+ value: 3
+ },
+ ],
+ dataType: "number",
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择表现",
+ trigger: "blur"
+ }]
+ }
+ // {
+ // label: '服务公司',
+ // prop: "departmentName",
+ // formslot: true,
+ // }
+]
export var securityFormPageColumn = [{
label: "姓名",
prop: "realName",
search: true,
- searchSpan: 4,
+ searchSpan: 3,
+ width: 65,
+ searchLabelWidth: 50,
display: false
},
{
+ label: "企业名称",
+ searchLabelWidth: "80",
+ // prop: "deptName",
+ prop: "deptId",
+ type: "tree",
+ // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ // hide: true,
+ slot: true,
+ searchSpan: 5,
+ display: false,
+ search: true,
+ minWidth: 160
+ },
+ {
label: "性别",
- prop: "sex",
+ prop: "sexs",
+ sortable: true,
+ width: 75,
type: "select",
dicData: [{
label: "男",
@@ -432,22 +520,41 @@
label: "女",
value: 2,
},
- {
- label: "未知",
- value: 3,
- },
+ // {
+ // label: "未知",
+ // value: 3,
+ // },
],
display: false
},
-
+ {
+ label: "身份证号码",
+ prop: "cardid",
+ search: true,
+ searchLabelWidth: 90,
+ searchSpan: 4,
+ width: 140,
+ display: false
+ },
+ {
+ label: "照片",
+ prop: "avatar",
+ type: "upload",
+ listType: "picture-img",
+ width: 60,
+ display: false
+ },
{
label: "籍贯",
prop: "nativeplace",
+ hide: true,
display: false
},
{
label: "民族",
prop: "nation",
+ hide: true,
+ width: 55,
display: false
},
{
@@ -456,93 +563,211 @@
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
- display: false
+ display: false,
+ hide: true,
},
{
- label: "学历",
- prop: "education",
- display: false,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- type: "select",
- rules: [{
- required: true,
- message: "请选择学历",
- trigger: "blur"
- }],
+ label: "年龄",
+ prop: "age",
+ width: 55,
+
+ display: false
},
+ // {
+ // label: "学历",
+ // prop: "education",
+ // display: false,
+ // width: 90,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // type: "select",
+ // // hide: true,
+ // rules: [{
+ // required: true,
+ // message: "请选择学历",
+ // trigger: "blur"
+ // }],
+ // },
{
label: "联系电话",
prop: "phone",
+ minWidth: 80,
display: false
},
{
- label: "邮箱",
- prop: "email",
- display: false,
- width: 150
+ label: "健康状态",
+ prop: "healstats",
+ hide: true,
+ display: false
+ },
+ {
+ label: "保安证编号",
+ prop: "securitynumber",
+ search: true,
+ searchLabelWidth: 90,
+ sortable: true,
+ width: 118,
+ searchSpan: 4,
+ addDisplay: false,
+ editDisplay: false,
+ // hide: true,
},
{
label: "入职时间",
prop: "rtime",
+ hide: true,
display: false
},
{
- label: "保安公司名称",
- searchLabelWidth: "110",
- // prop: "deptName",
- prop: "deptId",
- type: "tree",
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- props: {
- label: "title",
- value: "id",
- },
- slot: true,
- searchSpan: 5,
- display: false,
+ label: '是否派遣',
+ prop: 'dispatch',
+ type: 'select',
+ sortable: true,
+ editDisplay: false,
search: true,
- width: 260
+ width: 110,
+ searchSpan: 3,
+ addDisplay: false,
+ dicData: [{
+ label: '全部',
+ value: '2'
+ },
+ {
+ label: '已派遣',
+ value: '0'
+ },
+ {
+ label: '未派遣',
+ value: '1'
+ }
+ ]
},
{
label: "是否持证",
prop: "hold",
slot: true,
- display: false,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
+ sortable: true,
+ search: true,
+ searchSpan: 3,
+ width: 110,
type: "select",
+ dicData: [{
+ label: "是",
+ value: "1",
+ },
+ {
+ label: "否",
+ value: "2",
+ },
+ {
+ label: "已吊销",
+ value: "3",
+ },
+ ],
+ display: false,
rules: [{
required: true,
message: "请选择",
trigger: "blur"
}],
},
+
+ {
+ label: "是否制证",
+ prop: "userType",
+ type: "select",
+ sortable: true,
+ slot: true,
+ search: true,
+ // searchValue: 7,
+ editDisplay: false,
+ addDisplay: false,
+ searchSpan: 3,
+ width: 110,
+ dicData: [{
+ label: "已制证",
+ value: 6,
+ },
+ {
+ label: "未制证",
+ value: 7,
+ }
+ ],
+ },
+
// {
- // label: "入职时间",
- // prop: "rtime",
- // type: "datetime",
+ // label: "发证日期",
+ // prop: "papertime",
+ // type: "date",
// format: "yyyy-MM-dd",
// valueFormat: "yyyy-MM-dd",
- // searchRange: true,
- // searchSpan: 6,
- // hide: true,
- // addDisplay: false,
- // editDisplay: false,
- // viewDisplay: false,
- // search: true,
- // rules: [{
- // required: true,
- // message: "请输入时间",
- // trigger: "blur"
- // }]
+ // // searchRange: true,
+ // // searchSpan: 6,
+ // // hide: true,
+ // // addDisplay: false,
+ // // editDisplay: false,
+ // // viewDisplay: false,
+ // // search: true,
+ // // rules: [{
+ // // required: true,
+ // // message: "请输入时间",
+ // // trigger: "blur"
+ // // }]
// },
+ {
+ label: "有无照片",
+ prop: "isAvatar",
+ type: "select",
+ search: true,
+ minWidth: 105,
+ searchSpan: 3,
+ addDisplay: false,
+ editDisplay: false,
+ hide: true,
+ display: false,
+ dicData: [{
+ label: "全部",
+ value: 3,
+ },
+ {
+ label: "有",
+ value: 1,
+ },
+ {
+ label: "无",
+ value: 2,
+ },
+ ],
+ },
+ {
+ label: "是否采集指纹",
+ prop: "isFingerprint",
+ type: "select",
+ search: true,
+ searchLabelWidth: 110,
+ minWidth: 105,
+ searchSpan: 4,
+ addDisplay: false,
+ editDisplay: false,
+ hide: true,
+ display: false,
+ dicData: [{
+ label: "全部",
+ value: 3,
+ },
+ {
+ label: "是",
+ value: 1,
+ },
+ {
+ label: "否",
+ value: 2,
+ },
+ ],
+ },
{
label: "在职状态",
prop: "status",
@@ -553,8 +778,11 @@
value: "dictKey"
},
dataType: "number",
+ searchValue: 1,
display: false,
+ hide: true,
searchSpan: 3,
+ width: 80,
search: true,
rules: [{
required: true,
@@ -562,4 +790,28 @@
trigger: "blur"
}]
},
+ {
+ label: "审查状态",
+ prop: "examinationType",
+ type: "select",
+ sortable: true,
+ display: false,
+ searchSpan: 3,
+ search: true,
+ hide: true,
+ width: 110,
+ dicData: [{
+ label: "全部",
+ value: 6,
+ },
+ {
+ label: "正常",
+ value: "0",
+ },
+ {
+ label: "异常",
+ value: "1",
+ }
+ ],
+ },
]
\ No newline at end of file
--
Gitblit v1.9.3