From 43946aca83334ac3e1c3929a2d6dcba3f2bf6446 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 17 十二月 2024 15:27:59 +0800
Subject: [PATCH] fix:小程序眼镜密码,h5历史收发单

---
 pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue |   46 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
index bff4d76..e0909a6 100644
--- a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
+++ b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
@@ -12,7 +12,7 @@
 					<view class=""
 						v-if="orderType == '杞叆' || orderType == '杞嚭'">鍦哄湴:{{ coalDetailsData.filedName || '' }}</view>
 					<view class=""
-						v-else>浠撳簱:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
+						v-else>浠撳簱:{{ coalDetailsData.bunkerName || '鏆傛棤' }}</view>
 				</view>
 			</view>
 			<view class="block-information">
@@ -72,6 +72,7 @@
 			<view class="table">
 				<uni-table  border 
 		       id="table-box"
+			   v-if="coalDetailsData.isWeight === 1"
 			emptyText="鏆傛棤鏇村鏁版嵁">
 					<uni-tr>
 					    <uni-th align="center" >浜у搧</uni-th>
@@ -102,6 +103,37 @@
 					></uni-td>
 				</uni-tr>
 				</uni-table>
+				<uni-table  border 
+		       id="table-box"
+			   v-else
+			emptyText="鏆傛棤鏇村鏁版嵁">
+					<uni-tr>
+					    <uni-th align="center" >浜у搧</uni-th>
+						<!-- <uni-th align="center">鐨噸</uni-th>
+						<uni-th align="center">姣涢噸</uni-th>
+						<uni-th align="center">鍑�閲�</uni-th> -->
+				
+						<uni-th align="center">浠舵暟</uni-th>		
+					</uni-tr>
+					<uni-tr v-for="(subItem, index) in tmTaskCoalList" :key="index">
+						<uni-td align="center">
+							<view class="name">{{ subItem.productName }}</view></uni-td>
+					<!-- <uni-td align='right'>
+						<view  v-if="subItem.skin">{{ Number( subItem.skin).toFixed(2)  || ''}}</view>
+					</uni-td>
+					<uni-td align='right'>
+						<view class="name" v-if="subItem.hair">{{ Number(subItem.hair) .toFixed(2) || '' }}</view>
+					</uni-td>
+					<uni-td align='right'>
+						<view class="name" v-if="(subItem.clean || (subItem.clean && subItem.clean === 0))">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
+					</uni-td> -->
+					
+				聽   
+					   <uni-td align="right">
+					<view>{{ subItem.productQuantity }}</view
+					></uni-td>
+				</uni-tr>
+				</uni-table>
 			</view>
 			<!-- 璇疯緭鍏ラ泦瑁呯鍙� -->
 			<view class="codeBox" v-if="coalDetailsData.isContainerNum">
@@ -118,7 +150,7 @@
 			</view>
 		</view>
 		<view class="origin-info"
-			v-if="originInfoVisible&&!isSpecial">
+			v-if="originInfoVisible&&!isSpecial && isShowYuanFa">
 			<view class="origin-info_wrapper">
 				<view class="origin-info_content">
 					<!-- 鎶樺彔 -->
@@ -571,8 +603,14 @@
 					return  tempArr[index];
 				 }
 
-				
-
+			},
+			//鍒ゆ柇鏄惁灞曠ず 鍘熷彂淇℃伅
+			isShowYuanFa(){
+				if(this.coalContactClean && !this.coalDetailsData.tmTaskCoalList.length){
+					return false
+				}else{
+					return true
+				}
 			}
 		},
 		methods: {

--
Gitblit v1.9.1