shuishen
2024-01-17 3c8ce26ad8f5d894944c8d6eca630ee66a06f4d1
新增报错
2 files modified
90 ■■■■■ changed files
src/views/place/components/baseAllInfo.vue 76 ●●●●● patch | view | raw | blame | history
src/views/place/index.vue 14 ●●●● patch | view | raw | blame | history
src/views/place/components/baseAllInfo.vue
@@ -1,26 +1,34 @@
<template>
    <el-dialog class="place-info-box" title="场所维护" append-to-body :visible.sync="roleBox" center @close="roleBoxClose">
    <div class="cur-container-box">
        <div class="content-box">
            <box-title class="m10" :classVal="9" :title="'基本信息'"></box-title>
            <avue-form ref="baseForm" :option="option" v-model="form"></avue-form>
                <avue-form ref="baseForm" :option="option" v-model="form" :key="reload"></avue-form>
            <box-title class="m10" :classVal="9" :title="'其他信息'"></box-title>
            <avue-form ref="restForm" :option="optionDetail" v-model="placeForm"></avue-form>
            <box-title class="m10" :classVal="9" :title="'从业人员'"></box-title>
            <avue-crud :option="placeOption" :table-loading="loading" :data="placeExt" ref="crud" v-model="houseHoldForm"
                :permission="permissionList" @row-del="houseHoldRowDel" @row-update="houseHoldRowUpdate"
                @row-save="houseHoldRowSave" :page.sync="holdPage" @current-change="holdCurrentChange"
                @size-change="holdSizeChange" @refresh-change="refreshHoldChange" @on-load="holdOnLoad">
                <avue-crud :option="placeOption" :table-loading="loading" :data="placeExt" ref="crud"
                    v-model="houseHoldForm" :permission="permissionList" @row-del="houseHoldRowDel"
                    @row-update="houseHoldRowUpdate" @row-save="houseHoldRowSave" :page.sync="holdPage"
                    @current-change="holdCurrentChange" @size-change="holdSizeChange" @refresh-change="refreshHoldChange"
                    @on-load="holdOnLoad">
            </avue-crud>
        </div>
        <div class="footer-btn-box">
            <el-button size="small" type="primary" @click="dataUpdate">保 存</el-button>
            <el-button size="small" @click="closeRowDetails">关 闭</el-button>
                <el-button size="small" @click="roleBoxClose">关 闭</el-button>
        </div>
    </div>
    </el-dialog>
</template>
<script>
@@ -57,6 +65,9 @@
        }
        return {
            reload: Math.random(),
            roleBox: false,
            placeExt: [],
            form: {},
@@ -129,6 +140,7 @@
                        prop: "neiCode",
                        search: false,
                        type: "tree",
                        dataType: 'string',
                        dicUrl: "/api/blade-system/region/tree",
                        props: {
                            label: "name",
@@ -153,6 +165,7 @@
                            label: "gridName",
                            value: "id",
                        },
                        dataType: 'string',
                        dicUrl:
                            "/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
                        rules: [
@@ -169,7 +182,7 @@
                        span: 7,
                        label: "场所标签",
                        prop: "label",
                        type: "cascader",
                        type: "select",
                        dicUrl: "/api/blade-category/category/getCategory?level=2",
                        cascader: ["smallLabel"],
                        props: {
@@ -189,7 +202,7 @@
                        label: "",
                        labelWidth: 20,
                        prop: "smallLabel",
                        type: "cascader",
                        type: "select",
                        dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
                        props: {
                            label: "categoryName",
@@ -203,7 +216,7 @@
                        span: 12,
                        label: "标签颜色",
                        prop: "color",
                        type: "cascader",
                        type: "select",
                        dicData: [
                            {
                                label: '绿',
@@ -356,6 +369,7 @@
                total: 0,
            },
            houseHoldForm: {},
        }
    },
@@ -363,17 +377,27 @@
    inject: ["placeElement"],
    watch: {
        'placeElement.curRow': {
            handler (newData) {
    watch: {},
    methods: {
        initOpen (newData) {
            this.curRow = newData
            this.roleBox = true
                const that = this
                if (newData && 'id' in newData && newData['id'] != null && newData['id'] != '') {
                    that.$axios.all([
                        getPlace(newData['id']),
                        getPlaceExt({ placeId: newData['id'] }),
                    ]).then(that.$axios.spread(function (baseInfo, restInfo) {
                        that.form = baseInfo.data.data
                that.form = {
                    ...baseInfo.data.data,
                    neiCode: String(baseInfo.data.data.neiCode),
                    gridId: String(baseInfo.data.data.gridId),
                }
                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(',')
@@ -416,16 +440,14 @@
                            }
                        }
                // that.$nextTick(() => {
                //     that.$refs.baseForm.dicInit('select')
                // })
                    }))
                    that.holdOnLoad(this.holdPage)
                }
            },
            immediate: true
        }
    },
    methods: {
        locationDispose (data) {
            data = data.split(',')
@@ -481,7 +503,7 @@
        houseHoldRowSave (row, done, loading) {
            holdAdd({
                ...row,
                placeId: this.placeElement.curRow.id
                placeId: this.curRow.id
            }).then(
                () => {
                    this.holdOnLoad(this.holdPage)
@@ -504,11 +526,11 @@
        },
        holdOnLoad (holdPage, params = {}) {
            if (!this.placeElement.curRow.id) return
            if (!this.curRow.id) return
            let values = {
                ...params,
                placeId: this.placeElement.curRow.id
                placeId: this.curRow.id
            }
            getHoldList(holdPage.currentPage, holdPage.pageSize, values).then((res) => {
@@ -583,8 +605,14 @@
            })
        },
        closeRowDetails () {
            this.placeElement.roleBox = false
        roleBoxClose () {
            this.form = {}
            this.placeForm = {}
            this.$refs.baseForm && this.$refs.baseForm.resetForm()
            this.$refs.restForm && this.$refs.restForm.resetForm()
            this.roleBox = false
        }
    },
}
src/views/place/index.vue
@@ -48,9 +48,7 @@
            </template>
        </avue-crud>
        <el-dialog class="place-info-box" title="场所维护" append-to-body :visible.sync="roleBox" center @close="roleBoxClose">
            <baseAllInfo></baseAllInfo>
        </el-dialog>
        <baseAllInfo ref="BaseAllInfo"></baseAllInfo>
        <el-dialog class="place-info-box audit-info-box" title="审核" append-to-body :visible.sync="auditBasePopup"
            width="30%">
@@ -93,9 +91,6 @@
        }
        return {
            curRow: {},
            roleBox: false,
            form: {},
            query: {},
            loading: true,
@@ -548,13 +543,8 @@
            this.auditBasePopup = true
        },
        roleBoxClose () {
            this.curRow = {}
        },
        ManageTenants (item) {
            this.curRow = item
            this.roleBox = true
            this.$refs.BaseAllInfo.initOpen(item)
        },
        rowSave (row, done, loading) {