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 | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 4e9bc6d..20e670e 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -473,6 +473,7 @@
:addTypeIdMultiple="true"
:product-table-list="productTableList"
:detail-enter="!showFooter"
+ @selProductClick="selProductClick"
@inputContent="inputContent"
@addProductClick="addProductClick('鎿嶄綔')"
@getSelectArray="getSelectArray"
@@ -1484,13 +1485,14 @@
moreUnit:res.product.moreUnit,
moreUnitList:res.product.moreUnitList,
auxiliaryUnit:res.auxiliaryUnit,
- auxiliaryAmount:res.amount&&adjunctAmount?Number(adjunctAmount)*Number(res.amount):0,
+ // auxiliaryAmount:res.amount&&adjunctAmount?Number(adjunctAmount)*Number(res.amount):0,
+ 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 {
@@ -1502,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,
};
}
});
@@ -1551,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]):''
}
}
@@ -1606,8 +1608,12 @@
// }
// }
},
+ selProductClick(value, prop,row,scope){
+ this.getSelectArray([value],scope.$index)
+ },
// 鏂板鏂瑰紡淇敼
getSelectArray(val, index) {
+ debugger
if (this.tableData.length == 1 && this.tableData[0].number&&this.tableData[0].number.length == 0) {
this.tableData = [];
}
--
Gitblit v1.8.0