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

zhongrj

2023-12-26 a5f44d67017cebb302e9014b7edb80fa15eb1995

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

 src/views/community/index.vue

@@ -80,13 +80,25 @@
                            },
                        ],
                    },

                    {
                        parent: false,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        width: 96,
                        label: "所属街道",
                        prop: "townName",
                        search: true,
                        searchSpan: 4
                    },

                    {
                        hide: true,
                        parent: false,
                        label: "所属街道",
                        prop: "streetCode",
                        search: true,
                        searchSpan: 4,
                        width: 150,
                        labelWidth: 120,
                        type: "tree",
                        dicUrl: "/api/blade-system/region/getTownTree",
                        props: {
@@ -101,6 +113,7 @@
                            },
                        ],
                    },

                    {
                        label: "社区民警",
                        prop: "resPoliceUserId",
@@ -163,7 +176,7 @@
                        minRows: 6,
                        span: 24,
                    },
                    

                ],
            },
            data: [],

 src/views/grid/index.vue

@@ -46,17 +46,33 @@
                dialogClickModal: false,
                column: [
                    {
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        width: 160,
                        label: "所属社区",
                        prop: "communityName",
                        search: true,
                        searchSpan: 4,
                        rules: [{
                            required: true,
                            message: "请选择所属社区",
                            trigger: "blur",
                        }],
                    },

                    {
                        hide: true,
                        parent: false,
                        label: "所属社区",
                        prop: "communityCode",
                        search: true,
                        searchSpan: 4,
                        search: false,
                        width: 150,
                        type: "tree",
                        dicUrl: "/api/blade-system/region/tree",
                        props: {
                            label: "name",
                            value: "id"
                            value: "id",
                        },
                        rules: [
                            {
@@ -66,6 +82,7 @@
                            },
                        ],
                    },

                    {
                        label: "网格名称",
                        prop: "gridName",

 src/views/userHouse/houseList.vue

@@ -226,11 +226,10 @@
                    },

                    {
                        hide: true,
                        parent: false,
                        label: "小区名称",
                        prop: "districtCode",
                        searchSpan: 4,
                        search: true,
                        type: 'tree',
                        dicUrl: `/api/blade-district/district/getDistrictTree`,
                        props: {
@@ -240,7 +239,6 @@
                        defaultExpandedKeys: ["361102003"],
                        span: 12,
                        width: 220,
                        hide:true,
                        overHidden: true,
                    },

@@ -249,7 +247,7 @@
                        label: "小区名称",
                        prop: "districtName",
                        searchSpan: 4,
                        display:false,
                        display: false,
                        search: true,
                        overHidden: true,
                    },