From 2c41bb9bde06f279c41d3d2a4bdc65edc4be24b8 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 23 Nov 2021 16:23:43 +0800
Subject: [PATCH] +

---
 src/views/securityGuard/data.js |  171 +++++++++++++++++++++++++++------------------------------
 1 files changed, 81 insertions(+), 90 deletions(-)

diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index 4a6b3bf..15ab65f 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,7 +320,7 @@
     editDisplay: false,
     addDisplay: false
 }, {
-    label: '单位名称',
+    label: '企业名称',
     prop: "companyname",
     formslot: true,
 }, {
@@ -357,7 +357,7 @@
 
 export var practitionersColumns = [{
     width: 200,
-    label: '单位名称',
+    label: '企业名称',
     prop: "companyname",
     formslot: true,
 }, {
@@ -417,7 +417,7 @@
 //     label: '工作态度',
 //     prop: "workingattitude",
 //     formslot: true,
-// }, 
+// },
 {
     label: '工作表现',
     prop: "achievements",
@@ -473,23 +473,8 @@
     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: "所属保安公司",
+    label: "企业名称",
     searchLabelWidth: "110",
     // prop: "deptName",
     prop: "deptId",
@@ -506,25 +491,9 @@
     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",
+    prop: "sexs",
     width: 80,
     type: "select",
     dicData: [{
@@ -547,8 +516,8 @@
     prop: "cardid",
     search: true,
     searchLabelWidth: 90,
-    searchSpan: 5,
-    minWidth: 140,
+    searchSpan: 4,
+    minWidth: 150,
     display: false
 },
 
@@ -617,7 +586,7 @@
     search: true,
     searchLabelWidth: 90,
     minWidth: 105,
-    searchSpan: 4,
+    searchSpan: 3,
     addDisplay: false,
     editDisplay: false,
     // hide: true,
@@ -628,22 +597,6 @@
     hide: true,
     display: false
 },
-// {
-//     label: "是否派遣",
-//     prop: "dispatch",
-//     // hide: true,
-//     type: 'select',
-//     // display: false,
-//     dicData: [
-//         {
-//             label: '未派遣',
-//             value: 1
-//         }, {
-//             label: '已派遣',
-//             value: 0
-//         }
-//     ]
-// },
 {
     label: '是否派遣',
     prop: 'dispatch',
@@ -666,27 +619,20 @@
     searchSpan: 3,
     width: 69,
     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,24 +640,46 @@
     }],
 },
 
+{
+    label: "是否制证",
+    prop: "userType",
+    type: "select",
+    slot: true,
+    search: true,
+    // searchValue: 7,
+    editDisplay: false,
+    addDisplay: false,
+    searchSpan: 3,
+    width: 69,
+    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: "在职状态",
@@ -735,4 +703,27 @@
         trigger: "blur"
     }]
 },
+{
+    label: "审查状态",
+    prop: "examinationType",
+    type: "select",
+    display: false,
+    searchSpan: 3,
+    search: false,
+    hide: true,
+    width: 80,
+    dicData: [{
+        label: "全部",
+        value: 6,
+    },
+    {
+        label: "正常",
+        value: "0",
+    },
+    {
+        label: "异常",
+        value: 1,
+    }
+    ],
+},
 ]
\ No newline at end of file

--
Gitblit v1.9.3