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

liuyg

2021-09-14 b4b68d7dbff6c89ab52d81b95f30c984b17e0b1a

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

 src/views/companyApply/index.vue

@@ -362,8 +362,8 @@
            },
            dataType: "number",
            display: false,
            searchSpan: 4,
            search: true,
            // searchSpan: 4,
            // search: true,
            rules: [
              {
                required: true,

 src/views/trainExam/index.vue

@@ -353,6 +353,27 @@
            type: "textarea",
            span: 24,
            slot: true,
            hide:true,
            // 表单新增时是否禁止
            addDisabled: false,
            // 表单新增时是否可见
            addDisplay: true,
            // 表单新增时是否为查看模式
            addDetail: false,
            // 表单编辑时是否禁止
            editDisabled: false,
            // 表单编辑时是否可见
            editDisplay: true,
            // 表单编辑时是否为查看模式
            editDetail: false,
            width: 150,
          },
          {
            label: "报名人数",
            prop: "num",
            type: "textarea",
            span: 24,
            slot: true,
            // 表单新增时是否禁止
            addDisabled: false,
            // 表单新增时是否可见
@@ -369,7 +390,7 @@
          },
          {
            label: "申请时间",
            prop: "createTime",
            prop: "creatorDate",
            type: "datetime",
            width: 160,
            editDisplay: false,