Merge remote-tracking branch 'origin/master'

lin

2024-03-01 f37ea219d986a7c785a4132cd281ebccb0ff2903

 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"
@@ -251,6 +252,13 @@
                                value: 2,
                            }
                        ],
                        rules: [
                            {
                                required: true,
                                message: "请选择九小分类",
                                trigger: "blur",
                            },
                        ],
                        hide: true,
                    },
                    {
@@ -283,6 +291,13 @@
                            }
                        ],
                        hide: true,
                        rules: [
                            {
                                required: true,
                                message: "请选择阵地",
                                trigger: "blur",
                            },
                        ],
                    },
                    {
                        span: 12,
@@ -298,6 +313,7 @@
                            label: "dictValue",
                            value: "dictKey",
                        },
                        
                    },
                    {
                        label: "场所照片",
@@ -333,6 +349,32 @@
                            },
                        ],
                    },
                    // {
                    //     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",
@@ -341,7 +383,7 @@
                        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,6 +737,7 @@
        },

        desposeImage(data) {
            if (data) {
            if (data.length > 0) {
                var urls = []
                var split = data.split(",").filter((item) => item != "")
@@ -705,7 +747,7 @@
                })
                data = urls.join(",")
            }

            }
            return data
        },