diff --git a/src/api/excel.js b/src/api/excel.js index 16c887a..c1fd003 100644 --- a/src/api/excel.js +++ b/src/api/excel.js @@ -208,6 +208,16 @@ const downloadKateOrdersExcel = (data) => { }) } +const downloadPickTaskRecordsExcel = (data) => { + return request({ + url: '/excel/downloadPickTaskRecordsExcel', + method: 'post', + responseType: 'blob', + data: data, + timeout: 600000 + }) +} + export { uploadExcelStock, uploadExcelGoods, @@ -230,5 +240,6 @@ export { uploadWorkFlow, uploadExcelWorkDate, downloadWorkFlowExcel, - downloadKateOrdersExcel + downloadKateOrdersExcel, + downloadPickTaskRecordsExcel } \ No newline at end of file diff --git a/src/layout/kateOrdersTable.vue b/src/layout/kateOrdersTable.vue index 22cc189..09624ed 100755 --- a/src/layout/kateOrdersTable.vue +++ b/src/layout/kateOrdersTable.vue @@ -402,7 +402,7 @@ export default { // let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); //如果后台返回的不是blob对象类型,先定义成blob对象格式,该type导出为xls格式, let blob = res.data //如果后台返回的直接是blob对象类型,直接获取数据 // let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名,如果后端有给返回文件名的话 - let _fileName = "工单报表" + dateFormatter(new Date) + ".xlsx" + let _fileName = "未做工单报表" + dateFormatter(this.planStartDateQuery) + ".xlsx" link.style.display = 'none'//隐藏 // 兼容不同浏览器的URL对象 diff --git a/src/layout/pickTaskMonitor.vue b/src/layout/pickTaskMonitor.vue index 117ce1f..601ae34 100644 --- a/src/layout/pickTaskMonitor.vue +++ b/src/layout/pickTaskMonitor.vue @@ -1,293 +1,356 @@ - - - - - - - + + + + + + - 搜索 - 重置 - - - - 搜索 + 重置 + + + + 导出拣选任务记录 + + + + + + - - - - - - - - - - - - - 编辑 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + 编辑 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取消 确定 - - - - + + + + \ No newline at end of file