From b72d5ad73df3f502e19fd3a06497b2f4d2db1795 Mon Sep 17 00:00:00 2001
From: lzp <1747191978@qq.com>
Date: Thu, 22 Jan 2026 09:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E9=80=89=E6=8B=A9=E7=AD=BE=E5=90=8D=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/history/components/scaleInfor.vue   | 15 ++++++-------
 .../history/components/scaleInforCopy.vue     | 21 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/web_client/src/views/history/components/scaleInfor.vue b/web_client/src/views/history/components/scaleInfor.vue
index 9850337..8858df5 100644
--- a/web_client/src/views/history/components/scaleInfor.vue
+++ b/web_client/src/views/history/components/scaleInfor.vue
@@ -22,21 +22,21 @@
                 <div
                   class="div-derive cardRig-but"
                   style="width: 130px; margin-right: 10px"
-                  @click="handleExport('医生版')"
+                  @click="handleExport('医生版', true)"
                 >
                   <i class="el-icon-upload2"></i>导出（医生版）
                 </div>
                 <div
                   style="width: 130px; margin-right: 10px"
                   class="div-print cardRig-but"
-                  @click="handlePrinting('医生版')"
+                  @click="handlePrinting('医生版', true)"
                 >
                   <i class="el-icon-printer"></i>打印（医生版）
                 </div>
                 <div
                   class="div-derive cardRig-but"
                   style="width: 130px; margin-right: 10px"
-                  @click="handleExport('阳性版')"
+                  @click="handleExport('阳性版', true)"
                 >
                   <i class="el-icon-upload2"></i>导出（阳性版）
                 </div>
@@ -405,7 +405,7 @@ export default {
       this.$router.go(-1);
     },
     // 报告单报出
-    async handleExport(_type) {
+    async handleExport(_type, _printFlat) {
       this.type = _type;
       let params = {
         evaluationId: this.reportDetail1.patient.evaluationId,
@@ -423,8 +423,8 @@ export default {
 
       const { code, msg, data } = res;
       if (code === 200) {
-        // 是否是打印
-        if (!this.open) {
+        // 是否是打印 true为导出不打印
+        if (_printFlat) {
           // 导出下载
           window.open(this.apiUrl + data.path);
         } else {
@@ -494,7 +494,8 @@ export default {
     handlePrinting(_type) {
       this.type = _type;
       this.timestamp = new Date().getTime();
-      this.open = true;
+      // this.open = true;
+      this.handleExport(this.type);
     },
     // 调用打印方法
     handleInvoke(_path) {
diff --git a/web_client/src/views/history/components/scaleInforCopy.vue b/web_client/src/views/history/components/scaleInforCopy.vue
index eb6c6f9..7bc7ee5 100644
--- a/web_client/src/views/history/components/scaleInforCopy.vue
+++ b/web_client/src/views/history/components/scaleInforCopy.vue
@@ -21,21 +21,21 @@
                 <div
                   class="div-derive cardRig-but"
                   style="width: 130px; margin-right: 10px"
-                  @click="handleExport('医生版')"
+                  @click="handleExport('医生版', true)"
                 >
                   <i class="el-icon-upload2"></i>导出（医生版）
                 </div>
                 <div
                   style="width: 130px; margin-right: 10px"
                   class="div-print cardRig-but"
-                  @click="handlePrinting('医生版')"
+                  @click="handlePrinting('医生版', true)"
                 >
                   <i class="el-icon-printer"></i>打印（医生版）
                 </div>
                 <div
                   class="div-derive cardRig-but"
                   style="width: 130px; margin-right: 10px"
-                  @click="handleExport('阳性版')"
+                  @click="handleExport('阳性版', true)"
                 >
                   <i class="el-icon-upload2"></i>导出（阳性版）
                 </div>
@@ -213,7 +213,7 @@
                 <span>检查日期</span>
                 {{
                   $moment(reportDetail1.patient.checkTime - 0).format(
-                    "YYYY-MM-DD HH:mm"
+                    "YYYY-MM-DD HH:mm",
                   )
                 }}
               </div>
@@ -408,7 +408,7 @@ export default {
       this.$router.go(-1);
     },
     // 报告单报出
-    async handleExport(_type) {
+    async handleExport(_type, _printFlat) {
       this.type = _type;
       let params = {
         evaluationId: this.reportDetail1.patient.evaluationId,
@@ -426,14 +426,14 @@ export default {
 
       const { code, msg, data } = res;
       if (code === 200) {
-        // 是否是打印
-        if (!this.open) {
+        // 是否是打印 true为导出不打印
+        if (_printFlat) {
           // 导出下载
           window.open(this.apiUrl + data.path);
         } else {
           this.open = false;
           this.handleInvoke(
-            `${this.apiUrl}${data.path}?time${new Date().getTime()}`
+            `${this.apiUrl}${data.path}?time${new Date().getTime()}`,
           );
         }
         this.$forceUpdate();
@@ -497,7 +497,8 @@ export default {
     handlePrinting(_type) {
       this.type = _type;
       this.timestamp = new Date().getTime();
-      this.open = true;
+      // this.open = true;
+      this.handleExport(this.type);
     },
     // 调用打印方法
     handleInvoke(_path) {
@@ -514,7 +515,7 @@ export default {
         }
         this.reportPath = _path;
         var iframe = document.getElementById(
-          "reportPartIframe" + this.timestamp
+          "reportPartIframe" + this.timestamp,
         );
         iframe.onload = () => {
           iframe.contentWindow.print();