From b0d59aeb7d4cbd3fc1d9355473e2f72f942f70c7 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 1 Apr 2024 15:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E4=BA=BA=E5=91=98=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/header/index.vue           |  2 +-
 src/pages/match/manage/matchInfo.vue   |  6 +++---
 src/pages/match/manage/matchSignup.vue | 27 +++++++++++++++-----------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index f1c2967..9a73df9 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -20,7 +20,7 @@
            class="p-v-5 cursor-pointer"
            @click="toComment(item)">{{ item.commentUsername }} 回复了你的评论</p>
         <el-badge class="msg"
-                  :is-dot="notices.length"
+                  :is-dot="!!notices.length"
                   slot="reference">消息</el-badge>
       </el-popover>
       <el-dropdown class="user-wrap"
diff --git a/src/pages/match/manage/matchInfo.vue b/src/pages/match/manage/matchInfo.vue
index e419083..ad10410 100644
--- a/src/pages/match/manage/matchInfo.vue
+++ b/src/pages/match/manage/matchInfo.vue
@@ -66,8 +66,7 @@
         <tr>
           <th width="130">指导老师：</th>
           <td>
-            <div v-if="status < 5"
-                 class="plus">
+            <div class="plus">
               <i class="el-icon-circle-plus-outline icon"
                  @click="addAdvisor"></i>
             </div>
@@ -91,7 +90,7 @@
                         clearable
                         size="mini"
                         :disabled="!item.edit"></el-input>
-              <template v-if="status < 5">
+              <template>
                 <i v-if="item.edit"
                    class="el-icon-check icon"
                    @click="submitAdvisor(item)"></i>
@@ -493,6 +492,7 @@ export default {
         teamId: this.info.teamId,
         phone: row.phone,
         position: row.position,
+        accountId: this.accountId
       }).then(res => {
         util.successMsg((row.id ? '修改' : '新增') + '成功')
         this.getInfo()
diff --git a/src/pages/match/manage/matchSignup.vue b/src/pages/match/manage/matchSignup.vue
index 8c2bae7..81a671e 100644
--- a/src/pages/match/manage/matchSignup.vue
+++ b/src/pages/match/manage/matchSignup.vue
@@ -85,17 +85,17 @@
                        align="center">
       </el-table-column>
       <el-table-column prop="username"
-                       label="队长/成员"
+                       :label="info.completeCompetitionSetup.competitionType ? '队长/成员' : '学生姓名'"
                        min-width="140"
                        align="center">
       </el-table-column>
       <el-table-column prop="workNumber"
-                       label="队长/成员学号"
+                       :label="info.completeCompetitionSetup.competitionType ? '队长/成员学号' : '学号'"
                        min-width="140"
                        align="center">
       </el-table-column>
       <el-table-column prop="phone"
-                       label="队长/成员手机号"
+                       :label="info.completeCompetitionSetup.competitionType ? '队长/成员手机号' : '手机号'"
                        min-width="140"
                        align="center">
       </el-table-column>
@@ -286,7 +286,7 @@
           <el-button type="primary"
                      @click="download">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
         </div>
-        <el-upload ref="importStaff"
+        <el-upload ref="upload"
                    name="file"
                    accept=".xls,.xlsx"
                    :on-remove="handleRemove"
@@ -298,6 +298,7 @@
 								competitionId: id,
 								platformId: 1
 							 }"
+                   :auto-upload="false"
                    :on-exceed="handleExceed"
                    :action="info.completeCompetitionSetup.competitionType ? this.api.batchImportTeamData : this.api.batchImportPersonalData"
                    :file-list="uploadList"
@@ -529,10 +530,14 @@ export default {
         if (data.exportCode) {
           this.exportCode = data.exportCode
           this.uploadFaild = true
-          util.errorMsg(data.tip)
+          util.errorMsg(data.tip, 3000)
+        } else {
+          this.init()
+          this.importVisible = false
+          this.keyWord = ''
         }
       } else {
-        res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据")
+        util.errorMsg(res.message || '上传失败，请检查数据', 3000)
       }
     },
     uploadError (err, file, fileList) {
@@ -550,9 +555,7 @@ export default {
       this.uploadFaild = false
     },
     uploadSure () {
-      this.init()
-      this.importVisible = false
-      this.keyWord = ''
+      this.$refs.upload.submit();
     },
     // 新增
     add () {
@@ -772,7 +775,8 @@ export default {
           },
           responseType: 'blob'
         }).then((res) => {
-          util.downloadFileDirect(`报名人员.xls`, new Blob([res.data]))
+          const name = res.headers['content-disposition']
+          util.downloadFileDirect(name ? decodeURI(name) : '报名人员.xlsx', new Blob([res.data]))
         }).catch(res => { })
       } else {
         axios.get(`${this.api.excelExport}?competitionId=${this.id}`, {
@@ -781,7 +785,8 @@ export default {
           },
           responseType: 'blob'
         }).then((res) => {
-          util.downloadFileDirect(`报名人员.xls`, new Blob([res.data]))
+          const name = res.headers['content-disposition']
+          util.downloadFileDirect(name ? decodeURI(name) : '报名人员.xlsx', new Blob([res.data]))
         }).catch(res => { })
       }
     },