From 6b69b7706aaa4fa2cbc028e8704dcc312340f334 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 17 Sep 2021 10:07:12 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

---
 src/views/securityGuard/data.js | 1161 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 581 insertions(+), 580 deletions(-)

diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index cd92483..6c979e5 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",
-        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
+    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",
+    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
+}
 
 
 ]
 
 
 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: "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: "account",
-        disabled: true
+        label: "女",
+        value: 2
     },
     {
-        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
+        label: "未知",
+        value: 3
     }
+    ],
+    hide: true
+},
+{
+    label: "用户生日",
+    type: "date",
+    prop: "birthday",
+    hide: true
+}
 ]
 
 
@@ -398,63 +398,64 @@
     formslot: true,
 }]
 
-
 //表现
 export var trackRecordColumn = [{
-        label: "id",
-        prop: "id",
-        hide: true,
-        editDisplay: false,
-        addDisplay: false
-    }, {
-        label: '工作态度',
-        prop: "workingattitude",
-        formslot: true,
-    }, {
-        label: '工作成效',
-        prop: "achievements",
-        formslot: true,
-    }, {
-        label: '表现',
-        prop: "score",
-        type: "select",
-        // dicUrl: "/api/blade-system/dict-biz/dictionary?code=scoreType",
-        // props: {
-        //     label: "dictValue",
-        //     value: "dictKey"
-        // },
-        dicData: [{
-                label: "优秀",
-                value: 0
-            },
-            {
-                label: "良好",
-                value: 1
-            },
-            {
-                label: "一般",
-                value: 2
-            },
-            {
-                label: "差",
-                value: 3
-            },
-        ],
-        dataType: "number",
-        slot: true,
-        rules: [{
-            required: true,
-            message: "请选择表现",
-            trigger: "blur"
-        }]
-    }, {
-        label: '时间',
-        type: 'date',
-        format: "yyyy-MM-dd",
-        valueFormat: "yyyy-MM-dd",
-        prop: "time",
-        formslot: true,
+    label: "id",
+    prop: "id",
+    hide: true,
+    editDisplay: false,
+    addDisplay: false
+}, {
+    label: '时间',
+    type: 'date',
+    format: "yyyy-MM-dd",
+    valueFormat: "yyyy-MM-dd",
+    prop: "time",
+    formslot: true,
+},
+// {
+//     label: '工作态度',
+//     prop: "workingattitude",
+//     formslot: true,
+// }, 
+{
+    label: '工作表现',
+    prop: "achievements",
+    formslot: true,
+}, {
+    label: '表现评定',
+    prop: "score",
+    type: "select",
+    // dicUrl: "/api/blade-system/dict-biz/dictionary?code=scoreType",
+    // props: {
+    //     label: "dictValue",
+    //     value: "dictKey"
+    // },
+    dicData: [{
+        label: "优秀",
+        value: 0
     },
+    {
+        label: "良好",
+        value: 1
+    },
+    {
+        label: "一般",
+        value: 2
+    },
+    {
+        label: "差",
+        value: 3
+    },
+    ],
+    dataType: "number",
+    slot: true,
+    rules: [{
+        required: true,
+        message: "请选择表现",
+        trigger: "blur"
+    }]
+}
     // {
     //     label: '服务公司',
     //     prop: "departmentName",
@@ -464,244 +465,244 @@
 
 
 export var securityFormPageColumn = [{
-        label: "姓名",
-        prop: "realName",
-        search: true,
-        searchSpan: 3,
-        width: 60,
-        searchLabelWidth: 50,
-        display: false
+    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",
+    },
+    // hide: true,
+    slot: true,
+    searchSpan: 5,
+    display: false,
+    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",
+    width: 55,
+    type: "select",
+    dicData: [{
+        label: "男",
+        value: 1,
     },
     {
-        label: "所属保安公司",
-        searchLabelWidth: "110",
-        // prop: "deptName",
-        prop: "deptId",
-        type: "tree",
-        dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
-        props: {
-            label: "title",
-            value: "id",
-        },
-        // hide: true,
-        slot: true,
-        searchSpan: 5,
-        display: false,
-        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",
-        width: 55,
-        type: "select",
-        dicData: [{
-                label: "男",
-                value: 1,
-            },
-            {
-                label: "女",
-                value: 2,
-            },
-            {
-                label: "未知",
-                value: 3,
-            },
-        ],
-        display: false
+        label: "女",
+        value: 2,
     },
     {
-        label: "身份证号码",
-        prop: "cardid",
-        search: true,
-        searchLabelWidth: 90,
-        searchSpan: 5,
-        minWidth: 140,
-        display: false
+        label: "未知",
+        value: 3,
     },
+    ],
+    display: false
+},
+{
+    label: "身份证号码",
+    prop: "cardid",
+    search: true,
+    searchLabelWidth: 90,
+    searchSpan: 5,
+    minWidth: 140,
+    display: false
+},
 
-    {
-        label: "籍贯",
-        prop: "nativeplace",
-        hide: true,
-        display: false
-    },
-    {
-        label: "民族",
-        prop: "nation",
-        hide: true,
-        width: 55,
-        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: "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: "age",
-        width: 55,
-        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: '未派遣',
+        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"
     },
-    {
-        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"
-        }],
-    },
+    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"
-        },
-        dataType: "number",
-        searchValue: 1,
-        display: false,
-        hide: true,
-        searchSpan: 3,
-        width: 80,
-        search: true,
-        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"
     },
+    dataType: "number",
+    searchValue: 1,
+    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