From 581d0589ec2156b65b21c1d509c75672ca706210 Mon Sep 17 00:00:00 2001
From: JyuHsin <729757837@qq.com>
Date: Fri, 27 Feb 2026 14:21:42 +0800
Subject: [PATCH] commit

---
 .../ActivityReimbursementMineController.java   | 18 ++++++++++--------
 .../reimbursement/mine/index.html              |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java
index d0698f7..742ce8d 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java
@@ -259,6 +259,8 @@ public class ActivityReimbursementMineController {
         String actualMoneyChinese = integerChinese + decimalChinese;
         info.put("actualMoney", actualMoneyChinese);
 
+        info.put("sign", sysOfficeTemplateUtil.createPictureRenderData(info.getString("sign")));
+
         docData.put("schoolName", Globals.AppName);
         docData.put("info", info);
         // 使用BigDecimal确保精确处理
@@ -334,8 +336,8 @@ public class ActivityReimbursementMineController {
 
                     approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
                     approval.put("user", taskFormData.getStr("tf_userName"));
-                    if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) {
-                        approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign")));
+                    if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) {
+                        approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign")));
                     }
                     approval.put("opinion", taskFormData.getStr("tf_opinion"));
                     docData.put("fgh", approval);
@@ -350,8 +352,8 @@ public class ActivityReimbursementMineController {
 
                     approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
                     approval.put("user", taskFormData.getStr("tf_userName"));
-                    if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) {
-                        approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign")));
+                    if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) {
+                        approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign")));
                     }
                     approval.put("opinion", taskFormData.getStr("tf_opinion"));
                     docData.put("xh", approval);
@@ -366,8 +368,8 @@ public class ActivityReimbursementMineController {
 
                     approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
                     approval.put("user", taskFormData.getStr("tf_userName"));
-                    if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) {
-                        approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign")));
+                    if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) {
+                        approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign")));
                     }
                     approval.put("opinion", taskFormData.getStr("tf_opinion"));
                     docData.put("xfzr", approval);
@@ -382,8 +384,8 @@ public class ActivityReimbursementMineController {
 
                     approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
                     approval.put("user", taskFormData.getStr("tf_userName"));
-                    if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) {
-                        approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign")));
+                    if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) {
+                        approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign")));
                     }
                     approval.put("opinion", taskFormData.getStr("tf_opinion"));
                     docData.put("xzx", approval);
diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html
index 44be8f3..63969b4 100644
--- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html
+++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html
@@ -100,7 +100,7 @@ layout("/layouts/platform.html"){
                                    size="mini" type="danger">删除
                         </el-button>
 
-                        <el-button @click="doExportDeclare(row)" size="mini" type="primary">申请表导出</el-button>
+<!--                        <el-button @click="doExportDeclare(row)" size="mini" type="primary">申请表导出</el-button>-->
                         <el-button v-if="row.instanceState === 20" @click="doExportReimbursement(row)" size="mini"
                                    type="primary">报销凭证导出
                         </el-button>
@@ -155,7 +155,7 @@ layout("/layouts/platform.html"){
         methods: {
             // 导出示例
             doExportDeclare(row) {
-                this.$downLoad('/platform/activityDeclare/mine/doExportDeclare?id=' + row.declareId)
+                this.$downLoad('/platform/activityDeclare/mine/doExportDeclare?id=' + row.id)
             },
             // 导出报销凭证
             doExportReimbursement(row) {