From e59a71579f6afd21c76f9d45c3b3f09c28d03c41 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 14:37:22 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-report-preparation.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index ffe8dc1..08a3107 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -355,7 +355,8 @@
title: row.entrustCode + ".docx",
lang: 'zh-CN',
isPrint: true,
- user: { id: 1, name: userName},
+ user_id: 1,
+ user_name: userName,
editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + row.entrustCode + ".docx"
}
})
--
Gitblit v1.9.3