Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_jshvc

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/common/TeacherCongressCommonController.java

@@ -31,7 +31,7 @@ public class TeacherCongressCommonController {
     @At
     @SaCheckLogin
     public Result listSession() {
-        List<Teacher_congress_session> list = dao.query(Teacher_congress_session.class, Cnd.NEW().desc("startDate"));
+        List<Teacher_congress_session> list = dao.query(Teacher_congress_session.class, Cnd.NEW().desc("year"));
         return Result.success(list);
     }
 

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

@@ -30,12 +30,15 @@ const INFO = {
                     <el-descriptions-item label="活动计划时间">
                         {{ (viewData.planStartTime ? $moment(viewData.planStartTime).format('YYYY-MM-DD') :
                         '未填写')
-                        + ' ~ ' + (viewData.planEndTime ? $moment(viewData.planEndTime).format('YYYY-MM-DD') : '未填写') }}
+                        + ' ~ ' + (viewData.planEndTime ? $moment(viewData.planEndTime).format('YYYY-MM-DD') : '未填写')
+                        }}
                     </el-descriptions-item>
                     <el-descriptions-item label="活动人数">{{ viewData.activityNumber }}</el-descriptions-item>
 
-                    <el-descriptions-item label="实际活动时间" :span="2">{{ (viewData.startTime ? $moment(viewData.startTime).format('YYYY-MM-DD') :
-                        '未填写') + ' ~ ' + (viewData.endTime ? $moment(viewData.endTime).format('YYYY-MM-DD') : '未填写') }}
+                    <el-descriptions-item label="实际活动时间" :span="2">{{ (viewData.startTime ?
+                        $moment(viewData.startTime).format('YYYY-MM-DD') :
+                        '未填写') + ' ~ ' + (viewData.endTime ? $moment(viewData.endTime).format('YYYY-MM-DD') : '未填写')
+                        }}
                     </el-descriptions-item>
 
                     <el-descriptions-item label="活动地址" :span="2">{{ viewData.activityAddress }}
@@ -43,7 +46,7 @@ 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%)">
+                              style="width: calc(1200px - 150px - 15%)" 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"
@@ -147,6 +150,36 @@ const INFO = {
         }
     },
     methods: {
+        getSummaries(param) {
+            const {columns, data} = param;
+            const sums = [];
+            columns.forEach((column, index) => {
+                if (index === 0) {
+                    sums[index] = '合计';
+                    return;
+                }
+                const values = data.map(item => Number(item[column.property]));
+                if (!values.every(value => isNaN(value))) {
+                    if (![2].includes(index)){
+                        return;
+                    }
+                    sums[index] = values.reduce((prev, curr) => {
+                        const value = Number(curr);
+                        if (!isNaN(value)) {
+                            return prev + curr;
+                        } else {
+                            return prev;
+                        }
+                    }, 0);
+                    sums[index] += ' 元';
+                } else {
+                    sums[index] = '';
+                }
+            });
+
+            return sums;
+        },
+
         // 打开
         onOpen(row) {
             this.row = row

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/index.html

@@ -120,6 +120,8 @@ layout("/layouts/platform.html"){
 
             sessionChange(id) {
                 this.pageForm.sessionId = id
+                this.$refs.treeRef.sessionId=id
+                this.$refs.treeRef.listTree()
                 this.pageData()
             },