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 33f72fa..24fff3a 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 @@ -155,7 +155,15 @@ public class ActivityReimbursementMineController { if (!group.isEmpty()) { cnd.and(group); } else { - cnd.and("info.userId", "=", SecurityUtil.getUserId()); + if(!SecurityUtil.getUserLoginname().equals("CS2025015")){ + cnd.and("info.userId", "=", SecurityUtil.getUserId()); + } + } + if (StrUtil.isNotBlank(pageParam.getSearchKeyword())){ + SqlExpressionGroup groupUser = new SqlExpressionGroup(); + groupUser.orLike("info.userName", pageParam.getSearchKeyword()); + groupUser.orLike("info.loginName", pageParam.getSearchKeyword()); + cnd.and(groupUser); } cnd.andEX("info.clubId", "=", pageParam.getClubId()); diff --git a/src/main/resources/static/components/plugins/sysFilePreview/index.vue b/src/main/resources/static/components/plugins/sysFilePreview/index.vue index 410cd13..66e5eb7 100644 --- a/src/main/resources/static/components/plugins/sysFilePreview/index.vue +++ b/src/main/resources/static/components/plugins/sysFilePreview/index.vue @@ -1,50 +1,50 @@ @@ -208,19 +211,23 @@ module.exports = { margin: 0; height: calc(100vh - 43px - 32px - 20px - 10px); } + .file-preview-drawer .el-col { height: 100%; padding: 0; } + .file-preview-title { padding-left: 20px; font-weight: bold; margin-bottom: 10px; } + .file-preview-menu { height: 100%; padding-left: 10px; } + .file-preview-menu .el-menu-item, .file-preview-menu .el-submenu__title { height: 40px; @@ -229,6 +236,7 @@ module.exports = { white-space: nowrap; text-overflow: ellipsis; } + .file-preview-drawer iframe { vertical-align: bottom; display: block; @@ -237,6 +245,7 @@ module.exports = { .preview-content-col { /*padding: 0 20px 10px;*/ } + .preview-content-wrapper { width: 100%; height: 100%; @@ -244,17 +253,20 @@ module.exports = { flex-direction: column; box-sizing: border-box; } + .preview-main-content { flex: 1; overflow: auto; margin: 0 10px 10px; box-sizing: border-box; } + .preview-main-content .file-preview-image { margin: 0 auto; max-width: 80%; display: block; } + .preview-footer { line-height: 60px; padding: 0 10px; @@ -265,9 +277,11 @@ module.exports = { /* position: sticky; bottom: 0; */ } + .file-preview-drawer .el-menu-item.is-active { font-weight: bold; } + .file-preview-drawer .el-drawer__body { padding: 0; } @@ -275,57 +289,57 @@ module.exports = { diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js index 1beb9ff..521ce70 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js @@ -46,14 +46,14 @@ const INFO = { + show-summary :summary-method="getSummaries"> - + @@ -166,7 +166,7 @@ const INFO = { sums[index] = values.reduce((prev, curr) => { const value = Number(curr); if (!isNaN(value)) { - return prev + curr; + return Number((prev + curr).toFixed(2)); } else { return prev; } 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 63969b4..7f206de 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 @@ -96,7 +96,10 @@ layout("/layouts/platform.html"){ 撤回 - 删除 + + 删除