From 21c7375b7b38ebf2c8a2ca8fbf6fe9fb4f28250f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 12 Jan 2022 10:59:40 +0800
Subject: [PATCH] 新增公司注册机公司注册审核

---
 src/views/securityGuard/data.js |  323 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 201 insertions(+), 122 deletions(-)

diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index 4a6b3bf..fa8b8f1 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -10,7 +10,7 @@
     }
 },
 {
-    label: "所属保安公司",
+    label: "企业名称",
     prop: "deptId",
     type: "tree",
     dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
@@ -320,9 +320,14 @@
     editDisplay: false,
     addDisplay: false
 }, {
-    label: '单位名称',
+    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",
@@ -357,7 +372,7 @@
 
 export var practitionersColumns = [{
     width: 200,
-    label: '单位名称',
+    label: '企业名称',
     prop: "companyname",
     formslot: true,
 }, {
@@ -417,7 +432,7 @@
 //     label: '工作态度',
 //     prop: "workingattitude",
 //     formslot: true,
-// }, 
+// },
 {
     label: '工作表现',
     prop: "achievements",
@@ -469,32 +484,17 @@
     prop: "realName",
     search: true,
     searchSpan: 3,
-    width: 60,
+    width: 65,
     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",
+    label: "企业名称",
+    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",
@@ -504,28 +504,13 @@
     searchSpan: 5,
     display: false,
     search: true,
-    minWidth: 260
+    minWidth: 160
 },
-// {
-//     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: 80,
+    prop: "sexs",
+    sortable: true,
+    width: 75,
     type: "select",
     dicData: [{
         label: "男",
@@ -548,10 +533,17 @@
     search: true,
     searchLabelWidth: 90,
     searchSpan: 5,
-    minWidth: 140,
+    width: 140,
     display: false
 },
-
+{
+    label: "照片",
+    prop: "avatar",
+    type: "upload",
+    listType: "picture-img",
+    width: 60,
+    display: false
+},
 {
     label: "籍贯",
     prop: "nativeplace",
@@ -565,7 +557,6 @@
     width: 55,
     display: false
 },
-
 {
     label: "出生日期",
     prop: "birthday",
@@ -579,30 +570,31 @@
     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,
-    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: 80,
     display: false
 },
 {
@@ -616,8 +608,9 @@
     prop: "securitynumber",
     search: true,
     searchLabelWidth: 90,
-    minWidth: 105,
-    searchSpan: 4,
+    sortable: true,
+    width: 118,
+    searchSpan: 5,
     addDisplay: false,
     editDisplay: false,
     // hide: true,
@@ -628,65 +621,53 @@
     hide: true,
     display: false
 },
-// {
-//     label: "是否派遣",
-//     prop: "dispatch",
-//     // hide: true,
-//     type: 'select',
-//     // display: false,
-//     dicData: [
-//         {
-//             label: '未派遣',
-//             value: 1
-//         }, {
-//             label: '已派遣',
-//             value: 0
-//         }
-//     ]
-// },
 {
     label: '是否派遣',
     prop: 'dispatch',
     type: 'select',
+    sortable: true,
     editDisplay: false,
+    search: true,
+    width: 110,
+    searchSpan: 4,
     addDisplay: false,
     dicData: [{
-        label: '未派遣',
-        value: '1'
-    }, {
+        label: '全部',
+        value: '2'
+    },
+    {
         label: '已派遣',
         value: '0'
-    }]
+    },
+    {
+        label: '未派遣',
+        value: '1'
+    }
+    ]
 },
 {
     label: "是否持证",
     prop: "hold",
     slot: true,
+    sortable: true,
     search: true,
-    searchSpan: 3,
-    width: 69,
+    searchSpan: 4,
+    width: 110,
     type: "select",
-    dicData: [
-        {
-            label: "是",
-            value: "1",
-        },
-        {
-            label: "否",
-            value: "2",
-        },
-        {
-            label: "已吊销",
-            value: "3",
-        },
+    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: "请选择",
@@ -694,25 +675,99 @@
     }],
 },
 
+{
+    label: "是否制证",
+    prop: "userType",
+    type: "select",
+    sortable: true,
+    slot: true,
+    search: true,
+    // searchValue: 7,
+    editDisplay: false,
+    addDisplay: false,
+    searchSpan: 3,
+    width: 110,
+    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: "有无照片",
+    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",
@@ -735,4 +790,28 @@
         trigger: "blur"
     }]
 },
+{
+    label: "审查状态",
+    prop: "examinationType",
+    type: "select",
+    sortable: true,
+    display: false,
+    searchSpan: 3,
+    search: false,
+    hide: true,
+    width: 110,
+    dicData: [{
+        label: "全部",
+        value: 6,
+    },
+    {
+        label: "正常",
+        value: "0",
+    },
+    {
+        label: "异常",
+        value: "1",
+    }
+    ],
+},
 ]
\ No newline at end of file

--
Gitblit v1.9.3