commit

src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java

@@ -155,8 +155,16 @@ public class ActivityReimbursementMineController {
         if (!group.isEmpty()) {
             cnd.and(group);
         } else {
+            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());
         cnd.andEX("YEAR(info.applyTime)", "=", pageParam.getYear());

src/main/resources/static/components/plugins/sysFilePreview/index.vue

@@ -195,6 +195,9 @@ module.exports = {
     requestFullFile(ids) {
       this.$axios.post("/platform/sys/file/previewFileData", {ids: JSON.stringify(ids)}).then((res) => {
         if (res.code === 0) {
+          res.data.map(v => {
+            v.suffix = v.suffix.toLowerCase()
+          })
           this.fileList = res.data
         }
       })
@@ -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;
 }

src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js

@@ -46,14 +46,14 @@ const INFO = {
                 </template>
                 <el-descriptions-item label="费用" :span="2">
                     <el-table :data="viewData.budgets" border max-height="500" size="mini"
-                              style="width: calc(1200px - 150px - 15%)" show-summary :summary-method="getSummaries">
+                               show-summary :summary-method="getSummaries">
                         <el-table-column label="序号" sortable type="index" fixed></el-table-column>
                         <el-table-column label="费用项目名称" fixed prop="name" fixed></el-table-column>
                         <el-table-column label="预算费用" prop="budgetPrice"
                                          v-if="viewData.activityReimbursementMode==='activity'"></el-table-column>
                         <el-table-column label="实际费用" prop="actualPrice"></el-table-column>
                         <el-table-column label="收款人" prop="username"></el-table-column>
-                        <el-table-column label="支行名称" prop="bankName"></el-table-column>
+                        <el-table-column label="支行名称" prop="bankName"width="180"></el-table-column>
                         <el-table-column label="报销卡号" prop="bankCardNum" width="180"></el-table-column>
                         <el-table-column label="备注" prop="remark"></el-table-column>
                     </el-table>
@@ -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;
                         }

src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html

@@ -96,7 +96,10 @@ layout("/layouts/platform.html"){
                         </el-button>
                         <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
                         </el-button>
-                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)"
+                        <el-button v-if="(row.taskKey === 'startTask' || !row.instanceId)&&$store.state.user.loginname!=='CS2025015'" @click="onDelete(row.id)"
+                                   size="mini" type="danger">删除
+                        </el-button>
+                        <el-button v-if="$store.state.user.loginname==='CS2025015'" @click="onDelete(row.id)"
                                    size="mini" type="danger">删除
                         </el-button>