From a1b487e3417efb1481c3ef5598dcc4894529f1d5 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 18 四月 2024 16:42:04 +0800
Subject: [PATCH] 出入库明细打印的接口联调+根据公司的不同设置不同的打印宽度
---
src/views/overview/AddOverviewDialog.vue | 13 +++++++++----
src/components/layout/components/appHeader/index.vue | 1 +
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/components/layout/components/appHeader/index.vue b/src/components/layout/components/appHeader/index.vue
index e0d2d90..402ed29 100644
--- a/src/components/layout/components/appHeader/index.vue
+++ b/src/components/layout/components/appHeader/index.vue
@@ -40,6 +40,7 @@
},
created(){
const userObj = Cookies.get('userObj');
+ console.log(Cookies.get(),'==userObj')
if (userObj) {
let userInfo = JSON.parse(userObj);
this.editConfig.userId=userInfo.id
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index c7b067d..462936e 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -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