From 4f9eb354382eda4fe5e47c12e58a40896df552d9 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 05 七月 2024 17:08:34 +0800
Subject: [PATCH] fix:沧化修改测试bug
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index 8a25435..193a221 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -74,7 +74,7 @@
绉伴噸鏃堕棿
</view>
<view class="table-title_item coal-name">
- 鐓ょ鍚嶇О
+ 浜у搧鍚嶇О
</view>
<view class="table-title_item skin">
鐨噸閲嶉噺
@@ -132,7 +132,7 @@
<view class="suffix">{{ weighList.filedName || '' }}</view>
</view>
<view class="main-information">
- <view class="prefix">鐓ょ鍚嶇О:</view>
+ <view class="prefix">浜у搧:</view>
<view class="suffix">{{ weighList.productName || '' }}</view>
</view>
<view class="main-information">
@@ -151,6 +151,12 @@
<view class="prefix">鍑�閲�:</view>
<view class="suffix">
{{ temporaryWeighObj.clean == 0 ? weightObj.clean : temporaryWeighObj.clean ||"" }}
+ </view>
+ </view>
+ <view class="main-information" v-if=" temporaryWeighObj.discount ||weightObj.discount ">
+ <view class="prefix">鎶樺惃:</view>
+ <view class="suffix">
+ {{ weightObj.discount || '' }}
</view>
</view>
<view class="main-information">
@@ -175,7 +181,7 @@
<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 productList" :key="index">
<uni-td align="center">
@@ -187,11 +193,11 @@
<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">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
- </uni-td>
-<!--
- 聽 <uni-td align="center">
- <view>{{ subItem.bunkerName }}</view></uni-td> -->
+ <view class="name" v-if="(subItem.clean || subItem.clean === 0)">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
+ </uni-td>
+ 聽<uni-td align="right">
+ <view>{{ subItem.discount }}</view
+ ></uni-td>
</uni-tr>
</uni-table>
--
Gitblit v1.9.1