commit

src/main/resources/views/platform/zhgh/club/applyJoin/apply/index.html

@@ -153,6 +153,8 @@ layout("/layouts/platform.html"){
                 this.$axios.post("/platform/club/join/apply/checkApplyClub", { clubId: row.id }).then((res) => {
                     if (res.code === 0) {
                         this.$store.dispatch("pjaxRoute", "/platform/club/join/apply?clubId=" + row.id)
+                    } else {
+                        this.$message.warning(res.msg || "网络请求失败，请稍后重试！");
                     }
                 })
 

src/main/resources/views/platform/zhgh/club/join/mine/index.html

@@ -15,6 +15,12 @@ layout("/layouts/platform.html"){
                         style="width: 100%"
                     ></el-date-picker>
                 </search-item>
+                <search-item label="姓名：">
+                    <el-input placeholder="请输入姓名查询" clearable v-model="pageForm.userName"></el-input>
+                </search-item>
+                <search-item label="工号：">
+                    <el-input placeholder="请输入工号查询" clearable v-model="pageForm.loginName"></el-input>
+                </search-item>
             </search>
         </el-card>
 
@@ -46,7 +52,8 @@ layout("/layouts/platform.html"){
                         >
                             撤销
                         </el-button>
-                        <el-button v-if="[10].includes(row.processInstanceNodeCode)" size="mini" type="danger" @click="doDelete(row)">删除</el-button>
+                        <el-button  size="mini" type="danger" @click="doDelete(row)">删除</el-button>
+<!--                        <el-button v-if="[10].includes(row.processInstanceNodeCode)" size="mini" type="danger" @click="doDelete(row)">删除</el-button>-->
                     </template>
                 </el-table-column>
             </el-table>

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

@@ -35,7 +35,10 @@ layout("/layouts/platform.html"){
                 <table-tool label="协会统计">
                     <el-button @click="exportData" type="primary" size="small">导出全部统计数据</el-button>
                     <el-button @click="exportUserData(null)" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" type="primary" size="small">
-                        导出全部人员明细
+                        导出全部人员明细（zip）
+                    </el-button>
+                    <el-button @click="exportExcel(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">
                         导出全部上传资料
@@ -159,6 +162,14 @@ layout("/layouts/platform.html"){
                 const id = row === null ? "" : row.id
                 this.$downLoad("/platform/club/statistics/exportFiles", { clubId: id })
             },
+            exportExcel(){
+                let params = {
+                    clubId: this.pageForm.clubId,
+                    userState: this.pageForm.userState,
+                    sex: this.pageForm.sex
+                }
+                this.$downLoad("/platform/club/statistics/exportExcel", params)
+            },
             async openView(row) {
                 this.clickRow = row
                 await this.userPageData()