From f37ea219d986a7c785a4132cd281ebccb0ff2903 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 01 Mar 2024 11:51:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/place/components/baseAllInfo.vue | 80 ++++++++++++++++++++++++++++++---------
1 files changed, 61 insertions(+), 19 deletions(-)
diff --git a/src/views/place/components/baseAllInfo.vue b/src/views/place/components/baseAllInfo.vue
index 8531e72..bd76f0a 100644
--- a/src/views/place/components/baseAllInfo.vue
+++ b/src/views/place/components/baseAllInfo.vue
@@ -3,7 +3,8 @@
<div class="cur-container-box">
<div class="content-box">
<box-title class="m10" :classVal="9" :title="'基本信息'"></box-title>
- <avue-form v-if="baseShow" ref="baseForm" :option="option" v-model="form"></avue-form>
+ <avue-form v-if="baseShow" ref="baseForm" :option="option" v-model="form">
+ </avue-form>
<box-title class="m10" :classVal="9" :title="'其他信息'"></box-title>
<avue-form v-if="restShow" ref="restForm" :option="optionDetail" v-model="placeForm"></avue-form>
@@ -37,7 +38,7 @@
update,
updatePlaceExt,
} from "@/api/place/place"
-
+import { getPlaceList } from "@/api/doorplateAddress/doorplateAddress"
import website from "@/config/website"
import boxTitle from "./boxTitle"
@@ -82,7 +83,7 @@
],
},
-
+
{
label: "负责人",
@@ -251,6 +252,13 @@
value: 2,
}
],
+ rules: [
+ {
+ required: true,
+ message: "请选择九小分类",
+ trigger: "blur",
+ },
+ ],
hide: true,
},
{
@@ -258,7 +266,7 @@
label: "九小分类",
prop: "nineType",
type: "select",
- display:false,
+ display: false,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=nineType",
dataType: "number",
hide: true,
@@ -283,13 +291,20 @@
}
],
hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择阵地",
+ trigger: "blur",
+ },
+ ],
},
{
span: 12,
label: "阵地类型",
prop: "frontType",
type: "select",
- display:false,
+ display: false,
row: true,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=frontType",
dataType: "number",
@@ -298,6 +313,7 @@
label: "dictValue",
value: "dictKey",
},
+
},
{
label: "场所照片",
@@ -333,15 +349,41 @@
},
],
},
+ // {
+ // width: 160,
+ // overHidden: true,
+ // slot: true,
+ // label: "标准地址",
+ // prop: "houseCodeBinds",
+ // span: 24,
+ // type: 'select',
+ // dataType:"string",
+ // remote: true,
+ // multiple: true,
+ // hide: true,
+ // dicUrl: `/api/blade-doorplateAddress/doorplateAddress/getPlaceList?addressName={{key}}`,
+ // props: {
+ // label: 'addressName',
+ // value: 'addressCode',
+ // },
+ // dicData: [],
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择地址",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
{
label: "备注",
prop: "remark",
type: 'textarea',
- hide:true,
+ hide: true,
span: 24,
rules: [
{
- required: true,
+ required: false,
message: "请输入场所备注",
trigger: "blur",
},
@@ -503,7 +545,7 @@
}
}
},
- },
+ }
},
methods: {
initOpen(newData) {
@@ -517,7 +559,7 @@
const that = this
that.$axios
- .all([getPlace(newData["id"]), getPlaceExt({ placeId: newData["id"] })])
+ .all([getPlace(newData["id"]), getPlaceExt({ placeId: newData["id"] }), getPlaceList()])
.then(
that.$axios.spread(function (baseInfo, restInfo) {
that.form = baseInfo.data.data
@@ -554,7 +596,6 @@
}
that.baseShow = true
-
const data = restInfo.data.data
if (data) {
@@ -696,16 +737,17 @@
},
desposeImage(data) {
- if (data.length > 0) {
- var urls = []
- var split = data.split(",").filter((item) => item != "")
- split.forEach((url) => {
- var names = url.split("jczz/")
- urls.push(names[1])
- })
- data = urls.join(",")
+ if (data) {
+ if (data.length > 0) {
+ var urls = []
+ var split = data.split(",").filter((item) => item != "")
+ split.forEach((url) => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ data = urls.join(",")
+ }
}
-
return data
},
--
Gitblit v1.9.3