From 8b53f063a074d91e7093d35168bf0dc349c83ba9 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 11 七月 2024 14:14:39 +0800
Subject: [PATCH] feat::发运单详情去除折叠

---
 pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index 512cdf3..330b4dd 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -12,7 +12,7 @@
 				<view class="middle-container">
 					<view class="dept-name">
 						{{ deptName }}
-						<text v-show="deptName">({{ coalName }})</text>
+						<text v-show="deptName">({{ productNames || productName}})</text>
 					</view>
 					<view class="dept-num">
 						<text style="font-size: 46rpx;
@@ -60,11 +60,11 @@
 				</view>
 			</view>
 			<view class="block-top">
-				<combined-title title="鎻愮叅鍗曞巻鍙�"></combined-title>
+				<combined-title title="鏀跺彂鍗曞巻鍙�"></combined-title>
 				<view class="total">
 					鎬诲噣閲�
-					<text>{{ total.toFixed(2) || 0 }}</text>
-				</view>
+					<text>{{ Number(total).toFixed(2) || 0 }}</text>
+				</view> 
 			</view>
 			<view class="main-banner">
 				<view class="empty-pointer"
@@ -86,11 +86,11 @@
 							<view class="second-line">
 								<view class="line-content">
 									<view class="line-content_text">鍑�閲�</view>
-									<view class="line-content_num">{{ item.clean.toFixed(2)  || 0 }}</view>
+									<view class="line-content_num">{{ Number(item.clean) .toFixed(2)  || 0 }}</view>
 								</view>
 								<view class="line-content">
 									<view class="line-content_text">浣欓噺</view>
-									<view class="line-content_num">{{ item.allowance.toFixed(2)  || 0 }}</view>
+									<view class="line-content_num">{{ Number(item.orderSurplus).toFixed(2)  || 0 }}</view>
 								</view>
 							</view>
 						</view>
@@ -114,6 +114,7 @@
 			this.cars2 = value.cars2 ? value.cars2 : null;
 			this.deptName = value.deptName;
 			this.coalName = value.coalName;
+			this.productName =  value.productNames;
 			this.carNum = value.carNum ? value.carNum : null
 			console.log(value, '鍙戣繍璁″垝鍙傛暟');
 		},
@@ -123,12 +124,13 @@
 				orderCode: null,
 				orderPlanDetail: {},
 				coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
-					'杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�'
+					'杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓'
 				],
 				yyDailyList: [],
 				// 棰嗗彇鏁伴噺
 				cars2: '',
 				coalName: '',
+				productName:'',
 				deptName: '',
 				total: 0,
 				carNum: ''
@@ -145,7 +147,7 @@
 			},
 			showMore(item) {
 				uni.navigateTo({
-					url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore?orderPlanId=${this.orderPlanId}&id=${item.id}`
+					url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore?orderPlanId=${this.orderPlanId}&id=${item.id}&orderType=${item.orderType}`
 				});
 			},
 			init() {
@@ -164,6 +166,7 @@
 							this.total = this.yyDailyList.reduce((prev, cur) => {
 								return prev + cur.clean;
 							}, 0);
+							console.log(this.total,'total')
 						} else {
 							this.total = 0;
 						}

--
Gitblit v1.9.1