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

liuyg

2021-08-28 c8e279927a36c755fd78769cfa8e489568192aa4

 src/views/securityEquipment/car.js

@@ -1,12 +1,10 @@
var DIC = [
    {
        label: '招聘中',
        value: 1,
    }, {
        label: '停止招聘',
        value: 2,
    }
]
var DIC = [{
    label: '招聘中',
    value: 1,
}, {
    label: '停止招聘',
    value: 2,
}]

export var column = [
    // {
@@ -19,7 +17,7 @@
    {
        label: "车牌号码",
        prop: "carNumber",
        searchSpan: 4,
        searchSpan: 3,
        search: true,
        rules: [{
            required: true,
@@ -30,14 +28,21 @@
    {
        label: "号码种类",
        prop: "numberType",
        searchSpan: 4,
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=carNumberType",
        search: true,
        type: "select",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
        searchSpan: 3,
        rules: [{
            required: true,
            message: "请输入号码种类",
            trigger: "blur"
        }],
        search: true,
    },//上面不显示 
    }, //上面不显示 
    {
        label: "车辆类型",
        prop: "carType",
@@ -45,17 +50,23 @@
            required: true,
            message: "请输入车辆类型",
            trigger: "blur"
        }]
        // search: true,
    }
    , {
        }],
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=carType",
        search: true,
        searchSpan: 3,
        type: "select",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
    }, {
        label: "车辆型号",
        prop: "mode",
        // search: true,
        searchSpan: 4,
        width: 110,
        overHidden: true,
        search: true,
        // search: true,
        rules: [{
            required: true,
            message: "请输入车辆型号",
@@ -83,13 +94,7 @@
            label: "title",
            value: "id"
        },
        // search: true,
        type: "select",
        // rules: [{
        //     required: true,
        //     message: "请选择学历",
        //     trigger: "blur"
        // }],
    },
    {
        label: "责任人",
@@ -117,7 +122,6 @@
    {
        label: "出厂日期",
        prop: "dateForProduction",
        // search: true,
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
@@ -138,9 +142,9 @@
        // search: true,
        rules: [{
            required: true,
            message: "请输入环保标志 ,国IV",
            message: "请输入环保标志(如:国IV)",
            trigger: "blur"
        }],
        searchSpan: 4,
    }
]
]