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

zhongrj

2024-01-05 335642b3d8a4cdda3d43ea5a784087bdccdd2f73

 src/views/grid/gridman.vue

@@ -90,6 +90,7 @@
                    },

                    {
                        width: 110,
                        label: "网格员",
                        prop: "gridmanName",
                        searchSpan: 4,
@@ -118,10 +119,12 @@
                    },

                    {
                        width: 156,
                        overHidden: true,
                        label: "所属社区",
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        label: "所属社区",
                        prop: "communityName",
                        search: true,
                        searchSpan: 4,
@@ -133,10 +136,12 @@
                    },

                    {
                        width: 110,
                        overHidden: true,
                        label: "所属网格",
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        label: "所属网格",
                        prop: "gridName",
                        rules: [{
                            required: true,