From 0ca4e0cf74d7a12639f2884bab9111c3e0550593 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 27 Aug 2021 19:37:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/dispatch/dispatch.vue |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/views/dispatch/dispatch.vue b/src/views/dispatch/dispatch.vue
index c2815e6..b0c21f3 100644
--- a/src/views/dispatch/dispatch.vue
+++ b/src/views/dispatch/dispatch.vue
@@ -266,7 +266,7 @@
           {
             label: "合同生效时间",
             prop: "releaseTimeRange",
-            type: "datetime",
+            type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd",
             searchValue: [this.getStartTime(), this.getEndTime()],
@@ -289,14 +289,14 @@
           {
             label: "所属辖区",
             prop: "jurisdiction",
-            // multiple: true,
+            hide: true,
             searchLabelWidth: 80,
             search: true,
             searchSpan: 4,
             overHidden: true,
             labelWidth: 118,
             type: "tree",
-            dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
+            dicUrl: "/api/jurisdiction/lazy-tree?parentId=1123598813738675201",
             props: {
               label: "title",
               value: "id",
@@ -306,16 +306,42 @@
             rules: [
               {
                 required: true,
-                message: "请选择所属行政区",
+                message: "请选择所属辖区",
                 trigger: "click",
               },
             ],
           },
           {
-            label: " 派遣人数",
-            prop: "num",
+            label: "所属辖区",
+            prop: "jurisdictionName",
+            // multiple: true,
+            searchLabelWidth: 80,
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            overHidden: true,
             labelWidth: 118,
+            type: "tree",
+            dicUrl: "/api/jurisdiction/lazy-tree?parentId=1123598813738675201",
+            props: {
+              label: "title",
+              value: "id",
+            },
+            checkStrictly: true,
+            slot: true,
+            rules: [
+              {
+                required: true,
+                message: "请选择所属辖区",
+                trigger: "click",
+              },
+            ],
           },
+          // {
+          //   label: " 派遣人数",
+          //   prop: "num",
+          //   labelWidth: 118,
+          // },
           {
             label: "合同开始时间",
             prop: "startTime",

--
Gitblit v1.9.3