Merge remote-tracking branch 'origin/master'

linwei

2024-01-10 ca788e3a4122fbeb46947be76ec21625306fa0a7

 src/views/grid/gridman.vue

@@ -32,13 +32,16 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 350,
                border: true,
                //stripe:true,
                index: true,
@@ -105,6 +108,7 @@
                    },

                    {
                        width: 120,
                        label: "联系电话",
                        prop: "mobile",
                        searchSpan: 4,
@@ -119,7 +123,6 @@
                    },

                    {
                        width: 156,
                        overHidden: true,
                        label: "所属社区",
                        addDisplay: false,
@@ -136,7 +139,6 @@
                    },

                    {
                        width: 110,
                        overHidden: true,
                        label: "所属网格",
                        addDisplay: false,
@@ -151,9 +153,9 @@
                    },

                    {
                        width: 110,
                        label: "形象照",
                        prop: "picUrl",
                        width: 80,
                        type: "upload",
                        listType: "picture-img",
                        action: "/api/blade-resource/oss/endpoint/put-file-attach",