From 05273ace3da665cb10c36ca0dac4413a8284302a Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 18:10:36 +0800
Subject: [PATCH] 增加部分限制,增加新功能

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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 138a077..88689f6 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
@@ -259,9 +259,6 @@
 			handler(v) {
 				this.weighData.weigh = this.realTimeWeigh = v;
 				console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
-				// setTimeout(() => {
-				// 	this.weighData.weigh = this.realTimeWeigh = v;
-				// }, 0);
 			},
 			deep: true,
 			immediate: true
@@ -301,7 +298,7 @@
 			}
 		},
 		sideline() {
-			return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞嚭';
+			return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
 		}
 	},
 	methods: {
@@ -327,6 +324,9 @@
 					}
 					if (this.weighData.coalContactHair > 0 && this.weighData.coalContactSkin > 0) {
 						this.isInputOrigin = true;
+						if (this.isInputOrigin) {
+							this.$u.toast('淇℃伅宸插~鍐�');
+						}
 					}
 				}
 			});
@@ -572,7 +572,8 @@
 		}
 	}
 	.bottom-block {
-		width: 690rpx;
+		width: calc(100% - 60rpx);
+		box-sizing: border-box;
 		height: 630rpx;
 		margin: 0 vww(15) vww(45) vww(15);
 		background: #ffffff;
@@ -580,6 +581,7 @@
 		border-radius: 20rpx;
 		@include flex;
 		justify-content: center;
+		overflow: hidden;
 		.block-main {
 			width: 94%;
 			height: 565rpx;
@@ -588,6 +590,7 @@
 			justify-content: space-around;
 			align-items: flex-start;
 			flex-direction: column;
+			overflow: hidden;
 			.main-information {
 				width: 100%;
 				height: 28rpx;
@@ -596,6 +599,7 @@
 				color: #303030;
 				@include flex;
 				justify-content: flex-start;
+				overflow: hidden;
 				.prefix {
 					min-width: vww(60);
 				}

--
Gitblit v1.9.1