From eb50ca86fe34ada4e974d7c158af96f7b6fe8128 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 29 Mar 2025 23:39:55 +0800 Subject: [PATCH] =?UTF-8?q?YT-2292=E6=8B=86=E6=A0=87=E7=AD=BE=E7=9A=84?= =?UTF-8?q?=E6=89=93=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/hybrid/html/pointCG.html | 398 +++++++++++++ src/pages.json | 6 + src/pages/label/record/splitLabel.vue | 42 +- src/pages/pointSplitLabel/index.vue | 799 +++++++++++++++++++++----- 4 files changed, 1083 insertions(+), 162 deletions(-) create mode 100644 src/hybrid/html/pointCG.html diff --git a/src/hybrid/html/pointCG.html b/src/hybrid/html/pointCG.html new file mode 100644 index 00000000..92e5b717 --- /dev/null +++ b/src/hybrid/html/pointCG.html @@ -0,0 +1,398 @@ + + + + + + + + + + + + mainBody + + \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 21e3ca41..c2a5caf5 100644 --- a/src/pages.json +++ b/src/pages.json @@ -2850,6 +2850,12 @@ "navigationBarTitleText": "打印", "enablePullDownRefresh": false } + }, { + "path": "pages/pointSplitLabel/index", + "style": { + "navigationBarTitleText": "打印", + "enablePullDownRefresh": false + } }, { "path": "pages/pointProductReceipt/index", "style": { diff --git a/src/pages/label/record/splitLabel.vue b/src/pages/label/record/splitLabel.vue index 5503f4cc..b791cfbc 100644 --- a/src/pages/label/record/splitLabel.vue +++ b/src/pages/label/record/splitLabel.vue @@ -270,26 +270,26 @@ uni.hideLoading() if (res.data) { - let list = [] - res.data.forEach(item => { - list.push({ - itemCode: item.itemCode, // 物品代码 - itemName: item.itemName, // 物品名称 - packName: item.packName, // 包装名称 - packageCode: item.toPackingNumber, // 包装号 - batch: item.toBatch, //批次 - parentNumber: item.parentNumber, //父包装号 - itemType: item.itemType, //物料类型 - asnNumber: item.asnNumber, //ASN - supplierCode: item.supplierCode, // 供应商 - qty: item.qty, // 数量 - printTimes: getCurrDateTime(), // 打印时间 - productionLineCode: item.productionLineCode, //生产线 - barcodeString: item.barcodeString, // 标签信息 - barcodeBase64: '', - }) - }) - this.showCommitSuccessMessage("提交成功\n生成拆标签记录\n", list) + // let list = [] + // res.data.forEach(item => { + // list.push({ + // itemCode: item.itemCode, // 物品代码 + // itemName: item.itemName, // 物品名称 + // packName: item.packName, // 包装名称 + // packageCode: item.toPackingNumber, // 包装号 + // batch: item.toBatch, //批次 + // parentNumber: item.parentNumber, //父包装号 + // itemType: item.itemType, //物料类型 + // asnNumber: item.asnNumber, //ASN + // supplierCode: item.supplierCode, // 供应商 + // qty: item.qty, // 数量 + // printTimes: getCurrDateTime(), // 打印时间 + // productionLineCode: item.productionLineCode, //生产线 + // barcodeString: item.barcodeString, // 标签信息 + // barcodeBase64: '', + // }) + // }) + this.showCommitSuccessMessage("提交成功\n生成拆标签记录\n", res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") @@ -363,7 +363,7 @@ this.clearData(); if (pointData.length > 0) { uni.navigateTo({ - url: `/pages/point/index?points=${JSON.stringify(pointData)}` + url: `/pages/pointSplitLabel/index?points=${JSON.stringify(pointData)}` }); } }) diff --git a/src/pages/pointSplitLabel/index.vue b/src/pages/pointSplitLabel/index.vue index a6a45627..509f577f 100644 --- a/src/pages/pointSplitLabel/index.vue +++ b/src/pages/pointSplitLabel/index.vue @@ -1,73 +1,156 @@