Merge remote-tracking branch 'origin/main'

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

@@ -223,6 +223,8 @@ public class ActivityReimbursementApplyController {
         dao.execute(reiSql);
         List<String> reiDecIdList = reiSql.getList(String.class);
 
+        reiDecIdList = reiDecIdList.stream().filter(v -> StrUtil.isNotBlank(v)).toList();
+
         Cnd cnd = Cnd.NEW();
         cnd.and("outlayManageSource", "=", outlayManageSource);
         if (Objects.equals(outlayManageSource, "ACTIVITY_BUDGET_TYPE_TWO")) {
@@ -236,6 +238,8 @@ public class ActivityReimbursementApplyController {
         dao.execute(sql);
         List<String> declareIdList = sql.getList(String.class);
 
+        declareIdList = declareIdList.stream().filter(v -> StrUtil.isNotBlank(v)).toList();
+
         Sql applySql = Sqls.create("""
                 SELECT
                   info.*
@@ -248,12 +252,12 @@ public class ActivityReimbursementApplyController {
 
         if (Objects.equals(outlayManageSource, "ACTIVITY_BUDGET_TYPE_TWO")) {
             applyCnd.and("info.unionId", "=", SecurityUtil.getUnionId());
-            activityType="BRANCH_UNION";
+            activityType = "BRANCH_UNION";
         } else if (Objects.equals(outlayManageSource, "ACTIVITY_BUDGET_TYPE_THREE")) {
             applyCnd.and("info.clubId", "=", clubId);
-            activityType="CLUB";
+            activityType = "CLUB";
-        }else{
+        } else {
-            activityType="SCHOOL_UNION";
+            activityType = "SCHOOL_UNION";
         }
         applyCnd.and("info.activityType", "=", activityType);
         if (Lang.isNotEmpty(declareIdList)) {

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

@@ -510,38 +510,42 @@ layout("/layouts/platform.html"){
                                 this.formData.activityTime = [res.data.startTime, res.data.endTime]
                             }
                             this.getBudgetByYear()
+                            this.getActivityReimbursementByUser()
                         }
                     })
             },
             initBudgetType() {
-                this.budgetTypeOption = this.dict.type.ACTIVITY_BUDGET_TYPE
+                this.$businessTool.getDictOptions("ACTIVITY_BUDGET_TYPE").then(resp => {
-                const budgetTypeCloseOption = []
+                    this.budgetTypeOption = resp
-                if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) {
+                    const budgetTypeCloseOption = []
+                    if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) {
 
-                } else {
+                    } else {
-                    if (this.$auth.hasRoleOr(["SCHOOL_REIMBURSEMENT_MANAGER"])) {
+                        if (this.$auth.hasRoleOr(["SCHOOL_REIMBURSEMENT_MANAGER"])) {
-                        this.budgetTypeOption.map(v => {
+                            this.budgetTypeOption.map(v => {
-                            if (["ACTIVITY_BUDGET_TYPE_ONE"].includes(v.code)) {
+                                if (["ACTIVITY_BUDGET_TYPE_ONE"].includes(v.code)) {
-                                budgetTypeCloseOption.push(v)
+                                    budgetTypeCloseOption.push(v)
-                            }
+                                }
-                        })
+                            })
+                        }
+                        if (this.$auth.hasRoleOr(["UNION_REIMBURSEMENT_MANAGER", "BRANCH_UNION_CHAIRMAN", "BRANCH_UNION_WENTI_SPORTS"])) {
+                            this.budgetTypeOption.map(v => {
+                                if (["ACTIVITY_BUDGET_TYPE_TWO"].includes(v.code)) {
+                                    budgetTypeCloseOption.push(v)
+                                }
+                            })
+                        }
+                        if (this.$auth.hasRoleOr(["CLUB_REIMBURSEMENT_MANAGER", "CLUB_PRESIDENT"])) {
+                            this.budgetTypeOption.map(v => {
+                                if (["ACTIVITY_BUDGET_TYPE_THREE"].includes(v.code)) {
+                                    budgetTypeCloseOption.push(v)
+                                }
+                            })
+                        }
+                        this.budgetTypeOption = budgetTypeCloseOption
                     }
-                    if (this.$auth.hasRoleOr(["UNION_REIMBURSEMENT_MANAGER", "BRANCH_UNION_CHAIRMAN", "BRANCH_UNION_WENTI_SPORTS"])) {
+                })
-                        this.budgetTypeOption.map(v => {
+
-                            if (["ACTIVITY_BUDGET_TYPE_TWO"].includes(v.code)) {
-                                budgetTypeCloseOption.push(v)
-                            }
-                        })
-                    }
-                    if (this.$auth.hasRoleOr(["CLUB_REIMBURSEMENT_MANAGER", "CLUB_PRESIDENT"])) {
-                        this.budgetTypeOption.map(v => {
-                            if (["ACTIVITY_BUDGET_TYPE_THREE"].includes(v.code)) {
-                                budgetTypeCloseOption.push(v)
-                            }
-                        })
-                    }
-                    this.budgetTypeOption = budgetTypeCloseOption
-                }
             },
         },
         async created() {

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

@@ -160,7 +160,7 @@ layout("/layouts/platform.html"){
 					{prop: "actualMoney", label: "报销金额（元）"},
 					{prop: "declareUnitName", label: "申报单位/协会", sortable: true},
 					{prop: "applyTime", label: "申报时间", sortable: true},
-					{prop: "taskName", label: "当前节点"},
+					{prop: "curTaskName", label: "当前节点"},
 					{prop: "instanceState", label: "流程状态"}
 				],
 				activityDeclareReimbursementList: [],

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

@@ -151,7 +151,7 @@ layout("/layouts/platform.html"){
                     {prop: "actualMoney", label: "报销金额（元）"},
                     {prop: "declareUnitName", label: "申报单位/协会", sortable: true},
                     {prop: "applyTime", label: "申报时间", sortable: true},
-                    {prop: "taskName", label: "当前节点"},
+                    {prop: "curTaskName", label: "当前节点"},
                     {prop: "instanceState", label: "流程状态"}
                 ],
                 activityDeclareReimbursementList: [],

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

@@ -55,7 +55,7 @@ layout("/layouts/platform.html"){
 
         <el-card shadow="never" class="mt10">
             <table-tool label="申报记录">
-                <el-button size="small" type="primary" @click="onApply">活动申报</el-button>
+                <el-button size="small" type="primary" @click="onApply">报销申请</el-button>
             </table-tool>
 
             <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"

src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/info.js

@@ -34,7 +34,9 @@ const ACTIVITY_BUDGET_INFO = {
 
             <template v-for="task in doneTasks">
                 <div class="task-panel mt10">
-                    <div class="task-panel-header">{{ task.displayName }}</div>
+                    <div class="process-title">
+                        {{ task.displayName }}
+                    </div>
                     <el-descriptions border class="flow-task-form" :column="3" :key="task.id"
                                      v-if="task.ext.isFirstTaskNode">
                         <el-descriptions-item label="申请用户">{{ task.ext.initiatorName