From 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Nov 2021 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityGuard/data.js | 475 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 337 insertions(+), 138 deletions(-)
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index f1f2ecf..385c026 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,129 +398,98 @@
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: 60,
+ searchLabelWidth: 50,
display: false
},
- {
- label: "性别",
- prop: "sex",
- type: "select",
- dicData: [{
- label: "男",
- value: 1,
- },
- {
- label: "女",
- value: 2,
- },
- {
- label: "未知",
- value: 3,
- },
- ],
- display: false
- },
+ // {
+ // label: "温馨提示",
+ // prop: "realName1",
+ // hide: true,
+ // addDisplay: true,
+ // editDisplay: false,
+ // span: 24,
+ // value: "账号为身份证号码，密码为身份证后六位",
+ // addDisabled: true
+ // // search: true,
+ // // searchSpan: 3,
+ // // width: 60,
+ // // searchLabelWidth: 50,
+ // },
{
- label: "籍贯",
- prop: "nativeplace",
- display: false
- },
- {
- label: "民族",
- prop: "nation",
- display: false
- },
- {
- label: "出生日期",
- prop: "birthday",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- display: false
- },
- {
- 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: "phone",
- display: false
- },
- {
- label: "邮箱",
- prop: "email",
- display: false,
- width: 150
- },
- {
- label: "入职时间",
- prop: "rtime",
- display: false
- },
- {
- label: "保安公司名称",
+ label: "所属保安公司",
searchLabelWidth: "110",
// prop: "deptName",
prop: "deptId",
@@ -501,47 +499,245 @@
label: "title",
value: "id",
},
+ // hide: true,
slot: true,
searchSpan: 5,
display: false,
search: true,
- width: 260
+ minWidth: 260
+ },
+ // {
+ // label: "所属保安公司",
+ // searchLabelWidth: "110",
+ // prop: "deptName",
+ // // 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: 80,
+ type: "select",
+ dicData: [{
+ label: "男",
+ value: 1,
+ },
+ {
+ label: "女",
+ value: 2,
+ },
+ // {
+ // label: "未知",
+ // value: 3,
+ // },
+ ],
+ display: false
},
{
- label: "是否持证",
- prop: "hold",
- slot: true,
+ label: "身份证号码",
+ prop: "cardid",
+ search: true,
+ searchLabelWidth: 90,
+ searchSpan: 4,
+ 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,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ 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: "请选择学历",
+ trigger: "blur"
+ }],
+ },
+ {
+ label: "联系电话",
+ prop: "phone",
+ minWidth: 100,
+ display: false
+ },
+ {
+ label: "健康状态",
+ prop: "healstats",
+ hide: true,
+ display: false
+ },
+ {
+ label: "保安证编号",
+ prop: "securitynumber",
+ search: true,
+ searchLabelWidth: 90,
+ minWidth: 105,
+ searchSpan: 3,
+ 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: '是否派遣',
+ 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,
+ type: "select",
+ dicData: [{
+ label: "是",
+ value: "1",
+ },
+ {
+ label: "否",
+ value: "2",
+ },
+ {
+ label: "已吊销",
+ value: "3",
+ },
+ ],
+ 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: "是否制证",
+ prop: "userType",
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey",
+ // },
+ type: "select",
+ slot: true,
+ search: true,
+ // searchValue: 7,
+ editDisplay: false,
+ addDisplay: false,
+ searchSpan: 3,
+ width: 69,
+ 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: "在职状态",
@@ -553,8 +749,11 @@
value: "dictKey"
},
dataType: "number",
+ searchValue: 1,
display: false,
+ hide: true,
searchSpan: 3,
+ width: 80,
search: true,
rules: [{
required: true,
--
Gitblit v1.9.3