Merge remote-tracking branch 'origin/master'

lin

2024-04-03 4c8352e5dfd520423424c689ecc35e96ca1988de

Merge remote-tracking branch 'origin/master'

 src/views/place/components/baseAllInfo.vue

@@ -78,6 +78,7 @@
              span: 12,
              label: "场所名称",
              prop: "placeName",
              labelWidth:120,
              rules: [{
                required: true,
                message: "请输入场所名称",
@@ -90,6 +91,7 @@
            {
              label: "负责人",
              prop: "principal",
              labelWidth:120,
              rules: [{
                required: false,
                message: "请输入负责人",
@@ -101,6 +103,7 @@
              width: 96,
              label: "手机号码",
              prop: "principalPhone",
              labelWidth:120,
              search: true,
              searchSpan: 4,
              slot: true,
@@ -114,6 +117,7 @@
              width: 120,
              overHidden: true,
              label: "身份证号",
              labelWidth:120,
              prop: "principalIdCard",
              search: true,
              searchSpan: 4,
@@ -129,6 +133,7 @@
              hide: true,
              parent: false,
              label: "所属社区",
              labelWidth:120,
              prop: "neiCode",
              search: false,
              type: "tree",
@@ -152,6 +157,7 @@
              label: "所属网格",
              prop: "gridCode",
              type: "tree",
              labelWidth:120,
              cell: true,
              props: {
                label: "gridName",
@@ -170,6 +176,7 @@
              span: 7,
              label: "场所标签",
              prop: "label",
              labelWidth:120,
              type: "select",
              dicUrl: "/api/blade-category/category/getCategory?level=2",
              cascader: ["smallLabel"],
@@ -205,6 +212,7 @@
              label: "标签颜色",
              prop: "color",
              type: "select",
              labelWidth:120,
              dicData: [{
                  label: "绿",
                  value: "green",
@@ -228,6 +236,7 @@
              span: 12,
              label: "九小场所",
              prop: "isNine",
              labelWidth:120,
              type: "select",
              dicData: [{
                  label: "是",
@@ -249,6 +258,7 @@
              span: 12,
              label: "九小分类",
              prop: "nineType",
              labelWidth:120,
              type: "select",
              display: false,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=nineType",
@@ -263,6 +273,7 @@
              span: 12,
              label: "阵地",
              prop: "isFront",
              labelWidth:120,
              type: "select",
              dicData: [{
                  label: "是",
@@ -285,6 +296,7 @@
              label: "阵地类型",
              prop: "frontType",
              type: "select",
              labelWidth:120,
              display: false,
              row: true,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=frontType",
@@ -296,10 +308,33 @@
              },
            },
            {
              span: 12,
              label: "三级消防单位",
              prop: "threeFireProtection",
              labelWidth:120,
              type: "select",
              dicData: [{
                  label: "是",
                  value: 1,
                },
                {
                  label: "否",
                  value: 2,
                }
              ],
              hide: true,
              rules: [{
                required: false,
                message: "请选择三级消防单位",
                trigger: "blur",
              }, ],
            },
            {
              label: "场所照片",
              prop: "imageUrls",
              width: 80,
              type: "upload",
              labelWidth:120,
              listType: "picture-card",
              dataType: "string",
              multiple: true,
@@ -309,7 +344,7 @@
                name: "name",
                url: "link",
              },
              span: 12,
              span: 24,
            },
            {
              width: 160,
@@ -319,7 +354,8 @@
              prop: "location",
              type: "map",
              dataType: "string",
              span: 12,
              labelWidth:120,
              span: 24,
              value: [117.96646, 28.431002, ""],
              cascader: ['houseCodeBinds'],
              rules: [{
@@ -332,6 +368,7 @@
              width: 160,
              overHidden: true,
              display: false,
              labelWidth:120,
              hide: true,
              label: "地址",
              prop: "addressName",
@@ -346,6 +383,7 @@
              prop: "houseCodeBinds",
              span: 24,
              type: 'tree',
              labelWidth:120,
              dataType: "object",
              remote: true,
              multiple: true,
@@ -359,7 +397,7 @@
              dicData: [],
              rules: [{
                required: false,
                message: "请选择地址",
                message: "请选择标准地址",
                trigger: "blur",
              }, ],
            },
@@ -367,6 +405,7 @@
              label: "备注",
              prop: "remark",
              type: 'textarea',
              labelWidth:120,
              hide: true,
              span: 24,
              rules: [{

 src/views/place/index.vue

@@ -18,17 +18,19 @@
            </template>

            <template slot-scope="{row, size}" slot="confirmFlag">
                <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
                }}</el-tag>
                <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{
            showConfirmFlag(row.confirmFlag).text
        }}</el-tag>
            </template>

            <template slot-scope="{row, size}" slot="source">
                <el-tag :size="size" :type="showSource(row.source).type">{{ showSource(row.source).text
                }}</el-tag>
                    }}</el-tag>
            </template>

            <template slot="menuLeft">
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.place_delete" @click="handleDelete">删 除
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.place_delete"
                    @click="handleDelete">删 除
                </el-button>
            </template>

@@ -82,7 +84,7 @@
import baseAllInfo from './components/baseAllInfo'

export default {
    data () {
    data() {

        //手机号格式校验
        let validatorPhone = function (rule, value, callback) {
@@ -407,6 +409,28 @@
                        },
                    },
                    {
                        span: 12,
                        label: "三级消防单位",
                        prop: "threeFireProtection",
                        labelWidth: 120,
                        type: "select",
                        dicData: [{
                            label: "是",
                            value: 1,
                        },
                        {
                            label: "否",
                            value: 2,
                        }
                        ],
                        hide: true,
                        rules: [{
                            required: false,
                            message: "请选择三级消防单位",
                            trigger: "blur",
                        },],
                    },
                    {
                        width: 110,
                        label: "场所照片",
                        prop: "imageUrls",
@@ -420,7 +444,7 @@
                            name: 'name',
                            url: "link",
                        },
                        span: 12,
                        span: 24,
                    },
                    {
                        width: 156,
@@ -431,7 +455,7 @@
                        type: 'map',
                        dataType: "string",
                        minWidth: 250,
                        span: 12,
                        span: 24,
                        value: [117.966460, 28.431002, ""],
                        rules: [
                            {
@@ -525,7 +549,7 @@
        }
    },

    provide () {
    provide() {
        return {
            placeElement: this,
        }
@@ -535,7 +559,7 @@

    watch: {
        'form.isNine': {
            handler (newData) {
            handler(newData) {
                if (newData) {
                    let nineTypeColumn = this.findObject(
                        this.option.column,
@@ -551,7 +575,7 @@
            },
        },
        'form.isFront': {
            handler (newData) {
            handler(newData) {
                if (newData) {
                    let frontTypeColumn = this.findObject(
                        this.option.column,
@@ -570,7 +594,7 @@

    computed: {
        ...mapGetters(["permission", "userInfo"]),
        permissionList () {
        permissionList() {
            return {
                addBtn: this.vaildData(this.permission.place_add, true),
                viewBtn: this.vaildData(this.permission.place_view, true),
@@ -578,7 +602,7 @@
                editBtn: this.vaildData(this.permission.place_edit, true),
            }
        },
        ids () {
        ids() {
            let ids = []
            this.selectionList.forEach((ele) => {
                ids.push(ele.id)
@@ -586,7 +610,7 @@
            return ids.join(",")
        },

        showConfirmFlag () {
        showConfirmFlag() {
            return (data) => {
                let tags = {
                    text: '',
@@ -618,7 +642,7 @@
            }
        },

        showSource () {
        showSource() {
            return (data) => {
                let tags = {
                    text: '',
@@ -641,7 +665,7 @@
            }
        },

        showLocation () {
        showLocation() {
            return (data) => {
                if (data != null && data.indexOf(',') != -1) {
                    data = data.split(',')
@@ -653,7 +677,7 @@
            }
        },

        decimalProcessing () {
        decimalProcessing() {
            return (data) => {
                if (data != null) {
                    return Number(data).toFixed(6)
@@ -663,7 +687,7 @@
            }
        },

        textDispose () {
        textDispose() {
            return (row, flag, type) => {
                if (row[flag] || row[type] == null) {
                    return row[type]
@@ -678,11 +702,11 @@
        }
    },
    methods: {
        showStringDispose (row, type) {
        showStringDispose(row, type) {
            row[type] = !row[type]
        },

        locationDispose (data) {
        locationDispose(data) {
            data = data.split(',')

            return {
@@ -692,16 +716,16 @@
            }
        },

        auditCur (row) {
        auditCur(row) {
            this.curAuditRow = row
            this.auditBasePopup = true
        },

        ManageTenants (item) {
        ManageTenants(item) {
            this.$refs.BaseAllInfo.initOpen(item)
        },

        rowSave (row, done, loading) {
        rowSave(row, done, loading) {
            if (row.imageUrls.length > 0) {
                var urls = []
                var split = row.imageUrls.split(",").filter(item => item != '')
@@ -740,7 +764,7 @@
            )
        },

        rowUpdate (row, index, done, loading) {
        rowUpdate(row, index, done, loading) {
            if (row.imageUrls.length > 0) {
                var urls = []
                var split = row.imageUrls.split(",").filter(item => item != '')
@@ -779,7 +803,7 @@
            )
        },

        rowDel (row) {
        rowDel(row) {
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
@@ -798,26 +822,26 @@
                })
        },

        searchReset () {
        searchReset() {
            this.query = {}
            this.onLoad(this.page)
        },
        searchChange (params, done) {
        searchChange(params, done) {
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
        },
        selectionChange (list) {
        selectionChange(list) {
            this.selectionList = list
        },
        selectionClear () {
        selectionClear() {
            this.selectionList = []
            this.$nextTick(() => {
                this.$refs.crud && this.$refs.crud.toggleSelection()
            })
        },
        handleDelete () {
        handleDelete() {
            if (this.selectionList.length === 0) {
                this.$message.warning("请选择至少一条数据")
                return
@@ -840,7 +864,7 @@
                })
        },

        beforeOpen (done, type) {
        beforeOpen(done, type) {
            if (["edit", "view"].includes(type)) {
                getPlace(this.form.id).then((res) => {
                    this.form = res.data.data
@@ -872,16 +896,16 @@
            }
        },

        currentChange (currentPage) {
        currentChange(currentPage) {
            this.page.currentPage = currentPage
        },
        sizeChange (pageSize) {
        sizeChange(pageSize) {
            this.page.pageSize = pageSize
        },
        refreshChange () {
        refreshChange() {
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
        onLoad(page, params = {}) {
            this.loading = true

            getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {