From 8e357feadbb4720b99a3ab485e73cb72b66ea3ad Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 23 Dec 2023 11:37:24 +0800
Subject: [PATCH] 小区、住户、房屋、场所等页面调整,皮肤更换功能隐藏

---
 src/views/district/index.vue |   99 +++++++++++++++++++++++++++++--------------------
 1 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/src/views/district/index.vue b/src/views/district/index.vue
index 66d5cd9..c4f0139 100644
--- a/src/views/district/index.vue
+++ b/src/views/district/index.vue
@@ -50,7 +50,7 @@
                         parent: false,
                         label: "小区名称",
                         prop: "name",
-                        searchSpan: 5,
+                        searchSpan: 4,
                         search: true,
                         type: 'tree',
                         dicUrl: `/api/blade-district/district/getDistrictTree`,
@@ -70,6 +70,51 @@
                                 trigger: "blur",
                             },
                         ],
+                    },
+
+
+                    {
+                        parent: false,
+                        addDisplay: false,
+                        editDisplay: false,
+                        viewDisplay: false,
+                        width: 96,
+                        label: "所属街道",
+                        prop: "townStreetName",
+                        search: true,
+                        searchSpan: 4
+                    },
+
+                    {
+                        parent: false,
+                        label: "所属社区",
+                        prop: "communityCode",
+                        search: true,
+                        searchSpan: 4,
+                        searchType: 'input',
+                        width: 150,
+                        type: "tree",
+                        dicUrl: "/api/blade-system/region/tree",
+                        props: {
+                            label: "name",
+                            value: "id"
+                        },
+                        rules: [
+                            {
+                                required: true,
+                                message: "请选择所属社区",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+
+                    {
+                        addDisplay: false,
+                        editDisplay: false,
+                        viewDisplay: false,
+                        width: 96,
+                        label: "所属网格",
+                        prop: "gridName",
                     },
 
                     {
@@ -100,45 +145,6 @@
                         hide: true,
                         minRows: 6,
                         span: 24,
-                    },
-
-                    {
-                        addDisplay: false,
-                        editDisplay: false,
-                        viewDisplay: false,
-                        width: 96,
-                        label: "所属街道",
-                        prop: "townStreetName",
-                    },
-
-                    {
-                        label: "所属社区",
-                        prop: "communityCode",
-                        search: true,
-                        searchSpan: 4,
-                        width: 150,
-                        type: "tree",
-                        dicUrl: "/api/blade-system/region/tree",
-                        props: {
-                            label: "name",
-                            value: "id"
-                        },
-                        rules: [
-                            {
-                                required: true,
-                                message: "请选择所属社区",
-                                trigger: "blur",
-                            },
-                        ],
-                    },
-
-                    {
-                        addDisplay: false,
-                        editDisplay: false,
-                        viewDisplay: false,
-                        width: 96,
-                        label: "所属网格",
-                        prop: "gridName",
                     },
 
                     {
@@ -313,10 +319,11 @@
             this.onLoad(this.page, this.query)
         },
         onLoad (page, params = {}) {
-            const { dateTime } = this.query
+            const { dateTime, communityCode } = this.query
             let values = {
                 ...params,
             }
+
             if (dateTime) {
                 values = {
                     ...params,
@@ -326,6 +333,16 @@
                 }
                 values.dateTime = null
             }
+
+            if (communityCode) {
+                values = {
+                    ...values,
+                    communityName: communityCode
+                }
+
+                delete values.communityCode
+            }
+
             this.loading = true
             getList(page.currentPage, page.pageSize, values).then((res) => {
                 const data = res.data.data

--
Gitblit v1.9.3