From e43478e41aafb7460d200059deca9a9a63ddbd9a Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 07 Aug 2021 18:12:42 +0800
Subject: [PATCH] 冲突
---
src/views/trainingRegistration/data.js | 114 ++++++++++++++++++++------------------------------------
1 files changed, 41 insertions(+), 73 deletions(-)
diff --git a/src/views/trainingRegistration/data.js b/src/views/trainingRegistration/data.js
index e954a00..48e8162 100644
--- a/src/views/trainingRegistration/data.js
+++ b/src/views/trainingRegistration/data.js
@@ -19,26 +19,23 @@
var w = 160,
s = 12;
export var column = [{
- label: "单位名称",
- prop: "deptId",
- // width: 70,
- // search: true,
- // searchSpan: 4,
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- cascaderItem: ["userId"],
+ label: "培训公司名称",
+ prop: "trainingUnitId",
+ dicUrl: "/api/blade-system/dept/lazy-tree-type?parentId=1418458374477549569",
+ cascaderItem: ["trainExamId"],
props: {
label: "title",
value: "id"
},
- // search: true,
type: "select",
- // hide: true,
rules: [{
required: true,
- message: "请输入单位名称",
+ message: "请输入培训公司名称",
trigger: "blur"
}],
- overHidden: true
+ searchSpan: 4,
+ searchLabelWidth: 110,
+ search: true,
}, {
label: "姓名",
prop: "userId",
@@ -62,8 +59,7 @@
editDisplay: false,
addDisplay: false,
searchSpan: 4,
-},
-{
+}, {
label: "身份证号",
prop: "idCardNo",
rules: [{
@@ -78,7 +74,7 @@
{
label: "电话",
prop: "phone",
- hide: true,
+ // hide: true,
rules: [{
required: true,
message: "请输入电话",
@@ -87,23 +83,36 @@
editDisplay: false,
addDisplay: false,
width: 110,
-},
-{
- label: "培训公司名称",
- prop: "trainingUnitId",
- dicUrl: "/api/blade-system/dept/lazy-tree-type?parentId=1418458374477549569",
- cascaderItem: ["trainExamId"],
+}, {
+ label: "单位名称",
+ prop: "deptId",
+ // width: 70,
+ // search: true,
+ // searchSpan: 4,
+ dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ cascaderItem: ["userId"],
props: {
label: "title",
value: "id"
},
+ // search: true,
+ type: "select",
+ // hide: true,
+ rules: [{
+ required: true,
+ message: "请输入单位名称",
+ trigger: "blur"
+ }],
+ overHidden: true
+},
+{
type: "select",
rules: [{
required: true,
message: "请输入培训公司名称",
trigger: "blur"
}],
- searchSpan: 5,
+ searchSpan: 4,
searchLabelWidth: 110,
search: true,
},
@@ -115,50 +124,7 @@
label: "trainExamName",
value: "id"
},
- type: "select",
- rules: [{
- required: true,
- message: "请输入考试名称",
- trigger: "blur"
- }],
- hide: true,
-},
-{
- label: "考试名称",
- prop: "trainExamName",
- editDisplay: false,
- addDisplay: false,
- searchLabelWidth: 110,
-},
-{
- label: "报名时间",
- prop: "trainingTime",
- type: "date",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- rules: [{
- required: true,
- message: "请输入报名时间",
- trigger: "blur"
- }],
- editDisplay: false,
- addDisplay: false,
- width: 160
-},
-{
- label: "培训考试时间",
- prop: "trainExamTime",
- type: "date",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- rules: [{
- required: true,
- message: "请输入培训考试时间",
- trigger: "blur"
- }],
- editDisplay: false,
- addDisplay: false,
- width: 160
+
},
{
label: "报名状态",
@@ -172,12 +138,14 @@
editDisplay: false,
addDisplay: false,
searchSpan: 4,
- width: 70,
-}, {
- label: "确认截止时间",
- prop: "remainingTime",
- editDisplay: false,
- addDisplay: false,
- width: 160
-}
+ width: 100,
+},
+ // {
+ // label: "确认截止时间",
+ // prop: "remainingTime",
+ // editDisplay: false,
+ // addDisplay: false,
+ // width: 160
+ // }
+
]
\ No newline at end of file
--
Gitblit v1.9.3