From 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Nov 2021 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/trainingRegistration/data.js | 134 ++++++++++++++++++++++++++++++++++----------
1 files changed, 102 insertions(+), 32 deletions(-)
diff --git a/src/views/trainingRegistration/data.js b/src/views/trainingRegistration/data.js
index b53475c..1a14cec 100644
--- a/src/views/trainingRegistration/data.js
+++ b/src/views/trainingRegistration/data.js
@@ -9,7 +9,7 @@
label: '已报名',
value: 1,
}, {
- label: '已撤销',
+ label: '已取消',
value: 2,
}, {
label: '已确认',
@@ -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,12 +30,12 @@
type: "select",
rules: [{
required: true,
- message: "请输入培训公司名称",
+ message: "请输入学校名称",
trigger: "blur"
}],
- searchSpan: 6,
+ searchSpan: 4,
searchLabelWidth: 110,
- search: true,
+ width: 200,
}, {
label: "姓名",
prop: "userId",
@@ -46,7 +46,7 @@
label: "realName",
value: "id"
},
- searchSpan: 5,
+ searchSpan: 4,
rules: [{
required: true,
message: "请输入姓名",
@@ -58,7 +58,7 @@
search: true,
editDisplay: false,
addDisplay: false,
- searchSpan: 5,
+ searchSpan: 4,
}, {
label: "身份证号",
prop: "idCardNo",
@@ -70,20 +70,32 @@
editDisplay: false,
addDisplay: false,
width: 160
- },
- {
- label: "电话",
- prop: "phone",
- // hide: true,
+ }, {
+ label: "准考证号",
+ prop: "candidateNo",
rules: [{
required: true,
- message: "请输入电话",
+ message: "请输入准考证号",
trigger: "blur"
}],
editDisplay: false,
addDisplay: false,
- width: 110,
- }, {
+ width: 160
+ },
+ // {
+ // label: "电话",
+ // prop: "phone",
+ // // hide: true,
+ // rules: [{
+ // required: true,
+ // message: "请输入电话",
+ // trigger: "blur"
+ // }],
+ // editDisplay: false,
+ // addDisplay: false,
+ // width: 110,
+ // },
+ {
label: "单位名称",
prop: "deptId",
// width: 70,
@@ -97,41 +109,98 @@
},
// search: true,
type: "select",
- // hide: true,
+ hide: true,
rules: [{
required: true,
message: "请输入单位名称",
trigger: "blur"
}],
overHidden: true
- },
- {
- label: "报名时间",
- prop: "trainingTime",
- type: "date",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
+ }, {
+ label: "单位名称",
+ prop: "deptName",
+ // hide: true,
+ search: true,
+ searchSpan: 6,
rules: [{
required: true,
- message: "请输入报名时间",
+ message: "请输入单位名称",
trigger: "blur"
}],
- editDisplay: false,
- addDisplay: false,
- width: 160
+
},
{
- label: "报名状态",
- prop: "cancel",
- // search: true,
- dicData: DIC1,
+ label: "考试名称",
+ prop: "trainExamName",
+ width: 220,
+ },
+ {
+ label: "考试证件",
+ prop: "applyCard"
+ },
+ {
+ label: "审核状态",
+ search: true,
+ searchLabelWidth: 110,
+ type: "select",
+ searchSpan: 4,
+ prop: "auditStatus",
+ searchValue: 4,
+ dicData: [{
+ label: '全部',
+ value: 0,
+ },
+ {
+ label: '审核通过',
+ value: 1,
+ },
+ {
+ label: '审核不通过',
+ value: 2,
+ },
+ {
+ label: '已提交审核',
+ value: 3,
+ },
+ {
+ label: '未提交审核',
+ value: 4,
+ }
+ ],
props: {
label: "label",
value: "value"
},
editDisplay: false,
addDisplay: false,
- searchSpan: 5,
+ width: 100,
+ },
+ {
+ label: "报名状态",
+ search: true,
+ type: "select",
+ searchSpan: 4,
+ prop: "cancel",
+ searchValue: 1,
+ dicData: [{
+ label: '全部',
+ value: 0,
+ },
+ {
+ label: '已报名',
+ value: 1,
+ },
+ {
+ label: '已取消',
+ value: 2,
+ }
+ ],
+ props: {
+ label: "label",
+ value: "value"
+ },
+ editDisplay: false,
+ addDisplay: false,
width: 100,
},
// {
@@ -141,4 +210,5 @@
// addDisplay: false,
// width: 160
// }
+
]
\ No newline at end of file
--
Gitblit v1.9.3