diff --git a/src/manifest.json b/src/manifest.json index 8853c26c..6a45e3e6 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,8 +3,8 @@ "package" : "uni.UNI43932FE", "appid" : "__UNI__C9CF4BF", "description" : "", - "versionName" : "1.0.51", - "versionCode" : 51, + "versionName" : "1.0.52", + "versionCode" : 52, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/pages/customerReturn/record/returnRecord.vue b/src/pages/customerReturn/record/returnRecord.vue index 314fc6ad..d6502676 100644 --- a/src/pages/customerReturn/record/returnRecord.vue +++ b/src/pages/customerReturn/record/returnRecord.vue @@ -168,7 +168,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/customerReturn/request/customerReturnRequestCreate.vue b/src/pages/customerReturn/request/customerReturnRequestCreate.vue index f36714ce..aa6e07d9 100644 --- a/src/pages/customerReturn/request/customerReturnRequestCreate.vue +++ b/src/pages/customerReturn/request/customerReturnRequestCreate.vue @@ -193,7 +193,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/deliver/record/deliverRecord.vue b/src/pages/deliver/record/deliverRecord.vue index 82e7469a..048328c0 100644 --- a/src/pages/deliver/record/deliverRecord.vue +++ b/src/pages/deliver/record/deliverRecord.vue @@ -192,7 +192,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/inventoryMove/coms/comMove.vue b/src/pages/inventoryMove/coms/comMove.vue index ce96aa53..4fa3b88e 100644 --- a/src/pages/inventoryMove/coms/comMove.vue +++ b/src/pages/inventoryMove/coms/comMove.vue @@ -228,7 +228,7 @@ newDetail.toInventoryStatus = this.toInventoryStatus item.subList.push(newDetail); } else { - this.showErrorMessage(balance.packingNumber + "已经在列表中") + this.showErrorMessage(balance.packingNumber + "重复扫描") } } calcHandleQty(this.detailSource); diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 871807fc..0ed15f92 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -282,7 +282,7 @@ newDetail.fromLocationCode = result.fromLocationCode item.subList.push(newDetail); } else { - this.showErrorMessage(balance.packingNumber + "已经在列表中") + this.showErrorMessage(balance.packingNumber + "重复扫描") } } calcHandleQty(this.detailSource); diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue index 457a6208..2a784cbe 100644 --- a/src/pages/issue/record/directIssue.vue +++ b/src/pages/issue/record/directIssue.vue @@ -248,7 +248,7 @@ this.scanPopupGetFocus() } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/issue/record/directIssue1.vue b/src/pages/issue/record/directIssue1.vue index 89085406..73826aaa 100644 --- a/src/pages/issue/record/directIssue1.vue +++ b/src/pages/issue/record/directIssue1.vue @@ -206,7 +206,7 @@ var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch == balance.batch); if (itemDetail != undefined) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } // calcTreeHandleQty(this.detailSource); diff --git a/src/pages/issue/record/directIssue2.vue b/src/pages/issue/record/directIssue2.vue index 300ec2af..f66a01c0 100644 --- a/src/pages/issue/record/directIssue2.vue +++ b/src/pages/issue/record/directIssue2.vue @@ -353,8 +353,7 @@ calcHandleQty(this.detailSource); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + detail.packingNumber + "]批次[" + balance.batch + "]已经在列表中") - } + this.showErrorMessage("箱码[" + detail.packingNumber + "]批次[" + balance.batch + "]重复扫描 } } } }, @@ -401,7 +400,7 @@ calcHandleQty(this.detailSource); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/issue/record/issueRecord.vue b/src/pages/issue/record/issueRecord.vue index ae2171e6..5e195cdf 100644 --- a/src/pages/issue/record/issueRecord.vue +++ b/src/pages/issue/record/issueRecord.vue @@ -304,7 +304,7 @@ calcHandleQty(this.detailSource); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + detail.packingNumber + "]批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + detail.packingNumber + "]批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/package/record/mergePackageRecord.vue b/src/pages/package/record/mergePackageRecord.vue index 7fa7a928..0740bce5 100644 --- a/src/pages/package/record/mergePackageRecord.vue +++ b/src/pages/package/record/mergePackageRecord.vue @@ -168,7 +168,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index c87a4912..e648e73e 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -309,7 +309,7 @@ this.scanPopupGetFocus() } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/package/record/splitPackageRecord.vue b/src/pages/package/record/splitPackageRecord.vue index 183a8bd3..bd4faefb 100644 --- a/src/pages/package/record/splitPackageRecord.vue +++ b/src/pages/package/record/splitPackageRecord.vue @@ -219,7 +219,7 @@ this.closeScanPopup() } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index a90c28c2..bb40a81b 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -182,7 +182,7 @@ } else { if (detail.scaned == true) { this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + - "]已经在列表中") + "]重复扫描") } } } diff --git a/src/pages/productPutaway/request/putawayRequestCreate.vue b/src/pages/productPutaway/request/putawayRequestCreate.vue index c486e6c6..489ae021 100644 --- a/src/pages/productPutaway/request/putawayRequestCreate.vue +++ b/src/pages/productPutaway/request/putawayRequestCreate.vue @@ -206,7 +206,7 @@ // }); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/productReceipt/record/productReceiptRecord.vue b/src/pages/productReceipt/record/productReceiptRecord.vue index c17dada1..d12eabf4 100644 --- a/src/pages/productReceipt/record/productReceiptRecord.vue +++ b/src/pages/productReceipt/record/productReceiptRecord.vue @@ -170,7 +170,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]重复扫描") } } } diff --git a/src/pages/productRecycle/record/productRecycleRecord.vue b/src/pages/productRecycle/record/productRecycleRecord.vue index 9f6002c7..767dcaba 100644 --- a/src/pages/productRecycle/record/productRecycleRecord.vue +++ b/src/pages/productRecycle/record/productRecycleRecord.vue @@ -204,7 +204,7 @@ let newDetail = createDetailInfo(balance, pack); item.subList.push(newDetail); } else { - this.showErrorMessage('箱码[' + balance.packingNumber + "]已经在列表中") + this.showErrorMessage('箱码[' + balance.packingNumber + "]重复扫描") } } calcHandleQty(this.detailSource); diff --git a/src/pages/productionReceipt/record/productionReceiptRecord.vue b/src/pages/productionReceipt/record/productionReceiptRecord.vue index fdc5bac0..93a6d418 100644 --- a/src/pages/productionReceipt/record/productionReceiptRecord.vue +++ b/src/pages/productionReceipt/record/productionReceiptRecord.vue @@ -155,7 +155,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/productionReturn/coms/comReturn.vue b/src/pages/productionReturn/coms/comReturn.vue index 0cb0a2cb..4f39b93d 100644 --- a/src/pages/productionReturn/coms/comReturn.vue +++ b/src/pages/productionReturn/coms/comReturn.vue @@ -199,7 +199,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]重复扫描") } } } diff --git a/src/pages/productionReturn/record/returnToHold.vue b/src/pages/productionReturn/record/returnToHold.vue index fcede127..45648cbc 100644 --- a/src/pages/productionReturn/record/returnToHold.vue +++ b/src/pages/productionReturn/record/returnToHold.vue @@ -237,7 +237,7 @@ } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]重复扫描") } } } diff --git a/src/pages/productionReturn/record/returnToStore.vue b/src/pages/productionReturn/record/returnToStore.vue index 6ad0edba..1de0719e 100644 --- a/src/pages/productionReturn/record/returnToStore.vue +++ b/src/pages/productionReturn/record/returnToStore.vue @@ -250,7 +250,7 @@ } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]重复扫描") } } } diff --git a/src/pages/purchaseReturn/record/returnRecord.vue b/src/pages/purchaseReturn/record/returnRecord.vue index 7d040014..fea85dee 100644 --- a/src/pages/purchaseReturn/record/returnRecord.vue +++ b/src/pages/purchaseReturn/record/returnRecord.vue @@ -207,7 +207,7 @@ let newDetail = createDetailInfo(balance, pack); item.subList.push(newDetail); } else { - this.showErrorMessage('箱码[' + balance.packingNumber + "]已经在列表中") + this.showErrorMessage('箱码[' + balance.packingNumber + "]重复扫描") } } calcHandleQty(this.detailSource); diff --git a/src/pages/purchaseReturn/request/returnRequestCreate.vue b/src/pages/purchaseReturn/request/returnRequestCreate.vue index 923277af..f5b4cb11 100644 --- a/src/pages/purchaseReturn/request/returnRequestCreate.vue +++ b/src/pages/purchaseReturn/request/returnRequestCreate.vue @@ -174,7 +174,7 @@ let newDetail = createDetailInfo(balance, pack); item.subList.push(newDetail); } else { - this.showErrorMessage('箱码[' + balance.packingNumber + "]已经在列表中") + this.showErrorMessage('箱码[' + balance.packingNumber + "]重复扫描") } } calcHandleQty(this.detailSource); diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue index 052df9f0..9662d144 100644 --- a/src/pages/putaway/record/putawayRecord.vue +++ b/src/pages/putaway/record/putawayRecord.vue @@ -205,7 +205,7 @@ }); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/putaway/record/putawayRecord_bat.vue b/src/pages/putaway/record/putawayRecord_bat.vue index fc8b8ba8..b2b10de7 100644 --- a/src/pages/putaway/record/putawayRecord_bat.vue +++ b/src/pages/putaway/record/putawayRecord_bat.vue @@ -188,7 +188,7 @@ var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch == balance.batch); if(itemDetail!=undefined){ - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } // calcTreeHandleQty(this.detailSource); diff --git a/src/pages/putaway/request/putawayRequestCreate.vue b/src/pages/putaway/request/putawayRequestCreate.vue index 1ea52af3..27e1a10e 100644 --- a/src/pages/putaway/request/putawayRequestCreate.vue +++ b/src/pages/putaway/request/putawayRequestCreate.vue @@ -201,7 +201,7 @@ // }); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue index a7773b00..479ba4bc 100644 --- a/src/pages/repleinsh/record/directRepleinshRecord.vue +++ b/src/pages/repleinsh/record/directRepleinshRecord.vue @@ -273,7 +273,7 @@ this.scanPopupGetFocus() } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue index 6786de85..34eb05e2 100644 --- a/src/pages/repleinsh/record/repleinshRecord.vue +++ b/src/pages/repleinsh/record/repleinshRecord.vue @@ -341,7 +341,7 @@ this.scanPopupGetFocus() } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/scrap/record/scrapRecord.vue b/src/pages/scrap/record/scrapRecord.vue index 2c5c7624..38c0be01 100644 --- a/src/pages/scrap/record/scrapRecord.vue +++ b/src/pages/scrap/record/scrapRecord.vue @@ -166,7 +166,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/scrap/request/scrapRequestCreate.vue b/src/pages/scrap/request/scrapRequestCreate.vue index ef2ba7b4..3e8ef532 100644 --- a/src/pages/scrap/request/scrapRequestCreate.vue +++ b/src/pages/scrap/request/scrapRequestCreate.vue @@ -173,7 +173,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/transfer/coms/comTransferRecord.vue b/src/pages/transfer/coms/comTransferRecord.vue index 064dc915..2ea1546e 100644 --- a/src/pages/transfer/coms/comTransferRecord.vue +++ b/src/pages/transfer/coms/comTransferRecord.vue @@ -170,7 +170,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/transfer/record/deliverRecord.vue b/src/pages/transfer/record/deliverRecord.vue index ea89bd50..6fe03d5a 100644 --- a/src/pages/transfer/record/deliverRecord.vue +++ b/src/pages/transfer/record/deliverRecord.vue @@ -160,7 +160,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/transfer/record/receiptRecord.vue b/src/pages/transfer/record/receiptRecord.vue index a9065644..61b9ee37 100644 --- a/src/pages/transfer/record/receiptRecord.vue +++ b/src/pages/transfer/record/receiptRecord.vue @@ -149,7 +149,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } diff --git a/src/pages/unPlanned/record/issueRecord.vue b/src/pages/unPlanned/record/issueRecord.vue index 7aeda84d..a964ceee 100644 --- a/src/pages/unPlanned/record/issueRecord.vue +++ b/src/pages/unPlanned/record/issueRecord.vue @@ -169,7 +169,7 @@ let newDetail = createDetailInfo(balance, pack); item.subList.push(newDetail); } else { - this.showErrorMessage(result.packingNumber + "已经在列表中") + this.showErrorMessage(result.packingNumber + "重复扫描") } } this.calcHandleQty(); diff --git a/src/pages/unPlanned/request/issueRequestCreate.vue b/src/pages/unPlanned/request/issueRequestCreate.vue index 1c0b9c0e..501ba450 100644 --- a/src/pages/unPlanned/request/issueRequestCreate.vue +++ b/src/pages/unPlanned/request/issueRequestCreate.vue @@ -181,7 +181,7 @@ let newDetail = createDetailInfo(balance, pack); item.subList.push(newDetail); } else { - this.showErrorMessage(result.packingNumber + "已经在列表中") + this.showErrorMessage(result.packingNumber + "重复扫描") } } this.calcHandleQty();