From 3d739bbf2dc360d550a41c9372f17c28dc2ebfd8 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 15 十二月 2023 19:00:19 +0800
Subject: [PATCH] 质检扣罚代码提交

---
 pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
index 768d7fe..8eb27d4 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
@@ -66,6 +66,23 @@
 			<!-- 鍒ゆ柇鏄惁妫�楠岃川閲� -->
 			<view v-if="isShow(item) && isYanz()">
 				<view class="level">
+					<view style="width: 180rpx;">
+					<u--text text="渚涘簲鍟�"
+						size='32'></u--text>
+						
+				</view>
+				<view style="font-size: 35rpx;">{{ coalDetailsData.customerName || '' }}</view>
+				</view>
+
+				<view class="level">
+					<view style="width: 180rpx;">
+					<u--text text="鐗╂枡鍚嶇О"
+						size='32'></u--text>
+						
+				</view>
+				<view style="font-size: 35rpx;">{{ (coalDetailsData.coalName ? coalDetailsData.coalName: '') }}</view>
+				</view>
+				<view class="level">
 				<view style="width: 180rpx;">
 					<u--text text="鐗╄祫鏄庣粏"
 						size='32'></u--text>
@@ -187,7 +204,7 @@
 				</view>
 				<view class="num-show"
 					v-else-if="flag">
-					{{item.penaltyType}}
+					{{item.penaltyType == '0' ? '鏃犳墸缃�' : '鍏朵粬鎵g綒'}}
 				</view>
 			</view>
 			<!-- 鎵g綒閲戦 -->
@@ -316,12 +333,12 @@
 						readonly
 						@input='v=>unqualifiedWeightInputHandle(v,i,item.clean)'></u--input> -->
 						<view class="num-show"
->	{{el.unqualifiedWeight}}
+>					{{el.unqualifiedWeight || ''}}
 				</view>
 				</view>
 				<view class="num-show"
 					v-else-if="flag">
-					{{el.unqualifiedWeight}}
+					{{el.unqualifiedWeight || ''}}
 				</view>
 			</view>
 			</view>
@@ -630,8 +647,10 @@
 					if(item){
 					if(item.unqualifiedBreed){
 						arr = item.unqualifiedBreed.split(",");
-						
-					    temp = item.unqualifiedWeights.toString().split(',');
+						if(item.unqualifiedWeights){
+							temp = item.unqualifiedWeights.toString().split(',');
+						}
+					  
 						 let result =  arr.length && arr.map((el,index)=>{
 						let obj = {unqualifiedBreed:el,unqualifiedWeight:temp[index]}
 						return obj
@@ -786,8 +805,8 @@
 						v.penaltyAmount = '';
 						v.unqualifiedType = '';
 					}
-					if(this.globalShowWeigh[i].unqualifiedWeight){
-					unqualifiedWeightAll = this.globalShowWeigh[i].unqualifiedWeight.split(",").reduce((p,n)=>{return (p - 0) + (n - 0)},0)  || ''
+					if(this.globalShowWeigh[i].unqualifiedWeights){
+					unqualifiedWeightAll = this.globalShowWeigh[i].unqualifiedWeights.split(",").reduce((p,n)=>{return (p - 0) + (n - 0)},0)  || ''
 					}else{
 						unqualifiedWeightAll =''
 					}

--
Gitblit v1.9.1