Merge remote-tracking branch 'origin/master'

linwei

2024-01-10 ca788e3a4122fbeb46947be76ec21625306fa0a7

 src/views/cGovernance/punchCard.vue

@@ -28,6 +28,12 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 280,

                menu: false,
                addBtn: false,
                border: true,
@@ -37,15 +43,13 @@
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                //stripe:true,
                viewBtn: true,
                excelBtn: true,
                dialogClickModal: false,
                column: [
                    {
                        width: 96,
                        width: 110,
                        label: "打卡人员",
                        prop: "name",
                        search: true,
@@ -66,11 +70,12 @@
                        search: true,
                        rules: [{
                            required: true,
                            message: "请选择发布时间",
                            message: "请选择打卡时间",
                            trigger: "blur",
                        },],
                    },
                    {
                        width: 144,
                        label: "打卡时间",
                        prop: "createTime",
                        type: "date",
@@ -89,14 +94,17 @@
                        prop: "workContent",
                    },
                    {
                        width: 96,
                        label: "经度",
                        prop: "lng",
                    },
                    {
                        width: 96,
                        label: "纬度",
                        prop: "lat",
                    },
                    {
                        overHidden: true,
                        label: "打卡地址",
                        prop: "address",
                    },