From c41602a2b56abc7afbdcd9a2df0fdb23772cf1c4 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 27 May 2024 17:39:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7--=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 10 + src/pages.json | 12 + src/pages/pointProductReceipt/index.vue | 287 ++++++++++++++++++ src/pages/pointProductReceipt/webview.vue | 29 ++ .../job/fgProductReceiptDetail.vue | 57 +++- 5 files changed, 394 insertions(+), 1 deletion(-) create mode 100644 src/pages/pointProductReceipt/index.vue create mode 100644 src/pages/pointProductReceipt/webview.vue diff --git a/src/api/request2.js b/src/api/request2.js index f9b6f0ad..dc98b2f4 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -3888,6 +3888,16 @@ export function getManagementPrecision(params) { }); } +// 装配收货详情--打印功能 +export function getPrintProductReceiptList(params) { + return request({ + url: baseApi + "/wms/barbasic/getBarbasicByPackingNumber", + method: "get", + data: params, + }); +} + + /** * 查询库存通过多种条件 高级筛选 diff --git a/src/pages.json b/src/pages.json index 245464b2..9900c2ab 100644 --- a/src/pages.json +++ b/src/pages.json @@ -2037,6 +2037,18 @@ "navigationBarTitleText": "打印", "enablePullDownRefresh": false } + },{ + "path": "pages/pointProductReceipt/index", + "style": { + "navigationBarTitleText": "打印", + "enablePullDownRefresh": false + } + },{ + "path": "pages/pointProductReceipt/webview", + "style": { + "navigationBarTitleText": "打印", + "enablePullDownRefresh": false + } }, { "path": "pages/print/index", diff --git a/src/pages/pointProductReceipt/index.vue b/src/pages/pointProductReceipt/index.vue new file mode 100644 index 00000000..28cb3a00 --- /dev/null +++ b/src/pages/pointProductReceipt/index.vue @@ -0,0 +1,287 @@ + + + + + \ No newline at end of file diff --git a/src/pages/pointProductReceipt/webview.vue b/src/pages/pointProductReceipt/webview.vue new file mode 100644 index 00000000..181d3a9d --- /dev/null +++ b/src/pages/pointProductReceipt/webview.vue @@ -0,0 +1,29 @@ + + + diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 9d93c945..28f4682a 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -109,6 +109,7 @@ import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" import jobTop from '@/mycomponents/job/jobTop.vue' import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue" + import storage from '@/common/utils/storage.js' export default { name: 'receipt_detail', @@ -337,6 +338,59 @@ callback() } }); + }, + //打印功能 + print() { + let packingNumber = [] + this.detailSource.forEach(item => { + item.subList.forEach(detail => { + if (detail.scaned) { + // var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, + // detail.packingNumber, detail.batch); + // detail.toPackingNumber = info.packingNumber; + packingNumber.push(detail.packingNumber) + } + }) + }) + // #ifdef APP + getPrintProductReceiptList({ + packingNumber: packingNumber.join(','), + type: 'MakeLabel' + }).then(res => { + console.log('打印', res) + let pointData = [] + res.data.forEach(item => { + pointData.push({ + barcodeString: item.barcodeString, //标签 + itemCode: item.itemCode || '', //物品代码 + itemName: item.itemName || '', //物品名称 + itemDesc1: item.itemDesc1 || '', //物品描述 + relateNumber: item.relateNumber || '', //relateNumber包装号 + batch: item.batch || '', //批次 + productionLineCode: item.productionLineCode || '', //生产线 + shiftCode: item.shiftCode || '', //班次 + qty: item.qty || '', //数量 + printTimes: item.printTimes || '' //打印时间 + }) + }) + console.log('pointData', pointData) + + uni.navigateTo({ + url: `/pages/pointProductReceipt/index?points=${JSON.stringify(pointData)}` + }); + + }).catch(error => { + this.showErrorMessage(error) + }) + // #endif + // #ifdef H5 + const webUrl = + `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712?token=${storage.getStorage(storage.constant.token)}&asn_number=PN0521-000012` + uni.navigateTo({ + url: `/pages/pointProductReceipt/webview?url=${webUrl}` + }); + // #endif + }, commit() { @@ -466,7 +520,8 @@ showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => { - navigateBack(1) + // navigateBack(1) + this.print() }) },