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 | 121 +++++++++++++++++++++++++++++++---------
1 files changed, 93 insertions(+), 28 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index c7b067d..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({
@@ -1196,7 +1205,7 @@
params = {
baseOperationType: data.baseOperationType,
comment: data.comment || "",
- companyID: companyID,
+ companyID: companyID+'',
companyName: companyName,
contacterID: contacterID,
contacterName: contacterName,
@@ -1230,7 +1239,7 @@
params = {
baseOperationType: data.baseOperationType,
comment: data.comment || "",
- companyID: companyID,
+ companyID: companyID+'',
companyName: companyName,
contacterID: contacterID,
contacterName: contacterName,
@@ -1293,13 +1302,14 @@
{
label: "浜у搧鍚嶇О",
prop: "productName",
+ min:150,
productName: true,
isRequird: true,
},
{ label: "浜у搧缂栫爜", prop: "productId" },
- { label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
+ { label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
{ label: "杈呭姪鏁伴噺", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
{ label: "杈呭姪鍗曚綅", prop: "auxiliaryUnit" },
@@ -1313,19 +1323,21 @@
{
label: "浜у搧鍚嶇О",
prop: "productName",
+ min:150,
productName: true,
isRequird: true,
},
{ label: "浜у搧缂栫爜", prop: "productId" },
- { label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
{
label: "浠�",
prop: "fromLocationId",
+ min:120,
sonLocation: true,
isRequird: true,
},
+ { label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
{ label: "杈呭姪鏁伴噺", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
{ label: "杈呭姪鍗曚綅", prop: "auxiliaryUnit" },
@@ -1339,17 +1351,18 @@
{
label: "浜у搧鍚嶇О",
prop: "productName",
+ min:150,
productName: true,
isRequird: true,
},
{ label: "浜у搧缂栫爜", prop: "productId" },
- { label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
{
label: "浠�",
prop: "fromLocationId",
sonLocation: true,
+ min:120,
isRequird: true,
},
{
@@ -1358,6 +1371,7 @@
toLocation: true,
isRequird: true,
},
+ { label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
{ label: "杈呭姪鏁伴噺", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
{ label: "杈呭姪鍗曚綅", prop: "auxiliaryUnit" },
@@ -1371,16 +1385,17 @@
{
label: "浜у搧鍚嶇О",
prop: "productName",
+ min:150,
productName: true,
isRequird: true,
},
{ label: "浜у搧缂栫爜", prop: "productId" },
- { label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
{
label: "浠�",
prop: "fromLocationId",
+ min:120,
sonLocation: true,
isRequird: true,
},
@@ -1390,6 +1405,7 @@
toLocation: true,
isRequird: true,
},
+ { label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
];
} else if (this.workType == 5) {
@@ -1397,16 +1413,17 @@
{
label: "浜у搧鍚嶇О",
prop: "productName",
+ min:150,
productName: true,
isRequird: true,
},
{ label: "浜у搧缂栫爜", prop: "productId" },
- { label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
{
label: "浠�",
prop: "fromLocationId",
+ min:120,
sonLocation: true,
isRequird: true,
},
@@ -1416,6 +1433,7 @@
toLocation: true,
isRequird: true,
},
+ { label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
];
}
@@ -1468,31 +1486,68 @@
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.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:Number(adjunctAmount),
+ 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,
};
}
});
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) {
@@ -1500,9 +1555,11 @@
this.tableData.map((item) => {
if (item.id == row.id) {
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.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
}
}
});
@@ -1555,9 +1612,12 @@
// }
// }
},
+ selProductClick(value, prop,row,scope){
+ this.getSelectArray([value],scope.$index)
+ },
// 鏂板鏂瑰紡淇敼
getSelectArray(val, index) {
- if (this.tableData.length == 1 && this.tableData[0].number.length == 0) {
+ if (this.tableData.length == 1 && this.tableData[0].number&&this.tableData[0].number.length == 0) {
this.tableData = [];
}
if (index < this.tableData.length) {
@@ -1605,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 },
@@ -1613,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 },
];
@@ -1684,14 +1744,19 @@
console.log(res);
if (res.code == 200) {
console.log(this.editConfig.infomation.baseOperationType, "绫诲瀷");
+ let name=''
+ if(res.data){
+ name=res.data.name?res.data.name:''
+ }
let pdfParams = {
- url: res.data,
+ url: res.data?res.data.url:'',
baseOperationType:
this.editConfig.infomation.baseOperationType || undefined,
- cutAfterWidth:
- this.editConfig.infomation.baseOperationType == 2
+ // 1鏄槈鑱�
+ cutAfterWidth:name=='jialian'?53.9:
+ (this.editConfig.infomation.baseOperationType == 2
? 50.8
- : 53.3,
+ : 53.3),
};
var { href } = this.$router.resolve({
path: "/overview/previewExcel",
--
Gitblit v1.8.0