From 3f10299a92e23fd902e4bd51a6d59f9bf0c7d7ec Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 20 六月 2023 10:08:18 +0800
Subject: [PATCH] 增加用户绑定页面

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index 064437c..ffe5e41 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -103,15 +103,36 @@
 			style="width: 100%;height: 40rpx;"></view>
 		<view class="bottom-block">
 			<view class="block-main">
-				<view class="main-information">
+				<view class="main-information"
+					v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
+					<view class="prefix">
+						鍙戣揣鍦扮叅鍦�:
+					</view>
+					<view class="suffix">
+						{{ weighList.filedName || '' }}
+					</view>
+				</view>
+				<view class="main-information"
+					v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
+					<view class="prefix">
+						鏀惰揣鍦扮叅鍦�:
+					</view>
+					<view class="suffix">
+						{{ weighList.toFiledName || '' }}
+					</view>
+				</view>
+				<view class="main-information"
+					v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
 					<view class="prefix">瀹㈡埛:</view>
 					<view class="suffix">{{ weighList.customerName }}</view>
 				</view>
-				<view class="main-information">
-					<view class="prefix">鐭垮満锛�</view>
+				<view class="main-information"
+					v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
+					<view class="prefix">鐭垮満:</view>
 					<view class="suffix">{{ weighList.deptName || '' }}</view>
 				</view>
-				<view class="main-information">
+				<view class="main-information"
+					v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
 					<view class="prefix">鐓ゅ満:</view>
 					<view class="suffix">{{ weighList.filedName || '' }}</view>
 				</view>
@@ -327,13 +348,17 @@
 			isEvacuation() {
 				if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
 					'杞嚭') {
-					return this.weighList.skin == this.temporaryWeighObj.hair || this.temporaryWeighObj.skin == this
+					return (this.weighList.skin === 0 ? this.temporaryWeighObj.skin : this.weighList.skin) == this
 						.temporaryWeighObj.hair;
+					// return this.weighList.skin == this.temporaryWeighObj.hair || this.temporaryWeighObj.skin == this
+					// 	.temporaryWeighObj.hair;
 				}
 				if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType ==
 					'杞叆') {
-					return this.weighList.hair == this.temporaryWeighObj.skin || this.temporaryWeighObj.skin == this
+					return (this.weighList.hair === 0 ? this.temporaryWeighObj.skin : this.weighList.hair) == this
 						.temporaryWeighObj.hair;
+					// return this.weighList.hair == this.temporaryWeighObj.skin || this.temporaryWeighObj.skin == this
+					// 	.temporaryWeighObj.hair;
 				}
 			},
 			sideline() {

--
Gitblit v1.9.1