From f2ca54c4037fe550253e46356cf34b446c645938 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 19 四月 2024 11:05:32 +0800
Subject: [PATCH] 新增产品的时候产品不显示的 样式调整
---
src/views/overview/OverviewListView.vue | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index cce7adf..d8d2f0a 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: [
@@ -130,8 +130,12 @@
{ label: "浜у搧鍨嬪彿", prop: "model" },
{ label: "鏁伴噺", prop: "amount" },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
- { label: "杈呭姪鏁伴噺", prop: "unit" },
- { label: "杈呭姪鍗曚綅", prop: "amount" }
+ { label: "杈呭姪鏁伴噺", prop: "adjunctAmount" },
+ { label: "杈呭姪鍗曚綅", prop: "adjunctUnit" },
+ { label: "姣涢噸", prop: "grossWeight" },
+ { label: "鎬绘瘺閲�", prop: "totalGrossWeight" },
+ { label: "鍑�閲�", prop: "netWeight" },
+ { label: "鎬诲噣閲�", prop: "totalNetWeight" }
],
allotProductColumn: [
{ label: "浜у搧缂栧彿", prop: "id", default: true },
@@ -142,8 +146,12 @@
{ label: "璋冨嚭浣嶇疆", prop: "location" },
{ label: "璋冨叆浣嶇疆", prop: "toLocation" },
{ label: "鏁伴噺", prop: "amount" },
- { label: "杈呭姪鏁伴噺", prop: "unit" },
- { label: "杈呭姪鍗曚綅", prop: "amount" }
+ { label: "杈呭姪鏁伴噺", prop: "adjunctAmount" },
+ { label: "杈呭姪鍗曚綅", prop: "adjunctUnit" },
+ { label: "姣涢噸", prop: "grossWeight" },
+ { label: "鎬绘瘺閲�", prop: "totalGrossWeight" },
+ { label: "鍑�閲�", prop: "netWeight" },
+ { label: "鎬诲噣閲�", prop: "totalNetWeight" }
]
}
},
@@ -350,12 +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){
+ 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
+ toLocation: arr.toLocation.name,
+ adjunctUnit:adjunctUnit,
+ adjunctAmount:adjunctAmount&&item.amount?adjunctAmount:'',
+ grossWeight:item.product.grossWeight,
+ totalGrossWeight:item.totalGrossWeight,
+ netWeight:item.product.netWeight,
+ totalNetWeight:item.totalNetWeight,
}
})
this.productTableList.tableInfomation = list
--
Gitblit v1.8.0