From e4100ecc3a88273dcdbc2c1452d4e9f00736f3db Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 10:17:44 +0800
Subject: [PATCH] 派遣单位管理修改，考试成绩查询样式微调
---
src/views/securityGuard/data.js | 160 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 133 insertions(+), 27 deletions(-)
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index f1f2ecf..a6eca98 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
},
{
@@ -311,14 +340,14 @@
type: 'date',
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
- prop: "entryTime",
+ prop: "entrytime",
formslot: true,
}, {
label: '离职时间',
type: 'date',
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
- prop: "departureTime",
+ prop: "departuretime",
formslot: true,
}, {
label: '离职原因',
@@ -369,6 +398,8 @@
formslot: true,
}]
+
+//表现
export var trackRecordColumn = [{
label: "id",
prop: "id",
@@ -417,12 +448,32 @@
label: "姓名",
prop: "realName",
search: true,
- searchSpan: 4,
+ searchSpan: 3,
+ width: 60,
+ searchLabelWidth: 50,
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,
+ search: true,
+ minWidth: 260
},
{
label: "性别",
prop: "sex",
+ width: 55,
type: "select",
dicData: [{
label: "男",
@@ -439,35 +490,57 @@
],
display: false
},
+ {
+ label: "身份证号码",
+ prop: "cardid",
+ search: true,
+ searchLabelWidth: 90,
+ searchSpan: 5,
+ minWidth: 140,
+ display: false
+ },
{
label: "籍贯",
prop: "nativeplace",
+ hide: true,
display: false
},
{
label: "民族",
prop: "nation",
+ hide: true,
+ width: 55,
display: false
},
+
{
label: "出生日期",
prop: "birthday",
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
+ display: false,
+ hide: true,
+ },
+ {
+ 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: "请选择学历",
@@ -477,40 +550,69 @@
{
label: "联系电话",
prop: "phone",
+ minWidth: 100,
display: false
},
{
- label: "邮箱",
- prop: "email",
- display: false,
- width: 150
+ label: "健康状态",
+ prop: "healstats",
+ hide: true,
+ display: false
+ },
+ {
+ label: "保安证编号",
+ prop: "securitynumber",
+ search: true,
+ searchLabelWidth: 90,
+ minWidth: 105,
+ searchSpan: 4,
+ addDisplay: false,
+ editDisplay: false,
+ // hide: true,
},
{
label: "入职时间",
prop: "rtime",
+ hide: true,
display: false
},
+ // {
+ // label: "是否派遣",
+ // prop: "dispatch",
+ // // hide: true,
+ // type: 'select',
+ // // display: false,
+ // dicData: [
+ // {
+ // label: '未派遣',
+ // value: 1
+ // }, {
+ // label: '已派遣',
+ // value: 0
+ // }
+ // ]
+ // },
{
- 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,
- search: true,
- width: 260
+ label: '是否派遣',
+ prop: 'dispatch',
+ type: 'select',
+ editDisplay: false,
+ addDisplay: false,
+ dicData: [{
+ label: '未派遣',
+ value: '1'
+ }, {
+ label: '已派遣',
+ value: '0'
+ }]
},
{
label: "是否持证",
prop: "hold",
slot: true,
+ search: true,
+ searchSpan: 3,
+ width: 69,
display: false,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
props: {
@@ -524,6 +626,7 @@
trigger: "blur"
}],
},
+
// {
// label: "入职时间",
// prop: "rtime",
@@ -553,8 +656,11 @@
value: "dictKey"
},
dataType: "number",
+ searchValue: 1,
display: false,
+ hide: true,
searchSpan: 3,
+ width: 80,
search: true,
rules: [{
required: true,
--
Gitblit v1.9.3