From b0d3684dd9d7ea8640137f5d55d5043614d0870e Mon Sep 17 00:00:00 2001
From: LWH <2199719306@qq.com>
Date: Thu, 19 Mar 2026 11:33:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BA=E5=A4=84=E5=88=86=E5=92=8C?=
 =?UTF-8?q?=E8=A7=A3=E9=99=A4=E5=A4=84=E5=88=86=E6=A8=A1=E5=9D=97=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20Excel=20=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E5=8C=85=E5=90=AB=E5=89=8D=E7=AB=AF=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E3=80=81=E5=90=8E=E7=AB=AF=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=81=E7=A9=BA=E8=A1=8C=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=B7=B3=E8=BF=87=E3=80=81=E5=AD=A6=E5=8F=B7=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E5=8F=8A=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/auth.js                             |  6 ++
 .../routine/disciplinaryApplication/index.vue |  4 +
 src/views/routine/relieve/index.vue           | 73 +++++++++++++++++++
 3 files changed, 83 insertions(+)

diff --git a/src/utils/auth.js b/src/utils/auth.js
index 2fe05d8..748f3c5 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -4,6 +4,12 @@ const TokenKey = 'Admin-Token'
 
 export function getToken() {
   console.log('getToken')
+  // 先从 sessionStorage 获取
+  const token = sessionStorage.getItem(TokenKey)
+  if (token) {
+    return token
+  }
+  // 如果 sessionStorage 没有，再从 Cookie 获取
   return Cookies.get(TokenKey)
 }
 
diff --git a/src/views/routine/disciplinaryApplication/index.vue b/src/views/routine/disciplinaryApplication/index.vue
index e83c059..50d43df 100644
--- a/src/views/routine/disciplinaryApplication/index.vue
+++ b/src/views/routine/disciplinaryApplication/index.vue
@@ -244,6 +244,7 @@
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
         :auto-upload="false"
+        :with-credentials="true"
         drag
       >
         <i class="el-icon-upload"></i>
@@ -510,6 +511,9 @@ export default {
     handleImport() {
       this.upload.title = "学生处分导入";
       this.upload.open = true;
+      console.log('Token:', getToken());
+      console.log('Upload headers:', this.upload.headers);
+      console.log('Upload url:', this.upload.url);
     },
     /** 下载模板操作 */
     importTemplate() {
diff --git a/src/views/routine/relieve/index.vue b/src/views/routine/relieve/index.vue
index 3b94a09..e7268e4 100644
--- a/src/views/routine/relieve/index.vue
+++ b/src/views/routine/relieve/index.vue
@@ -29,6 +29,9 @@
       <el-col :span="1.5">
         <el-button v-hasPermi="['routine:relieve:export']" type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button v-hasPermi="['routine:relieve:import']" type="success" plain icon="el-icon-upload2" size="mini" @click="handleImport">解除处分导入</el-button>
+      </el-col>
       <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
     </el-row>
 
@@ -189,11 +192,40 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 学生解除处分导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        :with-credentials="true"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <span>仅允许导入 xls、xlsx 格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { addRelieve, delRelieve, getMyStuInfo, getPenaltyNumber, getRelieve, getStuInfo, getStuList, listRelieve, save } from '@/api/routine/relieve'
+import { getToken } from "@/utils/auth";
 import {
   pcaTextArr, // 省市区联动数据,纯汉字
 } from 'element-china-area-data'
@@ -270,6 +302,21 @@ export default {
       },
       // 省市区
       areaOptions: pcaTextArr,
+      // 导入参数
+      upload: {
+        // 是否显示弹出层
+        open: false,
+        // 弹出层标题
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/routine/relieve/importData"
+      },
     }
   },
   created() {
@@ -485,6 +532,32 @@ export default {
         },
       })
     },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "学生解除处分导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('routine/relieve/importTemplate', {
+      }, `relieve_template_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
   },
 }
 </script>