From 7b5e1c2372faf11b6211126410d2713f2b47f147 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 19 四月 2024 17:01:44 +0800
Subject: [PATCH] 嘉联 excel转化pdf的文件裁剪问题调整
---
src/views/overview/AddOverviewDialog.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 20e670e..9fdea10 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -1498,10 +1498,10 @@
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==0?null:res.grossWeight,
@@ -1555,7 +1555,7 @@
if(prop=='amount'){
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(auxiliaryAmountObject.auxiliaryAmount)*Number(item[prop]):''
+ item.auxiliaryAmount=item[prop]&&auxiliaryAmountObject.auxiliaryAmount?(Number(item[prop])/Number(auxiliaryAmountObject.auxiliaryAmount)).toFixed(2):''
}
}
});
@@ -1750,7 +1750,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