From e4100ecc3a88273dcdbc2c1452d4e9f00736f3db Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 10:17:44 +0800
Subject: [PATCH] 派遣单位管理修改,考试成绩查询样式微调

---
 src/views/trainingRegistration/data.js |  248 +++++++++++++++++++++---------------------------
 1 files changed, 109 insertions(+), 139 deletions(-)

diff --git a/src/views/trainingRegistration/data.js b/src/views/trainingRegistration/data.js
index a53d540..f08ae3d 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,71 +19,6 @@
 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"],
-        props: {
-            label: "title",
-            value: "id"
-        },
-        // search: true,
-        type: "select",
-        // hide: true,
-        rules: [{
-            required: true,
-            message: "请输入单位名称",
-            trigger: "blur"
-        }],
-        overHidden: true
-    }, {
-        label: "姓名",
-        prop: "userId",
-        type: "select",
-        hide: true,
-        dicUrl: "/api/blade-user/page-security-unit?deptId={{key}}",
-        props: {
-            label: "realName",
-            value: "id"
-        },
-        searchSpan: 5,
-    }, {
-        label: "姓名",
-        prop: "realName",
-        search: true,
-        editDisplay: false,
-        addDisplay: false,
-        searchSpan: 5,
-    },
-    {
-        label: "身份证号",
-        prop: "idCardNo",
-        rules: [{
-            required: true,
-            message: "请输入身份证号",
-            trigger: "blur"
-        }],
-        editDisplay: false,
-        addDisplay: false,
-        width: 160
-    },
-    {
-        label: "电话",
-        prop: "phone",
-        hide: true,
-        rules: [{
-            required: true,
-            message: "请输入电话",
-            trigger: "blur"
-        }],
-        editDisplay: false,
-        addDisplay: false,
-        width: 110,
-    },
-    {
         label: "培训公司名称",
         prop: "trainingUnitId",
         dicUrl: "/api/blade-system/dept/lazy-tree-type?parentId=1418458374477549569",
@@ -98,93 +33,128 @@
             message: "请输入培训公司名称",
             trigger: "blur"
         }],
-        searchSpan: 6,
+        searchSpan: 4,
         searchLabelWidth: 110,
-        search: true,
-        overHidden: true
-    },
-    {
-        label: "考试名称",
-        prop: "trainExamId",
-        dicUrl: "/api/trainExam/page-tree?deptId={{key}}",
+    }, {
+        label: "姓名",
+        prop: "userId",
+        type: "select",
+        hide: true,
+        dicUrl: "/api/blade-user/page-security-unit?deptId={{key}}",
         props: {
-            label: "trainExamName",
+            label: "realName",
             value: "id"
         },
-        type: "select",
+        searchSpan: 4,
         rules: [{
             required: true,
-            message: "请输入考试名称",
+            message: "请输入姓名",
             trigger: "blur"
         }],
-        hide: true,
-        searchSpan: 5,
-        searchLabelWidth: 110,
+    }, {
+        label: "姓名",
+        prop: "realName",
+        search: true,
+        editDisplay: false,
+        addDisplay: false,
+        searchSpan: 4,
+    }, {
+        label: "身份证号",
+        prop: "idCardNo",
+        rules: [{
+            required: true,
+            message: "请输入身份证号",
+            trigger: "blur"
+        }],
+        editDisplay: false,
+        addDisplay: false,
+        width: 160
+    }, {
+        label: "准考证号",
+        prop: "candidateNo",
+        rules: [{
+            required: true,
+            message: "请输入准考证号",
+            trigger: "blur"
+        }],
+        editDisplay: false,
+        addDisplay: false,
+        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,
+        // 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
+    }, {
+        label: "单位名称",
+        prop: "deptName",
+        // hide: true,
+        search: true,
+        searchSpan: 6,
+        rules: [{
+            required: true,
+            message: "请输入单位名称",
+            trigger: "blur"
+        }],
     },
     {
         label: "考试名称",
-        prop: "trainExamName",
-        rules: [{
-            required: true,
-            message: "请输入考试名称",
-            trigger: "blur"
-        }],
-        editDisplay: false,
-        addDisplay: false,
-        searchLabelWidth: 110,
-        // search: true,
-        overHidden: true
+        prop: "trainExamName"
     },
     {
-        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: "applyCard"
     },
-    {
-        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: "报名状态",
-        prop: "cancel",
-        // search: true,
-        dicData: DIC1,
-        props: {
-            label: "label",
-            value: "value"
-        },
-        editDisplay: false,
-        addDisplay: false,
-        searchSpan: 5,
-        width: 70,
-    }, {
-        label: "确认截止时间",
-        prop: "remainingTime",
-        editDisplay: false,
-        addDisplay: false,
-        width: 160
-    }
+    // {
+    //     label: "报名状态",
+    //     prop: "cancel",
+    //     // search: true,
+    //     dicData: DIC1,
+    //     props: {
+    //         label: "label",
+    //         value: "value"
+    //     },
+    //     editDisplay: false,
+    //     addDisplay: false,
+    //     searchSpan: 4,
+    //     width: 100,
+    // },
+    //  {
+    //     label: "确认截止时间",
+    //     prop: "remainingTime",
+    //     editDisplay: false,
+    //     addDisplay: false,
+    //     width: 160
+    // }
+
 ]
\ No newline at end of file

--
Gitblit v1.9.3