From eb70652ccab4e44c0608e1dc347c8c2a07dec2e3 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 24 Dec 2018 14:47:40 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=A4=87=E6=96=99=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/vendor/exportExcel.js | 13 ++++----- .../CreatePreparationBill/exportExcel.js | 20 ++++++++++++++ .../CreatePreparationBill/index.vue | 27 ++++++++++++------- 3 files changed, 45 insertions(+), 15 deletions(-) create mode 100644 src/views/ManufacturingCenter/CreatePreparationBill/exportExcel.js diff --git a/src/vendor/exportExcel.js b/src/vendor/exportExcel.js index 43ec8c71..ee3824a6 100644 --- a/src/vendor/exportExcel.js +++ b/src/vendor/exportExcel.js @@ -12,12 +12,6 @@ export function getExplorer() { return 'Safari' } } -export function method5(tableid) { - tableToExcel(tableid) -} -export function Cleanup() { - window.clearInterval(idTmr) -} const tableToExcel = (function() { const uri = 'data:application/vnd.ms-excel;base64,' const template = `{worksheet}{table}
` @@ -37,3 +31,10 @@ const tableToExcel = (function() { } })() +export function method5(tableid) { + tableToExcel(tableid) +} +export function Cleanup() { + window.clearInterval(idTmr) +} + diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/exportExcel.js b/src/views/ManufacturingCenter/CreatePreparationBill/exportExcel.js new file mode 100644 index 00000000..22925cee --- /dev/null +++ b/src/views/ManufacturingCenter/CreatePreparationBill/exportExcel.js @@ -0,0 +1,20 @@ +// 导出Excel方法（表格id，不加扩展名的文件名，sheet名） +export function exportExcelMethod(tableId, fileName, sheetName) { + tableToExcel(tableId, fileName, sheetName) + return 1 +} +const tableToExcel = (function() { + const uri = 'data:application/vnd.ms-excel;base64,' + // 设置导出表格的单元格默认高度/宽度/边框样式/字体颜色/背景颜色/居中，网页显示表格宽度建议1240，tr/td视情况而定 + const template = `{worksheet}{table}
` + const base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) } + const format = function(s, c) { return s.replace(/{(\w+)}/g, function(m, p) { return c[p] }) } + return function(table, filename, sheetname) { + if (!table.nodeType) table = document.getElementById(table) + const ctx = { worksheet: sheetname || 'Worksheet', table: table.innerHTML } + const aTag = document.createElement('a') + aTag.href = uri + base64(format(template, ctx)) + aTag.download = filename + aTag.click() + } +})() diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 03466263..dae8ca1b 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -6,7 +6,8 @@ 查询 查询全部 - 导出备料单 + 导出备料单 + 导出完成 @@ -78,10 +79,11 @@ - - diff --git a/src/views/PurchasingCenter/ContractChange/index.vue b/src/views/PurchasingCenter/ContractChange/index.vue deleted file mode 100644 index 5a587a48..00000000 --- a/src/views/PurchasingCenter/ContractChange/index.vue +++ /dev/null @@ -1,647 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/ContractStateSearch/index.vue b/src/views/PurchasingCenter/ContractStateSearch/index.vue deleted file mode 100644 index 4467c13e..00000000 --- a/src/views/PurchasingCenter/ContractStateSearch/index.vue +++ /dev/null @@ -1,221 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/CreateContract/index.vue b/src/views/PurchasingCenter/CreateContract/index.vue deleted file mode 100644 index 788a34fd..00000000 --- a/src/views/PurchasingCenter/CreateContract/index.vue +++ /dev/null @@ -1,597 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue deleted file mode 100644 index 4309e6b5..00000000 --- a/src/views/PurchasingCenter/FundApproval1/index.vue +++ /dev/null @@ -1,304 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/InvoiceStateSearch/index.vue b/src/views/PurchasingCenter/InvoiceStateSearch/index.vue deleted file mode 100644 index c997aafd..00000000 --- a/src/views/PurchasingCenter/InvoiceStateSearch/index.vue +++ /dev/null @@ -1,224 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue b/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue deleted file mode 100644 index ef1d60c1..00000000 --- a/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue +++ /dev/null @@ -1,397 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/ReceiptConnectionSheet/index.vue b/src/views/PurchasingCenter/ReceiptConnectionSheet/index.vue deleted file mode 100644 index cc08073c..00000000 --- a/src/views/PurchasingCenter/ReceiptConnectionSheet/index.vue +++ /dev/null @@ -1,429 +0,0 @@ - - - - - From 1bd68e5c1e2cb0cb225cb5837152be927fa55093 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Mon, 24 Dec 2018 15:16:46 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=90=88=E5=90=8C=E9=99=84=E5=9B=BE?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/PurchaseContractSearch/index.vue | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue index 6323b3a5..87ba806b 100644 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue @@ -160,7 +160,6 @@