协会整改

src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js

@@ -64,12 +64,12 @@ const EXAMINE_INFO_COMPONENT = {
                         </el-table>
                         <div class="process-title">统计</div>
                         <el-table v-if="viewData" :data="viewData.incomeCensus" max-height="300">
-                            <el-table-column label="去年年度结余" prop="lastYearSurplus"></el-table-column>
+                            <el-table-column label="上一年度结余" prop="lastYearSurplus"></el-table-column>
                             <el-table-column label="会费收入" prop="income"></el-table-column>
                             <el-table-column label="校工会拨款" prop="allocate"></el-table-column>
                             <el-table-column label="社会赞助" prop="support"></el-table-column>
                             <el-table-column label="年度总支出" prop="totalExpend"></el-table-column>
-                            <el-table-column label="年度结余" prop="surplus">
+                            <el-table-column label="本年度结余" prop="surplus">
                             </el-table-column>
                         </el-table>
                     </el-tab-pane>

src/main/resources/views/platform/zhgh/club/infoManage/pay/index.html

@@ -26,7 +26,7 @@ layout("/layouts/platform.html"){
                                 @change="doSearch"
                         ></el-date-picker>
                     </search-item>
-                    <search-item label="社团名称">
+                    <search-item label="社团名称" v-if="$auth.hasRoleOr(['SYSADMIN'])">
                         <el-select clearable filterable placeholder="请选择社团" @change="doSearch"
                                    style="width: 100%;" v-model="pageForm.clubId">
                             <el-option :label="item.clubName" :value="item.id"

src/main/resources/views/platform/zhgh/club/statistics/index.html

@@ -37,6 +37,9 @@ layout("/layouts/platform.html"){
                     <el-button @click="exportUserData(null)" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" type="primary" size="small">
                         导出全部人员明细
                     </el-button>
+                    <el-button @click="exportUserDataExcel(null)" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" type="primary" size="small">
+                        导出全部人员明细（EXCEL）
+                    </el-button>
                     <el-button @click="exportFiles(null)" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" type="primary" size="small">
                         导出全部上传资料
                     </el-button>
@@ -143,6 +146,16 @@ layout("/layouts/platform.html"){
             getRoleName(roleCode) {
                 return CLUB_ROLE_CONSTANT.getRoleName(roleCode)
             },
+            exportUserDataExcel(row) {
+                let params = {
+                    userState: this.pageForm.userState,
+                    sex: this.pageForm.sex
+                }
+                if (this.pageForm.giveMoney !== null) {
+                    params.giveMoney = this.pageForm.giveMoney
+                }
+                this.$downLoad("/platform/club/statistics/exportUserDataExcel", params)
+            },
             exportUserData(row) {
                 const id = row === null ? "" : row.id
                 let params = {

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/club/query/clubHistoryBackUser.js

@@ -33,6 +33,12 @@ const clubHistoryBackUser = {
                             <span class="text-success" v-if="row.payed">已缴</span>
                             <span class="text-danger" v-else>未缴</span>
                         </template>
+                        <template scope="{row}" v-else-if="column.prop==='userState'">
+                            <span v-if="row.userState === '退休' && row.retireDate">
+                                {{ row.userState + '(' + row.retireDate + ')' }}
+                            </span>
+                            <span v-else>{{ row.userState }}</span>
+                        </template>
                     </el-table-column>
                 </el-table>
                 <!--#include("/layouts/pagination.html"){}#-->