From 05ae88d2318dc8be1baa89a7a52929ec249f3fe6 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 20 Aug 2021 16:46:05 +0800
Subject: [PATCH] 保安单位智能分析  图表更改  装备管理加数量  派遣管理优化  字段 搜索

---
 src/views/dispatch/data.js |  100 +++++++++++++++++++++++++++++---------------------
 1 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/src/views/dispatch/data.js b/src/views/dispatch/data.js
index b807b64..65b27db 100644
--- a/src/views/dispatch/data.js
+++ b/src/views/dispatch/data.js
@@ -20,29 +20,34 @@
     },
     {
         label: "保安公司",
-        prop: "tenantName",
-        // type: "tree",
-        // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=0",
-        // props: {
-        //     label: "title",
-        //     value: "id"
-        // },
+        prop: "deptId",
+        type: "tree",
+        dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+        props: {
+            label: "title",
+            value: "id"
+        },
+        // hide: true,
         // hide: !website.tenantMode,
         // addDisplay: website.tenantMode,
         // editDisplay: website.tenantMode,
         // viewDisplay: website.tenantMode,
-        // rules: [{
-        //     required: true,
-        //     message: "请输入所属保安单位",
-        //     trigger: "click"
-        // }],
+        rules: [{
+            required: true,
+            message: "请选择保安公司",
+            trigger: "click"
+        }],
         labelWidth: 110,
         width: 200,
-        editDisplay: false,
-        addDisplay: false,
+        searchLabelWidth: 110,
+        search: true,
+        searchSpan: 4,
+        // editDisplay: false,
+        // addDisplay: false,
         // hide: true,
         // span: 11,
     },
+
     {
         label: " 联系人",
         prop: "linkman",
@@ -77,42 +82,53 @@
     //     // width: 110,
     //     // overHidden: true
     // },
+    // {
+    //     label: "所属辖区",
+    //     prop: "jurisdiction",
+    //     // multiple: true,
+    //     labelWidth: 110,
+    //     type: "tree",
+    //     dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
+    //     props: {
+    //         label: "title",
+    //         value: "id",
+    //     },
+    //     checkStrictly: true,
+    //     slot: true,
+    //     rules: [
+    //         {
+    //             required: true,
+    //             message: "请选择所属行政区",
+    //             trigger: "click",
+    //         },
+    //     ],
+    // },
+    // {
+    //     label: "详细地址",
+    //     prop: "address",
+    //     labelWidth: 110,
+    //     // search: true,
+    //     // width: 110,
+    //     // overHidden: true
+    // },
     {
-        label: "所属辖区",
-        prop: "jurisdiction",
-        // multiple: true,
+        label: "合同生效时间",
+        prop: "startTime",
         labelWidth: 110,
-        type: "tree",
-        dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
-        props: {
-            label: "title",
-            value: "id",
-        },
-        checkStrictly: true,
-        slot: true,
-        rules: [
-            {
-                required: true,
-                message: "请选择所属行政区",
-                trigger: "click",
-            },
-        ],
-    },
-    {
-        label: "详细地址",
-        prop: "address",
-        labelWidth: 110,
+        type: "date",
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
         // search: true,
-        // width: 110,
+        // searchSpan: 4,
         // overHidden: true
     },
     {
-        label: "创建时间",
-        prop: "createTime",
+        label: "合同到期时间",
+        prop: "endTime",
         labelWidth: 110,
         type: "date",
-        format: "yyyy-MM-dd hh:mm:ss",
-        valueFormat: "timestamp",
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
         // search: true,
         // searchSpan: 4,
         // overHidden: true

--
Gitblit v1.9.3