From d1b058faa19088838b668d6c03dd71c2bcc7d5d3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 09 Dec 2021 10:30:44 +0800
Subject: [PATCH] 用户角色控制修改
---
src/views/securityGuard/data.js | 247 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 160 insertions(+), 87 deletions(-)
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index e5c2191..6d371ef 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -10,7 +10,7 @@
}
},
{
- label: "所属保安公司",
+ label: "企业名称",
prop: "deptId",
type: "tree",
dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
@@ -83,7 +83,7 @@
prop: "jurisdiction",
// multiple: true,
type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
+ dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
value: "id",
@@ -320,9 +320,14 @@
editDisplay: false,
addDisplay: false
}, {
- label: '单位名称',
+ label: '企业名称',
prop: "companyname",
formslot: true,
+ rules: [{
+ required: true,
+ message: "请选择企业名称",
+ trigger: "blur"
+ }]
}, {
label: '部门',
prop: "department",
@@ -340,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",
@@ -357,7 +372,7 @@
export var practitionersColumns = [{
width: 200,
- label: '单位名称',
+ label: '企业名称',
prop: "companyname",
formslot: true,
}, {
@@ -397,7 +412,6 @@
prop: "leaving",
formslot: true,
}]
-
//表现
export var trackRecordColumn = [{
@@ -407,22 +421,48 @@
editDisplay: false,
addDisplay: false
}, {
- label: '工作态度',
- prop: "workingattitude",
+ label: '时间',
+ type: 'date',
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ prop: "time",
formslot: true,
-}, {
- label: '工作成效',
+},
+// {
+// label: '工作态度',
+// prop: "workingattitude",
+// formslot: true,
+// },
+{
+ label: '工作表现',
prop: "achievements",
formslot: true,
}, {
- label: '表现',
+ label: '表现评定',
prop: "score",
type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=scoreType",
- props: {
- label: "dictValue",
- value: "dictKey"
+ // 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: [{
@@ -430,18 +470,13 @@
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: "departmentName",
+ // formslot: true,
+ // }
+]
export var securityFormPageColumn = [{
@@ -454,16 +489,17 @@
display: false
},
{
- label: "所属保安公司",
+ label: "企业名称",
searchLabelWidth: "110",
// prop: "deptName",
prop: "deptId",
type: "tree",
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
label: "title",
value: "id",
},
+ // hide: true,
slot: true,
searchSpan: 5,
display: false,
@@ -472,8 +508,8 @@
},
{
label: "性别",
- prop: "sex",
- width: 55,
+ prop: "sexs",
+ width: 80,
type: "select",
dicData: [{
label: "男",
@@ -483,10 +519,10 @@
label: "女",
value: 2,
},
- {
- label: "未知",
- value: 3,
- },
+ // {
+ // label: "未知",
+ // value: 3,
+ // },
],
display: false
},
@@ -495,9 +531,8 @@
prop: "cardid",
search: true,
searchLabelWidth: 90,
- searchSpan: 4,
- minWidth: 140,
-
+ searchSpan: 5,
+ minWidth: 150,
display: false
},
@@ -565,8 +600,8 @@
prop: "securitynumber",
search: true,
searchLabelWidth: 90,
- minWidth: 105,
- searchSpan: 4,
+ minWidth: 115,
+ searchSpan: 5,
addDisplay: false,
editDisplay: false,
// hide: true,
@@ -577,35 +612,19 @@
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',
- dicData: [
- {
- label: '未派遣',
- value: '1'
- }, {
- label: '已派遣',
- value: '0'
- }
- ]
+ editDisplay: false,
+ addDisplay: false,
+ dicData: [{
+ label: '未派遣',
+ value: '1'
+ }, {
+ label: '已派遣',
+ value: '0'
+ }]
},
{
label: "是否持证",
@@ -614,13 +633,21 @@
search: true,
searchSpan: 3,
width: 69,
- display: false,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
type: "select",
+ dicData: [{
+ label: "是",
+ value: "1",
+ },
+ {
+ label: "否",
+ value: "2",
+ },
+ {
+ label: "已吊销",
+ value: "3",
+ },
+ ],
+ display: false,
rules: [{
required: true,
message: "请选择",
@@ -628,24 +655,46 @@
}],
},
+{
+ label: "是否制证",
+ prop: "userType",
+ 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: "在职状态",
@@ -657,6 +706,7 @@
value: "dictKey"
},
dataType: "number",
+ searchValue: 1,
display: false,
hide: true,
searchSpan: 3,
@@ -668,4 +718,27 @@
trigger: "blur"
}]
},
+{
+ label: "审查状态",
+ prop: "examinationType",
+ type: "select",
+ display: false,
+ searchSpan: 3,
+ search: false,
+ hide: true,
+ width: 80,
+ dicData: [{
+ label: "全部",
+ value: 6,
+ },
+ {
+ label: "正常",
+ value: "0",
+ },
+ {
+ label: "异常",
+ value: "1",
+ }
+ ],
+},
]
\ No newline at end of file
--
Gitblit v1.9.3