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

src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js

@@ -50,11 +50,14 @@ const userInfo = {
                 <el-table :data="courseList" class="mt20">
                     <el-table-column label="单选" width="160">
                         <template v-slot="{row}">
-                            <el-radio
-                                    @change.native="getCurrentRow(row)"
-                                    :disabled="(row.courseReservedNumber + row.registerNum) >= row.coursePeopleNumber"
-                                    v-model="afterAdjustCourse"
-                            ></el-radio>
+                            <el-radio-group v-model="afterAdjustCourse">
+                                <el-radio
+                                        @change.native="getCurrentRow(row)"
+                                        :disabled="(row.courseReservedNumber + row.registerNum) >= row.coursePeopleNumber"
+                                        :label="row.id"
+                                        key="row.id"
+                                > &nbsp;</el-radio>
+                            </el-radio-group>
                         </template>
                     </el-table-column>
                     <el-table-column

src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/statistics/index.html

@@ -26,6 +26,7 @@ layout("/layouts/platform.html"){
         </el-card>
         <el-card shadow="never">
             <table-tool label="资料列表">
+                <el-button @click="downloadFiles" icon="el-icon-download" size="small" type="primary">一键下载</el-button>
             </table-tool>
 
             <el-table :data="tableData" @sort-change="pageOrder">
@@ -79,6 +80,9 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
+            downloadFiles() {
+                this.$downLoad('/platform/grassrootsCongress/material/statistics/downloadFiles', this.pageForm)
+            },
             openView(row) {
                 this.$refs.guava.public(() => {
                     this.$refs.grassrootsCongressMaterialInfoRef.onOpen(row)

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headForm.js

@@ -40,7 +40,7 @@ const HEAD_FORM_TEMPLATE = {
                     <el-form-item prop="contactUserId" label="联络人">
                         <user-select v-model="formData.contactUserId"
                                      v-if="headDialogFormVisible"
-                                     api="/platform/teacherCongress/delegation/notHeadUser"
+                                     api="/platform/teacherCongress/delegation/notContactUser"
                                      :api_params="{sessionId:formData.sessionId,delegationId:formData.delegationId}"
                                      api_input_key_name="keyWord"
                                      :option_list="contactOptions"
@@ -70,8 +70,8 @@ const HEAD_FORM_TEMPLATE = {
                 name: [{required: true, message: "必填", trigger: ["change", "blur"]}],
                 code: [{required: true, message: "必填", trigger: ["change", "blur"]}],
                 userId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
-                viceUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
-                contactUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}]
+                //viceUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
+                //contactUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}]
             }
         }
     },