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/recruitmentManagement/data.js |   95 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/src/views/recruitmentManagement/data.js b/src/views/recruitmentManagement/data.js
index 704c0fc..5d5661a 100644
--- a/src/views/recruitmentManagement/data.js
+++ b/src/views/recruitmentManagement/data.js
@@ -25,32 +25,57 @@
         prop: "id",
         hide: true,
         editDisplay: false,
-        addDisplay: false
-    },
-    {
-        label: "保安单位",
-        prop: "tenantName",
-        hide: true,
-        editDisplay: false,
-        addDisplay: false
-    },
-    {
-        label: "保安id",
-        prop: "deptId",
-        hide: true,
-        editDisplay: false,
         addDisplay: false,
-        value: JSON.parse(window.localStorage.getItem("saber-userInfo")).content.dept_id
-    },//上面不显示
+        viewDisplay: false,
+    },
+    // {
+    //     label: "保安单位",
+    //     prop: "tenantName",
+    //     hide: true,
+    //     editDisplay: false,
+    //     addDisplay: false
+    // },
+    // {
+    //     label: "保安id",
+    //     prop: "deptId",
+    //     hide: true,
+    //     editDisplay: false,
+    //     addDisplay: false,
+    //     value: JSON.parse(window.localStorage.getItem("saber-userInfo")).content.dept_id
+    // },//上面不显示
+    {
+        label: "保安公司",
+        prop: "deptId",
+        rules: [{
+            required: true,
+            message: "请输入保安公司",
+            trigger: "blur"
+        }],
+        // addDisplay: true,
+        // editDisplay: true,
+        // viewDisplay: true,
+        overHidden: true,
+        searchSpan: 4,
+        dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+        props: {
+            label: "title",
+            value: "id"
+        },
+        hide: true,
+        // search: true,
+        type: "select",
+    },
     {
         label: "招聘岗位",
         prop: "name",
+        hide: true,
         // search: true,
     },
     {
         label: "招聘人数",
         prop: "number",
         width: 70,
+        hide: true,
         // search: true,
     },
     {
@@ -62,7 +87,8 @@
         filter: false,
         type: 'tree',
         dicData: DIC1,
-        searchSpan: 5,
+        searchSpan: 4,
+        hide: true,
         // dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
         // props: {
         //     label: "dictValue",
@@ -77,13 +103,14 @@
         addDisplay: true,
         editDisplay: true,
         viewDisplay: true,
-        searchSpan: 5,
+        searchSpan: 4,
         dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
         props: {
             label: "dictValue",
             value: "dictKey"
         },
-        search: true,
+        hide: true,
+        // search: true,
         type: "select",
         // rules: [{
         //     required: true,
@@ -97,13 +124,14 @@
         addDisplay: true,
         editDisplay: true,
         viewDisplay: true,
-        searchSpan: 5,
+        hide: true,
+        searchSpan: 4,
         dicUrl: "/api/blade-system/dict-biz/dictionary?code=experienceType",
         props: {
             label: "dictValue",
             value: "dictKey"
         },
-        search: true,
+        // search: true,
         type: "select",
         // rules: [{
         //     required: true,
@@ -115,28 +143,28 @@
         label: "工作任务",
         prop: "workDesc",
         // search: true,
-        width: 110,
+        // width: 110,
         overHidden: true
     },
     {
         label: "福利",
         prop: "welfare",
-        // search: true,
-        searchSpan: 4,
+        search: true,
+        searchSpan: 5,
         overHidden: true
     },
     {
         label: "最低薪资",
         prop: "minSalary",
-        width: 70,
+        width: 100,
         // search: true,
         searchSpan: 4,
     },
     {
         label: "最高薪资",
         prop: "maxSalary",
-        width: 70,
-        search: true,
+        width: 100,
+        // search: true,
         searchSpan: 4,
     },
     {
@@ -166,13 +194,14 @@
         addDisplay: true,
         editDisplay: true,
         viewDisplay: true,
+        width: 150,
         searchSpan: 4,
         dicUrl: "/api/blade-system/dict-biz/dictionary?code=unitsScaleType",
         props: {
             label: "dictValue",
             value: "dictKey"
         },
-        // search: true,
+        search: true,
         type: "select",
         // rules: [{
         //     required: true,
@@ -183,11 +212,13 @@
     {
         label: "联系人",
         prop: "linkman",
+        hide: true,
         // search: true,
     },
     {
         label: "联系人电话",
         prop: "phone",
+        hide: true,
         // search: true,
         width: 110,
     },
@@ -196,15 +227,17 @@
         prop: "address",
         width: 110,
         // search: true,
+        hide: true,
         overHidden: true
     },
     {
         label: "开始时间",
         prop: "startTime",
         // search: true,
+        hide: true,
         type: "date",
         format: "yyyy-MM-dd hh:mm:ss",
-        valueFormat: "timestamp",
+        valueFormat: "yyyy-MM-dd hh:mm:ss",
         width: 88,
     },
 
@@ -212,9 +245,10 @@
         label: "结束时间",
         prop: "endTime",
         // search: true,
+        hide: true,
         type: "date",
         format: "yyyy-MM-dd hh:mm:ss",
-        valueFormat: "timestamp",
+        valueFormat: "yyyy-MM-dd hh:mm:ss",
         width: 88,
     },
     {
@@ -224,6 +258,7 @@
         // searchSpan: 4,
         width: 70,
         prop: 'status',
+        hide: true,
         filter: false,
         type: 'tree',
         dicData: DIC,

--
Gitblit v1.9.3