diff --git a/src/views/process/restExam/index.vue b/src/views/process/restExam/index.vue index add784e..53ffc7a 100644 --- a/src/views/process/restExam/index.vue +++ b/src/views/process/restExam/index.vue @@ -130,7 +130,7 @@ - + + + @@ -153,7 +156,7 @@ - + @@ -166,7 +169,7 @@ - + @@ -208,7 +211,7 @@ - + { + this.deptOptions = this.handleTree(response.data, "id"); + }); + }, + /** 转换部门数据结构 */ + normalizer(node) { + if (node.children && !node.children.length) { + delete node.children; + } + return { + id: node.id, + label: node.orgName, + children: node.children + }; + }, + onSelect(selectedNode) { + this.form.orgName = selectedNode.orgName; + } + } }; diff --git a/src/views/report/attReport/index.vue b/src/views/report/attReport/index.vue index 6878866..125927b 100644 --- a/src/views/report/attReport/index.vue +++ b/src/views/report/attReport/index.vue @@ -6,9 +6,9 @@ @keyup.enter.native="handleQuery" /> - - + @@ -446,8 +446,9 @@ export default { pageNum: 1, pageSize: 10, userName: undefined, - orgId: undefined, - attStatus: undefined + orgIdList: undefined, + attStatus: undefined, + orgIds:undefined }, queryRecord: { pageNum: 1, @@ -544,6 +545,13 @@ export default { this.queryParams.startDate = undefined this.queryParams.endDate = undefined } + + if (this.queryParams.orgIdList && this.queryParams.orgIdList.length > 0) { + // 将数组中的每个元素转换为字符串(如果需要) + this.queryParams.orgIds = this.queryParams.orgIdList.map(id => id.toString()); + }else{ + this.queryParams.orgIds = undefined + } getDetailsList(this.queryParams).then(response => { this.typeList = response.rows this.total = response.total @@ -561,6 +569,9 @@ export default { this.dateRange = [] this.getWeekDates() this.resetForm('queryForm') + + this.queryParams.orgIdList =undefined + this.queryParams.orgIds = undefined this.handleQuery() }, // 多选框选中数据 @@ -798,6 +809,14 @@ export default { /** 导出按钮操作 */ handleExport() { this.queryParams.exportType = '考勤明细' + + if (this.queryParams.orgIdList && this.queryParams.orgIdList.length > 0) { + // 将数组中的每个元素转换为字符串(如果需要) + this.queryParams.orgIds = this.queryParams.orgIdList.map(id => id.toString()); + }else{ + this.queryParams.orgIds = undefined + } + exportAttRecord(this.queryParams).then(res => { this.downloadFile({ fileName: `考勤记录_${new Date().getTime()}.xlsx`, @@ -810,6 +829,15 @@ export default { /** 异常排名导出 */ abnormalRankingExport() { this.queryParams.exportType = '异常排名导出' + + if (this.queryParams.orgIdList && this.queryParams.orgIdList.length > 0) { + // 将数组中的每个元素转换为字符串(如果需要) + this.queryParams.orgIds = this.queryParams.orgIdList.map(id => id.toString()); + }else{ + this.queryParams.orgIds = undefined + } + + exportAbnormalRanking(this.queryParams).then(res => { this.downloadFile({ fileName: `异常排名_${new Date().getTime()}.xlsx`, diff --git a/src/views/report/dayReport/index.vue b/src/views/report/dayReport/index.vue index 5211830..c2f3cf1 100644 --- a/src/views/report/dayReport/index.vue +++ b/src/views/report/dayReport/index.vue @@ -127,6 +127,14 @@ + + + + + + + + + + + +