From 99611ea1fde099eef8bd18e4d610e98cfbab1f19 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Thu, 6 Mar 2025 16:24:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E8=A1=A8=E5=A4=9A=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/attReport/index.vue   |  4 +--
 src/views/report/monthReport/index.vue | 35 ++++++++++++++++----------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/views/report/attReport/index.vue b/src/views/report/attReport/index.vue
index 8dab63a..74e56f3 100644
--- a/src/views/report/attReport/index.vue
+++ b/src/views/report/attReport/index.vue
@@ -23,11 +23,9 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-right: 10px;"
-                   v-tooltip="{ content: '请谨慎操作', placement: 'top' }"
         >搜索
         </el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                   v-tooltip="{ content: '请谨慎操作', placement: 'top' }"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"       
         >重置
         </el-button>
         <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
diff --git a/src/views/report/monthReport/index.vue b/src/views/report/monthReport/index.vue
index 4aa95a9..f77d844 100644
--- a/src/views/report/monthReport/index.vue
+++ b/src/views/report/monthReport/index.vue
@@ -2,18 +2,12 @@
   <div class="app-container" id="monthReport">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="选择月份">
-        <!-- <el-date-picker
-          v-model="queryParams.month"
-          type="month" value-format="yyyy-MM"
-          placeholder="选择月">
-        </el-date-picker> -->
         <el-date-picker v-model="queryParams.month" type="monthrange" range-separator="至" start-placeholder="开始月份"
           end-placeholder="结束月份" value-format="yyyy-MM" :clearable="false" :editable="false">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="部门" prop="orgId">
-        <treeselect v-model="queryParams.orgId" :options="deptOptions" :normalizer="normalizer" @select="handleSelect"
-          placeholder="选择部门" style="width: 240px" />
+      <el-form-item label="部门" prop="orgIdList">
+        <treeselect v-model="queryParams.orgIdList" :options="deptOptions" :normalizer="normalizer" multiple placeholder="选择部门" style="width: 240px"/>
       </el-form-item>
       <el-form-item label="姓名" prop="userName">
         <el-input v-model="queryParams.userName" placeholder="请输入姓名" clearable style="width: 240px"
@@ -291,8 +285,8 @@
           </template>
         </el-table-column>
         <el-table-column label="节假日" align="center" prop="isHaveHoliday" width="180" :show-overflow-tooltip="true" />
-        <el-table-column label="所出勤开始时间" align="center" prop="attStartDate" sortable :show-overflow-tooltip="true" />
-        <el-table-column label="所出勤结束时间" align="center" prop="attEndDate" sortable :show-overflow-tooltip="true" />
+        <el-table-column label="应出勤开始时间" align="center" prop="attStartDate" sortable :show-overflow-tooltip="true" />
+        <el-table-column label="应出勤结束时间" align="center" prop="attEndDate" sortable :show-overflow-tooltip="true" />
       </el-table>
 
       <pagination v-show="totalTwoRequiredDays > 0" :total="totalTwoRequiredDays" :page.sync="queryRequiredDays.pageNum"
@@ -376,7 +370,7 @@ export default {
         pageSize: 10,
         month: undefined,
         userName: undefined,
-        orgId: undefined,
+        orgIdList: undefined,
         orgName: undefined,
       },
       deptOptions: [],
@@ -495,13 +489,20 @@ export default {
       query.startMonth = query.month[0];
       query.endMonth = query.month[1];
       delete query['month'];
+
+      if (query.orgIdList && query.orgIdList.length > 0) {
+        query.orgIds = query.orgIdList.map(id => id.toString());
+      } else {
+        query.orgIds = undefined;
+      }
+      delete query['orgIdList'];
+
       console.log(query)
       getMonthAttReport(query).then(response => {
         this.typeList = response.rows;
         this.total = response.total;
         this.loading = false;
-      }
-      );
+      });
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -589,6 +590,14 @@ export default {
       query.startMonth = query.month[0];
       query.endMonth = query.month[1];
       delete query['month'];
+
+      if (query.orgIdList && query.orgIdList.length > 0) {
+        query.orgIds = query.orgIdList.map(id => id.toString());
+      } else {
+        query.orgIds = undefined;
+      }
+      delete query['orgIdList'];
+
       console.log(query)
       exportMonthReport(query).then(res => {
         this.downloadFile({