From 52b1acf9aa11e2e510f74ce801b326eb9ef2425e Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 17 四月 2024 16:26:49 +0800
Subject: [PATCH] 出库入库调拨3个模块的添加编辑增加辅助单位，辅助数量根多单位是否启用是否浮动获辅助数量是否编辑的逻辑
---
src/views/overview/OverviewListView.vue | 62 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 49354f5..177b5e5 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -120,7 +120,7 @@
numberLabel: "鍗曞彿",
TabsIndex: "0",
productTableList: {},
- showBottomCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "璁￠噺鍗曚綅", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鏁伴噺","涓荤","浼氳","淇濈鍛�",'杈呭姪鏁伴噺','杈呭姪鍗曚綅'],
+ showBottomCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "璁￠噺鍗曚綅", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鏁伴噺","涓荤","浼氳","淇濈鍛�",'杈呭姪鏁伴噺','杈呭姪鍗曚綅','姣涢噸','鎬绘瘺閲�','鍑�閲�','鎬诲噣閲�'],
tableBottomColumn: [],
selectRow: {},
productColumn: [
@@ -131,7 +131,11 @@
{ label: "鏁伴噺", prop: "amount" },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
{ label: "杈呭姪鏁伴噺", prop: "adjunctAmount" },
- { label: "杈呭姪鍗曚綅", prop: "adjunctUnit" }
+ { label: "杈呭姪鍗曚綅", prop: "adjunctUnit" },
+ { label: "姣涢噸", prop: "grossWeight" },
+ { label: "鎬绘瘺閲�", prop: "totalGrossWeight" },
+ { label: "鍑�閲�", prop: "netWeight" },
+ { label: "鎬诲噣閲�", prop: "totalNetWeight" }
],
allotProductColumn: [
{ label: "浜у搧缂栧彿", prop: "id", default: true },
@@ -143,7 +147,11 @@
{ label: "璋冨叆浣嶇疆", prop: "toLocation" },
{ label: "鏁伴噺", prop: "amount" },
{ label: "杈呭姪鏁伴噺", prop: "adjunctAmount" },
- { label: "杈呭姪鍗曚綅", prop: "adjunctUnit" }
+ { label: "杈呭姪鍗曚綅", prop: "adjunctUnit" },
+ { label: "姣涢噸", prop: "grossWeight" },
+ { label: "鎬绘瘺閲�", prop: "totalGrossWeight" },
+ { label: "鍑�閲�", prop: "netWeight" },
+ { label: "鎬诲噣閲�", prop: "totalNetWeight" }
]
}
},
@@ -350,27 +358,45 @@
// 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){
- for(let j in moreUnitList){
- if(moreUnitList[j].floating){
- adjunctUnit=moreUnitList[j].unit
- adjunctAmount=moreUnitList[j].amount
- }
- }
- }
- }
+ // 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,
unit: item.product.unit,
+ model:item.product.model,
+ specs:item.product.specs,
location: arr.location.name,
toLocation: arr.toLocation.name,
- adjunctUnit:adjunctUnit,
- adjunctAmount:adjunctAmount
+ adjunctUnit:item.auxiliaryUnit,
+ adjunctAmount:item.auxiliaryAmount,
+ grossWeight:item.product.grossWeight,
+ totalGrossWeight:item.totalGrossWeight,
+ netWeight:item.product.netWeight,
+ totalNetWeight:item.totalNetWeight,
}
})
this.productTableList.tableInfomation = list
--
Gitblit v1.8.0