功能优化
This commit is contained in:
parent
9d3e61ec64
commit
f8febf299e
|
|
@ -80,9 +80,9 @@ export function delHoliday(HolidayId) {
|
|||
}
|
||||
|
||||
// 导出
|
||||
export function exportWorkReport(query) {
|
||||
export function exportRequestReport(query) {
|
||||
return request({
|
||||
url: '/system/workReport/export',
|
||||
url: '/system/requestReport/export',
|
||||
method: 'get',
|
||||
responseType: 'blob',
|
||||
params: query
|
||||
|
|
|
|||
|
|
@ -412,7 +412,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { listRequestReport,getHoliday,delHoliday,addHoliday,updateHoliday,changeHolidayStatus,exportHoliday,getPostName,getUserList } from "@/api/process/requestReport";
|
||||
import { listRequestReport,getHoliday,delHoliday,addHoliday,updateHoliday,changeHolidayStatus,exportRequestReport,getPostName,getUserList } from "@/api/process/requestReport";
|
||||
import Treeselect from "@riophae/vue-treeselect";
|
||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||
import {getLeaveReporting, updateLeaveReporting} from "@/api/process/leaveReporting";
|
||||
|
|
@ -815,8 +815,8 @@ export default {
|
|||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.queryParams.exportType="查询";
|
||||
exportHoliday(this.queryParams).then(res => {
|
||||
this.downloadFile({ fileName: `临时外出_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
|
||||
exportRequestReport(this.queryParams).then(res => {
|
||||
this.downloadFile({ fileName: `领导干部请示报备统计报表_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
|
||||
})
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -438,11 +438,32 @@ export default {
|
|||
};
|
||||
},
|
||||
created() {
|
||||
this.getMonthDates();
|
||||
this.getList();
|
||||
this.getPersonSelect();
|
||||
this.getUserLists();
|
||||
},
|
||||
methods: {
|
||||
getMonthDates() {
|
||||
const now = new Date();
|
||||
const year = now.getFullYear();
|
||||
const month = now.getMonth();
|
||||
|
||||
// 获取上个月的第一天
|
||||
const lastMonthFirstDay = new Date(year, month - 1, 1);
|
||||
// 获取上个月的最后一天
|
||||
const lastMonthLastDay = new Date(year, month, 0);
|
||||
|
||||
// 格式化日期为 YYYY-MM
|
||||
const formatDate = (date) => {
|
||||
const y = date.getFullYear();
|
||||
const m = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始,所以加1
|
||||
return `${y}-${m}`;
|
||||
};
|
||||
|
||||
this.dateRange[0] = formatDate(lastMonthFirstDay);
|
||||
this.dateRange[1] = formatDate(lastMonthLastDay);
|
||||
},
|
||||
handleDateChange() {
|
||||
if (this.form.leaveStartDate && this.form.leaveEndDate) {
|
||||
let daysNumber = this.daysBetween(this.form.leaveStartDate, this.form.leaveEndDate)
|
||||
|
|
|
|||
Loading…
Reference in New Issue