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

liuyg

2021-09-28 6d4034e3de290d277de4fac7f36d4bac1d164661

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

 src/views/trainingRegistration/data.js

@@ -19,7 +19,7 @@
var w = 160,
    s = 12;
export var column = [{
        label: "培训公司名称",
        label: "学校名称",
        prop: "trainingUnitId",
        dicUrl: "/api/blade-system/dept/lazy-tree-type?parentId=1418458374477549569",
        cascaderItem: ["trainExamId"],
@@ -30,7 +30,7 @@
        type: "select",
        rules: [{
            required: true,
            message: "请输入培训公司名称",
            message: "请输入学校名称",
            trigger: "blur"
        }],
        searchSpan: 4,

 src/views/trainingRegistration/index.vue

@@ -223,7 +223,7 @@
            ],
          },
          {
            label: "考试时间",
            label: "考试开始时间",
            prop: "startTime",
            type: "datetime",
            format: "yyyy-MM-dd HH:mm",
@@ -250,7 +250,7 @@
            span: 12,
          },
          {
            label: "截止时间",
            label: "考试开始截止时间",
            prop: "endTime",
            type: "datetime",
            format: "yyyy-MM-dd HH:mm",