From b8dfc98b089e47fdb3e269941bbd2de3f7fb7de1 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 13 Sep 2021 17:14:57 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

---
 src/views/trainingRegistration/data.js |   84 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 69 insertions(+), 15 deletions(-)

diff --git a/src/views/trainingRegistration/data.js b/src/views/trainingRegistration/data.js
index f08ae3d..c05d907 100644
--- a/src/views/trainingRegistration/data.js
+++ b/src/views/trainingRegistration/data.js
@@ -35,6 +35,7 @@
         }],
         searchSpan: 4,
         searchLabelWidth: 110,
+        width: 200,
     }, {
         label: "姓名",
         prop: "userId",
@@ -126,29 +127,82 @@
             message: "请输入单位名称",
             trigger: "blur"
         }],
+
     },
     {
         label: "考试名称",
-        prop: "trainExamName"
+        prop: "trainExamName",
+        width: 220,
     },
     {
         label: "考试证件",
         prop: "applyCard"
     },
-    // {
-    //     label: "报名状态",
-    //     prop: "cancel",
-    //     // search: true,
-    //     dicData: DIC1,
-    //     props: {
-    //         label: "label",
-    //         value: "value"
-    //     },
-    //     editDisplay: false,
-    //     addDisplay: false,
-    //     searchSpan: 4,
-    //     width: 100,
-    // },
+    {
+        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: "确认截止时间",
     //     prop: "remainingTime",

--
Gitblit v1.9.3