diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index 9b3d98e1f..c80cef69b 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -182,6 +182,6 @@ export const jasperExportAll = async(params: any) => { } //WMS采购标签和协定品标签 -export const jasperExportWMS = async(params: any) => { - return await request.download({url: `/wms/package/jasperExportWMS`, params}) -} \ No newline at end of file +// export const jasperExportWMS = async(params: any) => { +// return await request.download({url: `/wms/package/jasperExportWMS`, params}) +// } \ No newline at end of file diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index 2b41ea9e4..ed1c57d42 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -440,22 +440,22 @@ const handleExport = async () => { const BASE_URL = getJmreportBaseUrl() const documentSrc = ref(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()) const handleDocumentPrint = async (row) => { - // if (row.itemType == 'TOOL') { - // documentSrc.value =BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()//采购标签协定品模板 - // } else { - // documentSrc.value = BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()//采购标签模板 - // } - // window.open(documentSrc.value + '&id=' + row.id) - let id - if (row.itemType == 'TOOL') { - //协定品标签 - id = row.id - doHandlePrintAllExport(id, 'xdp') - } else { - //采购标签 - id = row.id - doHandlePrintAllExport(id, 'cg') + if (row.itemType == 'TOOL') { + documentSrc.value =BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()//采购标签协定品模板 + } else { + documentSrc.value = BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()//采购标签模板 } + window.open(documentSrc.value + '&id=' + row.id) + // let id + // if (row.itemType == 'TOOL') { + // //协定品标签 + // id = row.id + // doHandlePrintAllExport(id, 'xdp') + // } else { + // //采购标签 + // id = row.id + // doHandlePrintAllExport(id, 'cg') + // } } /** 导出明细按钮操作 */