From 983619ef25f84e095bcbf6f4996b0cb58210c73b Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期四, 08 八月 2024 18:25:24 +0800
Subject: [PATCH] 质检页面

---
 pages/public-page/forward/forward.vue |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index d0fb07b..c7d4cb9 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -90,7 +90,7 @@
 					:disabled="whetherClick"></u-button></view>
 			<!--鍒嗕韩鏃ヨ鍒�  -->
 			<view 
-			class="AdddBtn"><u-button text="鍒嗕韩鏃ヨ鍒�"
+			class="AdddBtn" v-if="isshow"><u-button text="鍒嗕韩鏃ヨ鍒�"
 					:hairline="false"
 					open-type="share"
 					:loading='loading'></u-button></view>
@@ -160,6 +160,8 @@
 	export default {
 		onLoad(params) {
 			console.log(params, '杞彂椤甸潰鐨勫弬鏁�');
+			let reg=RegExp(/閿�/)
+			this.isshow=!reg.test(params.orderType)
 			// 瀹㈡埛
 			this.cars2 = Number(params.cars2);
 			this.tempcarNumSurplus1 = this.carNumSurplus1 = Number(params.carNumSurplus1 || 0);
@@ -189,10 +191,12 @@
 
 		data() {
 			return {
+				isshow:false,
 				forwardSurplus: 0,
 				paramsName: {},
-				huoDaiData: [],  //璐т唬Data
-				fleetData: [],  //杞﹂槦Data
+				huoDaiData: [],
+				isClickFlag:true,// true 鍙互 or false for forward and back to the direction of the car direction (default	 	
+				fleetData: [],
 				// 鏃ヨ鍒抜d
 				orderPlanId: '',
 				jhOrderPlanForwardList: [{  //杞彂瀵硅薄
@@ -210,7 +214,7 @@
 				selectPopupShow: false,
 				list1: [{ name: '杞﹂槦' }, { name: '璐т唬' }],
 				tabHuoDai: false,
-				carNumSurplus1: '',  //鍓╀綑鐨勬彁鐓ゅ崟鏁伴噺锛堣浆鍙戠殑鏁伴噺 - 棰嗗彇鐨勬暟閲忥級
+				carNumSurplus1: '',  //鍓╀綑鐨勬敹鍙戝崟鏁伴噺锛堣浆鍙戠殑鏁伴噺 - 棰嗗彇鐨勬暟閲忥級
 				tempcarNumSurplus1: '',
 				cars2: '',  //宸茬粡棰嗗彇鐨勮溅鏁�
 				carNum: '',
@@ -247,10 +251,10 @@
 				return uni.getStorageSync('roleType');
 			},
 			text() {
-				return `宸查鍙�${this.cars2}寮犳彁鐓ゅ崟,鍓╀綑${this.carNumSurplus1}寮犳彁鐓ゅ崟`;
+				return `宸查鍙�${this.cars2}寮犳敹鍙戝崟,鍓╀綑${this.carNumSurplus1}寮犳敹鍙戝崟`;
 			},
 			text1() {
-				return `宸叉嫢鏈�${this.carNum}寮犳彁鐓ゅ崟,鍓╀綑${this.carNumSurplusHuodai}寮犳彁鐓ゅ崟`;
+				return `宸叉嫢鏈�${this.carNum}寮犳敹鍙戝崟,鍓╀綑${this.carNumSurplusHuodai}寮犳敹鍙戝崟`;
 			}
 		},
 		methods: {
@@ -384,11 +388,16 @@
 			},
 			// 杞彂瀵硅薄
 			forwardObjectClick(index, name, id) {
+				if(!id){
 				this.selectPopupShow = true;
 				this.index = index;
 				this.originForwardName = name || ''
 				this.isDirectAdd = this.originForwardName !== ''
 				this.forwardId = id
+				}else{
+					return 
+				}
+				
 			},
 			selectPopupClose() {
 				this.selectPopupShow = false;
@@ -417,7 +426,7 @@
 					// })
 					// 	this.selectPopupShow = false;
 					// } else {
-					// 	this.$u.toast('鎻愮叅鍗曞墿浣欐暟涓�0鎴栧凡娣诲姞');
+					// 	this.$u.toast('鏀跺彂鍗曞墿浣欐暟涓�0鎴栧凡娣诲姞');
 					// 	this.selectPopupShow = true;
 					// }
 					// } else {
@@ -458,7 +467,7 @@
 					// })
 					// 	this.selectPopupShow = false;
 					// } else {
-					// 	this.$u.toast('鎻愮叅鍗曞墿浣欐暟涓�0鎴栧凡娣诲姞');
+					// 	this.$u.toast('鏀跺彂鍗曞墿浣欐暟涓�0鎴栧凡娣诲姞');
 					// 	this.selectPopupShow = true;
 					// }
 					// } else {
@@ -476,25 +485,25 @@
 					// }
 				});
 			},
-			// 璁$畻鎻愮叅鍗曟暟閲忥紝娣诲姞鎴栧垹闄ゆ椂璋冪敤
+			// 璁$畻鏀跺彂鍗曟暟閲忥紝娣诲姞鎴栧垹闄ゆ椂璋冪敤
 			calculate(arr) {
 				let total = arr.reduce((prev, cur) => {
 					return cur.carNum + prev;
 				}, 0);
-				console.log(total, '鎻愮叅鍗曚竴鍏辩殑鏁版嵁');
+				console.log(total, '鏀跺彂鍗曚竴鍏辩殑鏁版嵁');
         //roleType 1瀹㈡埛 2 璐т唬 3鍙告満 5瑁呭嵏鍛�
 				if (this.roleType == 1) {
 					if (Number(this.cars2) > total) {
 						this.carNumSurplus1 = Number(this.cars2) - total;
 						this.whetherClick = false;
 						this.whetherClick1 = false;
-					} else if (Number(this.cars2) == total) {  //鍓╀綑鐨勬彁鐓ゅ崟涓�0锛堟坊鍔犮�佹彁浜ゆ寜閽笉鑳界偣鍑伙級
+					} else if (Number(this.cars2) == total) {  //鍓╀綑鐨勬敹鍙戝崟涓�0锛堟坊鍔犮�佹彁浜ゆ寜閽笉鑳界偣鍑伙級
 						this.whetherClick = true;
 						this.whetherClick1 = false;
 						this.carNumSurplus1 = Number(this.cars2) - total;
 					} else {
 						this.carNumSurplus1 = 0;
-						this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�');
+						this.$u.toast('鍓╀綑鏀跺彂鍗曟暟閲忎笉瓒�');
 						this.whetherClick = true;
 						this.whetherClick1 = true;
 					}
@@ -510,7 +519,7 @@
 						this.carNumSurplusHuodai = Number(this.carNum) - total;
 					} else {
 						this.carNumSurplusHuodai = 0;
-						this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�');
+						this.$u.toast('鍓╀綑鏀跺彂鍗曟暟閲忎笉瓒�');
 						this.whetherClick = true;
 						this.whetherClick1 = true;
 					}
@@ -613,6 +622,7 @@
 						return isPass;
 					}
 				});
+				console.log(this.jhOrderPlanForwardList,'jhOderPlan')
 				if (isPass) {
 					this.loading = true;
 					this.$reqPost('forward', this.jhOrderPlanForwardList, 'json').then(res => {

--
Gitblit v1.9.1