Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2024-01-23 60ee8093a60e2c556e304a4ec7903ca63f43c260

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

 src/views/base/region.vue

@@ -72,7 +72,7 @@
          nodeKey: 'id',
          lazy: true,
          treeLoad: function (node, resolve) {
            const parentCode = (node.level === 0) ? "361102" : node.data.id;
            const parentCode = (node.level === 0) ? "0" : node.data.id;
            getLazyTree(parentCode).then(res => {
              resolve(res.data.data.map(item => {
                return {

 src/views/community/index.vue

@@ -1,13 +1,11 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            <template slot="menuLeft">
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.community_delete"
                    @click="handleDelete">删 除
        <el-button size="small" icon="el-icon-delete" plain v-if="permission.community_delete" @click="handleDelete">删 除
                </el-button>
            </template>
        </avue-crud>
@@ -15,8 +13,16 @@
</template>

<script>
import { getList, remove, update, add, getCommunity } from "@/api/community/index"
import { mapGetters } from "vuex"
  import {
    getList,
    remove,
    update,
    add,
    getCommunity
  } from "@/api/community/index"
  import {
    mapGetters
  } from "vuex"
import website from '@/config/website'
export default {
    data () {
@@ -48,8 +54,7 @@
                viewBtn: true,
                selection: true,
                dialogClickModal: false,
                column: [
                    {
          column: [{
                        width: 156,
                        overHidden: true,
                        label: "社区名称",
@@ -57,13 +62,11 @@
                        searchSpan: 4,
                        search: true,
                        span: 12,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入社区名称",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },
                    {
                        width: 110,
@@ -73,13 +76,11 @@
                        searchSpan: 4,
                        search: true,
                        span: 12,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入社区编号",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },

                    {
@@ -105,13 +106,11 @@
                            label: "name",
                            value: "id"
                        },
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请选择所属街道",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },

                    {
@@ -119,18 +118,17 @@
                        label: "社区民警",
                        prop: "resPoliceUserId",
                        type: "tree",
              multiple: true,
                        dicUrl: "/api/blade-system/user/getUserListByParam?roleName=民警",
                        props: {
                            label: "name",
                            value: "id"
                        },
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请选择社区民警",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },
                    {
                        width: 110,
@@ -151,13 +149,11 @@
                        label: "地址",
                        prop: "address",
                        span: 24,
                        rules: [
                            {
              rules: [{
                                required: false,
                                message: "请输入地址",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },
                    {
                        label: "社区简介",
@@ -180,8 +176,7 @@
            data: [],
        }
    },
    watch: {
    },
    watch: {},
    computed: {
        ...mapGetters(["permission", "userInfo"]),
        permissionList () {

 src/views/property/propertyCompanyDistrict.vue

@@ -150,8 +150,8 @@
              prop: 'principal',
              span: 12,
              type: "tree",
              multiple: true,
              remote: true,
              // multiple: true,
              // remote: true,
              props: {
                label: 'name',
                value: 'id'
@@ -239,6 +239,24 @@
                trigger: "blur",
              }, ],
            },
            {
              label: '电子合同',
              type: 'upload',
              listType: 'picture-img',
              propsHttp: {
                res: 'data',
                url: 'link',
              },
              canvasOption: {
                text: ' ',
                ratio: 0.1
              },
              action: '/api/blade-resource/oss/endpoint/put-file',
              tip: '只能上传jpg/png图片，且不超过500kb',
              span: 12,
              row: true,
              prop: 'electronicContract'
            }
          ],
        },
        data: [],

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -6,12 +6,14 @@
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">

      <template slot-scope="{row, size}" slot="menu">
        <el-button type="text" :size="size" icon="el-icon-view"  v-if="permission.place_view"  plain @click="lookDetail(row, 0)">查 看
        <el-button type="text" :size="size" icon="el-icon-view" v-if="permission.place_view" plain
          @click="lookDetail(row, 0)">查 看
        </el-button>
        <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check && row.status == 1" plain
          @click="lookDetail(row, 1)">审 核
        <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check && row.status == 1"
          plain @click="lookDetail(row, 1)">审 核
        </el-button>
        <el-button type="text" :size="size" icon="el-icon-delete"  v-if="permission.place_del"   plain @click="rowDel(row)">删 除
        <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.place_del" plain
          @click="rowDel(row)">删 除
        </el-button>
      </template>

@@ -205,6 +207,9 @@
          }, {
            label: '未通过',
            value: 3
              }, {
                label: '待接收',
                value: 4
          }]
        },  {
          width: 100,
@@ -293,6 +298,11 @@
            type: 'danger',
            text: '未通过'
          }
          } else if (data == 4) {
            tags = {
              type: 'warning',
              text: '待接收'
            }
        }

        return tags

 src/views/system/dept.vue

@@ -140,7 +140,7 @@
            label: "管辖区域",
            prop: "regionCode",
            type: "tree",
            dicUrl: "/api/blade-system/region/tree?cityCode=361100000000",
            dicUrl: "/api/blade-system/region/tree?cityCode=361100",
            props: {
              label: "name",
              value: "id",

 src/views/userHouse/houseList.vue

@@ -7,23 +7,26 @@
                    @row-save="rowSave" :before-open="beforeOpen" :page.sync="page" @search-change="searchChange"
                    @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
                    @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
                    <!-- <template slot="menuLeft"> -->
                    <!-- <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.house_del"
                    <template slot="menuLeft">
                        <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.house_del"
                            @click="handleDelete">删 除
                        </el-button> -->
                        </el-button>
                    <!-- <el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin')"
                            icon="el-icon-upload2" @click="handleImport">导入
                        </el-button>
                        <el-button type="warning" size="small" plain v-if="userInfo.role_name.includes('admin')"
                            icon="el-icon-download" @click="handleExport">导出
                        </el-button> -->
                    <!-- <el-button type="success" size="small" plain v-if="permission.house_import"
                            icon="el-icon-upload2" @click="handleImport">导入
                        </el-button>
                        <el-button type="warning" size="small" plain v-if="permission.house_export"
                            icon="el-icon-download" @click="handleExport">导出
                        <!-- <el-button type="success" size="small" plain v-if="permission.house_import" icon="el-icon-upload2"
                            @click="handleImport">导入
                        </el-button> -->
                    <!-- </template> -->
                        <!-- <el-button type="warning" size="small" plain v-if="permission.house_export" icon="el-icon-download"
                            @click="handleExport">导出
                        </el-button> -->
                    </template>
                    <template slot-scope="{row}" slot="location">
                        <span v-text="showLocation(row.location)"></span>
                    </template>

                    <template slot-scope="{row, size}" slot="menu">
                        <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
@@ -133,7 +136,6 @@
} from "@/util/date"
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import func from "@/util/func"
import householdManager from "./components/householdManager"
import Qs from "qs"
export default {
@@ -237,12 +239,32 @@
                        overHidden: true,
                        label: '地址',
                        parent: false,
                        prop: "houseName",
                        prop: "address",
                        display: false,
                        searchLabelWidth: 66,
                        searchSpan: 4,
                        search: true,
                    },
                    {
                        overHidden: true,
                        slot: true,
                        label: "地址",
                        prop: "location",
                        type: 'map',
                        disabled: false,
                        dataType: "string",
                        searchLabelWidth: 66,
                        hide: true,
                        value: [117.966460, 28.431002, ""],
                        rules: [
                            {
                                required: true,
                                message: "请选择巡查地址",
                                trigger: "blur",
                            },
                        ],
                    },

                    {
                        hide: true,
                        parent: false,
@@ -487,7 +509,23 @@
            }
        }
    },
    watch: {},
    watch: {
        'form.source': {
            handler (newData) {

                let locationColumn = this.findObject(
                    this.option.column,
                    'location'
                )

                if (newData == 1) {
                    locationColumn.disabled = true
                } else {
                    locationColumn.disabled = false
                }
            },
        },
    },
    computed: {
        ...mapGetters(["userInfo", "permission"]),
        permissionList () {
@@ -512,6 +550,17 @@
                }
            }
        },
        showLocation () {
            return (data) => {
                if (data != null && data.indexOf(',') != -1) {
                    data = data.split(',')

                    return data[2]
                } else {
                    return data || ''
                }
            }
        },

        labelDispose () {
            return (list) => {
@@ -527,6 +576,15 @@
    },
    mounted () { },
    methods: {
        locationDispose (data) {
            data = data.split(',')

            return {
                lng: data[0],
                lat: data[1],
                address: data[2]
            }
        },

        onsubmit () {
            if (this.labelForm.color === '#EBEDF0') {
@@ -618,7 +676,8 @@
                row.imageUrls = urls.join(",")
            }

            add(row).then(() => {
            add({ ...row, ...this.locationDispose(row.location) }
            ).then(() => {
                this.initFlag = false
                this.onLoad(this.page)
                this.$message({
@@ -642,7 +701,7 @@
                row.imageUrls = urls.join(",")
            }

            update(row).then(() => {
            update({ ...row, ...this.locationDispose(row.location) }).then(() => {
                this.initFlag = false
                this.onLoad(this.page)
                this.$message({
@@ -752,6 +811,8 @@
                }).then(res => {
                    this.form = res.data.data

                    this.form.location = [this.form.lng, this.form.lat, this.form.address].join(',')

                    if (this.form.imageUrls) {
                        if (this.form.imageUrls.length > 0) {
                            var urls = []