From 834bf0a12e9e6e2f0ad6bf7622c7cc45012319d0 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 15 Jun 2024 14:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../package/job/overPackageJobDetail.vue | 16 +++--
.../package/record/overPackageRecord.vue | 28 +++++++-
src/pages/point/index.vue | 69 ++++++++++++++-----
3 files changed, 87 insertions(+), 26 deletions(-)
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 324c66c1..2cb32dd4 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -332,15 +332,19 @@
let list = [];
res.data.forEach(item => {
list.push({
- itemNumber: item.itemCode, // 物品代码
+ itemCode:item.itemCode, // 物品代码
itemName: item.itemName, // 物品名称
- referenceOrderRow: item.poLine, // 订单行
- referenceOrderCode: item.poNumber, // 订单号
- supplierCode: item.supplierCode, // 供应商
+ packName: item.packName,// 包装名称
packageCode: item.number, // 包装号
- amount: item.qty, // 数量
+ batch:item.batch,//批次
+ parentNumber:item.parentNumber,//父包装号
+ itemType:item.itemType,//物料类型
+ asnNumber:item.asnNumber,//ASN
+ supplierCode: item.supplierCode, // 供应商
+ qty: item.qty, // 数量
+ printTimes:getCurrDateTime(), // 打印时间
barcodeString: item.barcodeString, // 标签信息
- barcodeBase64: ''
+ barcodeBase64: '',
})
})
this.showCommitSuccessMessage("提交成功
生成翻包记录
", list)
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 7bd7be06..42ce7591 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -342,7 +342,25 @@
overPackageRecordSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
- this.showCommitSuccessMessage("提交成功
生成翻包记录
" + res.data)
+ let list = [];
+ res.data.forEach(item => {
+ list.push({
+ itemCode:item.itemCode, // 物品代码
+ itemName: item.itemName, // 物品名称
+ packName: item.packName,// 包装名称
+ packageCode: item.toPackingNumber, // 包装号
+ batch:item.batch,//批次
+ parentNumber:item.parentNumber,//父包装号
+ itemType: item.itemType,//物料类型
+ asnNumber:item.asnNumber,//ASN
+ supplierCode: item.supplierCode, // 供应商
+ qty: item.qty, // 数量
+ printTimes:item.printTimes, // 打印时间
+ barcodeString: item.barcodeString, // 标签信息
+ barcodeBase64: '',
+ })
+ })
+ this.showCommitSuccessMessage("提交成功
生成翻包记录
" + list)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
@@ -414,12 +432,18 @@
this.fromLocationCode = code;
this.openScanPopup();
},
+
- showCommitSuccessMessage(hint) {
+ showCommitSuccessMessage(hint,pointData) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
this.detailSource = []
this.fromLocationCode = '';
this.dataContent = {}
+ if (pointData.length > 0) {
+ uni.navigateTo({
+ url: `/pages/point/index?points=${JSON.stringify(pointData)}`
+ });
+ }
})
},
diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue
index 2bea1449..62bbe201 100644
--- a/src/pages/point/index.vue
+++ b/src/pages/point/index.vue
@@ -5,36 +5,53 @@