From 8e19102829f30f70ef396f2d5a972a54d227b207 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 06 Jul 2021 16:36:50 +0800
Subject: [PATCH] 保安人员相关

---
 public/favicon.png                |    0 
 src/views/management/details.vue  |   22 +++++++
 src/views/management/register.vue |  115 ++++++++++++++++++++++----------------
 3 files changed, 89 insertions(+), 48 deletions(-)

diff --git a/public/favicon.png b/public/favicon.png
index ecd70ca..0fc2fc1 100644
--- a/public/favicon.png
+++ b/public/favicon.png
Binary files differ
diff --git a/src/views/management/details.vue b/src/views/management/details.vue
new file mode 100644
index 0000000..06f0d22
--- /dev/null
+++ b/src/views/management/details.vue
@@ -0,0 +1,22 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-07-05 16:31:54
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-07-06 16:36:19
+ * menu-name 保安详细资料
+ */
+<template>
+  <div>
+    保安详细资料
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/management/register.vue b/src/views/management/register.vue
index 8eb5652..8acf06c 100644
--- a/src/views/management/register.vue
+++ b/src/views/management/register.vue
@@ -2,7 +2,7 @@
  * @Author: Morpheus
  * @Date: 2021-07-05 16:31:54
  * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-05 19:45:34
+ * @Last Modified time: 2021-07-06 16:33:50
  * menu-name 保安员注册查询
  */
 <template>
@@ -52,14 +52,6 @@
                     <template slot-scope="{row}"
                               slot="userTypeName">
                         <el-tag>{{row.userTypeName}}</el-tag>
-                    </template>
-                    <template slot-scope="{row}"
-                              slot="menu">
-                        <el-button type="text"
-                                   icon="icon-icon-biaoxianfen"
-                                   size="small"
-                                   @click.stop="manifestation(row)">查看表现
-                        </el-button>
                     </template>
                 </avue-crud>
                 <el-dialog title="用户数据导入"
@@ -200,74 +192,105 @@
                 delBtn: false,
                 editBtn: false,
 
+                selection: false,
+
+                align: 'center',
                 height: 'auto',
                 calcHeight: 80,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 6,
-                border: true,
+                searchMenuSpan: 4,
+                border: false,
                 index: true,
-                selection: true,
                 viewBtn: true,
                 //dialogType: 'drawer',
                 dialogClickModal: false,
                 // 操作栏宽度
-                menuWidth: 280,
+                menuWidth: 90,
+
                 column: [
                     {
-                        label: "登录账号",
-                        prop: "account",
+                        label: "保安姓名",
+                        prop: "realName",
                         search: true,
-                        display: false
+                        searchSpan: 5,
+                        display: false,
+                        width: 80
                     },
                     {
-                        label: "所属租户",
-                        prop: "tenantName",
+                        label: "性别",
+                        prop: "sex",
+                        type: "select",
+                        search: true,
+                        searchSpan: 4,
+                        searchLabelWidth: 50,
+                        dicData: [{
+                            label: '女',
+                            value: 2
+                        }, {
+                            label: '男',
+                            value: 1,
+                        }],
+                        slot: true,
+                        display: false,
+                        width: 50
+                    },
+                    {
+                        label: "身份证号",
+                        prop: "cardid",
+                        slot: true,
+                        display: false,
+                        width: 140
+                    },
+                    {
+                        label: "联系方式",
+                        prop: "phone",
+                        slot: true,
+                        display: false,
+                        width: 96
+                    },
+                    {
+                        label: "联系地址",
+                        prop: "address",
                         slot: true,
                         display: false
                     },
                     {
-                        label: "用户姓名",
-                        prop: "realName",
-                        search: true,
-                        display: false
+                        label: "入职时间",
+                        prop: "rtime",
+                        slot: true,
+                        display: false,
+                        width: 90
                     },
                     {
                         label: "所属角色",
                         prop: "roleName",
                         slot: true,
-                        display: false
+                        display: false,
+                        width: 100
                     },
                     {
-                        label: "所属部门",
+                        label: "所属公司",
                         prop: "deptName",
                         slot: true,
                         display: false
                     },
                     {
-                        label: "用户平台",
-                        prop: "userTypeName",
-                        slot: true,
-                        display: false
-                    },
-                    {
-                        label: "用户平台",
+                        label: "是否在职",
+                        prop: "status",
                         type: "select",
-                        dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey"
-                        },
-                        dataType: "number",
                         search: true,
-                        hide: true,
+                        searchSpan: 4,
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1,
+                        }],
+                        slot: true,
                         display: false,
-                        prop: "userType",
-                        rules: [{
-                            required: true,
-                            message: "请选择用户平台",
-                            trigger: "blur"
-                        }]
+                        width: 90
                     },
                 ],
                 group: [
@@ -809,10 +832,6 @@
                 this.selectionClear();
             });
         },
-        // 查看人员表现
-        manifestation (row) {
-            console.log(row)
-        }
     }
 };
 </script>

--
Gitblit v1.9.3