From f78a56ba2e2c3cf48a0809a824e306a578cefd00 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 14 Jul 2021 14:23:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/trainingRegistration/data.js |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/trainingRegistration/data.js b/src/views/trainingRegistration/data.js
index 73a1189..de38406 100644
--- a/src/views/trainingRegistration/data.js
+++ b/src/views/trainingRegistration/data.js
@@ -9,10 +9,10 @@
 ]
 var DIC1 = [
     {
-        label: '是',
+        label: '已撤销',
         value: 1,
     }, {
-        label: '否',
+        label: '未撤销',
         value: 2,
     }
 ]
@@ -180,7 +180,7 @@
             message: "请输入学历证书",
             trigger: "blur"
         }],
-        overHidden:true
+        overHidden: true
         // width: 70,
         // search: true,
         // searchSpan: 4,
@@ -203,7 +203,7 @@
             message: "请输入组织机构",
             trigger: "blur"
         }],
-        overHidden:true
+        overHidden: true
     },
     {
         label: "培训公司名称",
@@ -225,7 +225,7 @@
         //     value: "dictKey"
         // },
         search: true,
-        overHidden:true
+        overHidden: true
         // type: "select",
         // rules: [{
         //     required: false,
@@ -238,7 +238,7 @@
         prop: "trainingTime",
         type: "date",
         format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
+        valueFormat: "yyyy-MM-dd",
         rules: [{
             required: true,
             message: "请输入培训时间",
@@ -263,9 +263,9 @@
         // }],
     },
     {
-        label: "是否报名",
+        label: "撤销状态",
         prop: "cancel",
-        search: true,
+        // search: true,
         dicData: DIC1,
         props: {
             label: "label",
@@ -276,6 +276,7 @@
         //     message: "请选",
         //     trigger: "blur"
         // }]
+        // hide: false,
         editDisplay: false,
         addDisplay: false,
         searchSpan: 5,

--
Gitblit v1.9.3