From 9f2460bad24053ab368886407a3a47b34421fd70 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 18 四月 2024 19:03:52 +0800
Subject: [PATCH] 入库出库调拨出入库明细 4个模块添加和编辑产品的时候增加辅助数量的计算逻辑，浮动值和数量相乘所得
---
src/views/overview/AddOverviewDialog.vue | 43 ++++++++++++++++++++-
src/views/overview/OverviewListView.vue | 54 +++++++++++++-------------
2 files changed, 68 insertions(+), 29 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 462936e..31446e2 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -1468,8 +1468,11 @@
unit: res.product.unit,
model:res.product.model,
specs:res.product.specs,
+ moreUnit:res.product.moreUnit,
+ moreUnitList:res.product.moreUnitList,
auxiliaryUnit:res.auxiliaryUnit,
- auxiliaryAmount:res.auxiliaryAmount,
+ auxiliaryAmount:res.amount&&adjunctAmount?Number(adjunctAmount)*Number(res.amount):0,
+ auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
inputFloatAuxiliaryAmount:isValue,
grossWeight:res.product.grossWeight,
totalGrossWeight:res.totalGrossWeight,
@@ -1483,7 +1486,8 @@
productName: res.name,
productId: res.id,
auxiliaryUnit:adjunctUnit,
- auxiliaryAmount:Number(adjunctAmount),
+ auxiliaryAmount:adjunctAmount?Number(adjunctAmount)*1:0,
+ auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
inputFloatAuxiliaryAmount:isValue,
grossWeight:res.grossWeight,
totalGrossWeight:res.grossWeight?Number(res.grossWeight)*1:'',
@@ -1494,15 +1498,50 @@
});
return list||[];
},
+ getAuxiligyAmount(unit,unitList){
+ let adjunctUnit=''
+ let adjunctAmount=''
+ let isValue=false
+ let moreUnit=unit?unit:''
+ let moreUnitList=unitList?unitList:[]
+ if(moreUnit&&moreUnitList){
+ if(moreUnitList.length>0){
+ 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 {
+ auxiliaryAmount:adjunctAmount,
+ auxiliaryUnit:adjunctUnit,
+ }
+ },
// 鎿嶄綔杈撳叆
inputContent(val, prop, row) {
this.countId = row.countId;
this.tableData.map((item) => {
if (item.id == row.id) {
+ debugger
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]):''
}
}
});
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 177b5e5..d8d2f0a 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,8 +391,8 @@
specs:item.product.specs,
location: arr.location.name,
toLocation: arr.toLocation.name,
- adjunctUnit:item.auxiliaryUnit,
- adjunctAmount:item.auxiliaryAmount,
+ adjunctUnit:adjunctUnit,
+ adjunctAmount:adjunctAmount&&item.amount?adjunctAmount:'',
grossWeight:item.product.grossWeight,
totalGrossWeight:item.totalGrossWeight,
netWeight:item.product.netWeight,
--
Gitblit v1.8.0