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

src/main/resources/static/components/plugins/sysUpload/index.vue

@@ -436,7 +436,7 @@ module.exports = {
       let result = []
       if (response && response.code === 0 && file.status === "success") {
         fileList.forEach((f) => {
-          if(f.response.data.includes('webvpn')) {
+          if(f.response.data?.includes('webvpn')) {
             const index = f.response.data.indexOf('/platform')
             f.response.data = f.response.data.substring(index)
           }
@@ -444,6 +444,7 @@ module.exports = {
         })
       } else {
         this.$message.error(response.msg)
+        fileList = fileList.splice(file, 1)
       }
       if (result.length > 0) {
         if (this.upload_result_category === "interval") {
@@ -475,7 +476,7 @@ module.exports = {
         }
         return
       }
-      this.$emit("update:value", null)
+      this.$emit("update:value", fileList)
     },
 
     // 通过DOM获取上传的文件

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

@@ -14,7 +14,7 @@ layout("/layouts/platform.html"){
                 </el-select>
             </search-item>
             <search-item label="分工会" v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('SCHOOL_UNION_ADMIN')">
-                <el-select v-model="pageForm.unionId" filterable @change="listUnit" clearable style="width: 100%">
+                <el-select v-model="pageForm.unionId" filterable clearable style="width: 100%">
                     <el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
                 </el-select>
             </search-item>

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

@@ -1,13 +1,19 @@
 const HEAD_FORM_TEMPLATE = {
     template: `
             <el-dialog title="设置团长" :visible.sync="headDialogFormVisible" width="700px" :close-on-click-modal="false">
-                <el-form :model="formData" ref="headFormRef" size="small" label-width="120px" :rules="formRules">
+                <el-form :model="formData" ref="headFormRef" size="small" label-width="80px" :rules="formRules">
                     <el-form-item prop="sessionId" label="教代会">
                         <el-select v-model="formData.sessionId" disabled>
                             <el-option v-for="item in sessionOptions" :label="item.fullName" :value="item.id" :key="item.id"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item prop="userId" label="团长">
+                        <template #label>
+                            <el-tooltip content="候选人从此代表团的正式代表名单中选择" placement="bottom">
+                                <i class="el-icon-question"></i>
+                            </el-tooltip>
+                            团长
+                        </template>
                         <user-select v-model="formData.userId"
                                      v-if="headDialogFormVisible"
                                      api="/platform/teacherCongress/delegation/notHeadUser"