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 | 141 +++++++++++++++++++++++++++++++++--------------
1 files changed, 99 insertions(+), 42 deletions(-)
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index cd92483..385c026 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -398,7 +398,6 @@
formslot: true,
}]
-
//表现
export var trackRecordColumn = [{
label: "id",
@@ -407,15 +406,24 @@
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",
@@ -447,14 +455,7 @@
message: "请选择表现",
trigger: "blur"
}]
- }, {
- label: '时间',
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- prop: "time",
- formslot: true,
- },
+ }
// {
// label: '服务公司',
// prop: "departmentName",
@@ -472,6 +473,21 @@
searchLabelWidth: 50,
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: "所属保安公司",
searchLabelWidth: "110",
@@ -509,7 +525,7 @@
{
label: "性别",
prop: "sex",
- width: 55,
+ width: 80,
type: "select",
dicData: [{
label: "男",
@@ -519,10 +535,10 @@
label: "女",
value: 2,
},
- {
- label: "未知",
- value: 3,
- },
+ // {
+ // label: "未知",
+ // value: 3,
+ // },
],
display: false
},
@@ -531,7 +547,7 @@
prop: "cardid",
search: true,
searchLabelWidth: 90,
- searchSpan: 5,
+ searchSpan: 4,
minWidth: 140,
display: false
},
@@ -601,7 +617,7 @@
search: true,
searchLabelWidth: 90,
minWidth: 105,
- searchSpan: 4,
+ searchSpan: 3,
addDisplay: false,
editDisplay: false,
// hide: true,
@@ -649,13 +665,27 @@
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,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // type: "select",
rules: [{
required: true,
message: "请选择",
@@ -663,24 +693,51 @@
}],
},
+ {
+ 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: "在职状态",
--
Gitblit v1.9.3