From 5a8bc481870caa1bb54f0ab48849db932102db71 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 26 Aug 2021 19:07:40 +0800
Subject: [PATCH] 保安员修改

---
 src/views/securityGuard/data.js | 1010 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 504 insertions(+), 506 deletions(-)

diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index e67ca1c..e3ac2a2 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -1,314 +1,314 @@
 //保安员基本信息
 export var securityBaseInfoColumn = [{
-    label: "",
-    labelWidth: "20",
-    type: 'title',
-    prop: "title",
-    span: 24,
-    styles: {
-        fontSize: '24px'
-    }
-},
-{
-    label: "所属保安公司",
-    prop: "deptId",
-    type: "tree",
-    dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
-    // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
-    props: {
-        label: "title",
-        value: "id",
-    },
-    disabled: true,
-    span: 24,
-},
-{
-    label: "登录账号",
-    prop: "account",
-    disabled: true
-},
-{
-    label: "用户姓名",
-    prop: "realName",
-    disabled: true,
-},
-{
-    label: "用户昵称",
-    prop: "name",
-    disabled: true
-},
-{
-    label: "手机号码",
-    prop: "phone",
-    disabled: true
-},
-{
-    label: "电子邮箱",
-    prop: "email",
-    disabled: true
-},
-{
-    label: "身份证号",
-    prop: "cardid",
-    disabled: true
-},
-{
-    label: "籍贯",
-    prop: "nativeplace",
-    disabled: true
-},
-{
-    label: "民族",
-    prop: "nation",
-    disabled: true
-},
-{
-    label: "是否持证",
-    prop: "hold",
-    dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
-    props: {
-        label: "dictValue",
-        value: "dictKey",
-    },
-    type: "select",
-    disabled: true
-},
-{
-    label: "保安员证编号",
-    prop: "securitynumber",
-    disabled: true
-},
-{
-    label: "所属辖区",
-    prop: "jurisdiction",
-    // multiple: true,
-    type: "tree",
-    dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
-    props: {
-        label: "title",
-        value: "id",
-    },
-    disabled: true
-},
-{
-    label: "最高学历",
-    prop: "education",
-    type: "select",
-    dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
-    props: {
-        label: "dictValue",
-        value: "dictKey"
-    },
-    dataType: "number",
-    slot: true,
-    disabled: true
-},
-{
-    label: "政治面貌",
-    prop: "politicaloutlook",
-    disabled: true
-},
-{
-    label: "身高",
-    prop: "height",
-    disabled: true
-},
-{
-    label: "联系地址",
-    prop: "address",
-    disabled: true
-},
-{
-    label: "户口所在地",
-    prop: "registered",
-    disabled: true
-},
-{
-    label: "入职时间",
-    prop: "rtime",
-    type: 'date',
-    format: "yyyy-MM-dd",
-    valueFormat: "yyyy-MM-dd",
-    disabled: true
-},
-{
-    label: "用户性别",
-    prop: "sex",
-    type: "select",
-    dicData: [{
-        label: "男",
-        value: 1
+        label: "",
+        labelWidth: "20",
+        type: 'title',
+        prop: "title",
+        span: 24,
+        styles: {
+            fontSize: '24px'
+        }
     },
     {
-        label: "女",
-        value: 2
+        label: "所属保安公司",
+        prop: "deptId",
+        type: "tree",
+        dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+        // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+        props: {
+            label: "title",
+            value: "id",
+        },
+        disabled: true,
+        span: 24,
     },
     {
-        label: "未知",
-        value: 3
+        label: "登录账号",
+        prop: "account",
+        disabled: true
+    },
+    {
+        label: "用户姓名",
+        prop: "realName",
+        disabled: true,
+    },
+    {
+        label: "用户昵称",
+        prop: "name",
+        disabled: true
+    },
+    {
+        label: "手机号码",
+        prop: "phone",
+        disabled: true
+    },
+    {
+        label: "电子邮箱",
+        prop: "email",
+        disabled: true
+    },
+    {
+        label: "身份证号",
+        prop: "cardid",
+        disabled: true
+    },
+    {
+        label: "籍贯",
+        prop: "nativeplace",
+        disabled: true
+    },
+    {
+        label: "民族",
+        prop: "nation",
+        disabled: true
+    },
+    {
+        label: "是否持证",
+        prop: "hold",
+        dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+        props: {
+            label: "dictValue",
+            value: "dictKey",
+        },
+        type: "select",
+        disabled: true
+    },
+    {
+        label: "保安员证编号",
+        prop: "securitynumber",
+        disabled: true
+    },
+    {
+        label: "所属辖区",
+        prop: "jurisdiction",
+        // multiple: true,
+        type: "tree",
+        dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
+        props: {
+            label: "title",
+            value: "id",
+        },
+        disabled: true
+    },
+    {
+        label: "最高学历",
+        prop: "education",
+        type: "select",
+        dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+        props: {
+            label: "dictValue",
+            value: "dictKey"
+        },
+        dataType: "number",
+        slot: true,
+        disabled: true
+    },
+    {
+        label: "政治面貌",
+        prop: "politicaloutlook",
+        disabled: true
+    },
+    {
+        label: "身高",
+        prop: "height",
+        disabled: true
+    },
+    {
+        label: "联系地址",
+        prop: "address",
+        disabled: true
+    },
+    {
+        label: "户口所在地",
+        prop: "registered",
+        disabled: true
+    },
+    {
+        label: "入职时间",
+        prop: "rtime",
+        type: 'date',
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
+        disabled: true
+    },
+    {
+        label: "用户性别",
+        prop: "sex",
+        type: "select",
+        dicData: [{
+                label: "男",
+                value: 1
+            },
+            {
+                label: "女",
+                value: 2
+            },
+            {
+                label: "未知",
+                value: 3
+            }
+        ],
+        disabled: true
+    },
+    {
+        label: "用户生日",
+        type: "date",
+        prop: "birthday",
+        disabled: true
     }
-    ],
-    disabled: true
-},
-{
-    label: "用户生日",
-    type: "date",
-    prop: "birthday",
-    disabled: true
-}
 
 
 ]
 
 
 export var securityBaseInfoColumns = [{
-    label: "所属保安单位",
-    prop: "tenantId",
-    type: "tree",
-    dicUrl: "/api/blade-system/tenant/select",
-    props: {
-        label: "tenantName",
-        value: "tenantId"
-    },
-    disabled: true,
-    span: 24,
-},
-{
-    label: "登录账号",
-    prop: "account",
-    disabled: true
-},
-{
-    label: "用户姓名",
-    prop: "realName",
-    rules: [{
-        required: true,
-        message: "请输入用户姓名",
-        trigger: "blur"
-    }, {
-        min: 2,
-        max: 5,
-        message: '姓名长度在2到5个字符'
-    }]
-},
-{
-    label: "用户昵称",
-    prop: "name"
-},
-{
-    label: "手机号码",
-    prop: "phone",
-    overHidden: true,
-    rules: [{
-        required: true,
-        message: "请输入手机号",
-        trigger: "blur"
-    }]
-},
-{
-    label: "电子邮箱",
-    prop: "email",
-    hide: true,
-    overHidden: true
-},
-{
-    label: "身份证号",
-    prop: "cardid",
-    hide: true,
-    overHidden: true,
-    rules: [{
-        required: true,
-        message: "请输入身份证号",
-        trigger: "blur"
-    }]
-},
-{
-    label: "籍贯",
-    prop: "nativeplace",
-    hide: true,
-    overHidden: true
-},
-{
-    label: "民族",
-    prop: "nation",
-    hide: true,
-    overHidden: true
-},
-{
-    label: "最高学历",
-    prop: "education",
-    type: "select",
-    dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
-    props: {
-        label: "dictValue",
-        value: "dictKey"
-    },
-    dataType: "number",
-    slot: true,
-    rules: [{
-        required: true,
-        message: "请选择学历",
-        trigger: "blur"
-    }]
-},
-{
-    label: "政治面貌",
-    prop: "politicaloutlook",
-    hide: true,
-    overHidden: true
-},
-{
-    label: "身高",
-    prop: "height",
-    hide: true,
-    overHidden: true
-},
-{
-    label: "联系地址",
-    prop: "address",
-    hide: true,
-    overHidden: true
-},
-{
-    label: "户口所在地",
-    prop: "registered",
-    hide: true,
-    overHidden: true
-},
-{
-    label: "入职时间",
-    prop: "rtime",
-    type: 'date',
-    format: "yyyy-MM-dd",
-    valueFormat: "yyyy-MM-dd",
-    hide: true,
-    overHidden: true
-},
-{
-    label: "用户性别",
-    prop: "sex",
-    type: "select",
-    dicData: [{
-        label: "男",
-        value: 1
+        label: "所属保安单位",
+        prop: "tenantId",
+        type: "tree",
+        dicUrl: "/api/blade-system/tenant/select",
+        props: {
+            label: "tenantName",
+            value: "tenantId"
+        },
+        disabled: true,
+        span: 24,
     },
     {
-        label: "女",
-        value: 2
+        label: "登录账号",
+        prop: "account",
+        disabled: true
     },
     {
-        label: "未知",
-        value: 3
+        label: "用户姓名",
+        prop: "realName",
+        rules: [{
+            required: true,
+            message: "请输入用户姓名",
+            trigger: "blur"
+        }, {
+            min: 2,
+            max: 5,
+            message: '姓名长度在2到5个字符'
+        }]
+    },
+    {
+        label: "用户昵称",
+        prop: "name"
+    },
+    {
+        label: "手机号码",
+        prop: "phone",
+        overHidden: true,
+        rules: [{
+            required: true,
+            message: "请输入手机号",
+            trigger: "blur"
+        }]
+    },
+    {
+        label: "电子邮箱",
+        prop: "email",
+        hide: true,
+        overHidden: true
+    },
+    {
+        label: "身份证号",
+        prop: "cardid",
+        hide: true,
+        overHidden: true,
+        rules: [{
+            required: true,
+            message: "请输入身份证号",
+            trigger: "blur"
+        }]
+    },
+    {
+        label: "籍贯",
+        prop: "nativeplace",
+        hide: true,
+        overHidden: true
+    },
+    {
+        label: "民族",
+        prop: "nation",
+        hide: true,
+        overHidden: true
+    },
+    {
+        label: "最高学历",
+        prop: "education",
+        type: "select",
+        dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+        props: {
+            label: "dictValue",
+            value: "dictKey"
+        },
+        dataType: "number",
+        slot: true,
+        rules: [{
+            required: true,
+            message: "请选择学历",
+            trigger: "blur"
+        }]
+    },
+    {
+        label: "政治面貌",
+        prop: "politicaloutlook",
+        hide: true,
+        overHidden: true
+    },
+    {
+        label: "身高",
+        prop: "height",
+        hide: true,
+        overHidden: true
+    },
+    {
+        label: "联系地址",
+        prop: "address",
+        hide: true,
+        overHidden: true
+    },
+    {
+        label: "户口所在地",
+        prop: "registered",
+        hide: true,
+        overHidden: true
+    },
+    {
+        label: "入职时间",
+        prop: "rtime",
+        type: 'date',
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
+        hide: true,
+        overHidden: true
+    },
+    {
+        label: "用户性别",
+        prop: "sex",
+        type: "select",
+        dicData: [{
+                label: "男",
+                value: 1
+            },
+            {
+                label: "女",
+                value: 2
+            },
+            {
+                label: "未知",
+                value: 3
+            }
+        ],
+        hide: true
+    },
+    {
+        label: "用户生日",
+        type: "date",
+        prop: "birthday",
+        hide: true
     }
-    ],
-    hide: true
-},
-{
-    label: "用户生日",
-    type: "date",
-    prop: "birthday",
-    hide: true
-}
 ]
 
 
