From ef46e4b78e81418a831d4f7f21eb24d2fd4d35e1 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 25 Dec 2021 15:08:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/trainingRegistration/data.js |  418 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 209 insertions(+), 209 deletions(-)

diff --git a/src/views/trainingRegistration/data.js b/src/views/trainingRegistration/data.js
index 65fd128..15554f3 100644
--- a/src/views/trainingRegistration/data.js
+++ b/src/views/trainingRegistration/data.js
@@ -19,228 +19,228 @@
 var w = 160,
     s = 12;
 export var column = [{
-    label: "学校名称",
-    prop: "trainingUnitId",
-    dicUrl: "/api/blade-system/dept/lazy-tree-type?parentId=1418458374477549569",
-    cascaderItem: ["trainExamId"],
-    props: {
-        label: "title",
-        value: "id"
+        label: "学校名称",
+        prop: "trainingUnitId",
+        dicUrl: "/api/blade-system/dept/lazy-tree-type?parentId=1418458374477549569",
+        cascaderItem: ["trainExamId"],
+        props: {
+            label: "title",
+            value: "id"
+        },
+        type: "select",
+        rules: [{
+            required: true,
+            message: "请输入学校名称",
+            trigger: "blur"
+        }],
+        searchSpan: 4,
+        searchLabelWidth: 110,
+        width: 200,
+    }, {
+        label: "姓名",
+        prop: "userId",
+        type: "select",
+        hide: true,
+        dicUrl: "/api/blade-user/page-security-unit?deptId={{key}}",
+        props: {
+            label: "realName",
+            value: "id"
+        },
+        searchSpan: 4,
+        rules: [{
+            required: true,
+            message: "请输入姓名",
+            trigger: "blur"
+        }],
+    }, {
+        label: "姓名",
+        prop: "realName",
+        search: true,
+        searchLabelWidth: 56,
+        editDisplay: false,
+        addDisplay: false,
+        searchSpan: 3,
+    }, {
+        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
     },
-    type: "select",
-    rules: [{
-        required: true,
-        message: "请输入学校名称",
-        trigger: "blur"
-    }],
-    searchSpan: 4,
-    searchLabelWidth: 110,
-    width: 200,
-}, {
-    label: "姓名",
-    prop: "userId",
-    type: "select",
-    hide: true,
-    dicUrl: "/api/blade-user/page-security-unit?deptId={{key}}",
-    props: {
-        label: "realName",
-        value: "id"
-    },
-    searchSpan: 4,
-    rules: [{
-        required: true,
-        message: "请输入姓名",
-        trigger: "blur"
-    }],
-}, {
-    label: "姓名",
-    prop: "realName",
-    search: true,
-    searchLabelWidth: 56,
-    editDisplay: false,
-    addDisplay: false,
-    searchSpan: 3,
-}, {
-    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,
-    searchLabelWidth: 85,
-    searchSpan: 5,
-    rules: [{
-        required: true,
-        message: "请输入企业名称",
-        trigger: "blur"
-    }],
+    // {
+    //     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,
+        searchLabelWidth: 85,
+        searchSpan: 5,
+        rules: [{
+            required: true,
+            message: "请输入企业名称",
+            trigger: "blur"
+        }],
 
-},
-{
-    label: "考试名称",
-    prop: "trainExamName",
-    width: 220,
-},
-{
-    label: "考试证件",
-    prop: "applyCard"
-},
-{
-    label: "审核状态",
-    search: true,
-    searchLabelWidth: 110,
-    type: "select",
-    searchSpan: 4, searchLabelWidth: 85,
-    prop: "auditStatus",
-    searchValue: 4,
-    dicData: [{
-        label: '全部',
-        value: 0,
     },
     {
-        label: '审核通过',
-        value: 1,
+        label: "考试名称",
+        prop: "trainExamName",
+        width: 220,
     },
     {
-        label: '审核不通过',
-        value: 2,
+        label: "考试证件",
+        prop: "applyCard"
     },
     {
-        label: '已提交审核',
-        value: 3,
+        label: "审核状态",
+        search: true,
+        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: '未提交审核',
-        value: 4,
-    }
-    ],
-    props: {
-        label: "label",
-        value: "value"
-    },
-    editDisplay: false,
-    addDisplay: false,
-    width: 100,
-},
-{
-    label: "报名状态",
-    search: true,
-    type: "select",
-    searchSpan: 4,
-    prop: "cancel",
-    searchValue: 1, searchLabelWidth: 85,
-    dicData: [{
-        label: '全部',
-        value: 0,
+        label: "报名状态",
+        search: true,
+        type: "select",
+        searchSpan: 4,
+        prop: "cancel",
+        searchValue: 1,
+        searchLabelWidth: 85,
+        dicData: [{
+                label: '全部',
+                value: 0,
+            },
+            {
+                label: '已报名',
+                value: 1,
+            },
+            {
+                label: '已取消',
+                value: 2,
+            }
+        ],
+        props: {
+            label: "label",
+            value: "value"
+        },
+        editDisplay: false,
+        addDisplay: false,
+        width: 100,
     },
     {
-        label: '已报名',
-        value: 1,
+        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,
     },
-    {
-        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,
-},
     //  {
     //     label: "确认截止时间",
     //     prop: "remainingTime",

--
Gitblit v1.9.3