From 7434e5ccf889189d24e7f4e655fbf752a0883d5b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Dec 2021 19:23:58 +0800
Subject: [PATCH] 保安员查询修改

---
 src/views/securityGuard/data.js |  102 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 91 insertions(+), 11 deletions(-)

diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index c1b1cf1..9557d2a 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -323,6 +323,11 @@
     label: '企业名称',
     prop: "companyname",
     formslot: true,
+    rules: [{
+        required: true,
+        message: "请选择企业名称",
+        trigger: "blur"
+    }]
 }, {
     label: '部门',
     prop: "department",
@@ -342,6 +347,11 @@
     valueFormat: "yyyy-MM-dd",
     prop: "entrytime",
     formslot: true,
+    rules: [{
+        required: true,
+        message: "请选择入职时间",
+        trigger: "blur"
+    }]
 }, {
     label: '离职时间',
     type: 'date',
@@ -349,6 +359,11 @@
     valueFormat: "yyyy-MM-dd",
     prop: "departuretime",
     formslot: true,
+    rules: [{
+        required: true,
+        message: "请选择离职时间",
+        trigger: "blur"
+    }]
 }, {
     label: '离职原因',
     prop: "leaving",
@@ -475,11 +490,11 @@
     },
     {
         label: "企业名称",
-        searchLabelWidth: "110",
+        searchLabelWidth: "80",
         // 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",
@@ -516,11 +531,16 @@
         prop: "cardid",
         search: true,
         searchLabelWidth: 90,
-        searchSpan: 4,
+        searchSpan: 5,
         minWidth: 150,
         display: false
     },
-
+    {
+        label: "照片",
+        prop: "avatar",
+        type: "upload",
+        listType: "picture-img",
+    },
     {
         label: "籍贯",
         prop: "nativeplace",
@@ -548,6 +568,7 @@
         label: "年龄",
         prop: "age",
         width: 55,
+        sortable: true,
         display: false
     },
     {
@@ -586,7 +607,7 @@
         search: true,
         searchLabelWidth: 90,
         minWidth: 115,
-        searchSpan: 3,
+        searchSpan: 5,
         addDisplay: false,
         editDisplay: false,
         // hide: true,
@@ -602,14 +623,22 @@
         prop: 'dispatch',
         type: 'select',
         editDisplay: false,
+        search: true,
+        searchSpan: 3,
         addDisplay: false,
         dicData: [{
-            label: '未派遣',
-            value: '1'
-        }, {
-            label: '已派遣',
-            value: '0'
-        }]
+                label: '全部',
+                value: '2'
+            },
+            {
+                label: '已派遣',
+                value: '0'
+            },
+            {
+                label: '未派遣',
+                value: '1'
+            }
+        ]
     },
     {
         label: "是否持证",
@@ -682,6 +711,57 @@
     //     // }]
     // },
     {
+        label: "有无照片",
+        prop: "isAvatar",
+        type: "select",
+        search: true,
+        minWidth: 105,
+        searchSpan: 3,
+        addDisplay: false,
+        editDisplay: false,
+        hide: true,
+        display: false,
+        dicData: [{
+                label: "全部",
+                value: 3,
+            },
+            {
+                label: "有",
+                value: 1,
+            },
+            {
+                label: "无",
+                value: 2,
+            },
+        ],
+    },
+    {
+        label: "是否采集指纹",
+        prop: "isFingerprint",
+        type: "select",
+        search: true,
+        searchLabelWidth: 110,
+        minWidth: 105,
+        searchSpan: 4,
+        addDisplay: false,
+        editDisplay: false,
+        hide: true,
+        display: false,
+        dicData: [{
+                label: "全部",
+                value: 3,
+            },
+            {
+                label: "是",
+                value: 1,
+            },
+            {
+                label: "否",
+                value: 2,
+            },
+        ],
+    },
+    {
         label: "在职状态",
         prop: "status",
         type: "select",

--
Gitblit v1.9.3