Merge remote-tracking branch 'origin/main'

src/views/staff/oneStop/room/roomDetailedStatistics.vue

@@ -7,7 +7,7 @@
           <el-input v-model="queryParams.roomName" placeholder="请输入功能房名" clearable @keyup.enter.native="handleQuery" />
         </el-form-item> -->
         <el-form-item label="部门" prop="rtDepar">
-          <el-select v-model="queryParams.rtDepar" placeholder="请选择部门" filterable clearable @change="handleQuery">
+          <el-select v-model="queryParams.rtDepar" placeholder="请选择部门" filterable clearable multiple @change="handleQuery">
             <el-option v-for="item in departmentList" :key="item" :label="item" :value="item" />
           </el-select>
         </el-form-item>
@@ -83,7 +83,7 @@
           </div>
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportDepartmentUsageList">导出</el-button>
+              <el-button v-hasPermi="['staff:room:export']" type="warning" plain icon="el-icon-download" size="mini" @click="handleExportDepartmentUsageList">导出</el-button>
             </el-col>
             <right-toolbar :show-search.sync="showSearch" @queryTable="getUser" />
           </el-row>
@@ -235,6 +235,12 @@ export default {
           this.queryParams.endTime = this.queryParams.rtTimeRange[1]
         }
 
+        // 将多选的部门数组转换为逗号分隔的字符串
+        let rtDeparParam = this.queryParams.rtDepar;
+        if (Array.isArray(this.queryParams.rtDepar) && this.queryParams.rtDepar.length > 0) {
+          rtDeparParam = this.queryParams.rtDepar.join(',');
+        }
+
         // 获取各部门预约功能房统计数据
         const departmentRes = await getDepartmentReservationCount({
           startTime: this.queryParams.startTime,
@@ -242,7 +248,7 @@ export default {
           role: this.queryParams.rtRole,
           borrower: this.queryParams.rtCreatRole,
           auditStatus: this.queryParams.auditStatus,
-          rtDepar: this.queryParams.rtDepar,
+          rtDepar: rtDeparParam,  // 使用转换后的逗号分隔字符串
           eventPromoter: this.queryParams.eventPromoter,
           userName: this.queryParams.userName,
         })
@@ -254,7 +260,7 @@ export default {
           role: this.queryParams.rtRole,
           borrower: this.queryParams.rtCreatRole,
           auditStatus: this.queryParams.auditStatus,
-          rtDepar: this.queryParams.rtDepar,
+          rtDepar: rtDeparParam,  // 使用转换后的逗号分隔字符串
           eventPromoter: this.queryParams.eventPromoter,
           userName: this.queryParams.userName,
         })