diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue index eb9af1da..fa570e32 100644 --- a/src/pages/deliver/job/deliverDetail.vue +++ b/src/pages/deliver/job/deliverDetail.vue @@ -201,7 +201,9 @@ const submit = () => { } const submitJob = () => { const params = setParams() - + if (params.subList.length == 0) { + comMessageRef.value.showSuccessMessage('请扫描箱码') + } deliverJobSubmit(params) .then((res) => { uni.hideLoading() diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue index e0bf3621..f27e916e 100644 --- a/src/pages/issue/request/issueScanRequest.vue +++ b/src/pages/issue/request/issueScanRequest.vue @@ -85,6 +85,7 @@ const getScanResult = (data) => { const setParams = () => { detailSource.value.dueTime = getCurrDateOneMonthsTimes() + detailSource.value.isCallMaterialsLabel = 'TRUE' return detailSource.value } const submit = () => { diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index dec0477b..c22cbb6a 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -285,7 +285,26 @@ const submitJob = () => { .then((res) => { uni.hideLoading() if (res.data) { - showCommitSuccessMessage(`提交成功
生成翻包记录
${res.data}`) + const list = [] + const item = res.data + // 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: '' + }) + // }) + showCommitSuccessMessage(`提交成功
生成翻包记录
${list}`) } else { showErrorMessage(`提交失败[${res.msg}]`) } @@ -358,12 +377,17 @@ const getFromLocationCode = (location, code) => { fromLocationCode.value = code openScanPopup() } -const showCommitSuccessMessage = (hint) => { +const showCommitSuccessMessage = (hint, pointData) => { comMessageRef.value.showSuccessMessage(hint, (res) => { if (res) { detailSource.value = [] fromLocationCode.value = '' dataContent.value = {} + 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 0dcf6b80..91f5f276 100644 --- a/src/pages/point/index.vue +++ b/src/pages/point/index.vue @@ -5,37 +5,53 @@ 物品代码 - {{ item.itemNumber }} + {{ item.itemCode }} 物品名称 {{ item.itemName }} - 供应商 - {{ item.supplierCode }} + 包装名称 + {{item.packName}} 包装号 {{ item.packageCode }} - 订单行 - {{ item.referenceOrderRow }} - + 父包装号 + {{item.parentNumber}} + + + ASN + {{item.asnNumber}} + + + 数量 + {{item.qty}} + - 订单号 - {{ item.referenceOrderCode }} - - - 数量 - {{ item.amount }} - + 批次 + {{item.batch}} + + + 物料类型 + {{item.itemType}} + + + 供应商 + {{item.supplierCode}} + + + 打印时间 + {{item.printTimes}} + @@ -102,23 +118,31 @@
物品代码
-
${item.itemNumber}
+
${item.itemCode}
物品名称
${item.itemName}
-
供应商
-
${item.supplierCode}
+
包装名称
+
${item.packName}
包装号
${item.packageCode}
-
订单行
-
${item.referenceOrderRow}
+
父包装号
+
${item.parentNumber}
+
+
+
ASN
+
${item.asnNumber}
+
+
+
数量
+
${item.qty}
@@ -126,12 +150,20 @@
-
订单号
-
${item.referenceOrderRow}
+
批次
+
${item.batch}
-
数量
-
${item.amount}
+
物料类型
+
${item.itemType}
+
+
+
供应商
+
${item.supplierCode}
+
+
+
打印时间
+
${item.printTimes}
`