diff --git a/src/api/report/attReport.js b/src/api/report/attReport.js index d7f5a69..859bdb0 100644 --- a/src/api/report/attReport.js +++ b/src/api/report/attReport.js @@ -82,4 +82,14 @@ export function getAttCountList(query) { }) } +// 导出 +export function exportOutCountList(query) { + return request({ + url: '/system/export/exportAttWorkOut', + method: 'get', + responseType: 'blob', + params: query + }) +} + diff --git a/src/api/report/monthReport.js b/src/api/report/monthReport.js index 3664574..3d06086 100644 --- a/src/api/report/monthReport.js +++ b/src/api/report/monthReport.js @@ -9,7 +9,7 @@ export function getMonthAttReport(query) { params: query }) } - + // 导出 export function exportMonthReport(query) { return request({ @@ -18,4 +18,4 @@ export function exportMonthReport(query) { responseType: 'blob', params: query }) -} \ No newline at end of file +} diff --git a/src/views/report/attReport/index.vue b/src/views/report/attReport/index.vue index d81155e..70b6e2c 100644 --- a/src/views/report/attReport/index.vue +++ b/src/views/report/attReport/index.vue @@ -200,7 +200,7 @@ - + 导出 @@ -266,7 +266,16 @@ diff --git a/src/views/report/dayReport/index.vue b/src/views/report/dayReport/index.vue index 30b344c..3c93ddd 100644 --- a/src/views/report/dayReport/index.vue +++ b/src/views/report/dayReport/index.vue @@ -1,398 +1,486 @@ - - \ No newline at end of file + // 多选框选中数据 + handleSelectionChange(selection) { + this.ids = selection.map(item => item.dictId) + this.single = selection.length != 1 + this.multiple = !selection.length + }, + /** 导出按钮操作 */ + handleExport() { + exportDayReport(this.queryParams).then(res => { + this.downloadFile({ + fileName: `日报表记录_${new Date().getTime()}.xlsx`, + fileData: res, + fileType: 'application/vnd.ms-excel;charset=utf-8' + }) + }) + }, + + //打开工作时间外出次数 + openOutCountList(row){ + this.title = "工作时间外出次数"; + this.queryRecord.userId = row.userId; + this.queryRecord.attCurrentDay = row.attCurrentDay; + this.showOutCount = true; + this.getOutCountList(); + }, + + /** 查询工作时间外出次数列表 */ + getOutCountList() { + this.loadingTwo = true; + getOutCountList(this.queryRecord).then(response => { + this.tableDataOutCount = response.rows; + this.totalTwo = response.total; + this.loadingTwo = false; + }); + }, + + /** 导出按钮操作 */ + handleExportOutCountList() { + exportOutCountList(this.queryRecord).then(res => { + this.downloadFile({ + fileName: `工作时间外出次数记录_${new Date().getTime()}.xlsx`, + fileData: res, + fileType: 'application/vnd.ms-excel;charset=utf-8' + }) + }) + }, + + } +}; + diff --git a/src/views/report/monthReport/index.vue b/src/views/report/monthReport/index.vue index 6d27699..1a848d7 100644 --- a/src/views/report/monthReport/index.vue +++ b/src/views/report/monthReport/index.vue @@ -1,411 +1,505 @@