From 92d0cf73df170131eba84490d875bc954eb7a708 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 11 Aug 2021 20:41:58 +0800
Subject: [PATCH] 报名考试修改

---
 src/views/dispatchChild/data.js |  329 +++++++++++++++++++++++-------------------------------
 1 files changed, 138 insertions(+), 191 deletions(-)

diff --git a/src/views/dispatchChild/data.js b/src/views/dispatchChild/data.js
index 742a90d..a90d819 100644
--- a/src/views/dispatchChild/data.js
+++ b/src/views/dispatchChild/data.js
@@ -16,7 +16,7 @@
         prop: "title",
         span: 24,
         styles: {
-            fontSize: '24px'
+            fontSize: '10px'
         }
     },
     {
@@ -26,29 +26,31 @@
         labelWidth: 130,
         disabled: true,
     },
-    {
-        label: "保安公司",
-        prop: "tenantId",
-        type: "tree",
-        search: true,
-        dicUrl: "/api/blade-system/tenant/select",
-        props: {
-            label: "tenantName",
-            value: "tenantId"
-        },
-        // hide: !website.tenantMode,
-        // addDisplay: website.tenantMode,
-        // editDisplay: website.tenantMode,
-        // viewDisplay: website.tenantMode,
-        rules: [{
-            required: true,
-            message: "请输入所属保安单位",
-            trigger: "click"
-        }],
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
+    // {
+    //     label: "保安公司",
+    //     prop: "tenantName",
+    //     // type: "tree",
+    //     // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+    //     // props: {
+    //     //     label: "title",
+    //     //     value: "id"
+    //     // },
+    //     // hide: !website.tenantMode,
+    //     // addDisplay: website.tenantMode,
+    //     // editDisplay: website.tenantMode,
+    //     // viewDisplay: website.tenantMode,
+    //     // rules: [{
+    //     //     required: true,
+    //     //     message: "请输入所属保安单位",
+    //     //     trigger: "click"
+    //     // }],
+    //     span: 11,
+    //     labelWidth: 130,
+    //     // editDisplay: false,
+    //     // addDisplay: false,
+    //     // hide: true,
+    //     disabled: true,
+    // },
     {
         label: "联系人",
         prop: "linkman",
@@ -73,6 +75,9 @@
     {
         label: "创建时间",
         prop: "createTime",
+        // type: "date",
+        // format: "yyyy-MM-dd hh:mm:ss",
+        // valueFormat: "timestamp",
         span: 11,
         labelWidth: 130,
         disabled: true,
@@ -82,20 +87,74 @@
 ]
 
 export var column1 = [//派遣服务公司登记
+    // {
+    //     label: "id",
+    //     prop: "id",
+    //     // search: true,
+    //     // searchSpan: 4,
+    //     // overHidden: true,
+    //     // hide: true,
+    //     // editDisplay: false,
+    //     // addDisplay: false
+    // },
     {
-        label: "id",
-        prop: "id",
-        // search: true,
-        // searchSpan: 4,
-        // overHidden: true,
-        hide: true,
+        label: "保安公司",
+        prop: "deptId",
+        labelWidth: 120,
+        searchLabelWidth: 120,
+        searchSpan: 4,
+        dicUrl:
+            "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+        props: {
+            label: "title",
+            value: "id",
+        },
+        search: true,
+        overHidden: true,
+        type: "select",
+        rules: [
+            {
+                required: true,
+                message: "请输入保安公司",
+                trigger: "blur",
+            },
+        ],
+    },
+    {
+        label: "派遣单位",
+        prop: "dispatcherCompany",
+        addDisplay: false,
         editDisplay: false,
-        addDisplay: false
-    }, {
+    },
+    {
+        label: "派遣单位",
+        prop: "dispatcherUnitId",
+        labelWidth: 120,
+        searchLabelWidth: 120,
+        dicUrl: "/api/dispatcherUnit/page-tree",
+        props: {
+            label: "name",
+            value: "id",
+        },
+        hide: true,
+        searchSpan: 4,
+        search: true,
+        overHidden: true,
+        type: "tree",
+        rules: [
+            {
+                required: true,
+                message: "请输入保安公司",
+                trigger: "blur",
+            },
+        ],
+    },
+    {
         label: "保安人名称",
         prop: "name",
-        // search: true,
-        // searchSpan: 4,
+        search: true,
+        searchSpan: 4,
+        searchLabelWidth: 120
         // overHidden: true
     }, {
         label: "身份证",
@@ -103,17 +162,31 @@
         // search: true,
         // searchSpan: 4,
         // overHidden: true
-    }, {
-        label: "派遣人",
-        prop: "dispatcher",
-        // search: true,
-        // searchSpan: 4,
-        // overHidden: true
-    }, {
+    },
+    // {
+    //     label: "派遣人",
+    //     prop: "dispatcher",
+    //     // search: true,
+    //     // searchSpan: 4,
+    //     // overHidden: true
+    // }, 
+    {
         label: "派遣时间",
         prop: "dispatchertime",
+        type: "date",
+        format: "yyyy-MM-dd hh:mm:ss",
+        valueFormat: "timestamp",
+        search: true,
+        searchSpan: 4,
+        // overHidden: true
+    }, {
+        label: "结束时间",
+        prop: "endTime",
+        type: "date",
+        format: "yyyy-MM-dd hh:mm:ss",
+        valueFormat: "timestamp",
         // search: true,
-        // searchSpan: 4,
+        // searchSpan: 5,
         // overHidden: true
     }, {
         label: "派遣地址",
@@ -121,157 +194,31 @@
         // search: true,
         // searchSpan: 4,
         // overHidden: true
-    }, {
-        label: "派遣单位",
-        prop: "dispatcherCompany",
-        // search: true,
-        // searchSpan: 4,
-        // overHidden: true
     },
+    // {
+    //     label: "派遣单位",
+    //     // prop: "dispatcherCompany",
+    //     prop: "tenantName",
+    //     type: "tree",
+    //     dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+    //     props: {
+    //         label: "title",
+    //         value: "id"
+    //     },
+    //     // hide: !website.tenantMode,
+    //     // addDisplay: website.tenantMode,
+    //     // editDisplay: website.tenantMode,
+    //     // viewDisplay: website.tenantMode,
+    //     rules: [{
+    //         required: true,
+    //         message: "请输入派遣单位",
+    //         trigger: "click"
+    //     }],
+    // search: true,
+    // searchSpan: 4,
+    // overHidden: true
+    // },
 
 
 ]
 
-
-export var data = [
-    {
-        "tenant_id": "xx保安公司", "name": "xx职务",
-        "number": "10",
-        "education": "大专以上",
-        "experience": "2年",
-        "max_salary": "8k",
-        "units_scale": "200人+",
-        "linkman": "XX",
-        "phone": "xxxxxxxxxx",
-        "address": "环城路地一大道30号口下",
-        "start_time": "7月8日",
-        "end_time": "7月31日",
-        "status": "2"
-    },
-    {
-        "tenant_id": "xx保安公司", "name": "xx职务",
-        "number": "10",
-        "education": "大专以上",
-        "experience": "2年",
-        "max_salary": "8k",
-        "units_scale": "200人+",
-        "linkman": "XX",
-        "phone": "xxxxxxxxxx",
-        "address": "环城路地一大道30号口下",
-        "start_time": "7月8日",
-        "end_time": "7月31日",
-        "status": "2"
-    },
-    {
-        "tenant_id": "xx保安公司", "name": "xx职务",
-        "number": "10",
-        "education": "大专以上",
-        "experience": "2年",
-        "max_salary": "8k",
-        "units_scale": "200人+",
-        "linkman": "XX",
-        "phone": "xxxxxxxxxx",
-        "address": "环城路地一大道30号口下",
-        "start_time": "7月8日",
-        "end_time": "7月31日",
-        "status": "2"
-    },
-    {
-        "tenant_id": "xx保安公司", "name": "xx职务",
-        "number": "10",
-        "education": "大专以上",
-        "experience": "3年",
-        "max_salary": "8k",
-        "units_scale": "200人+",
-        "linkman": "XX",
-        "phone": "xxxxxxxxxx",
-        "address": "环城路地一大道30号口下",
-        "start_time": "7月8日",
-        "end_time": "7月31日",
-        "status": "2"
-    },
-    {
-        "tenant_id": "xx保安公司", "name": "xx职务",
-        "number": "10",
-        "education": "大专以上",
-        "experience": "5年",
-        "max_salary": "8k",
-        "units_scale": "200人+",
-        "linkman": "XX",
-        "phone": "xxxxxxxxxx",
-        "address": "环城路地一大道30号口下",
-        "start_time": "7月8日",
-        "end_time": "7月31日",
-        "status": "2"
-    },
-    {
-        "tenant_id": "xx保安公司", "name": "xx职务",
-        "number": "10",
-        "education": "大专以上",
-        "experience": "2年",
-        "max_salary": "8k",
-        "units_scale": "200人+",
-        "linkman": "XX",
-        "phone": "xxxxxxxxxx",
-        "address": "环城路地一大道30号口下",
-        "start_time": "7月8日",
-        "end_time": "7月31日",
-        "status": "2"
-    },
-    {
-        "tenant_id": "xx保安公司", "name": "xx职务",
-        "number": "10",
-        "education": "大专以上",
-        "experience": "2年",
-        "max_salary": "8k",
-        "units_scale": "200人+",
-        "linkman": "XX",
-        "phone": "xxxxxxxxxx",
-        "address": "环城路地一大道30号口下",
-        "start_time": "7月8日",
-        "end_time": "7月31日",
-        "status": "2"
-    },
-    {
-        "tenant_id": "xx保安公司", "name": "xx职务",
-        "number": "10",
-        "education": "大专以上",
-        "experience": "2年",
-        "max_salary": "8k",
-        "units_scale": "200人+",
-        "linkman": "XX",
-        "phone": "xxxxxxxxxx",
-        "address": "环城路地一大道30号口下",
-        "start_time": "7月8日",
-        "end_time": "7月31日",
-        "status": "2"
-    },
-    {
-        "tenant_id": "xx保安公司", "name": "xx职务",
-        "number": "10",
-        "education": "大专以上",
-        "experience": "2年",
-        "max_salary": "8k",
-        "units_scale": "200人+",
-        "linkman": "XX",
-        "phone": "xxxxxxxxxx",
-        "address": "环城路地一大道30号口下",
-        "start_time": "7月8日",
-        "end_time": "7月31日",
-        "status": "2"
-    },
-    {
-        "tenant_id": "xx保安公司", "name": "xx职务",
-        "number": "10",
-        "education": "大专以上",
-        "experience": "2年",
-        "max_salary": "8k",
-        "units_scale": "200人+",
-        "linkman": "XX",
-        "phone": "xxxxxxxxxx",
-        "address": "环城路地一大道30号口下",
-        "start_time": "7月8日",
-        "end_time": "7月31日",
-        "status": "2"
-    }
-]

--
Gitblit v1.9.3