From bfb79ad4692442749907aab55ff6ac66febdc985 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 14:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/place/index.vue | 221 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 133 insertions(+), 88 deletions(-)
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index 555f94d..1a64c0a 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -77,20 +77,6 @@
{
label: '场所位置',
prop: 'localtion'
- }, {
- label: '审核状态',
- prop: 'confirmFlag',
- type: 'radio',
- dicData: [{
- label: '待审核',
- value: 0
- }, {
- label: '审核通过',
- value: 1
- }, {
- label: '审核不通过',
- value: 2
- }]
}
]
},
@@ -170,6 +156,92 @@
trigger: "blur",
},],
},
+ {
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ width: 96,
+ label: "所属街道",
+ prop: "townStreetName",
+ search: true,
+ searchSpan: 4
+ },
+ {
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ label: "所属社区",
+ prop: "neiName",
+ search: true,
+ searchSpan: 4,
+ width: 150,
+ rules: [
+ {
+ required: true,
+ message: "请选择所属社区",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ hide: true,
+ label: "所属社区",
+ prop: "neiCode",
+ search: false,
+ width: 150,
+ type: "tree",
+ dicUrl: "/api/blade-system/region/tree",
+ props: {
+ label: "name",
+ value: "id",
+ },
+ parent: false,
+ cascader: ["gridId"],
+ rules: [
+ {
+ required: true,
+ message: "请选择所属社区",
+ trigger: "blur",
+ },
+ ],
+ },
+
+ {
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ label: "所属网格",
+ prop: "gridName",
+ width: 150,
+ rules: [
+ {
+ required: true,
+ message: "请选择所属网格",
+ trigger: "blur",
+ },
+ ],
+ },
+
+ {
+ hide: true,
+ label: "所属网格",
+ prop: "gridId",
+ type: "tree",
+ cell: true,
+ props: {
+ label: "gridName",
+ value: "id",
+ },
+ dicUrl:
+ "/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
+ rules: [
+ {
+ required: true,
+ message: "请选择所属网格",
+ trigger: "blur",
+ },
+ ],
+ },
{
label: "场所标签",
@@ -204,33 +276,14 @@
},
{
- label: "联系电话",
+ width: 110,
+ label: "电话",
prop: "principalPhone",
- searchSpan: 4,
search: true,
- rules: [{
- required: false,
- message: "请输入联系电话",
- trigger: "blur",
- },],
+ searchSpan: 4,
+ slot: true,
},
- {
- label: "审核状态",
- prop: "confirmFlag",
- searchSpan: 4,
- search: true,
- dicData: [{
- label: '待审核',
- value: 0,
- }, {
- label: '审核通过',
- value: 1,
- }, {
- label: '审核不通过',
- value: 2,
- }],
- },
{
label: "场所照片",
prop: "imageUrls",
@@ -249,41 +302,34 @@
},
{
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- width: 96,
- label: "所属街道",
- prop: "townStreetName",
- },
- {
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- width: 160,
- label: "所属社区",
- prop: "neiName",
- },
- {
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- width: 96,
- label: "所属网格",
- prop: "gridName",
- },
-
- {
label: "位置",
prop: "localtion",
span: 24,
minWidth: 220,
overHidden: true,
- rules: [{
- required: true,
- message: "请输入区域",
- trigger: "blur",
- },],
+ // rules: [{
+ // required: true,
+ // message: "请输入区域",
+ // trigger: "blur",
+ // },],
+ },
+ {
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ label: '审核状态',
+ prop: 'confirmFlag',
+ type: 'radio',
+ dicData: [{
+ label: '待审核',
+ value: 0
+ }, {
+ label: '审核通过',
+ value: 1
+ }, {
+ label: '审核不通过',
+ value: 2
+ }]
}
],
},
@@ -357,10 +403,9 @@
},
rowSave (row, done, loading) {
- console.log(row, 9999)
if (row.imageUrls.length > 0) {
var urls = []
- var split = row.imageUrls.split(",")
+ var split = row.imageUrls.split(",").filter(item => item != '')
split.forEach(url => {
var names = url.split("jczz/")
urls.push(names[1])
@@ -397,7 +442,7 @@
rowUpdate (row, index, done, loading) {
if (row.imageUrls.length > 0) {
var urls = []
- var split = row.imageUrls.split(",")
+ var split = row.imageUrls.split(",").filter(item => item != '')
split.forEach(url => {
var names = url.split("jczz/")
urls.push(names[1])
@@ -479,28 +524,28 @@
if (["edit", "view"].includes(type)) {
getPlace(this.form.id).then((res) => {
this.form = res.data.data
- if (this.form.imageUrls) {
- if (this.form.imageUrls.length > 0) {
- var urls = []
- var names = this.form.imageUrls.split(",")
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- this.form.imageUrls = urls.join(",")
- }
+
+ if (this.form.imageUrls.length) {
+ this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website.minioUrl + item).join(',')
}
- if (this.form.placePoiLabelVOList) {
- var arr = []
- this.form.placePoiLabelVOList.forEach(item => {
- arr.push(item.poiCode)
+
+ if (this.form.placePoiLabelVOList.length) {
+ let lebelTwo = this.form.placePoiLabelVOList.find(item => {
+ return item.type == 2
})
- this.form.label = arr.join(",")
+
+ if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
+
+ let lebelThree = this.form.placePoiLabelVOList.find(item => {
+ return item.type == 3
+ })
+
+ if (lebelThree) this.form.label = String(lebelThree.poiCode)
}
- console.log(this.form, 888888)
+
+ done()
})
}
- // con
- done()
},
currentChange (currentPage) {
this.page.currentPage = currentPage
@@ -536,7 +581,7 @@
if (item.imageUrls) {
if (item.imageUrls.length > 0) {
var urls = []
- var names = item.imageUrls.split(",")
+ var names = item.imageUrls.split(",").filter(item => item != '')
names.forEach(name => {
urls.push(website.minioUrl + name)
})
--
Gitblit v1.9.3