diff --git a/public/mix-manifest.json b/public/mix-manifest.json index bbeb3be1..774f9597 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { - "/js/lang-zh-CN.1d85218e91cf5373a2cc.js": "/js/lang-zh-CN.1d85218e91cf5373a2cc.js", - "/js/lang-es.95673cce1181da797103.js": "/js/lang-es.95673cce1181da797103.js", - "/js/lang-en.71b5c82148a8ff46b281.js": "/js/lang-en.71b5c82148a8ff46b281.js", + "/js/lang-zh-CN.c0da3973e52421a8cfe5.js": "/js/lang-zh-CN.c0da3973e52421a8cfe5.js", + "/js/lang-es.f4a1a5b4a30e92527b46.js": "/js/lang-es.f4a1a5b4a30e92527b46.js", + "/js/lang-en.0f790217417404ecc662.js": "/js/lang-en.0f790217417404ecc662.js", "/js/app.js": "/js/app.js", "/css/app.css": "/css/app.css" } \ No newline at end of file diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue index af44ac0c..31be6fa2 100644 --- a/resources/assets/js/pages/admin/booking/supplierReport.vue +++ b/resources/assets/js/pages/admin/booking/supplierReport.vue @@ -268,17 +268,11 @@ }, loading_btn: false, booking_details: { - id: null, - amount: null, - bia: null, - user_bankslip_path: null, + user_bankslip_path: null }, supplier_booking:{ }, active_bank_setting: { - x1_bank_id: null, - x2_bank_id: null, - beneficiary_id: null }, beneficiaryDetail:{ company_name: '奕继椿', @@ -326,11 +320,17 @@ methods: { downloadReport(){ let canvas = document.getElementById('myCanvas') - var dataString = canvas.toDataURL("image/png"); - var link = document.createElement("a"); - link.download = 'image'; - link.href = dataString; - link.click(); + + canvas.toBlob(function(blob) { + var link = document.createElement('a'); + // Add the element to the DOM + link.setAttribute("type", "hidden"); // make it hidden if needed + link.download = 'supplier-report.png'; + link.href = URL.createObjectURL(blob); + document.body.appendChild(link); + link.click(); + link.remove(); + }); }, goToSupplierBooking(){ this.$router.push({ @@ -373,7 +373,10 @@ }) }, getExtension(path){ - return path.slice(-3); + if(path == null){ + return + } + return path.slice(-3) }, isImage(path){ var ext = this.getExtension(path);