c-zhouhf1/zhgh_jshvc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
JyuHsin
2026-02-27 14:21:42 +08:00
parent 983a9edfce
commit 581d0589ec
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java
+10 -8
View File
@@ -259,6 +259,8 @@ public class ActivityReimbursementMineController {
String actualMoneyChinese = integerChinese + decimalChinese; String actualMoneyChinese = integerChinese + decimalChinese;
info.put("actualMoney", actualMoneyChinese); info.put("actualMoney", actualMoneyChinese);
info.put("sign", sysOfficeTemplateUtil.createPictureRenderData(info.getString("sign")));
docData.put("schoolName", Globals.AppName); docData.put("schoolName", Globals.AppName);
docData.put("info", info); docData.put("info", info);
// 使用BigDecimal确保精确处理 // 使用BigDecimal确保精确处理
@@ -334,8 +336,8 @@ public class ActivityReimbursementMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) {
approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign")));
} }
approval.put("opinion", taskFormData.getStr("tf_opinion")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("fgh", approval); docData.put("fgh", approval);
@@ -350,8 +352,8 @@ public class ActivityReimbursementMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) {
approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign")));
} }
approval.put("opinion", taskFormData.getStr("tf_opinion")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xh", approval); docData.put("xh", approval);
@@ -366,8 +368,8 @@ public class ActivityReimbursementMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) {
approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign")));
} }
approval.put("opinion", taskFormData.getStr("tf_opinion")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xfzr", approval); docData.put("xfzr", approval);
@@ -382,8 +384,8 @@ public class ActivityReimbursementMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) {
approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign")));
} }
approval.put("opinion", taskFormData.getStr("tf_opinion")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xzx", approval); docData.put("xzx", approval);
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html
+2 -2
View File
@@ -100,7 +100,7 @@ layout("/layouts/platform.html"){
size="mini" type="danger">删除 size="mini" type="danger">删除
</el-button> </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" <el-button v-if="row.instanceState === 20" @click="doExportReimbursement(row)" size="mini"
type="primary">报销凭证导出 type="primary">报销凭证导出
</el-button> </el-button>
@@ -155,7 +155,7 @@ layout("/layouts/platform.html"){
methods: { methods: {
// 导出示例 // 导出示例
doExportDeclare(row) { doExportDeclare(row) {
this.$downLoad('/platform/activityDeclare/mine/doExportDeclare?id=' + row.declareId) this.$downLoad('/platform/activityDeclare/mine/doExportDeclare?id=' + row.id)
}, },
// 导出报销凭证 // 导出报销凭证
doExportReimbursement(row) { doExportReimbursement(row) {