From f8febf299e961a6f07f84d6dc96b67443aabee70 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Thu, 14 Nov 2024 18:06:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/process/requestReport.js          |  4 ++--
 src/views/process/requestReport/index.vue |  6 +++---
 src/views/process/workReport/index.vue    | 21 +++++++++++++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/api/process/requestReport.js b/src/api/process/requestReport.js
index fbbcb85..86a6ac5 100644
--- a/src/api/process/requestReport.js
+++ b/src/api/process/requestReport.js
@@ -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
diff --git a/src/views/process/requestReport/index.vue b/src/views/process/requestReport/index.vue
index d57f33a..bd8cd22 100644
--- a/src/views/process/requestReport/index.vue
+++ b/src/views/process/requestReport/index.vue
@@ -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' })
         })
     },
 
diff --git a/src/views/process/workReport/index.vue b/src/views/process/workReport/index.vue
index 92ea9d6..1a4cdc3 100644
--- a/src/views/process/workReport/index.vue
+++ b/src/views/process/workReport/index.vue
@@ -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)