From bee6cd1e7f022b260a7c9ca47764209478c16dc0 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 25 Jul 2025 10:56:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRecordMain/index.vue | 51 +++++++++++-------- .../supplierdeliverRequestMain/index.vue | 41 +++++++-------- 2 files changed, 49 insertions(+), 43 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue index 6809b42c6..a18c664b1 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue @@ -149,6 +149,7 @@ import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain' import { SupplierdeliverRequestMainRules } from '../supplierdeliverRequestMain/supplierdeliverRequestMain.data' +import { log } from 'console' const { loadStart, loadDone } = usePageLoading() // 供应商发货记录主 defineOptions({ name: 'SupplierdeliverRecordMain' }) @@ -236,8 +237,10 @@ const buttonTableClick = async (val, row) => { if (val == 'generateApplication') { handlerCreatePurchasereceiptRequest(row.number) } else if (val == 'documentPrint') { + console.log('ye',); + // 单据打印 - handleDocumentPrint(row.masterId) + handleDocumentPrint(row.masterId, row.supplierName, row.deliNo) } } @@ -262,72 +265,80 @@ const handlerCreatePurchasereceiptRequest = async (number: string) => { // 品番状态是号试显示生准订单的发货单模版 // const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken()) -const handleDocumentPrint = async (id) => { - console.log("wolaile "); +const handleDocumentPrint = async (id, supplierName, deliNo) => { + console.log('wolaile ') + console.log(supplierName) + console.log(deliNo) await SupplierdeliverRecordMainApi.getPoLineType(id).then(async (res) => { if (res.isM && res.haveNOM == false) { //号试（生准订单）模板 // window.open(documentSrc2.value + '&id=' + id + '&type=' + 'M') - supplierdeliverJasperExportPS(id,'M'); + supplierdeliverJasperExportPS(id, 'M', supplierName, deliNo) } if (res.isM && res.haveNOM && res.noMAndItemStatus == '生准订单') { //号试（生准订单）模板 // window.open(documentSrc2.value + '&id=' + id ) - supplierdeliverJasperExportPS(id,''); + supplierdeliverJasperExportPS(id, '', supplierName, deliNo) } if (res.isM && res.haveNOM && res.noMAndItemStatus != '生准订单') { //（生准订单）模板 M型物料 //window.open(documentSrc.value + '&id=' + id+ '&type=' + 'M') - supplierdeliverJasperExport(id,'M'); - //（补给品订单）模板 - //window.open(documentSrc.value + '&id=' + id+ '&type=' + 'noM') - supplierdeliverJasperExport(id,'noM'); + supplierdeliverJasperExport(id, 'M', supplierName, deliNo) + //（补给品订单）模板 + //window.open(documentSrc.value + '&id=' + id+ '&type=' + 'noM') + supplierdeliverJasperExport(id, 'noM', supplierName, deliNo) } if (res.isM == false) { await SupplierdeliverRecordMainApi.getItemStatus(id).then(async (res) => { if (res) { //号试（生准订单）模板 //window.open(documentSrc2.value + '&id=' + id) - supplierdeliverJasperExportPS(id,''); + supplierdeliverJasperExportPS(id, '', supplierName, deliNo) } else { //window.open(documentSrc.value + '&id=' + id) - supplierdeliverJasperExport(id,''); + supplierdeliverJasperExport(id, '', supplierName, deliNo) } }) } }) } -const supplierdeliverJasperExport = async (id, type) => { +const supplierdeliverJasperExport = async (id, type, supplierName, deliNo) => { + console.log('tututut ') + console.log(supplierName) + console.log(deliNo) try { // 发起导出导出明细 let params = { id: id, type: type, pageNo: 1, - pageSize: 99999999, - + pageSize: 99999999 } - const excelTitle = ref(route.meta.title) const data = await PackageApi.supplierdeliverJasperExport(params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.pdf`) + download.excel( + data, + `【${supplierName}】【${formatDate(new Date(), 'YYYY-MM-DD HH:MM:ss')}】【${deliNo}】.pdf` + ) } catch { } finally { } } -const supplierdeliverJasperExportPS = async (id, type) => { +const supplierdeliverJasperExportPS = async (id, type, supplierName, deliNo) => { try { // 发起导出导出明细 let params = { id: id, type: type, pageNo: 1, - pageSize: 99999999, + pageSize: 99999999 } - const excelTitle = ref(route.meta.title) const data = await PackageApi.supplierdeliverJasperExportPS(params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.pdf`) + download.excel( + data, + `【${supplierName}】【${formatDate(new Date(), 'YYYY-MM-DD HH:MM:ss')}】【${deliNo}】.pdf` + ) } catch { } finally { } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 681cc9eba..c0267052d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1383,43 +1383,35 @@ const print = async () => { window.open(src.value + '&number=' + detatableData.tableList[0].number) } -// 单据打印 -// const BASE_URL = getJmreportBaseUrl() -// 品番状态是“补给品”和其余状态 的发货单模版 -// const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken()) -// 品番状态是号试显示生准订单的发货单模版 -// const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken()) - const handleDocumentPrint = async (id) => { - console.log("wolaile "); await SupplierdeliverRecordMainApi.getPoLineType(id).then(async (res) => { if (res.isM && res.haveNOM == false) { //号试（生准订单）模板 // window.open(documentSrc2.value + '&id=' + id + '&type=' + 'M') - supplierdeliverJasperExportPS(id,'M'); + supplierdeliverJasperExportPS(id, 'M') } if (res.isM && res.haveNOM && res.noMAndItemStatus == '生准订单') { //号试（生准订单）模板 // window.open(documentSrc2.value + '&id=' + id ) - supplierdeliverJasperExportPS(id,''); + supplierdeliverJasperExportPS(id, '') } if (res.isM && res.haveNOM && res.noMAndItemStatus != '生准订单') { //（生准订单）模板 M型物料 //window.open(documentSrc.value + '&id=' + id+ '&type=' + 'M') - supplierdeliverJasperExport(id,'M'); - //（补给品订单）模板 - //window.open(documentSrc.value + '&id=' + id+ '&type=' + 'noM') - supplierdeliverJasperExport(id,'noM'); + supplierdeliverJasperExport(id, 'M') + //（补给品订单）模板 + //window.open(documentSrc.value + '&id=' + id+ '&type=' + 'noM') + supplierdeliverJasperExport(id, 'noM') } if (res.isM == false) { await SupplierdeliverRecordMainApi.getItemStatus(id).then(async (res) => { if (res) { //号试（生准订单）模板 //window.open(documentSrc2.value + '&id=' + id) - supplierdeliverJasperExportPS(id,''); + supplierdeliverJasperExportPS(id, '') } else { //window.open(documentSrc.value + '&id=' + id) - supplierdeliverJasperExport(id,''); + supplierdeliverJasperExport(id, '') } }) } @@ -1433,12 +1425,13 @@ const supplierdeliverJasperExport = async (id, type) => { id: id, type: type, pageNo: 1, - pageSize: 99999999, - + pageSize: 99999999 } - const excelTitle = ref(route.meta.title) const data = await PackageApi.supplierdeliverJasperExport(params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.pdf`) + download.excel( + data, + `【供应商发货记录】【${formatDate(new Date(), 'YYYY-MM-DD HH:MM:ss')}】.pdf` + ) } catch { } finally { } @@ -1451,11 +1444,13 @@ const supplierdeliverJasperExportPS = async (id, type) => { id: id, type: type, pageNo: 1, - pageSize: 99999999, + pageSize: 99999999 } - const excelTitle = ref(route.meta.title) const data = await PackageApi.supplierdeliverJasperExportPS(params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.pdf`) + download.excel( + data, + `【${supplierName.value}】【${formatDate(new Date())}】【${deliNo.value}】.pdf` + ) } catch { } finally { } From 38a74b084f504d1d192f730a468b112ec7caa4ff Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 25 Jul 2025 14:23:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRecordMain/index.vue | 29 +++++++++---------- .../supplierdeliverRequestMain/index.vue | 4 +-- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue index a18c664b1..ee0eb5903 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue @@ -240,7 +240,7 @@ const buttonTableClick = async (val, row) => { console.log('ye',); // 单据打印 - handleDocumentPrint(row.masterId, row.supplierName, row.deliNo) + handleDocumentPrint(row.masterId, row.supplierCode, row.deliNo) } } @@ -265,48 +265,45 @@ const handlerCreatePurchasereceiptRequest = async (number: string) => { // 品番状态是号试显示生准订单的发货单模版 // const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken()) -const handleDocumentPrint = async (id, supplierName, deliNo) => { +const handleDocumentPrint = async (id, supplierCode, deliNo) => { console.log('wolaile ') - console.log(supplierName) + console.log(supplierCode) console.log(deliNo) await SupplierdeliverRecordMainApi.getPoLineType(id).then(async (res) => { if (res.isM && res.haveNOM == false) { //号试（生准订单）模板 // window.open(documentSrc2.value + '&id=' + id + '&type=' + 'M') - supplierdeliverJasperExportPS(id, 'M', supplierName, deliNo) + supplierdeliverJasperExportPS(id, 'M', supplierCode, deliNo) } if (res.isM && res.haveNOM && res.noMAndItemStatus == '生准订单') { //号试（生准订单）模板 // window.open(documentSrc2.value + '&id=' + id ) - supplierdeliverJasperExportPS(id, '', supplierName, deliNo) + supplierdeliverJasperExportPS(id, '', supplierCode, deliNo) } if (res.isM && res.haveNOM && res.noMAndItemStatus != '生准订单') { //（生准订单）模板 M型物料 //window.open(documentSrc.value + '&id=' + id+ '&type=' + 'M') - supplierdeliverJasperExport(id, 'M', supplierName, deliNo) + supplierdeliverJasperExport(id, 'M', supplierCode, deliNo) //（补给品订单）模板 //window.open(documentSrc.value + '&id=' + id+ '&type=' + 'noM') - supplierdeliverJasperExport(id, 'noM', supplierName, deliNo) + supplierdeliverJasperExport(id, 'noM', supplierCode, deliNo) } if (res.isM == false) { await SupplierdeliverRecordMainApi.getItemStatus(id).then(async (res) => { if (res) { //号试（生准订单）模板 //window.open(documentSrc2.value + '&id=' + id) - supplierdeliverJasperExportPS(id, '', supplierName, deliNo) + supplierdeliverJasperExportPS(id, '', supplierCode, deliNo) } else { //window.open(documentSrc.value + '&id=' + id) - supplierdeliverJasperExport(id, '', supplierName, deliNo) + supplierdeliverJasperExport(id, '', supplierCode, deliNo) } }) } }) } -const supplierdeliverJasperExport = async (id, type, supplierName, deliNo) => { - console.log('tututut ') - console.log(supplierName) - console.log(deliNo) +const supplierdeliverJasperExport = async (id, type, supplierCode, deliNo) => { try { // 发起导出导出明细 let params = { @@ -318,14 +315,14 @@ const supplierdeliverJasperExport = async (id, type, supplierName, deliNo) => { const data = await PackageApi.supplierdeliverJasperExport(params) download.excel( data, - `【${supplierName}】【${formatDate(new Date(), 'YYYY-MM-DD HH:MM:ss')}】【${deliNo}】.pdf` + `【${supplierCode}】【${formatDate(new Date(), 'YYYY-MM-DD')}】【${deliNo}】.pdf` ) } catch { } finally { } } -const supplierdeliverJasperExportPS = async (id, type, supplierName, deliNo) => { +const supplierdeliverJasperExportPS = async (id, type, supplierCode, deliNo) => { try { // 发起导出导出明细 let params = { @@ -337,7 +334,7 @@ const supplierdeliverJasperExportPS = async (id, type, supplierName, deliNo) => const data = await PackageApi.supplierdeliverJasperExportPS(params) download.excel( data, - `【${supplierName}】【${formatDate(new Date(), 'YYYY-MM-DD HH:MM:ss')}】【${deliNo}】.pdf` + `【${supplierCode}】【${formatDate(new Date(), 'YYYY-MM-DD')}】【${deliNo}】.pdf` ) } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index c0267052d..4b1f16618 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1430,7 +1430,7 @@ const supplierdeliverJasperExport = async (id, type) => { const data = await PackageApi.supplierdeliverJasperExport(params) download.excel( data, - `【供应商发货记录】【${formatDate(new Date(), 'YYYY-MM-DD HH:MM:ss')}】.pdf` + `【供应商发货记录】【${formatDate(new Date(), 'YYYY-MM-DD')}】.pdf` ) } catch { } finally { @@ -1449,7 +1449,7 @@ const supplierdeliverJasperExportPS = async (id, type) => { const data = await PackageApi.supplierdeliverJasperExportPS(params) download.excel( data, - `【${supplierName.value}】【${formatDate(new Date())}】【${deliNo.value}】.pdf` + `【供应商发货记录】【${formatDate(new Date(), 'YYYY-MM-DD')}】.pdf` ) } catch { } finally { From e2c139563d4e37fafe4a2575764c6a30d6cca751 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 25 Jul 2025 16:22:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 4b1f16618..9d626b4de 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1383,42 +1383,43 @@ const print = async () => { window.open(src.value + '&number=' + detatableData.tableList[0].number) } -const handleDocumentPrint = async (id) => { +const handleDocumentPrint = async (result,id) => { await SupplierdeliverRecordMainApi.getPoLineType(id).then(async (res) => { if (res.isM && res.haveNOM == false) { //号试（生准订单）模板 // window.open(documentSrc2.value + '&id=' + id + '&type=' + 'M') - supplierdeliverJasperExportPS(id, 'M') + supplierdeliverJasperExportPS(id, 'M',result.supplierCode,result.deliNo) } if (res.isM && res.haveNOM && res.noMAndItemStatus == '生准订单') { //号试（生准订单）模板 // window.open(documentSrc2.value + '&id=' + id ) - supplierdeliverJasperExportPS(id, '') + supplierdeliverJasperExportPS(id, '',result.supplierCode,result.deliNo) } if (res.isM && res.haveNOM && res.noMAndItemStatus != '生准订单') { //（生准订单）模板 M型物料 //window.open(documentSrc.value + '&id=' + id+ '&type=' + 'M') - supplierdeliverJasperExport(id, 'M') + supplierdeliverJasperExport(id, 'M',result.supplierCode,result.deliNo) //（补给品订单）模板 //window.open(documentSrc.value + '&id=' + id+ '&type=' + 'noM') - supplierdeliverJasperExport(id, 'noM') + supplierdeliverJasperExport(id, 'noM',result.supplierCode,result.deliNo) } if (res.isM == false) { await SupplierdeliverRecordMainApi.getItemStatus(id).then(async (res) => { if (res) { //号试（生准订单）模板 //window.open(documentSrc2.value + '&id=' + id) - supplierdeliverJasperExportPS(id, '') + supplierdeliverJasperExportPS(id, '',result.supplierCode,result.deliNo) } else { //window.open(documentSrc.value + '&id=' + id) - supplierdeliverJasperExport(id, '') + supplierdeliverJasperExport(id, '',result.supplierCode,result.deliNo) } }) } }) } -const supplierdeliverJasperExport = async (id, type) => { +const supplierdeliverJasperExport = async (id, type,supplierCode,deliNo) => { + debugger; try { // 发起导出导出明细 let params = { @@ -1430,14 +1431,15 @@ const supplierdeliverJasperExport = async (id, type) => { const data = await PackageApi.supplierdeliverJasperExport(params) download.excel( data, - `【供应商发货记录】【${formatDate(new Date(), 'YYYY-MM-DD')}】.pdf` + `【${supplierCode}】【${formatDate(new Date(), 'YYYY-MM-DD')}】【${deliNo}】.pdf` ) } catch { } finally { } } -const supplierdeliverJasperExportPS = async (id, type) => { +const supplierdeliverJasperExportPS = async (id, type,supplierCode,deliNo) => { + debugger; try { // 发起导出导出明细 let params = { @@ -1449,7 +1451,7 @@ const supplierdeliverJasperExportPS = async (id, type) => { const data = await PackageApi.supplierdeliverJasperExportPS(params) download.excel( data, - `【供应商发货记录】【${formatDate(new Date(), 'YYYY-MM-DD')}】.pdf` + `【${supplierCode}】【${formatDate(new Date(), 'YYYY-MM-DD')}】【${deliNo}】.pdf` ) } catch { } finally { From 90c195345d93fb6ea2b5aa2a2132f97202097948 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 25 Jul 2025 17:24:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9PDF=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 9d626b4de..05f8b513d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1116,7 +1116,7 @@ const genRecords = async (id: number) => { getLoading?.close() // 单据打印 - await handleDocumentPrint(res,id) + await handleDocumentPrint(res) }) .catch((err) => { getLoading?.close() @@ -1383,43 +1383,42 @@ const print = async () => { window.open(src.value + '&number=' + detatableData.tableList[0].number) } -const handleDocumentPrint = async (result,id) => { +const handleDocumentPrint = async (id) => { await SupplierdeliverRecordMainApi.getPoLineType(id).then(async (res) => { if (res.isM && res.haveNOM == false) { //号试（生准订单）模板 // window.open(documentSrc2.value + '&id=' + id + '&type=' + 'M') - supplierdeliverJasperExportPS(id, 'M',result.supplierCode,result.deliNo) + supplierdeliverJasperExportPS(id, 'M') } if (res.isM && res.haveNOM && res.noMAndItemStatus == '生准订单') { //号试（生准订单）模板 // window.open(documentSrc2.value + '&id=' + id ) - supplierdeliverJasperExportPS(id, '',result.supplierCode,result.deliNo) + supplierdeliverJasperExportPS(id, '') } if (res.isM && res.haveNOM && res.noMAndItemStatus != '生准订单') { //（生准订单）模板 M型物料 //window.open(documentSrc.value + '&id=' + id+ '&type=' + 'M') - supplierdeliverJasperExport(id, 'M',result.supplierCode,result.deliNo) + supplierdeliverJasperExport(id, 'M') //（补给品订单）模板 //window.open(documentSrc.value + '&id=' + id+ '&type=' + 'noM') - supplierdeliverJasperExport(id, 'noM',result.supplierCode,result.deliNo) + supplierdeliverJasperExport(id, 'noM') } if (res.isM == false) { await SupplierdeliverRecordMainApi.getItemStatus(id).then(async (res) => { if (res) { //号试（生准订单）模板 //window.open(documentSrc2.value + '&id=' + id) - supplierdeliverJasperExportPS(id, '',result.supplierCode,result.deliNo) + supplierdeliverJasperExportPS(id, '') } else { //window.open(documentSrc.value + '&id=' + id) - supplierdeliverJasperExport(id, '',result.supplierCode,result.deliNo) + supplierdeliverJasperExport(id, '') } }) } }) } -const supplierdeliverJasperExport = async (id, type,supplierCode,deliNo) => { - debugger; +const supplierdeliverJasperExport = async (id, type) => { try { // 发起导出导出明细 let params = { @@ -1431,15 +1430,14 @@ const supplierdeliverJasperExport = async (id, type,supplierCode,deliNo) => { const data = await PackageApi.supplierdeliverJasperExport(params) download.excel( data, - `【${supplierCode}】【${formatDate(new Date(), 'YYYY-MM-DD')}】【${deliNo}】.pdf` + `【asd】【${formatDate(new Date(), 'YYYY-MM-DD')}】.pdf` ) } catch { } finally { } } -const supplierdeliverJasperExportPS = async (id, type,supplierCode,deliNo) => { - debugger; +const supplierdeliverJasperExportPS = async (id, type) => { try { // 发起导出导出明细 let params = { @@ -1451,7 +1449,7 @@ const supplierdeliverJasperExportPS = async (id, type,supplierCode,deliNo) => { const data = await PackageApi.supplierdeliverJasperExportPS(params) download.excel( data, - `【${supplierCode}】【${formatDate(new Date(), 'YYYY-MM-DD')}】【${deliNo}】.pdf` + `【asd】【${formatDate(new Date(), 'YYYY-MM-DD')}】.pdf` ) } catch { } finally { From b5682b457e3ffde2772c72d99e4afa6c3c48e98f Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Sun, 27 Jul 2025 22:31:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=AF=BC=E5=87=BA?= =?UTF-8?q?PDF=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 05f8b513d..e0d35b698 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1427,10 +1427,18 @@ const supplierdeliverJasperExport = async (id, type) => { pageNo: 1, pageSize: 99999999 } + let supplierCode='' ; + let deliNo ='' ; + await SupplierdeliverRecordMainApi.getSupplierdeliverRecordMain(id).then(async (res) => { + if (res) { + supplierCode = res.supplierCode; + deliNo = res.deliNo; + } + }) const data = await PackageApi.supplierdeliverJasperExport(params) download.excel( data, - `【asd】【${formatDate(new Date(), 'YYYY-MM-DD')}】.pdf` + `【${supplierCode}】【${formatDate(new Date(), 'YYYY-MM-DD')}】【${deliNo}】.pdf` ) } catch { } finally { @@ -1446,10 +1454,18 @@ const supplierdeliverJasperExportPS = async (id, type) => { pageNo: 1, pageSize: 99999999 } + let supplierCode='' ; + let deliNo ='' ; + await SupplierdeliverRecordMainApi.getSupplierdeliverRecordMain(id).then(async (res) => { + if (res) { + supplierCode = res.supplierCode; + deliNo = res.deliNo; + } + }) const data = await PackageApi.supplierdeliverJasperExportPS(params) download.excel( data, - `【asd】【${formatDate(new Date(), 'YYYY-MM-DD')}】.pdf` + `【${supplierCode}】【${formatDate(new Date(), 'YYYY-MM-DD')}】【${deliNo}】.pdf` ) } catch { } finally {