From a653bcff54e077ad83e31c8528aa174d7a7348f7 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 24 十月 2023 11:46:51 +0800
Subject: [PATCH] 再生资源 bugfix

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

diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index 7837438..83dd8f1 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -5,15 +5,15 @@
 		</view>
 		<view class="top-information">
 			<view class="cutomer-name"
-				v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.toFiledName || '' }}</view>
+				v-if="orderType == '杞叆' || orderType == '杞嚭'">浠撳簱:{{ coalDetailsData.toFiledName || '' }}</view>
 			<view class="cutomer-name"
 				v-else>瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
 			<view class="fild-name">
-				<view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
+				<view class="">鍩哄湴:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
 				<view class=""
-					v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view>
+					v-if="orderType == '杞叆' || orderType == '杞嚭'">浠撳簱:{{ coalDetailsData.filedName || '' }}</view>
 				<view class=""
-					v-else>鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
+					v-else>浠撳簱:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
 			</view>
 		</view>
 		<view class="block-information">
@@ -95,7 +95,9 @@
 					@click="showCaolPickUpBill"
 					type="primary"
 					shape="circle"></u-button></view>
-			<view class="weigh-button"><u-button text="涓婄璁¢噺"
+			<view class="weigh-button"><u-button 
+				    :disabled="!isapproach"
+				    text="涓婄璁¢噺"
 					@click="cengZhongClick"
 					type="primary"
 					shape="circle"></u-button></view>
@@ -140,6 +142,7 @@
 			return {
 				orderPlanId: null,
 				yyId: null,
+				chengZhongFlag:true, // 涓婃绉伴噸鐘舵��
 				dayRZ: [],
 				coalDetailsData: {}, // 閫氱煡鍗曡鎯�
 				currentPageCoalStatus: 0, // 褰撳墠椤甸潰閫氱煡鍗曠姸鎬�
@@ -491,7 +494,7 @@
 			// 鏌ョ湅璐ㄩ噺鏄庣粏
 			jumpWeighDetail() {
 				uni.navigateTo({
-					url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${this.orderPlanId}`
+					url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${this.orderPlanId}&flag=${true}`
 				})
 			}
 		}

--
Gitblit v1.9.1