From d1b058faa19088838b668d6c03dd71c2bcc7d5d3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 09 Dec 2021 10:30:44 +0800
Subject: [PATCH] 用户角色控制修改

---
 src/views/trainingRegistration/data.js |  169 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 134 insertions(+), 35 deletions(-)

diff --git a/src/views/trainingRegistration/data.js b/src/views/trainingRegistration/data.js
index 48e8162..852093f 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: 4,
     searchLabelWidth: 110,
-    search: true,
+    width: 200,
 }, {
     label: "姓名",
     prop: "userId",
@@ -70,21 +70,33 @@
     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,
-}, {
-    label: "单位名称",
+    width: 160
+},
+// {
+//     label: "电话",
+//     prop: "phone",
+//     // hide: true,
+//     rules: [{
+//         required: true,
+//         message: "请输入电话",
+//         trigger: "blur"
+//     }],
+//     editDisplay: false,
+//     addDisplay: false,
+//     width: 110,
+// },
+{
+    label: "企业名称",
     prop: "deptId",
     // width: 70,
     // search: true,
@@ -97,47 +109,134 @@
     },
     // search: true,
     type: "select",
-    // hide: true,
+    hide: true,
     rules: [{
         required: true,
-        message: "请输入单位名称",
+        message: "请输入企业名称",
         trigger: "blur"
     }],
     overHidden: true
-},
-{
-    type: "select",
+}, {
+    label: "企业名称",
+    prop: "deptName",
+    // hide: true,
+    search: true,
+    searchSpan: 6,
     rules: [{
         required: true,
-        message: "请输入培训公司名称",
+        message: "请输入企业名称",
         trigger: "blur"
     }],
-    searchSpan: 4,
-    searchLabelWidth: 110,
-    search: true,
-},
-{
-    label: "考试名称",
-    prop: "trainExamId",
-    dicUrl: "/api/trainExam/page-tree?deptId={{key}}",
-    props: {
-        label: "trainExamName",
-        value: "id"
-    },
 
 },
 {
-    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,
+    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,
+},
+{
+    label: "考试状态",
+    search: true,
+    type: "select",
+    searchSpan: 4,
+    prop: "isExam",
+    searchValue: 1,
+    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,
     width: 100,
 },
     //  {

--
Gitblit v1.9.3