From bce4898c20c7445faed1a0b3a68875cf0047b0ef Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 2 Jul 2024 20:00:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=BB=A5=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/qty/balanceQtyEdit.vue       | 20 ++++++++++---------
 .../purchaseReceipt/job/receiptDetail.vue     |  5 +----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/mycomponents/qty/balanceQtyEdit.vue b/src/mycomponents/qty/balanceQtyEdit.vue
index cbd92cdf..741d2cc3 100644
--- a/src/mycomponents/qty/balanceQtyEdit.vue
+++ b/src/mycomponents/qty/balanceQtyEdit.vue
@@ -178,18 +178,20 @@
 			},
 			setValue() {
 				var balanceQty = Number(this.dataContent.balanceQty);
-				if (this.allQty == 0) {
-					this.$refs.comMessage.showConfirmWarningModal('数量必须大于0',
+				if(this.allQty<0){
+					this.$refs.comMessage.showConfirmWarningModal('数量必须大于等于0',
 						res => {
 							this.allQty = balanceQty;
 						})
-				} else if (this.allQty > balanceQty) {
-					this.$refs.comMessage.showConfirmWarningModal('数量[' + this.allQty + ']不允许大于库存数量[' + balanceQty + ']',
-						res => {
-							this.allQty = balanceQty;
-						})
-				} else {
-					this.callback();
+				}else {
+					if (this.allQty > balanceQty) {
+						this.$refs.comMessage.showConfirmWarningModal('数量[' + this.allQty + ']不允许大于库存数量[' + balanceQty + ']',
+							res => {
+								this.allQty = balanceQty;
+							})
+					} else {
+						this.callback();
+					}
 				}
 			},
 			callback() {
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 3f016a43..eb213c52 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -515,10 +515,7 @@
 									const timer1 = setInterval(async () => {
 										if (timerCount == 15) {
 											clearInterval(timer1)
-											uni.showToast({
-												title: "跳转打印页面失败",
-												icon: "none"
-											});
+											this.showErrorMessage("上架任务生成异常，请到收货记录里重新生成上架申请")
 											return;
 										}
 										await getPutawayJobList({