From 4c71426795d126d0491f2e4105090273909e6d51 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 19 四月 2024 15:16:38 +0800
Subject: [PATCH] 辅助数量限制值修改
---
src/views/overview/AddOverviewDialog.vue | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index e23fced..37e074e 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 {
@@ -1501,13 +1501,13 @@
productName: res.name,
productId: res.id,
auxiliaryUnit:adjunctUnit,
- auxiliaryAmount:adjunctAmount?Number(adjunctAmount)*1:0,
+ auxiliaryAmount:adjunctAmount?(1/Number(adjunctAmount)).toFixed(2):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,9 +1553,9 @@
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.auxiliaryAmount=item[prop]&&auxiliaryAmountObject.auxiliaryAmount?Number(auxiliaryAmountObject.auxiliaryAmount)*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(item[prop])/Number(auxiliaryAmountObject.auxiliaryAmount)).toFixed(2):''
}
}
});
@@ -1613,7 +1613,6 @@
},
// 鏂板鏂瑰紡淇敼
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