From 8903e1a476fd1140acbc1a91e187de6d771e4664 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期四, 23 三月 2023 17:56:23 +0800
Subject: [PATCH] 1.待领取列表增加字段 矿、煤场、煤种、客户名称、发运日期、日计划编号(完成) 2.多次抢单弹框再次确认是否抢单(完成) 3.待预约提煤单列表显示样式(完成)

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   50 +++++++++++++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 25 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 b33e955..2b56177 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
@@ -90,29 +90,29 @@
 			// 	pingMessage: JSON.stringify({ type: 'ping' }) // 蹇冭烦璇锋眰淇℃伅
 			// }
 			// 涓存椂绉伴噸瀵硅薄
-			temporaryWeighObj:{
-				skin:0,
-				hair:0,
-				clean:0
+			temporaryWeighObj: {
+				skin: 0,
+				hair: 0,
+				clean: 0
 			},
-			infraredStatus:false// 绾㈠鐘舵��
+			infraredStatus: false // 绾㈠鐘舵��
 		};
 	},
-	watch:{
-		realTimeWeigh(newV,oldV){
-			if(this.weighList.orderTye == '澶栭攢'){
-				if(this.weighList.skin == 0){
-					this.temporaryWeighObj.skin = this.realTimeWeigh
+	watch: {
+		realTimeWeigh(newV, oldV) {
+			if (this.weighList.orderTye == '澶栭攢') {
+				if (this.weighList.skin == 0) {
+					this.temporaryWeighObj.skin = this.realTimeWeigh;
 				} else {
-					this.temporaryWeighObj.hair = this.realTimeWeigh
-					this.temporaryWeighObj.clean = this.temporaryWeighObj.hair - this.weighList.skin
+					this.temporaryWeighObj.hair = this.realTimeWeigh;
+					this.temporaryWeighObj.clean = this.temporaryWeighObj.hair - this.weighList.skin;
 				}
-			} else if(this.weighList.orderTye == '澶栬喘'){
-				if(this.weighList.hair == 0){
-					this.temporaryWeighObj.hair = this.realTimeWeigh
+			} else if (this.weighList.orderTye == '澶栬喘') {
+				if (this.weighList.hair == 0) {
+					this.temporaryWeighObj.hair = this.realTimeWeigh;
 				} else {
-					this.temporaryWeighObj.skin = this.realTimeWeigh
-					this.temporaryWeighObj = this.weighList.hair - this.temporaryWeighObj.skin
+					this.temporaryWeighObj.skin = this.realTimeWeigh;
+					this.temporaryWeighObj = this.weighList.hair - this.temporaryWeighObj.skin;
 				}
 			}
 		}
@@ -134,7 +134,7 @@
 					return false;
 				}
 			}
-		},
+		}
 	},
 	methods: {
 		init() {
@@ -227,13 +227,13 @@
 			// 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
 			socket.onMessage(res => {
 				console.log('socketWeigh', res);
-				let nowWeighObj = JSON.parse(res.data.slice(7))
+				let nowWeighObj = JSON.parse(res.data.slice(7));
 				if (nowWeighObj.eqCode == this.weighHouseCode) {
-					if(nowWeighObj.eqInfraredStatus){
-						this.infraredStatus = true
+					if (nowWeighObj.eqInfraredStatus) {
+						this.infraredStatus = true;
 						this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
-					}else{
-						this.infraredStatus = false
+					} else {
+						this.infraredStatus = false;
 						this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
 					}
 				}
@@ -259,7 +259,7 @@
 	flex-direction: column;
 	.one {
 		flex: 2;
-		border: vww(1) solid #dddddd;
+		border: vww(2) solid #dddddd;
 		margin: vww(20) vww(20) 0 vww(20);
 		border-radius: vww(15);
 		.top {
@@ -288,7 +288,7 @@
 	}
 	.two {
 		flex: 4;
-		border: vww(1) solid #dddddd;
+		border: vww(2) solid #dddddd;
 		margin: vww(20);
 		border-radius: vww(10);
 		padding: vww(20);

--
Gitblit v1.9.1