From ec59ab15df819e21a73435b7522b51982a3b4ca5 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 20 Jan 2024 17:37:13 +0800
Subject: [PATCH] merge
---
src/views/place/components/baseAllInfo.vue | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/src/views/place/components/baseAllInfo.vue b/src/views/place/components/baseAllInfo.vue
index 88930ba..752dfd9 100644
--- a/src/views/place/components/baseAllInfo.vue
+++ b/src/views/place/components/baseAllInfo.vue
@@ -147,7 +147,7 @@
label: "name",
value: "id",
},
- cascader: ["gridId"],
+ cascader: ["gridCode"],
rules: [
{
required: true,
@@ -159,14 +159,14 @@
{
hide: true,
label: "所属网格",
- prop: "gridId",
+ prop: "gridCode",
type: "tree",
cell: true,
props: {
label: "gridName",
- value: "id",
+ value: "gridCode",
},
- dataType: 'string',
+ // dataType: 'string',
dicUrl:
"/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
rules: [
@@ -392,9 +392,6 @@
getPlaceExt({ placeId: newData['id'] }),
]).then(that.$axios.spread(function (baseInfo, restInfo) {
that.form = baseInfo.data.data
- console.log(that.form, 90999)
-
- // that.$nextTick(() => that.$refs.baseForm.dicInit('cascader'))
that.form.location = [that.form.lng, that.form.lat, that.form.location].join(',')
@@ -436,13 +433,7 @@
planImageUrls
}
}
-
- // that.$nextTick(() => {
- // that.$refs.baseForm.dicInit('select')
- // })
}))
-
- that.holdOnLoad(this.holdPage)
},
locationDispose (data) {
@@ -523,6 +514,7 @@
},
holdOnLoad (holdPage, params = {}) {
+
if (!this.curRow.id) return
let values = {
@@ -549,20 +541,27 @@
this.holdPage.pageSize = pageSize
},
- dataUpdate () {
- const that = this
-
- let imageUrls = this.form.imageUrls
-
- if (imageUrls.length > 0) {
+ desposeImage (data) {
+ if (data.length > 0) {
var urls = []
- var split = imageUrls.split(",").filter(item => item != '')
+ var split = data.split(",").filter(item => item != '')
split.forEach(url => {
var names = url.split("jczz/")
urls.push(names[1])
})
- imageUrls = urls.join(",")
+ data = urls.join(",")
}
+
+ return data
+ },
+
+ dataUpdate () {
+ const that = this
+
+ let imageUrls = this.desposeImage(this.form.imageUrls)
+ let placeImages = this.desposeImage(this.placeForm.imageUrls)
+ let placePlanImageUrls = this.desposeImage(this.placeForm.planImageUrls)
+
let label = this.form.label
@@ -582,14 +581,18 @@
label,
...this.locationDispose(this.form.location)
}),
- updatePlaceExt(this.placeForm)
+ updatePlaceExt({
+ ...this.placeForm,
+ imageUrls: placeImages,
+ planImageUrls: placePlanImageUrls
+ })
]).then(that.$axios.spread(function () {
that.$message({
type: "success",
message: "操作成功!",
})
- that.closeRowDetails()
+ that.roleBoxClose()
that.placeElement.onLoad(that.placeElement.page, that.placeElement.query)
--
Gitblit v1.9.3