From 4c71426795d126d0491f2e4105090273909e6d51 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 19 四月 2024 15:16:38 +0800
Subject: [PATCH] 辅助数量限制值修改
---
src/views/overview/OverviewListView.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index fef9531..a7a79f4 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -109,7 +109,7 @@
title: "鏂板缓",
infomation: {}
},
- workType: this.$route.params.workType,
+ workType: this.$route.query.workType,
keyword: "",
params: {},
displayEdit: false,
@@ -120,7 +120,7 @@
numberLabel: "鍗曞彿",
TabsIndex: "0",
productTableList: {},
- showBottomCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "璁￠噺鍗曚綅", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鏁伴噺","涓荤","浼氳","淇濈鍛�",],
+ showBottomCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "璁￠噺鍗曚綅", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鏁伴噺","涓荤","浼氳","淇濈鍛�",'杈呭姪鏁伴噺','杈呭姪鍗曚綅','姣涢噸','鎬绘瘺閲�','鍑�閲�','鎬诲噣閲�'],
tableBottomColumn: [],
selectRow: {},
productColumn: [
@@ -128,8 +128,14 @@
{ label: "浜у搧鍚嶇О", prop: "productName" },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
+ { 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" }
],
allotProductColumn: [
{ label: "浜у搧缂栧彿", prop: "id", default: true },
@@ -139,7 +145,13 @@
{ label: "璁￠噺鍗曚綅", prop: "unit" },
{ label: "璋冨嚭浣嶇疆", prop: "location" },
{ label: "璋冨叆浣嶇疆", prop: "toLocation" },
- { label: "鏁伴噺", prop: "amount" }
+ { label: "鏁伴噺", prop: "amount" },
+ { label: "杈呭姪鏁伴噺", prop: "adjunctAmount" },
+ { label: "杈呭姪鍗曚綅", prop: "adjunctUnit" },
+ { label: "姣涢噸", prop: "grossWeight" },
+ { label: "鎬绘瘺閲�", prop: "totalGrossWeight" },
+ { label: "鍑�閲�", prop: "netWeight" },
+ { label: "鎬诲噣閲�", prop: "totalNetWeight" }
]
}
},
@@ -151,7 +163,8 @@
if (paramsData) {
params = JSON.parse(sessionStorage.getItem("paramsData"))
} else {
- params = this.$route.params
+ params = this.$route.query
+ params.id=Number(params.id)
sessionStorage.setItem("paramsData", JSON.stringify(params))
}
this.params = params
@@ -318,7 +331,7 @@
async getData() {
await getOperation({
number: this.keyword,
- operationTypeId: this.$route.params.id ? this.$route.params.id : this.params.id,
+ operationTypeId: this.$route.query.id ? Number(this.$route.query.id) : this.params.id,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
status: this.params.status
@@ -345,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:item.auxiliaryUnit,
+ adjunctAmount:item.auxiliaryAmount,
+ grossWeight:item.product.grossWeight==0?'':item.product.grossWeight,
+ totalGrossWeight:item.totalGrossWeight==0?'':item.totalGrossWeight,
+ netWeight:item.product.netWeight==0?'':item.product.netWeight,
+ totalNetWeight:item.totalNetWeight==0?'':item.totalNetWeight,
}
})
this.productTableList.tableInfomation = list
--
Gitblit v1.8.0