From 8f53694cc7ed5b9965d172a511ab39b914edbfb6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 19 四月 2024 14:18:02 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index 6d21a00..fe180ed 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -26,8 +26,10 @@
break
}
case 'printing' :{
- const url = router.resolve({path: '/main/delivery/deliveryPrinting', query: { deliveryID: row.deliveryId }})
+ /*const url = router.resolve({path: '/main/delivery/deliveryPrinting', query: { deliveryID: row.deliveryId }})
window.open(url.href, '_blank')
+ break*/
+ router.push({path: '/main/delivery/deliveryPrinting', query: { deliveryID: row.deliveryId }})
break
}
case 'delete':{
@@ -355,10 +357,11 @@
<el-dialog
v-model="dialogTableVisible"
destroy-on-close
- style="width: 75%;height:70% ">
+ id="deliveryPrinting"
+ style="width: 100%;height:100%;margin-top: 0; ">
<DeliveryPrinting
:deliveryId="rowClickIndex.deliveryId"
- style="width: 100%;height: 100%" />
+ style="width: 100%;height: 100%;" />
</el-dialog>
</div>
--
Gitblit v1.8.0