From b4b68d7dbff6c89ab52d81b95f30c984b17e0b1a Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 14 Sep 2021 14:39:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/trainExam/index.vue | 23 ++++++++++++++++++++++-
src/views/companyApply/index.vue | 4 ++--
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/views/companyApply/index.vue b/src/views/companyApply/index.vue
index 6627bc6..ae57961 100644
--- a/src/views/companyApply/index.vue
+++ b/src/views/companyApply/index.vue
@@ -362,8 +362,8 @@
},
dataType: "number",
display: false,
- searchSpan: 4,
- search: true,
+ // searchSpan: 4,
+ // search: true,
rules: [
{
required: true,
diff --git a/src/views/trainExam/index.vue b/src/views/trainExam/index.vue
index 412cc67..7227509 100644
--- a/src/views/trainExam/index.vue
+++ b/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,
--
Gitblit v1.9.3