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] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=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 {