From f56b025631ef59269d24d83bbf49f82544e16588 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 19 四月 2024 14:02:17 +0800
Subject: [PATCH] 修改总毛重，总净重的数据类型
---
src/views/overview/AddOverviewDialog.vue | 20 ++++++++++----------
src/views/overview/OverviewListView.vue | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index e23fced..20e670e 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -1489,10 +1489,10 @@
auxiliaryAmount:res.auxiliaryAmount,
auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
inputFloatAuxiliaryAmount:isValue,
- grossWeight:res.product.grossWeight==0?'':res.product.grossWeight,
- totalGrossWeight:res.totalGrossWeight,
- netWeight:res.product.netWeight==0?'':res.product.netWeight,
- totalNetWeight:res.totalNetWeight,
+ grossWeight:res.product.grossWeight==0?null:res.product.grossWeight,
+ totalGrossWeight:res.totalGrossWeight==0?null:Number(res.totalGrossWeight),
+ netWeight:res.product.netWeight==0?null:res.product.netWeight,
+ totalNetWeight:res.totalNetWeight==0?null:Number(res.totalNetWeight),
};
}else{
return {
@@ -1504,10 +1504,10 @@
auxiliaryAmount:adjunctAmount?Number(adjunctAmount)*1:0,
auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
inputFloatAuxiliaryAmount:isValue,
- grossWeight:res.grossWeight==0?'':res.grossWeight,
- totalGrossWeight:res.grossWeight?Number(res.grossWeight)*1:'',
- netWeight:res.netWeight==0?'':res.netWeight,
- totalNetWeight:res.netWeight?Number(res.netWeight)*1:'',
+ grossWeight:res.grossWeight==0?null:res.grossWeight,
+ totalGrossWeight:res.grossWeight?Number(res.grossWeight)*1:null,
+ netWeight:res.netWeight==0?null:res.netWeight,
+ totalNetWeight:res.netWeight?Number(res.netWeight)*1:null,
};
}
});
@@ -1553,8 +1553,8 @@
item[prop] = val;
let auxiliaryAmountObject=this.getAuxiligyAmount(item.moreUnit,item.moreUnitList)
if(prop=='amount'){
- item.totalGrossWeight=item[prop]&&item.grossWeight?Number(item.grossWeight)*Number(item[prop]):''
- item.totalNetWeight=item[prop]&&item.netWeight?Number(item.netWeight)*Number(item[prop]):''
+ item.totalGrossWeight=item[prop]&&item.grossWeight?Number(item.grossWeight)*Number(item[prop]):null
+ item.totalNetWeight=item[prop]&&item.netWeight?Number(item.netWeight)*Number(item[prop]):null
item.auxiliaryAmount=item[prop]&&auxiliaryAmountObject.auxiliaryAmount?Number(auxiliaryAmountObject.auxiliaryAmount)*Number(item[prop]):''
}
}
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index ef84b5c..a7a79f4 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -394,9 +394,9 @@
adjunctUnit:item.auxiliaryUnit,
adjunctAmount:item.auxiliaryAmount,
grossWeight:item.product.grossWeight==0?'':item.product.grossWeight,
- totalGrossWeight:item.totalGrossWeight,
+ totalGrossWeight:item.totalGrossWeight==0?'':item.totalGrossWeight,
netWeight:item.product.netWeight==0?'':item.product.netWeight,
- totalNetWeight:item.totalNetWeight,
+ totalNetWeight:item.totalNetWeight==0?'':item.totalNetWeight,
}
})
this.productTableList.tableInfomation = list
--
Gitblit v1.8.0