From 01e96c8855927df67ac8a6831e345b6cb33140d1 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 09 五月 2023 18:49:40 +0800
Subject: [PATCH] 样式修改

---
 pages/public-page/forward/forward.vue |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index e1a090f..ed2d14a 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -204,6 +204,9 @@
 						// 瀹㈡埛
 						if (this.roleType == 1) {
 							this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.personalForward.carNum, tempcarNumSurplus1);
+							if (this.jhOrderPlanForwardList[index].carNum == 0) {
+								this.jhOrderPlanForwardList[index].carNum == tempcarNumSurplus1;
+							}
 						}
 						tempcarNumSurplus1 = 0;
 						// 璐т唬
@@ -214,11 +217,13 @@
 					});
 				} else {
 					if (this.roleType == 1) {
-						this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.jhOrderPlanForwardList[index].carNum, this.carNumSurplus1);
+						this.jhOrderPlanForwardList[index].carNum = this.carNumSurplus1;
+						// this.allrelay(this.jhOrderPlanForwardList[index].carNum, this.carNumSurplus1);
 					}
 					tempcarNumSurplus1 = 0;
 					if (this.roleType == 2) {
-						this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.jhOrderPlanForwardList[index].carNum, this.forwardSurplus);
+						this.jhOrderPlanForwardList[index].carNum = this.forwardSurplus;
+						// this.allrelay(this.jhOrderPlanForwardList[index].carNum, this.forwardSurplus);
 					}
 					tempforwardSurplus = 0;
 				}
@@ -233,14 +238,14 @@
 				let tempcarNumSurplus1 = this.carNumSurplus1;
 				// 璐т唬
 				if (this.roleType == 2) {
-					this.jhOrderPlanForwardList[index].carNum = this.allrelayto(this.jhOrderPlanForwardList[index].carNum, this.forwardSurplus);
+					this.jhOrderPlanForwardList[index].carNum = 0;
 					if (this.jhOrderPlanForwardList[index].carNum <= 0) {
 						this.jhOrderPlanForwardList[index].carNum = 0;
 					}
 				}
 				// 瀹㈡埛
 				if (this.roleType == 1) {
-					this.jhOrderPlanForwardList[index].carNum = this.allrelayto(this.jhOrderPlanForwardList[index].carNum, this.carNumSurplus1);
+					this.jhOrderPlanForwardList[index].carNum = 0;
 					if (this.jhOrderPlanForwardList[index].carNum <= 0) {
 						this.jhOrderPlanForwardList[index].carNum = 0;
 					}
@@ -347,8 +352,9 @@
 			if (this.jhOrderPlanForwardList.length === 0) {
 				this.$u.toast('璇疯嚦灏戦�夋嫨涓�缁勮浆鍙戝璞�');
 			}
+			let reg = /^[1-9]\d*$/;
 			this.jhOrderPlanForwardList.forEach(v => {
-				if (isNaN(Number(v.carNum)) || Number(v.carNum) <= 0) {
+				if (!reg.test(v.carNum) || Number(v.carNum) <= 0) {
 					this.$u.toast('璇疯緭鍏ュ悎娉曟暟瀛�');
 					isPass = false;
 					return isPass;

--
Gitblit v1.9.1