From 288d334f5afcb45da57d769c6699cf3b91d7a194 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 25 六月 2024 16:21:53 +0800
Subject: [PATCH] feat:集装箱显示加判断
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 82 insertions(+), 15 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 45ad154..40d2fe5 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">
鐨噸閲嶉噺
@@ -86,7 +86,7 @@
{{item.createTime||"" }}
</view>
<view class="item">
- {{item.coalName||"" }}
+ {{item.productName||"" }}
</view>
<view class="item skin">
<view class="">
@@ -132,25 +132,31 @@
<view class="suffix">{{ weighList.filedName || '' }}</view>
</view>
<view class="main-information">
- <view class="prefix">鐓ょ鍚嶇О:</view>
- <view class="suffix">{{ weighList.coalName || '' }}</view>
+ <view class="prefix">浜у搧:</view>
+ <view class="suffix">{{ weighList.productName || '' }}</view>
</view>
<view class="main-information">
<view class="prefix">鐨噸:</view>
<view class="suffix">
- {{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin||"" }}
+ {{ temporaryWeighObj.skin == 0 ? weightObj.skin : temporaryWeighObj.skin||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">姣涢噸:</view>
<view class="suffix">
- {{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair||"" }}
+ {{ temporaryWeighObj.hair == 0 ? weightObj.hair : temporaryWeighObj.hair||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">鍑�閲�:</view>
<view class="suffix">
- {{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean ||"" }}
+ {{ 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">
@@ -161,6 +167,42 @@
v-show="orderSurplusLess&&!isSpecial">* 璁㈠崟浣欓噺涓嶈冻</text>
</view>
</view>
+ </view>
+ <!-- 浜у搧淇℃伅 -->
+ <view class="chanpin">
+ <view class="sub-table">
+ <view class="first-line"><combined-title title="浜у搧淇℃伅"></combined-title></view>
+ <view class="table">
+ <uni-table border
+ id="table-box"
+ 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 productList" :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">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
+ </uni-td>
+ 聽<uni-td align="right">
+ <view>{{ subItem.discount }}</view
+ ></uni-td>
+
+ </uni-tr>
+ </uni-table>
+ </view>
+ </view>
</view>
<view class="three">
<!-- 鏀剧┖ -->
@@ -292,6 +334,7 @@
data() {
return {
avgFalse:false, // 鏄惁鐨噸寮傚父
+ productList:[], // 浜у搧鏁扮粍
weighData: {
//纭绉伴噸鎺ュ彛鍙傛暟
deptId: '',
@@ -374,6 +417,7 @@
mergeState: true, //鍚堝崱鐘舵��
// mergeStateShow: false, //鍚堝崱寮圭獥
checkboxValue1: [],
+
isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸
refreshLoading: false,
timer: null,
@@ -398,13 +442,13 @@
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
- this.errorTipShow = (xx.minus(yy).toNumber() <= -this.weightReal || xx.minus(yy).toNumber() >= this.weightReal) &&
+ this.errorTipShow = (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) &&
this.avgSkin !== 0
} else {
this.isSkinWeigh = false;
this.temporaryWeighObj.hair = newV;
let x = new BigNumber(this.temporaryWeighObj.hair)
- let y = new BigNumber(this.weighList.skin)
+ let y = new BigNumber(this.weightObj.skin)
this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
@@ -422,9 +466,9 @@
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
- this.errorTipShow = (xx.minus(yy).toNumber() <= -this.weightReal || xx.minus(yy).toNumber() >= this.weightReal) &&
+ this.errorTipShow = (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) &&
this.avgSkin !== 0;
- let x = new BigNumber(this.weighList.hair)
+ let x = new BigNumber(this.weightObj.hair)
let y = new BigNumber(this.temporaryWeighObj.skin)
this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
@@ -457,12 +501,26 @@
isEvacuation() {
if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
'杞嚭') {
- return this.weighList.skin == this.temporaryWeighObj.hair;
+ return this.weightObj.skin == this.temporaryWeighObj.hair;
}
if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType ==
'杞叆') {
- return this.weighList.hair == this.temporaryWeighObj.skin;
+ return this.weightObj.hair == this.temporaryWeighObj.skin;
}
+ },
+ weightObj(){
+ const index = this.weighList.tmTaskCoalList.length - 1;//涓嬫爣浣� 锛岃鍙栫鍑犵粍鐨勭毊姣涘噣锛�,榛樿鏈�鍚庝竴缁�;
+ const tempArr = this.weighList.tmTaskCoalList.filter(item=> item.isWeight === 1);
+ const result =tempArr.find(item=>!item.skin || !item.hair || !item.clean);
+ console.log(result,'result')
+ if(result){
+ return result
+ }else{
+ return tempArr[index];
+ }
+
+
+
},
sideline() {
return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
@@ -498,7 +556,9 @@
this.outBuy = !(this.weighList.orderType === '澶栬喘' || this.weighList.orderType ===
'鍐呰喘' ||
this.weighList.orderType === '杞叆')
+ this.productList = res.data.tmTaskCoalList;
console.log(this.outBuy);
+
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
@@ -522,7 +582,7 @@
} else {
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(this.globalweigh)
- if (xx.minus(yy).toNumber() <= -this.weightReal || xx.minus(yy).toNumber() >= this.weightReal) {
+ if (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) {
this.abnormalModalShow = true
this.skinAbnormal()
} else {
@@ -717,7 +777,14 @@
justify-content: space-between;
align-items: center;
}
-
+ .chanpin{
+ width: calc(100% - 60rpx);
+ height: 300rpx;
+ margin: 0 30rpx 30rpx 30rpx;
+ /deep/ .uni-table{
+ min-width: 0!important;
+ }
+ }
::v-deep.weighingDevice {
width: 100%;
height: 100%;
--
Gitblit v1.9.1