From aa9f98d8fd29b2e3db0169ac8e408b9ed8e82fea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 23 Nov 2021 22:26:08 +0800
Subject: [PATCH] 保安审查修改，报名清册修改
---
src/views/securityGuard/data.js | 147 ++++++++++++++++++++++++++++---------------------
1 files changed, 84 insertions(+), 63 deletions(-)
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index 2df2cec..c1b1cf1 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",
@@ -320,7 +320,7 @@
editDisplay: false,
addDisplay: false
}, {
- label: '单位名称',
+ label: '企业名称',
prop: "companyname",
formslot: true,
}, {
@@ -357,7 +357,7 @@
export var practitionersColumns = [{
width: 200,
- label: '单位名称',
+ label: '企业名称',
prop: "companyname",
formslot: true,
}, {
@@ -417,7 +417,7 @@
// label: '工作态度',
// prop: "workingattitude",
// formslot: true,
- // },
+ // },
{
label: '工作表现',
prop: "achievements",
@@ -474,7 +474,7 @@
display: false
},
{
- label: "所属保安公司",
+ label: "企业名称",
searchLabelWidth: "110",
// prop: "deptName",
prop: "deptId",
@@ -491,25 +491,9 @@
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",
+ prop: "sexs",
width: 80,
type: "select",
dicData: [{
@@ -532,8 +516,8 @@
prop: "cardid",
search: true,
searchLabelWidth: 90,
- searchSpan: 5,
- minWidth: 140,
+ searchSpan: 4,
+ minWidth: 150,
display: false
},
@@ -601,8 +585,8 @@
prop: "securitynumber",
search: true,
searchLabelWidth: 90,
- minWidth: 105,
- searchSpan: 4,
+ minWidth: 115,
+ searchSpan: 3,
addDisplay: false,
editDisplay: false,
// hide: true,
@@ -613,22 +597,6 @@
hide: true,
display: false
},
- // {
- // label: "是否派遣",
- // prop: "dispatch",
- // // hide: true,
- // type: 'select',
- // // display: false,
- // dicData: [
- // {
- // label: '未派遣',
- // value: 1
- // }, {
- // label: '已派遣',
- // value: 0
- // }
- // ]
- // },
{
label: '是否派遣',
prop: 'dispatch',
@@ -650,13 +618,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: "请选择",
@@ -664,24 +640,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: "在职状态",
@@ -705,4 +703,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