From db0e6fcd3c2765e5d928ff0f0cc48f2da9261fa6 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 21 Dec 2021 14:55:36 +0800
Subject: [PATCH] 新增,修改,按钮位置调整

---
 src/views/securityGuard/data.js |  114 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index 8365c25..dbfc255 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -509,7 +509,8 @@
     {
         label: "性别",
         prop: "sexs",
-        width: 80,
+        sortable: true,
+        width: 70,
         type: "select",
         dicData: [{
                 label: "男",
@@ -532,10 +533,17 @@
         search: true,
         searchLabelWidth: 90,
         searchSpan: 5,
-        minWidth: 150,
+        width: 140,
         display: false
     },
-
+    {
+        label: "照片",
+        prop: "avatar",
+        type: "upload",
+        listType: "picture-img",
+        width: 60,
+        display: false
+    },
     {
         label: "籍贯",
         prop: "nativeplace",
@@ -549,7 +557,6 @@
         width: 55,
         display: false
     },
-
     {
         label: "出生日期",
         prop: "birthday",
@@ -563,31 +570,31 @@
         label: "年龄",
         prop: "age",
         width: 55,
-        sortable: true,
+
         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,
-        rules: [{
-            required: true,
-            message: "请选择学历",
-            trigger: "blur"
-        }],
-    },
+    // {
+    //     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,
+    //     rules: [{
+    //         required: true,
+    //         message: "请选择学历",
+    //         trigger: "blur"
+    //     }],
+    // },
     {
         label: "联系电话",
         prop: "phone",
-        minWidth: 100,
+        minWidth: 70,
         display: false
     },
     {
@@ -601,7 +608,8 @@
         prop: "securitynumber",
         search: true,
         searchLabelWidth: 90,
-        minWidth: 115,
+        sortable: true,
+        width: 110,
         searchSpan: 5,
         addDisplay: false,
         editDisplay: false,
@@ -617,8 +625,10 @@
         label: '是否派遣',
         prop: 'dispatch',
         type: 'select',
+        sortable: true,
         editDisplay: false,
         search: true,
+        width: 80,
         searchSpan: 3,
         addDisplay: false,
         dicData: [{
@@ -639,6 +649,7 @@
         label: "是否持证",
         prop: "hold",
         slot: true,
+        sortable: true,
         search: true,
         searchSpan: 3,
         width: 69,
@@ -668,6 +679,7 @@
         label: "是否制证",
         prop: "userType",
         type: "select",
+        sortable: true,
         slot: true,
         search: true,
         // searchValue: 7,
@@ -706,6 +718,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",
@@ -731,6 +794,7 @@
         label: "审查状态",
         prop: "examinationType",
         type: "select",
+        sortable: true,
         display: false,
         searchSpan: 3,
         search: false,

--
Gitblit v1.9.3