From 957ef82a3cf13bf29076e3e892de0328dc993fed Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 15 Jul 2021 22:27:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/dispatchChild/data.js |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/views/dispatchChild/data.js b/src/views/dispatchChild/data.js
index 70e0392..a90d819 100644
--- a/src/views/dispatchChild/data.js
+++ b/src/views/dispatchChild/data.js
@@ -98,10 +98,62 @@
     //     // addDisplay: false
     // },
     {
+        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,
+    },
+    {
+        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: 5,
+        searchSpan: 4,
         searchLabelWidth: 120
         // overHidden: true
     }, {
@@ -125,7 +177,7 @@
         format: "yyyy-MM-dd hh:mm:ss",
         valueFormat: "timestamp",
         search: true,
-        searchSpan: 5,
+        searchSpan: 4,
         // overHidden: true
     }, {
         label: "结束时间",

--
Gitblit v1.9.3