From ac77acd88859311081f77da22c6efc8a1bb85a2d Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Wed, 1 Jul 2026 10:39:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=92=E9=B8=9F=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E9=9D=A2=E5=8D=95=E4=B8=8D=E8=BF=9B=E5=85=A5=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/order/order/orderDetail.vue | 31 +++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index 677895b9..638c4cb3 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -1155,24 +1155,41 @@ export default {
         }
       })
     },
-    toPrints () {
-      if (this.faceSheetForm.logisticsId != null && this.faceSheetForm.logisticsId != '') {
-        this.orderDeliverModal = false;
+    toPrints (printWindow) {
+      this.orderDeliverModal = false;
+      if (!this.someJSONdata) {
+        printWindow && printWindow.close();
+        return;
       }
+      const win = printWindow || window.open('', '_blank');
+      if (!win) {
+        this.$Message.error('无法打开打印窗口，请允许浏览器弹窗');
+        return;
+      }
+      win.document.write(this.someJSONdata);
+      win.document.close();
+      win.focus();
+      this.$Message.success('电子面单发货成功');
+      this.getDataDetail();
     },
     //订单发货提交
     orderDeliverySubmit () {
       if (this.facesheetFlag) {
         this.$refs['faceSheetForm'].validate((valid) => {
           if (valid) {
+            const printWindow = window.open('', '_blank');
             API_Order.getOrderFaceSheet(this.sn, this.faceSheetForm).then(res => {
               if (res.success && res.result.printTemplate) {
                 this.someJSONdata = res.result.printTemplate;
-                this.toPrints();
-              }else{
-                this.$Message.success("电子面单发货失败！");
+                this.toPrints(printWindow);
+              } else {
+                printWindow && printWindow.close();
+                this.$Message.error('电子面单发货失败！');
               }
-            })
+            }).catch(() => {
+              printWindow && printWindow.close();
+              this.$Message.error('电子面单发货失败！');
+            });
           }
         })
       } else {