From c4e67a8942e514b65ab41bb19781d50576c15725 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 24 Sep 2021 19:56:52 +0800
Subject: [PATCH] 用户

---
 src/views/securityGuard/data.js |  204 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 157 insertions(+), 47 deletions(-)

diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index 565ff83..6c979e5 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -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",
@@ -340,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: '离职原因',
@@ -398,7 +398,6 @@
     formslot: true,
 }]
 
-
 //表现
 export var trackRecordColumn = [{
     label: "id",
@@ -407,22 +406,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,31 +455,62 @@
         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 = [{
     label: "姓名",
     prop: "realName",
     search: true,
-    searchSpan: 4,
+    searchSpan: 3,
+    width: 60,
     searchLabelWidth: 50,
     display: false
 },
 {
+    label: "所属保安公司",
+    searchLabelWidth: "110",
+    // prop: "deptName",
+    prop: "deptId",
+    type: "tree",
+    dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+    props: {
+        label: "title",
+        value: "id",
+    },
+    // hide: true,
+    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: 55,
     type: "select",
     dicData: [{
         label: "男",
@@ -471,36 +527,57 @@
     ],
     display: false
 },
+{
+    label: "身份证号码",
+    prop: "cardid",
+    search: true,
+    searchLabelWidth: 90,
+    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",
     format: "yyyy-MM-dd",
     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"
     },
     type: "select",
-    hide: true,
+    // hide: true,
     rules: [{
         required: true,
         message: "请选择学历",
@@ -510,40 +587,69 @@
 {
     label: "联系电话",
     prop: "phone",
+    minWidth: 100,
     display: false
 },
 {
-    label: "邮箱",
-    prop: "email",
-    display: false,
-    width: 150
+    label: "健康状态",
+    prop: "healstats",
+    hide: true,
+    display: false
+},
+{
+    label: "保安证编号",
+    prop: "securitynumber",
+    search: true,
+    searchLabelWidth: 90,
+    minWidth: 105,
+    searchSpan: 4,
+    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: "保安公司名称",
-    searchLabelWidth: "110",
-    // prop: "deptName",
-    prop: "deptId",
-    type: "tree",
-    dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
-    props: {
-        label: "title",
-        value: "id",
-    },
-    slot: true,
-    searchSpan: 4,
-    display: false,
-    search: true,
-    width: 260
+    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,
     display: false,
     dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
     props: {
@@ -557,6 +663,7 @@
         trigger: "blur"
     }],
 },
+
 // {
 //     label: "入职时间",
 //     prop: "rtime",
@@ -586,8 +693,11 @@
         value: "dictKey"
     },
     dataType: "number",
+    searchValue: 1,
     display: false,
-    searchSpan: 4,
+    hide: true,
+    searchSpan: 3,
+    width: 80,
     search: true,
     rules: [{
         required: true,

--
Gitblit v1.9.3