From 2d742116c8cdc3a3f646e20340a185455f18cd5a Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 29 六月 2023 09:56:56 +0800
Subject: [PATCH] 称重页面问题修改

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 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 b2ec273..36b3c6a 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
@@ -141,6 +141,10 @@
 					<view class="suffix">{{ weighList.coalName || '' }}</view>
 				</view>
 				<view class="main-information">
+					<view class="prefix">璁㈠崟绫诲瀷:</view>
+					<view class="suffix">{{ weighList.orderType || '' }}</view>
+				</view>
+				<view class="main-information">
 					<view class="prefix">鐨噸:</view>
 					<view class="suffix">{{ showWeigh.skin||"" }}
 					</view>
@@ -172,7 +176,7 @@
 			<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
 			<u-button type="primary"
 				text="纭畾绉伴噸"
-				:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
+				:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh "
 				:loading="isConfirmWeighLoading"
 				loadingText="纭"
 				@click="confirmWeigh"></u-button>
@@ -369,21 +373,19 @@
 						this.weighData.filedId = res.data.filedId;
 						this.weighData.coalContactHair = res.data.hairTwo ? res.data.hairTwo : 0;
 						this.weighData.coalContactSkin = res.data.skinTwo ? res.data.skinTwo : 0;
-						if (this.weighList.orderType == '澶栬喘') {
-							this.outBuy = true
-							this.outsourcing = false;
-							// this.firstHairCustomernameShow = true;
-							// if (this.weighList.hair > 0) {
-							// 	this.haveInputOrigin = true;
-							// 	this.isInputOrigin = true;
-							// }
-							// if (this.weighList.hair == 0) {
-							// 	this.outBuy = false; 
-							// }
-						} else if (this.weighList.orderType == '澶栭攢') {
-							this.outsourcing = true;
-							this.outBuy = false
-						}
+						this.outBuy = this.weighList.orderType == '澶栬喘' && this.weighList.hair > 0;
+						this.outsourcing = this.weighList.orderType == '澶栭攢' && this.weighList.hair > 0;
+						// if (this.weighList.orderType == '澶栬喘') {
+						// 	if (this.weighList.hair > 0) {
+						// 		this.outBuy = true
+						// 		this.outsourcing = false;
+						// 	}
+						// } else if (this.weighList.orderType == '澶栭攢') {
+						// 	if (this.weighList.hair > 0) {
+						// 		this.outsourcing = true;
+						// 		this.outBuy = false
+						// 	}
+						// }
 					}
 				});
 			},

--
Gitblit v1.9.1