From 9a4370f8bd16d2bcfb41aac0df3f580ac6642d7b Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 12 五月 2025 16:14:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
index a2e8ca3..0ae1168 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue
@@ -815,6 +815,7 @@
             isPrint: false,
             user_id: 1,
             user_name: userName,
+            editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + row.finishReportUrl
           }
         } else {
           this.option = {}
@@ -952,7 +953,7 @@
   },
   // 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
   computed: {
-    ...mapGetters(["userId"]),
+    ...mapGetters(["userId", "nickName"]),
     action() {
       return this.javaApi + '/qualityMonitor/importQualityMonitor'
     },

--
Gitblit v1.9.3