From 4959a25a7cac2a514a9b8fb2471101c067fd72e4 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 18 四月 2024 17:22:54 +0800
Subject: [PATCH] 产品 启用多单位的时候如果没有设置显示弹框
---
src/views/overview/AddOverviewDialog.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 7492a14..462936e 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -1485,9 +1485,9 @@
auxiliaryUnit:adjunctUnit,
auxiliaryAmount:Number(adjunctAmount),
inputFloatAuxiliaryAmount:isValue,
- grossWeight:Number(res.grossWeight),
+ grossWeight:res.grossWeight,
totalGrossWeight:res.grossWeight?Number(res.grossWeight)*1:'',
- netWeight:Number(res.netWeight),
+ netWeight:res.netWeight,
totalNetWeight:res.netWeight?Number(res.netWeight)*1:'',
};
}
@@ -1684,14 +1684,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'?52.6:
+ (this.editConfig.infomation.baseOperationType == 2
? 50.8
- : 53.3,
+ : 53.3),
};
var { href } = this.$router.resolve({
path: "/overview/previewExcel",
--
Gitblit v1.8.0