From 5e2aafeede13d337380f736567caf74f49713be7 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:38:32 +0800
Subject: [PATCH] 代码优化
---
src/views/district/index.vue | 139 ++++++++++++++++++++++++----------------------
1 files changed, 72 insertions(+), 67 deletions(-)
diff --git a/src/views/district/index.vue b/src/views/district/index.vue
index 66d5cd9..18632c6 100644
--- a/src/views/district/index.vue
+++ b/src/views/district/index.vue
@@ -32,13 +32,16 @@
datetime: "",
selectionList: [],
option: {
+ labelWidth: 96,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 210,
+
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 280,
border: true,
//stripe:true,
index: true,
@@ -47,35 +50,74 @@
dialogClickModal: false,
column: [
{
- parent: false,
- label: "小区名称",
+ width: 220,
+ overHidden: true,
+ label: '小区名称',
prop: "name",
- searchSpan: 5,
+ searchSpan: 4,
search: true,
- type: 'tree',
- dicUrl: `/api/blade-district/district/getDistrictTree`,
+ searchLabelWidth: 76,
+ span: 12,
+ rules: [
+ {
+ required: true,
+ message: "请输入小区名称",
+ trigger: "blur",
+ },
+ ],
+ },
+
+
+ {
+ width: 110,
+ label: "所属街道",
+ parent: false,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "townStreetName",
+ search: true,
+ searchSpan: 4
+ },
+
+ {
+ width: 156,
+ overHidden: true,
+ label: "所属社区",
+ parent: false,
+ prop: "communityCode",
+ search: true,
+ searchSpan: 4,
+ searchType: 'input',
+ type: "tree",
+ dicUrl: "/api/blade-system/region/treeToCommunity",
props: {
label: "name",
value: "id"
},
- defaultExpandedKeys: ["361102003"],
- span: 12,
- labelWidth: 120,
- width: 220,
- overHidden: true,
rules: [
{
required: true,
- message: "请选择小区",
+ message: "请选择所属社区",
trigger: "blur",
},
],
},
{
+ width: 110,
+ overHidden: true,
+ label: "所属网格",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "gridName",
+ },
+
+ {
+ width: 110,
label: "小区图片",
prop: "picUrl",
- width: 80,
type: "upload",
listType: "picture-img",
action: "/api/blade-resource/oss/endpoint/put-file",
@@ -103,48 +145,10 @@
},
{
- 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",
- },
-
- {
label: "地址",
prop: "address",
span: 24,
+ overHidden: true,
rules: [
{
required: true,
@@ -313,20 +317,21 @@
this.onLoad(this.page, this.query)
},
onLoad (page, params = {}) {
- const { dateTime } = this.query
- let values = {
- ...params,
- }
- if (dateTime) {
- values = {
- ...params,
- startTime: dateTime[0],
- endTime: dateTime[1],
- ...this.query,
- }
- values.dateTime = null
- }
this.loading = true
+
+ let values = Object.assign(params, this.query)
+
+ const { communityCode } = this.query
+
+ if (communityCode) {
+ values = {
+ ...values,
+ communityName: communityCode
+ }
+
+ delete values.communityCode
+ }
+
getList(page.currentPage, page.pageSize, values).then((res) => {
const data = res.data.data
this.page.total = data.total
--
Gitblit v1.9.3