From 5b9aded57ee94d0d8f7188d2abe4ec79cf8111b5 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 05 Nov 2021 11:51:48 +0800
Subject: [PATCH] 保安证件相关修改
---
src/views/securityGuard/data.js | 706 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 367 insertions(+), 339 deletions(-)
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index b9d3cb8..042946a 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -6,156 +6,156 @@
prop: "title",
span: 24,
styles: {
- fontSize: '24px'
+ fontSize: '24px'
}
-},
-{
+ },
+ {
label: "所属保安公司",
prop: "deptId",
type: "tree",
dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
// dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
props: {
- label: "title",
- value: "id",
+ label: "title",
+ value: "id",
},
disabled: true,
span: 24,
-},
-{
+ },
+ {
label: "登录账号",
prop: "account",
disabled: true
-},
-{
+ },
+ {
label: "用户姓名",
prop: "realName",
disabled: true,
-},
-{
+ },
+ {
label: "用户昵称",
prop: "name",
disabled: true
-},
-{
+ },
+ {
label: "手机号码",
prop: "phone",
disabled: true
-},
-{
+ },
+ {
label: "电子邮箱",
prop: "email",
disabled: true
-},
-{
+ },
+ {
label: "身份证号",
prop: "cardid",
disabled: true
-},
-{
+ },
+ {
label: "籍贯",
prop: "nativeplace",
disabled: true
-},
-{
+ },
+ {
label: "民族",
prop: "nation",
disabled: true
-},
-{
+ },
+ {
label: "是否持证",
prop: "hold",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
props: {
- label: "dictValue",
- value: "dictKey",
+ 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",
+ label: "title",
+ value: "id",
},
disabled: true
-},
-{
+ },
+ {
label: "最高学历",
prop: "education",
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
props: {
- label: "dictValue",
- value: "dictKey"
+ label: "dictValue",
+ value: "dictKey"
},
dataType: "number",
slot: true,
disabled: true
-},
-{
+ },
+ {
label: "政治面貌",
prop: "politicaloutlook",
disabled: true
-},
-{
+ },
+ {
label: "身高",
prop: "height",
disabled: true
-},
-{
+ },
+ {
label: "联系地址",
prop: "address",
disabled: true
-},
-{
+ },
+ {
label: "户口所在地",
prop: "registered",
disabled: true
-},
-{
+ },
+ {
label: "入职时间",
prop: "rtime",
type: 'date',
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
disabled: true
-},
-{
+ },
+ {
label: "用户性别",
prop: "sex",
type: "select",
dicData: [{
label: "男",
value: 1
- },
- {
+ },
+ {
label: "女",
value: 2
- },
- {
+ },
+ {
label: "未知",
value: 3
- }
+ }
],
disabled: true
-},
-{
+ },
+ {
label: "用户生日",
type: "date",
prop: "birthday",
disabled: true
-}
+ }
]
@@ -167,115 +167,115 @@
type: "tree",
dicUrl: "/api/blade-system/tenant/select",
props: {
- label: "tenantName",
- value: "tenantId"
+ label: "tenantName",
+ value: "tenantId"
},
disabled: true,
span: 24,
-},
-{
+ },
+ {
label: "登录账号",
prop: "account",
disabled: true
-},
-{
+ },
+ {
label: "用户姓名",
prop: "realName",
rules: [{
- required: true,
- message: "请输入用户姓名",
- trigger: "blur"
+ required: true,
+ message: "请输入用户姓名",
+ trigger: "blur"
}, {
- min: 2,
- max: 5,
- message: '姓名长度在2到5个字符'
+ min: 2,
+ max: 5,
+ message: '姓名长度在2到5个字符'
}]
-},
-{
+ },
+ {
label: "用户昵称",
prop: "name"
-},
-{
+ },
+ {
label: "手机号码",
prop: "phone",
overHidden: true,
rules: [{
- required: true,
- message: "请输入手机号",
- trigger: "blur"
+ required: true,
+ message: "请输入手机号",
+ trigger: "blur"
}]
-},
-{
+ },
+ {
label: "电子邮箱",
prop: "email",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "身份证号",
prop: "cardid",
hide: true,
overHidden: true,
rules: [{
- required: true,
- message: "请输入身份证号",
- trigger: "blur"
+ required: true,
+ message: "请输入身份证号",
+ trigger: "blur"
}]
-},
-{
+ },
+ {
label: "籍贯",
prop: "nativeplace",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "民族",
prop: "nation",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "最高学历",
prop: "education",
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
props: {
- label: "dictValue",
- value: "dictKey"
+ label: "dictValue",
+ value: "dictKey"
},
dataType: "number",
slot: true,
rules: [{
- required: true,
- message: "请选择学历",
- trigger: "blur"
+ required: true,
+ message: "请选择学历",
+ trigger: "blur"
}]
-},
-{
+ },
+ {
label: "政治面貌",
prop: "politicaloutlook",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "身高",
prop: "height",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "联系地址",
prop: "address",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "户口所在地",
prop: "registered",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "入职时间",
prop: "rtime",
type: 'date',
@@ -283,119 +283,119 @@
valueFormat: "yyyy-MM-dd",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "用户性别",
prop: "sex",
type: "select",
dicData: [{
label: "男",
value: 1
- },
- {
+ },
+ {
label: "女",
value: 2
- },
- {
+ },
+ {
label: "未知",
value: 3
- }
+ }
],
hide: true
-},
-{
+ },
+ {
label: "用户生日",
type: "date",
prop: "birthday",
hide: true
-}
+ }
]
//从业记录
export var practitionersColumn = [{
- label: "id",
- prop: "id",
- hide: true,
- editDisplay: false,
- addDisplay: false
+ label: "id",
+ prop: "id",
+ hide: true,
+ editDisplay: false,
+ addDisplay: false
}, {
- label: '单位名称',
- prop: "companyname",
- formslot: true,
+ label: '单位名称',
+ prop: "companyname",
+ formslot: true,
}, {
- label: '部门',
- prop: "department",
- formslot: true,
+ label: '部门',
+ prop: "department",
+ formslot: true,
}, {
- label: '岗位',
- prop: "post",
- formslot: true,
+ label: '岗位',
+ prop: "post",
+ formslot: true,
}, {
- label: '岗位职责',
- prop: "responsibilities",
- formslot: true,
+ label: '岗位职责',
+ prop: "responsibilities",
+ formslot: true,
}, {
- label: '入职时间',
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- prop: "entrytime",
- formslot: true,
+ label: '入职时间',
+ type: 'date',
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ prop: "entrytime",
+ formslot: true,
}, {
- label: '离职时间',
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- prop: "departuretime",
- formslot: true,
+ label: '离职时间',
+ type: 'date',
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ prop: "departuretime",
+ formslot: true,
}, {
- label: '离职原因',
- prop: "leaving",
- formslot: true,
+ label: '离职原因',
+ prop: "leaving",
+ formslot: true,
}]
export var practitionersColumns = [{
- width: 200,
- label: '单位名称',
- prop: "companyname",
- formslot: true,
+ width: 200,
+ label: '单位名称',
+ prop: "companyname",
+ formslot: true,
}, {
- width: 200,
- label: '部门',
- prop: "department",
- formslot: true,
+ width: 200,
+ label: '部门',
+ prop: "department",
+ formslot: true,
}, {
- width: 200,
- label: '岗位',
- prop: "post",
- formslot: true,
+ width: 200,
+ label: '岗位',
+ prop: "post",
+ formslot: true,
}, {
- width: 200,
- label: '岗位职责',
- prop: "responsibilities",
- formslot: true,
+ width: 200,
+ label: '岗位职责',
+ prop: "responsibilities",
+ formslot: true,
}, {
- width: 200,
- label: '入职时间',
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- prop: "entryTime",
- formslot: true,
+ width: 200,
+ label: '入职时间',
+ type: 'date',
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ prop: "entryTime",
+ formslot: true,
}, {
- width: 200,
- label: '离职时间',
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- prop: "departureTime",
- formslot: true,
+ width: 200,
+ label: '离职时间',
+ type: 'date',
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ prop: "departureTime",
+ formslot: true,
}, {
- width: 200,
- label: '离职原因',
- prop: "leaving",
- formslot: true,
+ width: 200,
+ label: '离职原因',
+ prop: "leaving",
+ formslot: true,
}]
//表现
@@ -405,24 +405,24 @@
hide: true,
editDisplay: false,
addDisplay: false
-}, {
+ }, {
label: '时间',
type: 'date',
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
prop: "time",
formslot: true,
-},
-// {
-// label: '工作态度',
-// prop: "workingattitude",
-// formslot: true,
-// },
-{
+ },
+ // {
+ // label: '工作态度',
+ // prop: "workingattitude",
+ // formslot: true,
+ // },
+ {
label: '工作表现',
prop: "achievements",
formslot: true,
-}, {
+ }, {
label: '表现评定',
prop: "score",
type: "select",
@@ -434,33 +434,33 @@
dicData: [{
label: "优秀",
value: 0
- },
- {
+ },
+ {
label: "良好",
value: 1
- },
- {
+ },
+ {
label: "一般",
value: 2
- },
- {
+ },
+ {
label: "差",
value: 3
- },
+ },
],
dataType: "number",
slot: true,
rules: [{
- required: true,
- message: "请选择表现",
- trigger: "blur"
+ required: true,
+ message: "请选择表现",
+ trigger: "blur"
}]
-}
- // {
- // label: '服务公司',
- // prop: "departmentName",
- // formslot: true,
- // }
+ }
+ // {
+ // label: '服务公司',
+ // prop: "departmentName",
+ // formslot: true,
+ // }
]
@@ -472,23 +472,23 @@
width: 60,
searchLabelWidth: 50,
display: false
-},
-// {
-// label: "温馨提示",
-// prop: "realName1",
-// hide: true,
-// addDisplay: true,
-// editDisplay: false,
-// span: 24,
-// value: "账号为身份证号码，密码为身份证后六位",
+ },
+ // {
+ // label: "温馨提示",
+ // prop: "realName1",
+ // hide: true,
+ // addDisplay: true,
+ // editDisplay: false,
+ // span: 24,
+ // value: "账号为身份证号码，密码为身份证后六位",
-// addDisabled: true
-// // search: true,
-// // searchSpan: 3,
-// // width: 60,
-// // searchLabelWidth: 50,
-// },
-{
+ // addDisabled: true
+ // // search: true,
+ // // searchSpan: 3,
+ // // width: 60,
+ // // searchLabelWidth: 50,
+ // },
+ {
label: "所属保安公司",
searchLabelWidth: "110",
// prop: "deptName",
@@ -496,8 +496,8 @@
type: "tree",
dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
- label: "title",
- value: "id",
+ label: "title",
+ value: "id",
},
// hide: true,
slot: true,
@@ -505,24 +505,24 @@
display: false,
search: true,
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: "所属保安公司",
+ // 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,
@@ -530,19 +530,19 @@
dicData: [{
label: "男",
value: 1,
- },
- {
+ },
+ {
label: "女",
value: 2,
- },
- // {
- // label: "未知",
- // value: 3,
- // },
+ },
+ // {
+ // label: "未知",
+ // value: 3,
+ // },
],
display: false
-},
-{
+ },
+ {
label: "身份证号码",
prop: "cardid",
search: true,
@@ -550,23 +550,23 @@
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",
@@ -574,44 +574,44 @@
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"
+ label: "dictValue",
+ value: "dictKey"
},
type: "select",
// hide: true,
rules: [{
- required: true,
- message: "请选择学历",
- trigger: "blur"
+ required: true,
+ message: "请选择学历",
+ trigger: "blur"
}],
-},
-{
+ },
+ {
label: "联系电话",
prop: "phone",
minWidth: 100,
display: false
-},
-{
+ },
+ {
label: "健康状态",
prop: "healstats",
hide: true,
display: false
-},
-{
+ },
+ {
label: "保安证编号",
prop: "securitynumber",
search: true,
@@ -621,44 +621,44 @@
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",
+ // // 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: '1'
}, {
- label: '已派遣',
- value: '0'
+ label: '已派遣',
+ value: '0'
}]
-},
-{
+ },
+ {
label: "是否持证",
prop: "hold",
slot: true,
@@ -666,19 +666,18 @@
searchSpan: 3,
width: 69,
type: "select",
- dicData: [
- {
- label: "是",
- value: "1",
- },
- {
- label: "否",
- value: "2",
- },
- {
- label: "已吊销",
- value: "3",
- },
+ dicData: [{
+ label: "是",
+ value: "1",
+ },
+ {
+ label: "否",
+ value: "2",
+ },
+ {
+ label: "已吊销",
+ value: "3",
+ },
],
display: false,
// dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
@@ -688,39 +687,68 @@
// },
// type: "select",
rules: [{
- required: true,
- message: "请选择",
- trigger: "blur"
+ required: true,
+ message: "请选择",
+ trigger: "blur"
}],
-},
+ },
-// {
-// 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"
-// // }]
-// },
-{
+ {
+ label: "是否制证",
+ prop: "userType",
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey",
+ // },
+ type: "select",
+ slot: true,
+ search: true,
+ searchSpan: 3,
+ width: 69,
+ dicData: [{
+ label: "已制证",
+ value: 6,
+ },
+ {
+ label: "未制证",
+ value: 7,
+ }
+ ],
+ rules: [{
+ required: true,
+ message: "请选择",
+ trigger: "blur",
+ }, ],
+ },
+
+ // {
+ // 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"
+ // // }]
+ // },
+ {
label: "在职状态",
prop: "status",
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
props: {
- label: "dictValue",
- value: "dictKey"
+ label: "dictValue",
+ value: "dictKey"
},
dataType: "number",
searchValue: 1,
@@ -730,9 +758,9 @@
width: 80,
search: true,
rules: [{
- required: true,
- message: "请选择在职状态",
- trigger: "blur"
+ required: true,
+ message: "请选择在职状态",
+ trigger: "blur"
}]
-},
-]
\ No newline at end of file
+ },
+]
--
Gitblit v1.9.3