From 4d41577c2d01648ba3e9919fbd540380279ca85f Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 19 四月 2024 11:23:05 +0800
Subject: [PATCH] 毛重，净重如果是0强制修改为空的逻辑处理
---
src/views/overview/OverviewListView.vue | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 177b5e5..7de76d6 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -358,31 +358,31 @@
// bottom浜у搧淇℃伅鏁版嵁澶勭悊
bottomProductData(arr) {
const list = arr.details.map((item) => {
- // let adjunctUnit=''
- // let adjunctAmount=''
- // if(item.product.moreUnit&&item.product.moreUnitList){
- // let moreUnitList=item.product.moreUnitList
- // if(moreUnitList.length>0){
- // let isValue=false
- // for(let j in moreUnitList){
- // if(moreUnitList[j].floating){
- // isValue=true;
- // adjunctUnit=moreUnitList[j].unit
- // adjunctAmount=moreUnitList[j].amount
- // break;
- // }
- // }
- // if(!isValue){
- // for(let j in moreUnitList){
- // if(moreUnitList[j].unit){
- // adjunctUnit=moreUnitList[j].unit
- // adjunctAmount=moreUnitList[j].amount
- // break;
- // }
- // }
- // }
- // }
- // }
+ let adjunctUnit=''
+ let adjunctAmount=''
+ if(item.product.moreUnit&&item.product.moreUnitList){
+ let moreUnitList=item.product.moreUnitList
+ if(moreUnitList.length>0){
+ let isValue=false
+ for(let j in moreUnitList){
+ if(moreUnitList[j].floating){
+ isValue=true;
+ adjunctUnit=moreUnitList[j].unit
+ adjunctAmount=moreUnitList[j].amount
+ break;
+ }
+ }
+ if(!isValue){
+ for(let j in moreUnitList){
+ if(moreUnitList[j].unit){
+ adjunctUnit=moreUnitList[j].unit
+ adjunctAmount=moreUnitList[j].amount
+ break;
+ }
+ }
+ }
+ }
+ }
return {
...item,
productName: item.product.name,
@@ -391,11 +391,11 @@
specs:item.product.specs,
location: arr.location.name,
toLocation: arr.toLocation.name,
- adjunctUnit:item.auxiliaryUnit,
- adjunctAmount:item.auxiliaryAmount,
- grossWeight:item.product.grossWeight,
+ adjunctUnit:adjunctUnit,
+ adjunctAmount:adjunctAmount&&item.amount?adjunctAmount:'',
+ grossWeight:item.product.grossWeight==0?'':item.product.grossWeight,
totalGrossWeight:item.totalGrossWeight,
- netWeight:item.product.netWeight,
+ netWeight:item.product.netWeight==0?'':item.product.netWeight,
totalNetWeight:item.totalNetWeight,
}
})
--
Gitblit v1.8.0