diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index c03ae478..0f561981 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -204,9 +204,13 @@ export default { this.uploadList.push({ name: res.fileName, url:res.url }); + console.log("==1111==>", this.uploadList); + if (this.uploadList.length === this.number) { this.fileList = this.fileList.concat(this.uploadList); + console.log("==2222==>", this.uploadList); + this.uploadList = []; this.number = 0; this.$emit("input", this.listToString(this.fileList)); diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue index 7de31d89..d2922c80 100644 --- a/src/components/XdTable/index.vue +++ b/src/components/XdTable/index.vue @@ -38,7 +38,17 @@
- + {}); }, + handleExport_new() { + var xlsxParam = { raw: true } + let wb = XLSX.utils.table_to_book(document.querySelector("#refTable"),xlsxParam); + let wbout = XLSX.write(wb, { + bookType: "xlsx", + bookSST: true, + type: "array" + }); + try { + FileSaver.saveAs( + new Blob([wbout], { type: "application/octet-stream" }), + '运单列表.xlsx' + ); + } + catch (e) { + if (typeof console !== "undefined") console.log(e, wbout); + } + return wbout; + }, /** 导出按钮操作 */ - handleExport() { + handleExport_old() { // this.download('emis/emisWaybill/export', { // ...this.queryParams // }, `emisWaybill_${new Date().getTime()}.xlsx`) diff --git a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue index 91d9ca9f..ffc8bc8c 100644 --- a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue +++ b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue @@ -176,13 +176,13 @@ - + - + - +