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

Administrator

2021-07-14 f78a56ba2e2c3cf48a0809a824e306a578cefd00

 src/views/trainingRegistration/data.js

@@ -9,10 +9,10 @@
]
var DIC1 = [
    {
        label: '是',
        label: '已撤销',
        value: 1,
    }, {
        label: '否',
        label: '未撤销',
        value: 2,
    }
]
@@ -238,7 +238,7 @@
        prop: "trainingTime",
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "timestamp",
        valueFormat: "yyyy-MM-dd",
        rules: [{
            required: true,
            message: "请输入培训时间",
@@ -263,9 +263,9 @@
        // }],
    },
    {
        label: "是否报名",
        label: "撤销状态",
        prop: "cancel",
        search: true,
        // search: true,
        dicData: DIC1,
        props: {
            label: "label",
@@ -276,6 +276,7 @@
        //     message: "请选",
        //     trigger: "blur"
        // }]
        // hide: false,
        editDisplay: false,
        addDisplay: false,
        searchSpan: 5,