From 700c025aa912047fbd71975d4c6f8bb930ba82f8 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 16 十一月 2023 17:12:49 +0800
Subject: [PATCH] 司机日计划通知单增加创建时间,称重页面样式优化

---
 pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 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 bc323b4..d5edfc3 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
@@ -44,7 +44,7 @@
 		</view>
 
 		<!--  绉伴噸鍘嗗彶-->
-		<weigh-item :list="showWeigh"></weigh-item>
+		<weigh-item :list="showWeigh" class="weighing-item"></weigh-item>
 		<!-- 鏃堕棿绾� -->
 		<view class="timeLine">
 			<u-steps :current="dayRZ.length - 1"
@@ -66,7 +66,7 @@
 						plain
 						@click="arriveClick"
 						shape="circle"
-						:disabled="coalDetailsData.status >= 2"></u-button>
+						:disabled="coalDetailsData.status > 2"></u-button>
 					<u-button text="鎵撳嵃纾呭崟"
 						type="primary"
 						plain
@@ -131,6 +131,7 @@
 			weighItem
 		},
 		onLoad(value) {
+			console.log(value,'valyue')
 			this.orderPlanId = value.orderPlanId;
 			this.yyId = value.yyId;
 			if (value.overTmWaixiao) {
@@ -170,7 +171,7 @@
 					openId: null,
 					openName: ''
 				},
-				coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'], // 鐘舵��
+				coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '澶勭悊瀹屾垚'], // 鐘舵��
 				weighHouseCode: '',
 				// 鏀剧┖寮圭獥鎺у埗鍙橀噺
 				evacuationModalShow: false,
@@ -239,7 +240,7 @@
 				return this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0;
 			},
 			isapproach() {
-				return this.currentPageCoalStatus !== 3;
+				return this.currentPageCoalStatus < 3;
 			},
 			// 灞曠ず鐨瘺鍑�
 			showWeigh() {
@@ -381,7 +382,7 @@
 				uni.navigateTo({
 					url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}&coalStatus=${
 					this.currentPageCoalStatus
-				}&tmId=${this.getWeightHouseObj.tmId}`
+				}&tmId=${this.getWeightHouseObj.tmId}&yyId=${this.yyId}`
 				});
 			},
 			// 鍏ュ満鐢宠
@@ -507,13 +508,15 @@
 			//鎵撳嵃纾呭崟
 			printOrder(){
 				this.$reqGet('printerHandler',{tmId:this.orderPlanId}).then(res => {
+					uni.hideLoading();
+					this.$u.toast(res.msg)
 					if (res.data) {
-						uni.hideLoading();
+						// this.$u.toast('鎵撳嵃鎴愬姛')
 						// this.orderPlanData = res.data
-					} else {
-						uni.hideLoading();
-						this.$u.toast('鍔犺浇澶辫触')
-					}
+					} 
+				}).catch((err) => {
+					uni.hideLoading();
+						this.$u.toast('鎵撳嵃澶辫触')
 				})
 			}
 		}
@@ -522,6 +525,9 @@
 
 <style lang="scss"
 	scoped>
+	.weighing-item{
+		min-height: 200rpx!important;
+	}
 	/deep/.u-steps {
 		.u-steps-item {
 			.u-steps-item__content {

--
Gitblit v1.9.1