@@ -340,14 +340,14 @@
     type: 'date',
     format: "yyyy-MM-dd",
     valueFormat: "yyyy-MM-dd",
-    prop: "entryTime",
+    prop: "entrytime",
     formslot: true,
 }, {
     label: '离职时间',
     type: 'date',
     format: "yyyy-MM-dd",
     valueFormat: "yyyy-MM-dd",
-    prop: "departureTime",
+    prop: "departuretime",
     formslot: true,
 }, {
     label: '离职原因',
@@ -445,229 +445,227 @@
 
 
 export var securityFormPageColumn = [{
-    label: "姓名",
-    prop: "realName",
-    search: true,
-    searchSpan: 3,
-    width: 60,
-    searchLabelWidth: 50,
-    display: false
-},
-{
-    label: "所属保安公司",
-    searchLabelWidth: "110",
-    // prop: "deptName",
-    prop: "deptId",
-    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: 55,
-    type: "select",
-    dicData: [{
-        label: "男",
-        value: 1,
+        label: "姓名",
+        prop: "realName",
+        search: true,
+        searchSpan: 3,
+        width: 60,
+        searchLabelWidth: 50,
+        display: false
     },
     {
-        label: "女",
-        value: 2,
+        label: "所属保安公司",
+        searchLabelWidth: "110",
+        // prop: "deptName",
+        prop: "deptId",
+        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: "未知",
-        value: 3,
+        label: "性别",
+        prop: "sex",
+        width: 55,
+        type: "select",
+        dicData: [{
+                label: "男",
+                value: 1,
+            },
+            {
+                label: "女",
+                value: 2,
+            },
+            {
+                label: "未知",
+                value: 3,
+            },
+        ],
+        display: false
     },
-    ],
-    display: false
-},
-{
-    label: "身份证号码",
-    prop: "cardid",
-    search: true,
-    searchLabelWidth: 90,
-    searchSpan: 4,
-    minWidth: 140,
-
-    display: false
-},
-
-{
-    label: "籍贯",
-    prop: "nativeplace",
-    hide: true,
-    display: false
-},
-{
-    label: "民族",
-    prop: "nation",
-    hide: true,
-    width: 55,
-    display: false
-},
-
-{
-    label: "出生日期",
-    prop: "birthday",
-    type: "date",
-    format: "yyyy-MM-dd",
-    valueFormat: "yyyy-MM-dd",
-    display: false,
-    hide: true,
-},
-{
-    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"
+    {
+        label: "身份证号码",
+        prop: "cardid",
+        search: true,
+        searchLabelWidth: 90,
+        searchSpan: 5,
+        minWidth: 140,
+        display: false
     },
-    type: "select",
-    // hide: true,
-    rules: [{
-        required: true,
-        message: "请选择学历",
-        trigger: "blur"
-    }],
-},
-{
-    label: "联系电话",
-    prop: "phone",
-    minWidth: 100,
-    display: false
-},
-{
-    label: "健康状态",
-    prop: "healstats",
-    hide: true,
-    display: false
-},
-{
-    label: "保安证编号",
-    prop: "securitynumber",
-    search: true,
-    searchLabelWidth: 90,
-    minWidth: 105,
-    searchSpan: 4,
-    addDisplay: false,
-    editDisplay: false,
-    // hide: true,
-},
-{
-    label: "入职时间",
-    prop: "rtime",
-    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',
-    editDisplay: false,
-    addDisplay: false,
-    dicData: [
-        {
+
+    {
+        label: "籍贯",
+        prop: "nativeplace",
+        hide: true,
+        display: false
+    },
+    {
+        label: "民族",
+        prop: "nation",
+        hide: true,
+        width: 55,
+        display: false
+    },
+
+    {
+        label: "出生日期",
+        prop: "birthday",
+        type: "date",
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
+        display: false,
+        hide: true,
+    },
+    {
+        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: "phone",
+        minWidth: 100,
+        display: false
+    },
+    {
+        label: "健康状态",
+        prop: "healstats",
+        hide: true,
+        display: false
+    },
+    {
+        label: "保安证编号",
+        prop: "securitynumber",
+        search: true,
+        searchLabelWidth: 90,
+        minWidth: 105,
+        searchSpan: 4,
+        addDisplay: false,
+        editDisplay: false,
+        // hide: true,
+    },
+    {
+        label: "入职时间",
+        prop: "rtime",
+        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',
+        editDisplay: false,
+        addDisplay: false,
+        dicData: [{
             label: '未派遣',
             value: '1'
         }, {
             label: '已派遣',
             value: '0'
-        }
-    ]
-},
-{
-    label: "是否持证",
-    prop: "hold",
-    slot: true,
-    search: true,
-    searchSpan: 3,
-    width: 69,
-    display: false,
-    dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
-    props: {
-        label: "dictValue",
-        value: "dictKey"
+        }]
     },
-    type: "select",
-    rules: [{
-        required: true,
-        message: "请选择",
-        trigger: "blur"
-    }],
-},
+    {
+        label: "是否持证",
+        prop: "hold",
+        slot: true,
+        search: true,
+        searchSpan: 3,
+        width: 69,
+        display: false,
+        dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+        props: {
+            label: "dictValue",
+            value: "dictKey"
+        },
+        type: "select",
+        rules: [{
+            required: true,
+            message: "请选择",
+            trigger: "blur"
+        }],
+    },
 
-// {
-//     label: "入职时间",
-//     prop: "rtime",
-//     type: "datetime",
-//     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"
-//     }]
-// },
-{
-    label: "在职状态",
-    prop: "status",
-    type: "select",
-    dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
-    props: {
-        label: "dictValue",
-        value: "dictKey"
+    // {
+    //     label: "入职时间",
+    //     prop: "rtime",
+    //     type: "datetime",
+    //     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"
+    //     }]
+    // },
+    {
+        label: "在职状态",
+        prop: "status",
+        type: "select",
+        dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
+        props: {
+            label: "dictValue",
+            value: "dictKey"
+        },
+        dataType: "number",
+        searchValue: 1,
+        display: false,
+        hide: true,
+        searchSpan: 3,
+        width: 80,
+        search: true,
+        rules: [{
+            required: true,
+            message: "请选择在职状态",
+            trigger: "blur"
+        }]
     },
-    dataType: "number",
-    display: false,
-    hide: true,
-    searchSpan: 3,
-    width: 80,
-    search: true,
-    rules: [{
-        required: true,
-        message: "请选择在职状态",
-        trigger: "blur"
-    }]
-},
 ]
\ No newline at end of file

--
Gitblit v1.9.3