From e38af0656b37e7bfb4d5aae257760bb7370eda5f Mon Sep 17 00:00:00 2001 From: chenfang <1057876684@qq.com> Date: Sun, 27 Apr 2025 09:48:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92=E5=A4=96?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=94=B3=E8=AF=B7=E6=89=93=E5=8D=B0=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E7=A7=AF=E6=9C=A8=E4=BB=A3=E7=A0=81id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain/index.vue | 20 ++++++++++++++++++- .../unplannedreceiptRequestMain/index.vue | 2 +- .../purchasereturnRecordMain/index.vue | 2 +- .../purchasereturnRequestMain/index.vue | 2 +- .../purchasereturnRequestMainNew/index.vue | 10 +++++----- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 3fdc49e37..6535c7adc 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -357,6 +357,15 @@ const butttondata = (row,$index) => { color: '', hasPermi: '', link: true // 文本展现按钮 + },{ + label: '单据打印', + name: 'documentPrint', + // hide: isShowMainButton(row, ['3']), + type: 'primary', + icon: '', + color: '', + hasPermi: '', + link: true // 文本展现按钮 }, defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreturn-request-main:delete'}), // 删除 @@ -460,7 +469,16 @@ const buttonTableClick = async (val, row) => { } else if (val == 'point') { // 标签打印 handlePoint(row) - } + } else if (val == 'documentPrint') { + // 单据打印 + handleDocumentPrint(row.masterId) + } +} +//单据打印 +const BASE_URL2 = getJmreportBaseUrl() +const documentSrc = ref(BASE_URL2 + '/jmreport/view/1072439265659957248?token=' + getAccessToken()) +const handleDocumentPrint = async (masterId) => { + window.open(documentSrc.value + '&ids=' + masterId) } // 生成标签 const isCreateLabel = ref(false) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 3d3ab78c0..40525ce57 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -929,7 +929,7 @@ const tableFormSelectOnBlur = (field, val, row, index) => { // 标签打印 const BASE_URL = getJmreportBaseUrl() -const src = ref(BASE_URL + '/jmreport/view/936912164754612224?token=' + getAccessToken()) +const src = ref(BASE_URL + '/jmreport/view/1073106008723972096?token=' + getAccessToken()) const labelPrint = async (row) => { window.open(src.value + '&request_number=' + row.number) } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index 8dfa91796..a1cfdd47b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -149,7 +149,7 @@ const buttonTableClick = async (val, row) => { // 单据打印 const BASE_URL = getJmreportBaseUrl() -const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken()) +const documentSrc = ref(BASE_URL + '/jmreport/view/1069189940095995904?token=' + getAccessToken()) const handleDocumentPrint = async (requestNumber,itemCode) => { window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode + '&reqType=record') } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 02e56721a..c9e182be0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -621,7 +621,7 @@ const buttonTableClick = async (val, row) => { // 单据打印 const BASE_URL2 = getJmreportBaseUrl() -const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken()) +const documentSrc = ref(BASE_URL2 + '/jmreport/view/1070555613858615296?token=' + getAccessToken()) const handleDocumentPrint = async (number,itemCode) => { window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode + '&reqType=request') } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue index a5256d8e0..6360230ff 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue @@ -528,7 +528,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'documentPrint') { // 单据打印 - handleDocumentPrint(row.number,row.itemCode) + handleDocumentPrint(row.masterId) }else if (val == 'point') { // 标签打印 labelPrint(row) @@ -537,9 +537,9 @@ const buttonTableClick = async (val, row) => { // 单据打印 const BASE_URL2 = getJmreportBaseUrl() -const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken()) -const handleDocumentPrint = async (number,itemCode) => { - window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode + '&reqType=request') +const documentSrc = ref(BASE_URL2 + '/jmreport/view/1070555613858615296?token=' + getAccessToken()) +const handleDocumentPrint = async (masterId) => { + window.open(documentSrc.value + '&ids=' + masterId) } /** 添加/修改操作 */ @@ -1111,7 +1111,7 @@ const detailOpenForm = (type, row) => { } const BASE_URL = getJmreportBaseUrl() -const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) +const src = ref(BASE_URL + '/jmreport/view/1070555613858615296?token=' + getAccessToken()) // 标签打印 const showLabelRef = ref()