注册协会申请完成后导出申请表

注册协会的上传申请表字段不必填

src/main/resources/views/platform/zhgh/club/register/apply/clubRegisterForm.js

@@ -180,9 +180,7 @@ const CLUB_FORM_TEMPLATE = {
                 clubType: [{ required: true, message: "请选择协会类型", trigger: ["blur", "change"] }],
                 concatPerson: [{ required: true, message: "请选择协会联系人", trigger: ["blur", "change"] }],
                 foundTime: [{ required: true, message: "请选择成立时间", trigger: ["blur", "change"] }],
-                establishReport: [{ required: true, message: "请上传申请成立报告", trigger: ["blur", "change"] }],
                 rulesFile: [{ required: true, message: "请上传章程草案", trigger: ["blur", "change"] }]
-                // establishReport: [{ required: true, message: "请上传申请成立报告", trigger: ["blur", "change"] }]
                 //rulesFile: [{ required: true, message: "请上传章程草案", trigger: ["blur", "change"] }],
                 //manageFile: [{ required: true, message: "请上传经费来源及管理办法", trigger: ["blur", "change"] }],
                 //yearPlanFile: [{ required: true, message: "请上传年度活动计划", trigger: ["blur", "change"] }]

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

@@ -62,17 +62,11 @@ layout("/layouts/platform.html"){
         },
         methods: {
             nextStep() {
-                let valid = true
-                this.$refs.clubFormRef.$refs.form.validateField(
-                    ["clubName", "clubType", "foundTime", "establishReport", "rulesFile"],
-                    (errMsg) => {
-                        if (!errMsg) {
-                            valid = false
-                        }
-                    }
-                )
-                if (valid) return
-                this.activeName = 1
+                this.$refs.clubFormRef.$refs.form.validate().then(() => {
+                    this.activeName = 1
+                }).catch(() => {
+                    this.$message.warning({ title: "警告", message: "存在必填项未填写！" })
+                })
             },
             async onSave() {
                 let valid = true
@@ -100,13 +94,9 @@ layout("/layouts/platform.html"){
                     this.$message.warning({ title: "警告", message: "存在必填项未填写！" })
                 })
             },
-            // 文件上传组件使用数组承载文件，提交前显式检查空数组，避免表单校验误判为已填写。
+            // 申请成立报告为选填；章程草案仍需上传，提交前显式检查空数组，避免表单校验误判。
             validateRequiredFiles() {
                 const formData = this.$refs.clubFormRef.formData
-                if (!formData.establishReport || formData.establishReport.length === 0) {
-                    this.$message.warning({ title: "警告", message: "请上传申请成立报告" })
-                    return false
-                }
                 if (!formData.rulesFile || formData.rulesFile.length === 0) {
                     this.$message.warning({ title: "警告", message: "请上传章程草案" })
                     return false

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

@@ -56,6 +56,7 @@ layout("/layouts/platform.html"){
                 <el-table-column label="操作" width="300">
                     <template v-slot="{row}">
                         <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="row.instanceState === 20" @click="exportApply(row)" size="mini" type="primary">导出申请表</el-button>
                         <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
                         <el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
                         <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
@@ -112,6 +113,9 @@ layout("/layouts/platform.html"){
             onEdit(row) {
                 commonUtil.pjaxPush('/platform/club/register/clubRegisterApply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
             },
+            exportApply(row) {
+                this.$downLoad("/platform/club/register/clubMyApply/exportApply", { id: row.id })
+            },
             async onDelete(id) {
                 const confirm = await this.$confirm("此操作将永久删除, 是否继续?", "提示", {
                     confirmButtonText: "确定",