From a90640403fec7645493fb39c26ae95c985392c8a Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 25 四月 2024 15:35:01 +0800
Subject: [PATCH] 新建出库页面的出库位置样式调整
---
src/views/overview/AddOverviewDialog.vue | 56 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index df3c3a5..a942362 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -473,6 +473,7 @@
:addTypeIdMultiple="true"
:product-table-list="productTableList"
:detail-enter="!showFooter"
+ @selProductClick="selProductClick"
@inputContent="inputContent"
@addProductClick="addProductClick('鎿嶄綔')"
@getSelectArray="getSelectArray"
@@ -480,10 +481,10 @@
@clearupProduct="clearupProduct"
>
<template v-if="showFooter" slot="tableButton">
+ <!-- fixed="right" -->
<el-table-column
label="鎿嶄綔"
width="60"
- fixed="right"
align="center"
>
<template slot-scope="scope">
@@ -1044,6 +1045,8 @@
productId: item.productId,
auxiliaryUnit:item.auxiliaryUnit,
auxiliaryAmount:item.auxiliaryAmount,
+ totalNetWeight:item.totalNetWeight,
+ totalGrossWeight:item.totalGrossWeight,
});
});
params.details = arr;
@@ -1057,6 +1060,8 @@
productId: item.productId,
auxiliaryUnit:item.auxiliaryUnit,
auxiliaryAmount:item.auxiliaryAmount,
+ totalNetWeight:item.totalNetWeight,
+ totalGrossWeight:item.totalGrossWeight,
});
} else {
arr.push({
@@ -1066,6 +1071,8 @@
productId: item.productId,
auxiliaryUnit:item.auxiliaryUnit,
auxiliaryAmount:item.auxiliaryAmount,
+ totalNetWeight:item.totalNetWeight,
+ totalGrossWeight:item.totalGrossWeight,
});
}
});
@@ -1085,6 +1092,8 @@
productId: item.productId,
auxiliaryUnit:item.auxiliaryUnit,
auxiliaryAmount:item.auxiliaryAmount,
+ totalNetWeight:item.totalNetWeight,
+ totalGrossWeight:item.totalGrossWeight,
});
// if(item.fromLocationId.value){
// arr.push({
@@ -1324,6 +1333,7 @@
{
label: "浠�",
prop: "fromLocationId",
+ min:120,
sonLocation: true,
isRequird: true,
},
@@ -1352,6 +1362,7 @@
label: "浠�",
prop: "fromLocationId",
sonLocation: true,
+ min:120,
isRequird: true,
},
{
@@ -1384,6 +1395,7 @@
{
label: "浠�",
prop: "fromLocationId",
+ min:120,
sonLocation: true,
isRequird: true,
},
@@ -1411,6 +1423,7 @@
{
label: "浠�",
prop: "fromLocationId",
+ min:120,
sonLocation: true,
isRequird: true,
},
@@ -1476,28 +1489,29 @@
moreUnit:res.product.moreUnit,
moreUnitList:res.product.moreUnitList,
auxiliaryUnit:res.auxiliaryUnit,
- auxiliaryAmount:res.amount&&adjunctAmount?Number(adjunctAmount)*Number(res.amount):0,
+ // auxiliaryAmount:res.amount&&adjunctAmount?Number(adjunctAmount)*Number(res.amount):0,
+ auxiliaryAmount:res.auxiliaryAmount,
auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
inputFloatAuxiliaryAmount:isValue,
- grossWeight:res.product.grossWeight,
- totalGrossWeight:res.totalGrossWeight,
- netWeight: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 {
...res,
amount: 1,
- productName: res.name,
- productId: res.id,
+ productName: res.productId?res.productName:res.name,
+ productId: res.productId?res.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,
- totalGrossWeight:res.grossWeight?Number(res.grossWeight)*1:'',
- netWeight:res.netWeight,
- totalNetWeight:res.netWeight?Number(res.netWeight)*1:'',
+ grossWeight:res.grossWeight==0?null:res.grossWeight,
+ totalGrossWeight:res.grossWeight==0?null:Number(res.grossWeight)*1,
+ netWeight:res.netWeight==0?null:res.netWeight,
+ totalNetWeight:res.netWeight==0?null:Number(res.netWeight)*1,
};
}
});
@@ -1540,13 +1554,12 @@
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]):''
+ 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):null
}
}
});
@@ -1599,6 +1612,9 @@
// }
// }
},
+ selProductClick(value, prop,row,scope){
+ this.getSelectArray([value],scope.$index)
+ },
// 鏂板鏂瑰紡淇敼
getSelectArray(val, index) {
if (this.tableData.length == 1 && this.tableData[0].number&&this.tableData[0].number.length == 0) {
@@ -1649,7 +1665,7 @@
if (this.workType == "鍐呴儴璋冩嫧"||this.workType==3) {
this.tableColumn = [
{ label: "浜у搧", prop: "name", productName: true, isRequird: true },
- { label: "浠�", prop: "number", select: true },
+ { label: "浠�", prop: "number", select: true,min:120,},
{ label: "鑷�", prop: "amount", select: true },
{ label: "瀹屾垚", prop: "total", inputFloat: true },
{ label: "璁￠噺鍗曚綅", prop: "total", select: true },
@@ -1657,7 +1673,7 @@
} else {
this.tableColumn = [
{ label: "浜у搧", prop: "name", productName: true, isRequird: true },
- { label: "浠�", prop: "number", select: true },
+ { label: "浠�", prop: "number", select: true , min:120,},
{ label: "瀹屾垚", prop: "total", inputFloat: true },
{ label: "璁￠噺鍗曚綅", prop: "total", select: true },
];
@@ -1737,7 +1753,7 @@
baseOperationType:
this.editConfig.infomation.baseOperationType || undefined,
// 1鏄槈鑱�
- cutAfterWidth:name=='jialian'?52.6:
+ cutAfterWidth:name=='jialian'?53.9:
(this.editConfig.infomation.baseOperationType == 2
? 50.8
: 53.3),
--
Gitblit v1.8.0