Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

Administrator

2021-08-20 9f0421ca359101cfc56786b80cc5111932796da3

 src/views/securityGuard/data.js

@@ -448,13 +448,32 @@
        label: "姓名",
        prop: "realName",
        search: true,
        searchSpan: 4,
    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,
    width: 260
},
{
        label: "性别",
        prop: "sex",
    width: 55,
        type: "select",
        dicData: [{
                label: "男",
@@ -471,17 +490,31 @@
        ],
        display: false
    },
{
    label: "身份证号码",
    prop: "cardid",
    search: true,
    searchLabelWidth: 90,
    searchSpan: 4,
    width: 140,

    display: false
},

    {
        label: "籍贯",
        prop: "nativeplace",
    hide: true,
        display: false
    },
    {
        label: "民族",
        prop: "nation",
    hide: true,
    width: 55,
        display: false
    },

    {
        label: "出生日期",
        prop: "birthday",
@@ -491,16 +524,23 @@
        display: false
    },
    {
    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,
    // hide: true,
        rules: [{
            required: true,
            message: "请选择学历",
@@ -510,40 +550,39 @@
    {
        label: "联系电话",
        prop: "phone",
    width: 100,
        display: false
    },
    {
        label: "邮箱",
        prop: "email",
        display: false,
        width: 150
    label: "健康状态",
    prop: "healstats",
    display: false
},
{
    label: "保安证编号",
    prop: "securitynumber",
    search: true,
    searchLabelWidth: 90,
    width: 105,
    searchSpan: 4,
    addDisplay: false,
    editDisplay: false,
    // hide: true,
    },
    {
        label: "入职时间",
        prop: "rtime",
    hide: true,
        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: 6,
        display: false,
        search: true,
        width: 260
    },

    {
        label: "是否持证",
        prop: "hold",
        slot: true,
    search: true,
    searchSpan: 3,
    width: 69,
        display: false,
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
        props: {
@@ -557,6 +596,7 @@
            trigger: "blur"
        }],
    },

    // {
    //     label: "入职时间",
    //     prop: "rtime",
@@ -587,7 +627,9 @@
        },
        dataType: "number",
        display: false,
        searchSpan: 4,
    hide: true,
    searchSpan: 3,
    width: 80,
        search: true,
        rules: [{
            required: true,