From 2a84e9b92fc03734e51f14c596a8c6a60bb90bde Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 21 Aug 2025 18:04:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/calendar/components/addCalendar.vue |   67 +-
 src/views/config/classFiles.vue               |  106 +-
 src/views/config/components/addTeacher.vue    |   35 +-
 src/views/config/teacher.vue                  |   38 +-
 src/views/course/components/addClass.vue      | 1811 ++++++++---------
 src/views/course/components/editClass.vue     |  133 +-
 src/views/email/index.vue                     |  486 ++---
 src/views/student/index.vue                   |   53 +-
 src/views/student/schoolmate.vue              |   35 +-
 9 files changed, 1440 insertions(+), 1324 deletions(-)

diff --git a/src/views/calendar/components/addCalendar.vue b/src/views/calendar/components/addCalendar.vue
index 08909d0..9987434 100644
--- a/src/views/calendar/components/addCalendar.vue
+++ b/src/views/calendar/components/addCalendar.vue
@@ -15,7 +15,7 @@
           <div class="xy-table-item-label" style="font-weight: bold">
             <span style="color: red; font-weight: bold; padding-right: 4px"
               >*</span
-            >是否发布：
+            >是否对外展示：
           </div>
           <div class="xy-table-item-content">
             <el-select
@@ -97,12 +97,25 @@
             >具体说明：
           </div>
           <div class="xy-table-item-content">
-            <el-input
+            <el-select
               v-model="form.introduce"
-              placeholder="请填写第*模块"
+              filterable
+              allow-create
+              default-first-option
+              placeholder="请选择或新建模块"
               clearable
               style="width: 100%"
-            ></el-input>
+              @change="onModuleChange"
+              @create="onCreateModule"
+            >
+              <el-option
+                v-for="item in module_options"
+                :key="item.id"
+                :label="item.value"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
           </div>
         </div>
       </template>
@@ -331,6 +344,18 @@ export default {
       course_content_options: [],
       course_options: [],
       canSelect: false,
+      module_options: [
+        { id: 1, value: '第一模块' },
+        { id: 2, value: '第二模块' },
+        { id: 3, value: '第三模块' },
+        { id: 4, value: '第四模块' },
+        { id: 5, value: '第五模块' },
+        { id: 6, value: '第六模块' },
+        { id: 7, value: '第七模块' },
+        { id: 8, value: '第八模块' },
+        { id: 9, value: '第九模块' },
+        { id: 10, value: '第十模块' }
+      ],
       form: {
         is_publish:1,
         type: "",
@@ -483,6 +508,40 @@ export default {
         });
       }
     },
+    onModuleChange(value) {
+      // 当选择模块时，自动拼接到标题后面
+      if (value && this.form.title) {
+        // 先去除标题中可能存在的模块值
+        let cleanTitle = this.form.title;
+        this.module_options.forEach(module => {
+          if (cleanTitle.includes(' | ' + module.value)) {
+            cleanTitle = cleanTitle.replace(' | ' + module.value, '');
+          }
+        });
+        // 拼接新的模块值
+        this.form.title = cleanTitle + ' | ' + value;
+      }
+    },
+    onCreateModule(value) {
+      // 当创建新模块时，添加到选项列表并选中
+      const newModule = {
+        id: this.module_options.length + 1,
+        value: value
+      };
+      this.module_options.push(newModule);
+      this.form.introduce = value;
+      // 先去除标题中可能存在的模块值，再拼接新的模块值
+      if (this.form.title) {
+        let cleanTitle = this.form.title;
+        this.module_options.forEach(module => {
+          if (cleanTitle.includes(' | ' + module.value)) {
+            cleanTitle = cleanTitle.replace(' | ' + module.value, '');
+          }
+        });
+        // 拼接新的模块值
+        this.form.title = cleanTitle + ' | ' + value;
+      }
+    },
     submit() {
       if (this.id) {
         this.form.id = this.id;
diff --git a/src/views/config/classFiles.vue b/src/views/config/classFiles.vue
index 2af20e7..cec6975 100644
--- a/src/views/config/classFiles.vue
+++ b/src/views/config/classFiles.vue
@@ -6,11 +6,17 @@
         <lx-header icon="md-apps" :text="$route.meta.title" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
           <div slot="content">
             <div class="searchwrap" style="display: flex;align-items: center;">
-              <div>
-                <el-select filterable v-model="select.teacher_id" placeholder="请选择授课老师" clearable style="width: 100%;">
-                  <el-option v-for="(item,index) in teachers" :key="index" :label="item.name" :value="item.id">
-                  </el-option>
-                </el-select>
+              <div>
+                <el-select filterable v-model="select.teacher_id" placeholder="请选择授课老师" clearable style="width: 100%;">
+                  <el-option v-for="(item,index) in teachers" :key="index" :label="item.name" :value="item.id">
+                  </el-option>
+                </el-select>
+              </div>
+              <div>
+                <el-select filterable v-model="select.direction" placeholder="请选择课程方向" clearable style="width: 100%;">
+                  <el-option v-for="(item,index) in direction_options" :key="index" :label="item.value" :value="item.id">
+                  </el-option>
+                </el-select>
               </div>
               <div>
                 <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
@@ -28,10 +34,10 @@
     </div>
 
     <div>
-      <xy-table :list="list" :total="total" @pageIndexChange="pageIndexChange" @pageSizeChange="pageSizeChange"
+      <xy-table :showIndex="false" :list="list" :total="total" @pageIndexChange="pageIndexChange" @pageSizeChange="pageSizeChange"
         :table-item="table_item">
         <template v-slot:files>
-          <el-table-column align='left' label="课件" width="240" header-align="center">
+          <el-table-column align='left' fixed="left" label="课件" width="240" header-align="center">
             <template slot-scope="scope">
               <div v-for="(item,index) in scope.row.files">
                 <div>
@@ -59,27 +65,36 @@
   </div>
 </template>
 
-<script>
-  import {
-    index as teacherGet
+<script>
+  import {
+    index as teacherGet
   } from "@/api/info/teachers.js"
   import {
     index
   } from '@/api/course/courseContent.js'
+  import {
+    getparameteritem
+  } from "@/api/system/dictionary.js"
   export default {
     components: {
     },
     data() {
-      return {
+      return {
         teachers:[],
+        direction_options: [], // 课程方向选项
         select: {
           teacher_id: '',
+          direction: '', // 课程方向筛选
           page: 1,
           page_size: 10
         },
         list: [],
         total: 0,
-        table_item: [{
+        table_item: [{type:'index',
+          align: 'center',
+          width: 80,
+          fixed: 'left'
+        },{
           prop: 'files',
           label: '课件',
           align: 'left',
@@ -89,11 +104,6 @@
           label: '课程名称',
           align: 'left',
           width: 240,
-        }, {
-          prop: 'theme',
-          label: '授课主题',
-          align: 'center',
-          width: 120,
         }, {
           prop: 'date',
           label: '日期',
@@ -101,7 +111,7 @@
           width: 120,
         }, {
           prop: 'period',
-          label: '时间 ',
+          label: '上课时间 ',
           align: 'center',
           width: 180,
         }, {
@@ -110,13 +120,18 @@
           align: 'center',
           width: 120,
         }, {
-          prop: 'teacher.sex',
-          label: '性别',
-          align: 'center',
-          width: 80
+          prop: 'teacher.introduce',
+          label: '老师简介',
+          align: 'left',
+          width: 240,
         }, {
-          prop: 'teacher.mobile',
-          label: '联系方式',
+          prop: 'theme',
+          label: '课程主题',
+          align: 'center',
+          width: 120,
+        },{
+          prop: 'direction_detail.value',
+          label: '课程方向',
           align: 'center',
           width: 120,
         }, {
@@ -124,26 +139,26 @@
           label: '上课地点',
           align: 'left',
           width: 240,
-        }, {
-          prop: 'teacher.introduce',
-          label: '老师简介',
-          align: 'left',
-          width: 240,
         }],
 
       }
     },
-    created() {
+    created() {
       this.getTeachers()
+      this.getDirectionOptions()
       this.getList()
     },
-    methods: {
-      async getTeachers(){
-        const res = await teacherGet({
-          page:1,
-          page_size:999
-        })
-        this.teachers = res.data
+    methods: {
+      async getTeachers(){
+        const res = await teacherGet({
+          page:1,
+          page_size:999
+        })
+        this.teachers = res.data
+      },
+      async getDirectionOptions() {
+        const res = await getparameteritem('course_direction')
+        this.direction_options = res.detail
       },
       pageIndexChange(e) {
         this.select.page = e
@@ -156,6 +171,7 @@
       },
       resetSelect() {
         this.select.teacher_id = ''
+        this.select.direction = ''
         this.select.course = ''
         this.select.page = 1
         this.getList()
@@ -164,15 +180,19 @@
         const res = await index({
           page_size: this.select.page_size,
           page: this.select.page,
-          show_relation: ['course','teacher'],
+          show_relation: ['course','teacher','directionDetail'],
           filter: [{
             key: 'file_ids',
             op: 'notnull',
             value: '1'
-          },{
-            key: 'teacher_id',
-            op: 'eq',
-            value: this.select.teacher_id?this.select.teacher_id:''
+          },{
+            key: 'teacher_id',
+            op: 'eq',
+            value: this.select.teacher_id?this.select.teacher_id:''
+          },{
+            key: 'direction',
+            op: 'eq',
+            value: this.select.direction?this.select.direction:''
           }]
         })
         this.list = res.data
@@ -209,4 +229,4 @@
       }
     }
   }
-</style>
+</style>
diff --git a/src/views/config/components/addTeacher.vue b/src/views/config/components/addTeacher.vue
index c2c8b81..d451bb6 100644
--- a/src/views/config/components/addTeacher.vue
+++ b/src/views/config/components/addTeacher.vue
@@ -1,14 +1,25 @@
 <template>
   <div>
     <xy-dialog ref="dialog" :width="40" :is-show.sync="isShow" :type="'form'"
-      :title="type === 'add' ? '新增教师信息' : '编辑教师信息'" :form="form" :rules='rules' @submit="submit">
+      :title="type === 'add' ? '新增授课老师信息' : '编辑授课老师信息'" :form="form" :rules='rules' @submit="submit">
       <template v-slot:name>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>姓名：
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>授课老师：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.name" placeholder="请输入姓名" clearable style="width: 100%;"></el-input>
+            <el-input v-model="form.name" placeholder="请输入授课老师" clearable style="width: 100%;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:introduce>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>老师简介：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.introduce" type="textarea" placeholder="请输入老师简介" clearable
+              style="width: 100%;"></el-input>
           </div>
         </div>
       </template>
@@ -35,13 +46,14 @@
           </div>
         </div>
       </template>
-      <template v-slot:introduce>
+      
+      <template v-slot:remark>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>介绍：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>备注：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.introduce" type="textarea" placeholder="请输入介绍" clearable
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" clearable
               style="width: 100%;"></el-input>
           </div>
         </div>
@@ -69,9 +81,10 @@
         id: '',
         form: {
           name: '',
+          introduce: '',
           sex: '',
           mobile: '',
-          introduce: ''
+          remark: ''
         },
         sex_options: [{
           label: '男',
@@ -108,7 +121,7 @@
         save(this.form).then(res => {
           this.$message({
             type: 'success',
-            message: this.type === 'add' ? '新增教师成功' : '编辑教师成功'
+            message: this.type === 'add' ? '新增授课老师成功' : '编辑授课老师成功'
           })
           this.isShow = false
           this.$emit('refresh')
@@ -133,9 +146,11 @@
           this.id = ''
           this.form = {
             name: '',
+            introduce: '',
             sex: '',
             mobile: '',
-            introduce: ''
+            
+            remark: ''
           }
           this.$refs['dialog'].reset()
         }
@@ -152,4 +167,4 @@
   ::v-deep .mobile {
     flex-basis: 100%;
   }
-</style>
+</style>
diff --git a/src/views/config/teacher.vue b/src/views/config/teacher.vue
index 9f06303..2d29695 100644
--- a/src/views/config/teacher.vue
+++ b/src/views/config/teacher.vue
@@ -7,7 +7,7 @@
           <div slot="content">
             <div class="searchwrap" style="display: flex;align-items: center;">
               <div>
-                <el-input v-model="select.name" placeholder="请输入姓名"></el-input>
+                <el-input v-model="select.name" placeholder="请输入授课老师姓名"></el-input>
               </div>
               <div>
                 <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
@@ -39,28 +39,36 @@
             <el-table-column prop="course.name" label="课程名称" width="240" align="left">
               <template slot-scope="scope">
                 <div class="cc-item" v-for="(item, index) in scope.row.course_contents" :key="index">
-                  {{ item.course ? item.course.name : '' }}
+                  <el-tooltip :content="item.course ? item.course.name : ''" placement="top" :disabled="!item.course || item.course.name.length <= 20">
+                    <span>{{ item.course ? item.course.name : '' }}</span>
+                  </el-tooltip>
                 </div>
               </template>
             </el-table-column>
             <el-table-column prop="theme" label="课程主题" width="240" align="left">
               <template slot-scope="scope">
                 <div class="cc-item" v-for="(item, index) in scope.row.course_contents" :key="index">
-                  {{ item.theme || '' }}
+                  <el-tooltip :content="item.theme || ''" placement="top" :disabled="!item.theme || item.theme.length <= 20">
+                    <span>{{ item.theme || '' }}</span>
+                  </el-tooltip>
                 </div>
               </template>
             </el-table-column>
             <el-table-column prop="direction" label="课程方向" width="240" align="left">
               <template slot-scope="scope">
                 <div class="cc-item" v-for="(item, index) in scope.row.course_contents" :key="index">
-                  {{ item.direction || '' }}
+                  <el-tooltip :content="item.direction_detail ? item.direction_detail.value : ''" placement="top" :disabled="!item.direction_detail || item.direction_detail.value.length <= 20">
+                    <span>{{ item.direction_detail ? item.direction_detail.value : '' }}</span>
+                  </el-tooltip>
                 </div>
               </template>
             </el-table-column>
             <el-table-column prop="remark" label="备注" width="240" align="left">
               <template slot-scope="scope">
                 <div class="cc-item" v-for="(item, index) in scope.row.course_contents" :key="index">
-                  {{ item.remark || '' }}
+                  <el-tooltip :content="item.remark || ''" placement="top" :disabled="!item.remark || item.remark.length <= 20">
+                    <span>{{ item.remark || '' }}</span>
+                  </el-tooltip>
                 </div>
               </template>
             </el-table-column>
@@ -118,10 +126,15 @@
           fixed: 'left'
         },{
           prop: 'name',
-          label: '姓名',
+          label: '授课老师',
           align: 'center',
           width: 180,
           fixed: 'left'
+        },{
+          prop: 'introduce',
+          label: '老师简介',
+          align: 'left',
+          width: 240,
         }, {
           prop: 'sex',
           label: '性别',
@@ -132,11 +145,6 @@
           label: '联系方式',
           align: 'center',
           width: 180,
-        },{
-          prop: 'introduce',
-          label: '介绍',
-          align: 'left',
-          width: 240,
         },{
           prop: 'course_contents',
           label: '排课历史',
@@ -180,7 +188,7 @@
 
       },
       async exportExcel() {
-        let sheetName = `教师${new Date().getTime().toString()}`
+        let sheetName = `授课老师${new Date().getTime().toString()}`
         const res = await index({
           filter: [{
             key: 'name',
@@ -260,8 +268,10 @@
     padding: 6px 0;
     border-bottom: 1px dashed #dcdfe6;
     line-height: 1.2;
-    word-break: break-all;
-    white-space: normal;
+    height: 24px; /* 固定每行高度 */
+    overflow: hidden; /* 隐藏超出部分 */
+    text-overflow: ellipsis; /* 超出显示省略号 */
+    white-space: nowrap; /* 不换行 */
   }
   .cc-item:last-child {
     border-bottom: none;
diff --git a/src/views/course/components/addClass.vue b/src/views/course/components/addClass.vue
index 79da883..fa008e9 100644
--- a/src/views/course/components/addClass.vue
+++ b/src/views/course/components/addClass.vue
@@ -1,936 +1,875 @@
-<template>
-  <div>
-    <Modal v-model="isShow" width="70" title="排课设置">
-      <div class="txl">
-        <div>课程名称：{{ subjectObj.name }}</div>
-        <div>
-          开课日期：{{ subjectObj.start_date }}至{{ subjectObj.end_date }}
-        </div>
-        <div>
-          课程体系：{{
-            subjectObj.type_detail ? subjectObj.type_detail.name : ""
-          }}
-        </div>
-      </div>
-      <div class="txl">
-        <div>
-          班主任：{{ subjectObj.teacherList ? subjectObj.teacherList : "" }}
-        </div>
-        <div>
-          课表状态：{{
-            subjectObj.course_content_status === 1 ? "已发布" : "未发布"
-          }}
-        </div>
-      </div>
-      <div class="txl">
-        <div>
-          <el-button
-            type="primary"
-            size="small"
-            @click="editClass('add', subjectObj.id)"
-            >添加课程</el-button
-          >
-        </div>
-        <div>
-          <el-button type="primary" size="small" @click="importTable"
-            >导入</el-button
-          >
-        </div>
-
-        <div v-if="subjectObj.course_content_status === 0">
-          <el-button
-            type="primary"
-            size="small"
-            @click="changeContentStatus(true)"
-            >发布课表</el-button
-          >
-        </div>
-        <div v-if="subjectObj.course_content_status === 1">
-          <el-button
-            type="primary"
-            size="small"
-            @click="changeContentStatus(false)"
-            >取消发布课表</el-button
-          >
-        </div>
-        <div v-if="subjectObj.course_content_status === 1">
-          <el-button type="primary" size="small" @click="isSendMessage"
-            >短信通知</el-button
-          >
-        </div>
-
-        <div>
-          <el-button type="primary" size="small" v-print="'#print'"
-            >下载并打印课表</el-button
-          >
-        </div>
-        <div>
-          <el-button
-            type="warning"
-            size="small"
-            @click="batchEditAddress"
-            :disabled="!selectedRows || selectedRows.length === 0"
-            >批量修改地址</el-button
-          >
-        </div>
-      </div>
-
-      <div class="schedule" id="print">
-        <el-table
-          :data="list"
-          :show-index="false"
-          :height="300"
-          @selection-change="handleSelectionChange"
-          style="width: 100%"
-        >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="date"
-            label="日期"
-            width="120"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="period"
-            label="时间"
-            width="120"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="theme"
-            label="主题"
-            min-width="150"
-            align="left"
-          ></el-table-column>
-          <el-table-column
-            prop="teacher.name"
-            label="老师"
-            width="120"
-            align="center"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.teacher ? scope.row.teacher.name : "" }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="address"
-            label="地点"
-            width="150"
-            align="left"
-          ></el-table-column>
-          <el-table-column
-            prop="address_detail"
-            label="签到地点"
-            width="150"
-            align="left"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="课件"
-            width="240"
-            header-align="center"
-          >
-            <template slot-scope="scope">
-              <div v-if="scope.row.files && scope.row.files.length > 0">
-                <div
-                  v-for="file in scope.row.files"
-                  :key="file.id"
-                  class="file-item"
-                >
-                  <el-link
-                    type="primary"
-                    @click="downloadFile(file)"
-                    :underline="false"
-                  >
-                    <i class="el-icon-document"></i>
-                    {{ file.original_name }}
-                  </el-link>
-                </div>
-              </div>
-              <span v-else class="no-files">暂无课件</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="left"
-            fixed="right"
-            label="操作"
-            width="250"
-            header-align="center"
-          >
-            <template slot-scope="scope">
-              <el-button
-                type="primary"
-                size="small"
-                style="margin-left: 5px; margin-bottom: 5px"
-                @click="editClass('editor', scope.row.id)"
-                >编辑</el-button
-              >
-              <el-button
-                type="success"
-                size="small"
-                style="margin-left: 5px; margin-bottom: 5px"
-                @click="uploadMaterial(scope.row)"
-                >上传课件</el-button
-              >
-              <el-popconfirm
-                style="margin: 0 10px"
-                @confirm="deleteList(scope.row.id)"
-                title="确定删除吗？"
-              >
-                <el-button type="danger" size="small" slot="reference"
-                  >删除</el-button
-                >
-              </el-popconfirm>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <template v-slot:footer>
-        <el-button
-          plain
-          type="primary"
-          plain
-          style="margin-left: 5px; margin-bottom: 5px"
-          @click="closeClass"
-          >取消</el-button
-        >
-      </template>
-    </Modal>
-    <imports
-      ref="imports"
-      :table-name="'course_contents'"
-      :course_id="id + ''"
-      @refresh="refreshData"
-    ></imports>
-
-    <editClass ref="editClass" @refresh="getCousreContent"></editClass>
-
-    <!-- 上传课件模态框 -->
-    <el-dialog
-      title="上传课件"
-      :visible.sync="materialDialogVisible"
-      width="600px"
-      center
-    >
-      <div class="material-upload-container">
-        <div class="course-info">
-          <h4>课程信息</h4>
-          <p><strong>日期：</strong>{{ selectedCourse.date }}</p>
-          <p><strong>时间：</strong>{{ selectedCourse.period }}</p>
-          <!-- <p><strong>上课时间：</strong>{{ selectedCourse.start_time }}{{ selectedCourse.end_time }}</p> -->
-          <p><strong>主题：</strong>{{ selectedCourse.theme }}</p>
-          <p>
-            <strong>老师：</strong
-            >{{ selectedCourse.teacher ? selectedCourse.teacher.name : "" }}
-          </p>
-        </div>
-
-        <div class="upload-section">
-          <h4>课件上传</h4>
-          <el-upload
-            ref="materialUpload"
-            :action="uploadAction"
-            :headers="uploadHeaders"
-            :file-list="materialFileList"
-            :on-success="handleMaterialUploadSuccess"
-            :on-remove="handleMaterialUploadRemove"
-            :on-error="handleMaterialUploadError"
-            :before-upload="beforeMaterialUpload"
-            multiple
-            drag
-            accept=".pdf,.doc,.docx,.ppt,.pptx,.xls,.xlsx,.zip,.rar,.txt,.jpg,.jpeg,.png,.gif"
-          >
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">
-              将文件拖到此处，或<em>点击上传</em>
-            </div>
-            <div slot="tip" class="el-upload__tip">
-              支持 PDF、Word、PPT、Excel、压缩包、图片等格式，单个文件不超过50MB
-            </div>
-          </el-upload>
-        </div>
-
-        <div class="uploaded-files" v-if="materialFileList.length > 0">
-          <h4>已上传文件</h4>
-          <div
-            v-for="file in materialFileList"
-            :key="file.uid"
-            class="file-item"
-          >
-            <span class="file-name">{{ file.name }}</span>
-            <span class="file-size">{{ formatFileSize(file.size) }}</span>
-            <el-button
-              type="danger"
-              size="mini"
-              @click="removeMaterialFile(file)"
-              >删除</el-button
-            >
-          </div>
-        </div>
-      </div>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="materialDialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="saveMaterialFiles" :loading="saving"
-          >保存</el-button
-        >
-      </div>
-    </el-dialog>
-
-    <!-- 批量修改地址模态框 -->
-    <el-dialog
-      title="批量修改地址"
-      :visible.sync="batchAddressDialogVisible"
-      width="600px"
-      center
-    >
-      <div class="batch-address-container">
-        <div class="selected-info">
-          <h4>已选择 {{ selectedRows.length }} 个课程</h4>
-          <p>将统一修改以下课程的地址信息：</p>
-          <ul>
-            <li v-for="row in selectedRows" :key="row.id">
-              {{ row.date }} {{ row.period }} - {{ row.theme }}
-            </li>
-          </ul>
-        </div>
-
-        <div class="address-form">
-          <h4>地址信息</h4>
-          <el-form :model="batchAddressForm" label-width="100px">
-            <el-form-item label="上课地点：">
-              <el-input
-                v-model="batchAddressForm.address"
-                placeholder="请输入上课地点"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="签到地点：">
-              <avue-input-map
-                v-model="batchMapForm"
-                :params="mapparams"
-                style="width: 100%"
-                placeholder="请选择地图"
-              />
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="batchAddressDialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="saveBatchAddress" :loading="saving"
-          >保存</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import myMixins from "@/mixin/selectMixin.js";
-import {
-  index,
-  sendSms,
-  destroy,
-  save as saveContent,
-  batchSave,
-} from "@/api/course/courseContent.js";
-import { index as teacherIndex } from "@/api/info/teachers.js";
-import { show, save } from "@/api/course/index.js";
-import { uploads } from "@/api/uploads.js";
-import imports from "@/views/component/imports.vue";
-import editClass from "../components/editClass.vue";
-export default {
-  mixins: [myMixins],
-  components: {
-    imports,
-    editClass,
-  },
-  data() {
-    return {
-      isShow: false,
-      id: "", // 课程id，其他接口的course_id
-      subjectObj: {}, // 课程信息
-      list: [],
-      teacher_options: [],
-      showBtn: true,
-      table_item: [
-        {
-          prop: "theme",
-          label: "授课主题",
-          align: "center",
-          width: 120,
-          fixed: "left",
-        },
-        {
-          prop: "date",
-          label: "上课日期",
-          align: "center",
-          width: 120,
-        },
-        {
-          prop: "period",
-          label: "上课时间",
-          align: "center",
-          width: 180,
-        },
-
-        // {
-        //   prop: 'start_time',
-        //   label: '开始时间',
-        //   align: 'center',
-        //   width: 120,
-        // }, {
-        //   prop: 'end_time',
-        //   label: '结束时间',
-        //   align: 'center',
-        //   width: 120,
-        // },
-        {
-          prop: "teacher.name",
-          label: "授课老师",
-          align: "center",
-          width: 120,
-        },
-        {
-          prop: "teacher.sex",
-          label: "性别",
-          align: "left",
-          align: "center",
-          width: 80,
-        },
-        {
-          prop: "teacher.mobile",
-          label: "联系方式",
-          align: "center",
-          width: 180,
-        },
-        {
-          prop: "teacher.introduce",
-          label: "老师简介",
-          align: "left",
-          width: 240,
-        },
-        {
-          prop: "address",
-          label: "上课地点",
-          align: "left",
-          width: 240,
-        },
-        {
-          prop: "address_detail",
-          label: "签到地点",
-          align: "left",
-          width: 240,
-        },
-        {
-          prop: "files",
-          label: "课件",
-          align: "left",
-          width: 240,
-        },
-      ],
-      materialDialogVisible: false, // 上传课件模态框的可见性
-      selectedCourse: {}, // 当前选中的课程内容
-      uploadAction: `${process.env.VUE_APP_UPLOAD_API}`, // 上传文件的URL
-      uploadHeaders: {
-        Authorization: `Bearer ${this.$store.getters.token}`,
-      }, // 上传文件时的请求头
-      materialFileList: [], // 已上传的课件文件列表
-      saving: false, // 保存状态
-      selectedRows: [], // 选中的行数据
-      batchAddressDialogVisible: false, // 批量修改地址弹框的可见性
-      batchAddressForm: {
-        address: "",
-        address_detail: "",
-        latitude: "",
-        longitude: "",
-      },
-      batchMapForm: [], // 批量修改地址的地图表单
-      mapparams: {
-        zoom: 11,
-      },
-    };
-  },
-
-  methods: {
-    setTeachers(e) {
-      this.teacher_options = e;
-    },
-    //  获取排课
-    async getCousreContent() {
-      const res = await index({
-        page: 1,
-        page_size: 999,
-        show_relation: ["teacher"],
-        sort_name: "date",
-        sort_type: "ASC",
-        filter: [
-          {
-            key: "course_id",
-            op: "eq",
-            value: this.id,
-          },
-        ],
-      });
-      this.list = res.data;
-    },
-    async getCourseDetail() {
-      const res = await show({
-        id: this.id,
-        show_relation: ["teacher", "type_detail"],
-      });
-      this.subjectObj = {};
-      this.subjectObj = this.base.deepCopy(res);
-      let teacher = [];
-      if (res.teacher_detail.length > 0) {
-        res.teacher_detail.map((item) => {
-          teacher.push(item.name);
-        });
-      }
-      this.subjectObj.teacherList = teacher.join(",");
-    },
-    // 导入
-    importTable() {
-      this.$refs.imports.show();
-    },
-    refreshData() {
-      this.$emit("refresh");
-      this.getTeachers();
-      this.getCourseDetail();
-      this.getCousreContent();
-    },
-    // 发布课表
-    changeContentStatus(flag) {
-      if (this.list.length === 0) {
-        this.$Message.warning("请先导入课表");
-        return;
-      }
-      if (flag) {
-        this.subjectObj.course_content_status = 1;
-      } else {
-        this.subjectObj.course_content_status = 0;
-      }
-      save(this.subjectObj).then((res) => {
-        this.$Message.success(flag ? "发布成功" : "已取消发布");
-        this.$emit("refresh");
-        this.getCourseDetail();
-        if (flag) {
-          this.isSendMessage();
-        }
-      });
-    },
-    // 发布课表之后 确认是否发送短信
-    isSendMessage() {
-      this.$confirm("课表已发布，是否需要短信通知所有学员", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "success",
-      })
-        .then(() => {
-          this.sendMessage();
-        })
-        .catch(() => {});
-    },
-    sendMessage() {
-      sendSms({
-        id: this.id,
-      }).then((res) => {
-        this.$Message.success("短信发送成功");
-      });
-    },
-    closeClass() {
-      this.isShow = false;
-    },
-    editClass(type, id) {
-      this.$refs.editClass.type = type;
-      this.$refs.editClass.id = id;
-      if (type === "add") {
-        // 新增时，将subjectObj.id作为course_id传递
-        this.$refs.editClass.form.course_id = this.subjectObj.id;
-      }
-      this.$refs.editClass.setTeachers(this.teacher_options);
-      this.$refs.editClass.isShow = true;
-    },
-    async getTeachers() {
-      const res = await teacherIndex({
-        page: 1,
-        page_size: 999,
-      });
-      this.teacher_options = res.data;
-    },
-    deleteList(id) {
-      var that = this;
-      destroy({
-        id: id,
-      })
-        .then((response) => {
-          this.$Message.success("删除成功");
-          this.getCousreContent();
-        })
-        .catch((error) => {
-          console.log(error);
-          reject(error);
-        });
-    },
-    uploadMaterial(row) {
-      this.selectedCourse = row;
-      this.materialFileList = []; // 清空已上传文件列表
-      this.materialDialogVisible = true;
-      this.$nextTick(() => {
-        this.$refs.materialUpload.clearFiles(); // 清空上传组件的文件列表
-      });
-    },
-    handleMaterialUploadSuccess(response, file, fileList) {
-      this.$message.success("课件上传成功");
-      this.materialFileList = fileList;
-    },
-    handleMaterialUploadRemove(file, fileList) {
-      this.materialFileList = fileList;
-    },
-    handleMaterialUploadError(err, file, fileList) {
-      this.$message.error("课件上传失败: " + err);
-    },
-    beforeMaterialUpload(file) {
-      const isLt50M = file.size / 1024 / 1024 < 50;
-      if (!isLt50M) {
-        this.$message.error("上传文件大小不能超过 50MB!");
-      }
-      return isLt50M;
-    },
-    downloadMaterial(file) {
-      window.open(file.url);
-    },
-    formatFileSize(size) {
-      if (size === 0) return "0 Bytes";
-      const k = 1024;
-      const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
-      const i = Math.floor(Math.log(size) / Math.log(k));
-      return parseFloat((size / Math.pow(k, i)).toFixed(2)) + " " + sizes[i];
-    },
-    downloadFile(file) {
-      // 创建一个临时的a标签来下载文件
-      const link = document.createElement("a");
-      link.href = file.url;
-      link.download = file.original_name;
-      link.target = "_blank";
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
-    },
-    async saveMaterialFiles() {
-      if (this.materialFileList.length === 0) {
-        this.$message.warning("请先上传课件文件");
-        return;
-      }
-
-      this.saving = true;
-      try {
-        // 提取文件ID数组
-        const fileIds = this.materialFileList.map((file) => {
-          return file.response ? file.response.id : file.id;
-        });
-
-        // 只传递课程ID和文件ID数组
-        const updateData = {
-          id: this.selectedCourse.id,
-          file_ids: fileIds,
-        };
-
-        await saveContent(updateData);
-        this.$message.success("课件保存成功");
-        this.materialDialogVisible = false;
-        this.getCousreContent(); // 刷新列表
-      } catch (error) {
-        this.$message.error("保存失败: " + error.message);
-      } finally {
-        this.saving = false;
-      }
-    },
-    handleSelectionChange(selection) {
-      this.selectedRows = selection;
-    },
-    batchEditAddress() {
-      if (!this.selectedRows || this.selectedRows.length === 0) {
-        this.$Message.warning("请先选择要修改的课程");
-        return;
-      }
-      this.batchAddressDialogVisible = true;
-    },
-    saveBatchAddress() {
-      if (!this.batchAddressForm.address && !this.batchMapForm.length) {
-        this.$message.warning("请至少填写上课地点或选择签到地点");
-        return;
-      }
-
-      // 处理地图数据
-      if (this.batchMapForm.length > 0) {
-        this.batchAddressForm.longitude = this.batchMapForm[0];
-        this.batchAddressForm.latitude = this.batchMapForm[1];
-        this.batchAddressForm.address_detail = this.batchMapForm[2];
-      }
-
-      // 构建提交数据
-      const submitData = {
-        id: this.selectedRows.map((row) => row.id).join(","), // 将选中的ID以逗号拼接
-        address: this.batchAddressForm.address,
-        address_detail: this.batchAddressForm.address_detail,
-        latitude: this.batchAddressForm.latitude,
-        longitude: this.batchAddressForm.longitude,
-      };
-
-      this.saving = true;
-
-      // 调用批量保存接口
-      batchSave(submitData)
-        .then((res) => {
-          this.$message.success("批量修改地址成功");
-          this.batchAddressDialogVisible = false;
-          this.getCousreContent(); // 刷新列表
-          this.resetBatchAddressForm(); // 重置表单
-        })
-        .catch((error) => {
-          this.$message.error("批量修改地址失败：" + error.message);
-        })
-        .finally(() => {
-          this.saving = false;
-        });
-    },
-    resetBatchAddressForm() {
-      this.batchAddressForm = {
-        address: "",
-        address_detail: "",
-        latitude: "",
-        longitude: "",
-      };
-      this.batchMapForm = [];
-    },
-  },
-  watch: {
-    isShow(newVal) {
-      if (newVal) {
-        this.getCourseDetail();
-        this.getCousreContent();
-      } else {
-        this.id = "";
-        this.subjectObj = {};
-        this.list = [];
-        // this.$refs['dialog'].reset()
-      }
-    },
-    selectedCourse(val) {
-      if (val) {
-        this.$nextTick(function () {
-          this.renderQRCode(val.id);
-        });
-      }
-    },
-    batchMapForm(newVal) {
-      if (newVal && newVal.length > 0) {
-        this.batchAddressForm.longitude = newVal[0];
-        this.batchAddressForm.latitude = newVal[1];
-        this.batchAddressForm.address_detail = newVal[2];
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@media print {
-  @page {
-    size: auto;
-  }
-
-  body,
-  html,
-  div {
-    height: auto !important;
-  }
-  table th:last-child,
-  table th:last-child {
-    display: none;
-  }
-}
-
-::v-deep .el-table__cell {
-  position: relative;
-}
-
-.subjectCell {
-  min-height: 50px;
-
-  .close {
-    position: absolute;
-    width: 20px;
-    height: 20px;
-    background-color: #ddd;
-    color: #fff;
-    text-align: center;
-    line-height: 20px;
-    top: 5px;
-    right: 5px;
-    border-radius: 20px;
-    cursor: pointer;
-  }
-
-  & > div {
-    text-align: center;
-  }
-}
-
-.txl {
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-
-  & > div {
-    margin-right: 10px;
-  }
-}
-
-.material-upload-container {
-  .course-info {
-    background: #f5f7fa;
-    padding: 15px;
-    border-radius: 4px;
-    margin-bottom: 20px;
-
-    h4 {
-      margin: 0 0 10px 0;
-      color: #303133;
-    }
-
-    p {
-      margin: 5px 0;
-      color: #606266;
-    }
-  }
-
-  .upload-section {
-    margin-bottom: 20px;
-
-    h4 {
-      margin: 0 0 10px 0;
-      color: #303133;
-    }
-
-    h5 {
-      margin: 0 0 10px 0;
-      color: #303133;
-      font-size: 14px;
-    }
-
-    .el-upload__tip {
-      font-size: 12px;
-      color: #909399;
-      margin-top: 5px;
-    }
-  }
-
-  .material-list {
-    h4 {
-      margin: 0 0 10px 0;
-      color: #303133;
-    }
-  }
-}
-
-.file-item {
-  margin-bottom: 5px;
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-
-  .el-link {
-    font-size: 12px;
-
-    i {
-      margin-right: 4px;
-    }
-  }
-}
-
-.no-files {
-  color: #909399;
-  font-size: 12px;
-}
-
-.batch-address-container {
-  .selected-info {
-    margin-bottom: 20px;
-    padding: 15px;
-    background: #f5f7fa;
-    border-radius: 4px;
-
-    h4 {
-      margin: 0 0 10px 0;
-      color: #303133;
-      font-size: 16px;
-    }
-
-    p {
-      margin: 0 0 10px 0;
-      color: #606266;
-      font-size: 14px;
-    }
-
-    ul {
-      margin: 0;
-      padding-left: 20px;
-      color: #606266;
-      font-size: 13px;
-
-      li {
-        margin-bottom: 5px;
-      }
-    }
-  }
-
-  .address-form {
-    h4 {
-      margin: 0 0 15px 0;
-      color: #303133;
-      font-size: 16px;
-    }
-  }
-}
-
-.uploaded-files {
-  margin-top: 20px;
-
-  h4 {
-    margin: 0 0 10px 0;
-    color: #303133;
-    font-size: 14px;
-  }
-
-  .file-item {
-    display: flex;
-    align-items: center;
-    margin-bottom: 8px;
-    padding: 8px;
-    background: #f5f7fa;
-    border-radius: 4px;
-
-    .file-name {
-      flex: 1;
-      margin-right: 10px;
-      font-size: 12px;
-      color: #606266;
-    }
-
-    .file-size {
-      margin-right: 10px;
-      font-size: 12px;
-      color: #909399;
-    }
-  }
-}
-</style>
+<template>
+  <div>
+    <Modal v-model="isShow" width="70" title="排课设置">
+      <div class="txl">
+        <div>课程名称：{{ subjectObj.name }}</div>
+        <div>
+          开课日期：{{ subjectObj.start_date }}至{{ subjectObj.end_date }}
+        </div>
+        <div>
+          课程体系：{{
+            subjectObj.type_detail ? subjectObj.type_detail.name : ""
+          }}
+        </div>
+      </div>
+      <div class="txl">
+        <div>
+          班主任：{{ subjectObj.teacherList ? subjectObj.teacherList : "" }}
+        </div>
+        <div>
+          课表状态：{{
+            subjectObj.course_content_status === 1 ? "已发布" : "未发布"
+          }}
+        </div>
+      </div>
+      <div class="txl">
+        <div>
+          <el-button
+            type="primary"
+            size="small"
+            @click="editClass('add', subjectObj.id)"
+            >添加课程</el-button
+          >
+        </div>
+        <div>
+          <el-button type="primary" size="small" @click="importTable"
+            >导入</el-button
+          >
+        </div>
+
+        <div v-if="subjectObj.course_content_status === 0">
+          <el-button
+            type="primary"
+            size="small"
+            @click="changeContentStatus(true)"
+            >发布课表</el-button
+          >
+        </div>
+        <div v-if="subjectObj.course_content_status === 1">
+          <el-button
+            type="primary"
+            size="small"
+            @click="changeContentStatus(false)"
+            >取消发布课表</el-button
+          >
+        </div>
+        <div v-if="subjectObj.course_content_status === 1">
+          <el-button type="primary" size="small" @click="isSendMessage"
+            >短信通知</el-button
+          >
+        </div>
+
+        <div>
+          <el-button type="primary" size="small" v-print="'#print'"
+            >下载并打印课表</el-button
+          >
+        </div>
+        <div>
+          <el-button
+            type="warning"
+            size="small"
+            @click="batchEditAddress"
+            :disabled="!selectedRows || selectedRows.length === 0"
+            >批量修改地址</el-button
+          >
+        </div>
+      </div>
+
+      <div class="schedule" id="print">
+        <el-table
+          :data="list"
+          :show-index="false"
+          :height="300"
+          @selection-change="handleSelectionChange"
+          style="width: 100%"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="date"
+            label="日期"
+            width="120"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="period"
+            label="上课时间"
+            width="180"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="teacher.name"
+            label="授课老师"
+            width="120"
+            align="center"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.teacher ? scope.row.teacher.name : "" }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="teacher.introduce"
+            label="老师简介"
+            width="240"
+            align="left"
+          >
+          </el-table-column>
+            <el-table-column
+              prop="theme"
+              label="课程主题"
+              min-width="150"
+              align="left"
+            ></el-table-column>
+            <el-table-column
+              prop="direction_detail.value"
+              label="课程方向"
+              min-width="150"
+              align="left"
+            ></el-table-column>
+          <el-table-column
+            prop="address"
+            label="上课地点"
+            width="150"
+            align="left"
+          ></el-table-column>
+          <el-table-column
+            prop="address_detail"
+            label="签到地点"
+            width="150"
+            align="left"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="课件"
+            width="240"
+            header-align="center"
+          >
+              <template slot-scope="scope">
+                <div v-if="scope.row.files && scope.row.files.length > 0">
+                <div
+                  v-for="file in scope.row.files"
+                  :key="file.id"
+                  class="file-item"
+                >
+                  <el-link
+                    type="primary"
+                    @click="downloadFile(file)"
+                    :underline="false"
+                  >
+                      <i class="el-icon-document"></i>
+                      {{ file.original_name }}
+                    </el-link>
+                  </div>
+                </div>
+                <span v-else class="no-files">暂无课件</span>
+              </template>
+            </el-table-column>
+          <el-table-column
+            align="left"
+            fixed="right"
+            label="操作"
+            width="250"
+            header-align="center"
+          >
+              <template slot-scope="scope">
+              <el-button
+                type="primary"
+                size="small"
+                style="margin-left: 5px; margin-bottom: 5px"
+                @click="editClass('editor', scope.row.id)"
+                >编辑</el-button
+              >
+              <el-button
+                type="success"
+                size="small"
+                style="margin-left: 5px; margin-bottom: 5px"
+                @click="uploadMaterial(scope.row)"
+                >上传课件</el-button
+              >
+              <el-popconfirm
+                style="margin: 0 10px"
+                @confirm="deleteList(scope.row.id)"
+                title="确定删除吗？"
+              >
+                <el-button type="danger" size="small" slot="reference"
+                  >删除</el-button
+                >
+                </el-popconfirm>
+              </template>
+            </el-table-column>
+        </el-table>
+      </div>
+      <template v-slot:footer>
+        <el-button
+          plain
+          type="primary"
+          plain
+          style="margin-left: 5px; margin-bottom: 5px"
+          @click="closeClass"
+          >取消</el-button
+        >
+      </template>
+    </Modal>
+    <imports
+      ref="imports"
+      :table-name="'course_contents'"
+      :course_id="id + ''"
+      @refresh="refreshData"
+    ></imports>
+    
+    <editClass ref="editClass" @refresh="getCousreContent"></editClass>
+
+    <!-- 上传课件模态框 -->
+    <el-dialog
+      title="上传课件"
+      :visible.sync="materialDialogVisible"
+      width="600px"
+      center
+    >
+      <div class="material-upload-container">
+        <div class="course-info">
+          <h4>课程信息</h4>
+          <p><strong>日期：</strong>{{ selectedCourse.date }}</p>
+          <p><strong>时间：</strong>{{ selectedCourse.period }}</p>
+          <!-- <p><strong>上课时间：</strong>{{ selectedCourse.start_time }}{{ selectedCourse.end_time }}</p> -->
+          <p><strong>主题：</strong>{{ selectedCourse.theme }}</p>
+          <p>
+            <strong>老师：</strong
+            >{{ selectedCourse.teacher ? selectedCourse.teacher.name : "" }}
+          </p>
+        </div>
+
+        <div class="upload-section">
+          <h4>课件上传</h4>
+          <el-upload
+            ref="materialUpload"
+            :action="uploadAction"
+            :headers="uploadHeaders"
+            :file-list="materialFileList"
+            :on-success="handleMaterialUploadSuccess"
+            :on-remove="handleMaterialUploadRemove"
+            :on-error="handleMaterialUploadError"
+            :before-upload="beforeMaterialUpload"
+            multiple
+            drag
+            accept=".pdf,.doc,.docx,.ppt,.pptx,.xls,.xlsx,.zip,.rar,.txt,.jpg,.jpeg,.png,.gif"
+          >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">
+              将文件拖到此处，或<em>点击上传</em>
+            </div>
+            <div slot="tip" class="el-upload__tip">
+              支持 PDF、Word、PPT、Excel、压缩包、图片等格式，单个文件不超过50MB
+            </div>
+          </el-upload>
+        </div>
+
+        <div class="uploaded-files" v-if="materialFileList.length > 0">
+          <h4>已上传文件</h4>
+          <div
+            v-for="file in materialFileList"
+            :key="file.uid"
+            class="file-item"
+          >
+            <span class="file-name">{{ file.name }}</span>
+            <span class="file-size">{{ formatFileSize(file.size) }}</span>
+            <el-button
+              type="danger"
+              size="mini"
+              @click="removeMaterialFile(file)"
+              >删除</el-button
+            >
+          </div>
+        </div>
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="materialDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="saveMaterialFiles" :loading="saving"
+          >保存</el-button
+        >
+      </div>
+    </el-dialog>
+
+    <!-- 批量修改地址模态框 -->
+    <el-dialog
+      title="批量修改地址"
+      :visible.sync="batchAddressDialogVisible"
+      width="600px"
+      center
+    >
+      <div class="batch-address-container">
+        <div class="selected-info">
+          <h4>已选择 {{ selectedRows.length }} 个课程</h4>
+          <p>将统一修改以下课程的地址信息：</p>
+          <ul>
+            <li v-for="row in selectedRows" :key="row.id">
+              {{ row.date }} {{ row.period }} - {{ row.theme }}
+            </li>
+          </ul>
+        </div>
+
+        <div class="address-form">
+          <h4>地址信息</h4>
+          <el-form :model="batchAddressForm" label-width="100px">
+            <el-form-item label="上课地点：">
+              <el-input
+                v-model="batchAddressForm.address"
+                placeholder="请输入上课地点"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="签到地点：">
+              <avue-input-map
+                v-model="batchMapForm"
+                :params="mapparams"
+                style="width: 100%"
+                placeholder="请选择地图"
+              />
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="batchAddressDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="saveBatchAddress" :loading="saving"
+          >保存</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import myMixins from "@/mixin/selectMixin.js";
+  import {
+    index,
+    sendSms,
+    destroy,
+  save as saveContent,
+  batchSave,
+} from "@/api/course/courseContent.js";
+import { index as teacherIndex } from "@/api/info/teachers.js";
+import { show, save } from "@/api/course/index.js";
+import { uploads } from "@/api/uploads.js";
+import imports from "@/views/component/imports.vue";
+import editClass from "../components/editClass.vue";
+  export default {
+    mixins: [myMixins],
+    components: {
+      imports,
+    editClass,
+    },
+    data() {
+      return {
+        isShow: false,
+      id: "", // 课程id，其他接口的course_id
+        subjectObj: {}, // 课程信息
+        list: [],
+        teacher_options: [],
+        showBtn: true,
+      table_item: [
+      ],
+        materialDialogVisible: false, // 上传课件模态框的可见性
+        selectedCourse: {}, // 当前选中的课程内容
+        uploadAction: `${process.env.VUE_APP_UPLOAD_API}`, // 上传文件的URL
+        uploadHeaders: {
+        Authorization: `Bearer ${this.$store.getters.token}`,
+        }, // 上传文件时的请求头
+        materialFileList: [], // 已上传的课件文件列表
+      saving: false, // 保存状态
+      selectedRows: [], // 选中的行数据
+      batchAddressDialogVisible: false, // 批量修改地址弹框的可见性
+      batchAddressForm: {
+        address: "",
+        address_detail: "",
+        latitude: "",
+        longitude: "",
+      },
+      batchMapForm: [], // 批量修改地址的地图表单
+      mapparams: {
+        zoom: 11,
+      },
+    };
+  },
+
+    methods: {
+      setTeachers(e) {
+      this.teacher_options = e;
+      },
+      //  获取排课
+      async getCousreContent() {
+        const res = await index({
+          page: 1,
+          page_size: 999,
+        show_relation: ["teacher",'directionDetail'],
+        sort_name: "date",
+        sort_type: "DESC",
+        filter: [
+          {
+            key: "course_id",
+            op: "eq",
+            value: this.id,
+          },
+        ],
+      });
+      this.list = res.data;
+      },
+      async getCourseDetail() {
+        const res = await show({
+          id: this.id,
+        show_relation: ["teacher", "type_detail"],
+      });
+      this.subjectObj = {};
+      this.subjectObj = this.base.deepCopy(res);
+      let teacher = [];
+      if (res.teacher_detail.length > 0) {
+        res.teacher_detail.map((item) => {
+          teacher.push(item.name);
+        });
+      }
+      this.subjectObj.teacherList = teacher.join(",");
+      },
+      // 导入
+      importTable() {
+      this.$refs.imports.show();
+      },
+      refreshData() {
+      this.$emit("refresh");
+      this.getTeachers();
+      this.getCourseDetail();
+      this.getCousreContent();
+      },
+      // 发布课表
+      changeContentStatus(flag) {
+        if (this.list.length === 0) {
+        this.$Message.warning("请先导入课表");
+        return;
+      }
+      if (flag) {
+        this.subjectObj.course_content_status = 1;
+      } else {
+        this.subjectObj.course_content_status = 0;
+      }
+      save(this.subjectObj).then((res) => {
+        this.$Message.success(flag ? "发布成功" : "已取消发布");
+        this.$emit("refresh");
+        this.getCourseDetail();
+        if (flag) {
+          this.isSendMessage();
+        }
+      });
+      },
+      // 发布课表之后 确认是否发送短信
+      isSendMessage() {
+      this.$confirm("课表已发布，是否需要短信通知所有学员", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "success",
+      })
+        .then(() => {
+          this.sendMessage();
+        })
+        .catch(() => {});
+      },
+      sendMessage() {
+        sendSms({
+        id: this.id,
+      }).then((res) => {
+        this.$Message.success("短信发送成功");
+      });
+      },
+      closeClass() {
+      this.isShow = false;
+      },
+      editClass(type, id) {
+      this.$refs.editClass.type = type;
+      this.$refs.editClass.id = id;
+      if (type === "add") {
+        // 新增时，将subjectObj.id作为course_id传递
+        this.$refs.editClass.form.course_id = this.subjectObj.id;
+      }
+      this.$refs.editClass.setTeachers(this.teacher_options);
+      this.$refs.editClass.isShow = true;
+      },
+      async getTeachers() {
+        const res = await teacherIndex({
+          page: 1,
+        page_size: 999,
+      });
+      this.teacher_options = res.data;
+      },
+      deleteList(id) {
+        var that = this;
+        destroy({
+          id: id,
+      })
+        .then((response) => {
+          this.$Message.success("删除成功");
+          this.getCousreContent();
+        })
+        .catch((error) => {
+          console.log(error);
+          reject(error);
+        });
+      },
+      uploadMaterial(row) {
+        this.selectedCourse = row;
+        this.materialFileList = []; // 清空已上传文件列表
+        this.materialDialogVisible = true;
+        this.$nextTick(() => {
+          this.$refs.materialUpload.clearFiles(); // 清空上传组件的文件列表
+        });
+      },
+      handleMaterialUploadSuccess(response, file, fileList) {
+      this.$message.success("课件上传成功");
+        this.materialFileList = fileList;
+      },
+      handleMaterialUploadRemove(file, fileList) {
+        this.materialFileList = fileList;
+      },
+      handleMaterialUploadError(err, file, fileList) {
+      this.$message.error("课件上传失败: " + err);
+      },
+      beforeMaterialUpload(file) {
+        const isLt50M = file.size / 1024 / 1024 < 50;
+        if (!isLt50M) {
+        this.$message.error("上传文件大小不能超过 50MB!");
+        }
+        return isLt50M;
+      },
+      downloadMaterial(file) {
+        window.open(file.url);
+      },
+      formatFileSize(size) {
+      if (size === 0) return "0 Bytes";
+        const k = 1024;
+      const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
+        const i = Math.floor(Math.log(size) / Math.log(k));
+      return parseFloat((size / Math.pow(k, i)).toFixed(2)) + " " + sizes[i];
+      },
+      downloadFile(file) {
+        // 创建一个临时的a标签来下载文件
+      const link = document.createElement("a");
+        link.href = file.url;
+        link.download = file.original_name;
+      link.target = "_blank";
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      },
+      async saveMaterialFiles() {
+        if (this.materialFileList.length === 0) {
+        this.$message.warning("请先上传课件文件");
+          return;
+        }
+
+        this.saving = true;
+        try {
+          // 提取文件ID数组
+        const fileIds = this.materialFileList.map((file) => {
+            return file.response ? file.response.id : file.id;
+          });
+
+          // 只传递课程ID和文件ID数组
+          const updateData = {
+            id: this.selectedCourse.id,
+          file_ids: fileIds,
+          };
+
+          await saveContent(updateData);
+        this.$message.success("课件保存成功");
+          this.materialDialogVisible = false;
+          this.getCousreContent(); // 刷新列表
+        } catch (error) {
+        this.$message.error("保存失败: " + error.message);
+        } finally {
+          this.saving = false;
+        }
+    },
+    handleSelectionChange(selection) {
+      this.selectedRows = selection;
+    },
+    batchEditAddress() {
+      if (!this.selectedRows || this.selectedRows.length === 0) {
+        this.$Message.warning("请先选择要修改的课程");
+        return;
+      }
+      this.batchAddressDialogVisible = true;
+    },
+    saveBatchAddress() {
+      if (!this.batchAddressForm.address && !this.batchMapForm.length) {
+        this.$message.warning("请至少填写上课地点或选择签到地点");
+        return;
+      }
+
+      // 处理地图数据
+      if (this.batchMapForm.length > 0) {
+        this.batchAddressForm.longitude = this.batchMapForm[0];
+        this.batchAddressForm.latitude = this.batchMapForm[1];
+        this.batchAddressForm.address_detail = this.batchMapForm[2];
+      }
+
+      // 构建提交数据
+      const submitData = {
+        id: this.selectedRows.map((row) => row.id).join(","), // 将选中的ID以逗号拼接
+        address: this.batchAddressForm.address,
+        address_detail: this.batchAddressForm.address_detail,
+        latitude: this.batchAddressForm.latitude,
+        longitude: this.batchAddressForm.longitude,
+      };
+
+      this.saving = true;
+
+      // 调用批量保存接口
+      batchSave(submitData)
+        .then((res) => {
+          this.$message.success("批量修改地址成功");
+          this.batchAddressDialogVisible = false;
+          this.getCousreContent(); // 刷新列表
+          this.resetBatchAddressForm(); // 重置表单
+        })
+        .catch((error) => {
+          this.$message.error("批量修改地址失败：" + error.message);
+        })
+        .finally(() => {
+          this.saving = false;
+        });
+    },
+    resetBatchAddressForm() {
+      this.batchAddressForm = {
+        address: "",
+        address_detail: "",
+        latitude: "",
+        longitude: "",
+      };
+      this.batchMapForm = [];
+    },
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+        this.getCourseDetail();
+        this.getCousreContent();
+        } else {
+        this.id = "";
+        this.subjectObj = {};
+        this.list = [];
+          // this.$refs['dialog'].reset()
+        }
+      },
+    selectedCourse(val) {
+      if (val) {
+        this.$nextTick(function () {
+          this.renderQRCode(val.id);
+        });
+      }
+    },
+    batchMapForm(newVal) {
+      if (newVal && newVal.length > 0) {
+        this.batchAddressForm.longitude = newVal[0];
+        this.batchAddressForm.latitude = newVal[1];
+        this.batchAddressForm.address_detail = newVal[2];
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+  @media print {
+    @page {
+      size: auto;
+    }
+
+    body,
+    html,
+    div {
+      height: auto !important;
+    }
+    table th:last-child,
+    table th:last-child {
+      display: none;
+    }
+  }
+
+  ::v-deep .el-table__cell {
+    position: relative;
+  }
+
+  .subjectCell {
+    min-height: 50px;
+
+    .close {
+      position: absolute;
+      width: 20px;
+      height: 20px;
+      background-color: #ddd;
+      color: #fff;
+      text-align: center;
+      line-height: 20px;
+      top: 5px;
+      right: 5px;
+      border-radius: 20px;
+    cursor: pointer;
+    }
+
+  & > div {
+      text-align: center;
+    }
+  }
+
+  .txl {
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+
+  & > div {
+      margin-right: 10px;
+    }
+  }
+
+  .material-upload-container {
+    .course-info {
+      background: #f5f7fa;
+      padding: 15px;
+      border-radius: 4px;
+      margin-bottom: 20px;
+
+      h4 {
+        margin: 0 0 10px 0;
+        color: #303133;
+      }
+
+      p {
+        margin: 5px 0;
+        color: #606266;
+      }
+    }
+
+    .upload-section {
+      margin-bottom: 20px;
+
+      h4 {
+        margin: 0 0 10px 0;
+        color: #303133;
+      }
+
+    h5 {
+      margin: 0 0 10px 0;
+      color: #303133;
+      font-size: 14px;
+    }
+
+    .el-upload__tip {
+      font-size: 12px;
+      color: #909399;
+      margin-top: 5px;
+      }
+    }
+
+    .material-list {
+      h4 {
+        margin: 0 0 10px 0;
+        color: #303133;
+      }
+    }
+  }
+
+  .file-item {
+    margin-bottom: 5px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    .el-link {
+      font-size: 12px;
+
+      i {
+        margin-right: 4px;
+      }
+    }
+  }
+
+  .no-files {
+    color: #909399;
+    font-size: 12px;
+  }
+
+.batch-address-container {
+  .selected-info {
+    margin-bottom: 20px;
+    padding: 15px;
+    background: #f5f7fa;
+    border-radius: 4px;
+
+    h4 {
+      margin: 0 0 10px 0;
+      color: #303133;
+      font-size: 16px;
+    }
+
+    p {
+      margin: 0 0 10px 0;
+      color: #606266;
+      font-size: 14px;
+    }
+
+    ul {
+      margin: 0;
+      padding-left: 20px;
+      color: #606266;
+      font-size: 13px;
+
+      li {
+        margin-bottom: 5px;
+      }
+    }
+  }
+
+  .address-form {
+    h4 {
+      margin: 0 0 15px 0;
+      color: #303133;
+      font-size: 16px;
+    }
+  }
+}
+
+.uploaded-files {
+  margin-top: 20px;
+
+  h4 {
+    margin: 0 0 10px 0;
+    color: #303133;
+    font-size: 14px;
+  }
+
+  .file-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 8px;
+    padding: 8px;
+    background: #f5f7fa;
+    border-radius: 4px;
+
+    .file-name {
+      flex: 1;
+      margin-right: 10px;
+      font-size: 12px;
+      color: #606266;
+    }
+
+    .file-size {
+      margin-right: 10px;
+      font-size: 12px;
+      color: #909399;
+    }
+  }
+  }
+</style>
diff --git a/src/views/course/components/editClass.vue b/src/views/course/components/editClass.vue
index d5ce39b..26a4acb 100644
--- a/src/views/course/components/editClass.vue
+++ b/src/views/course/components/editClass.vue
@@ -42,11 +42,22 @@
             <span style="color: red;font-weight: bold;padding-right: 4px;"></span>授课老师：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.teacher_id" @change="changeTeacher" style="width:100%" placeholder="请选择授课老师"
+            <el-select filterable v-model="form.teacher_id" @change="changeTeacher" style="width:60%" placeholder="请选择授课老师"
               clearable>
               <el-option v-for="item in teacher_options" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
+            <el-button type="primary" size="small" @click="addTeacher" style="margin-left: 10px;">新增授课老师</el-button>
+          </div>
+        </div>
+      </template>
+      <template v-slot:teacher_introduce>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>授课老师简介：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input type="textarea" :rows="3" style="width: 100%;" v-model="form.teacher_introduce" placeholder="请输入授课老师简介" clearable></el-input>
           </div>
         </div>
       </template>
@@ -60,36 +71,40 @@
           </div>
         </div>
       </template>
-      <template v-slot:address>
+      <template v-slot:direction>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>上课地点：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>课程方向：
           </div>
           <div class="xy-table-item-content">
-            <el-input style="width: 100%;" v-model="form.address" placeholder="请输入上课地点" clearable></el-input>
+            <el-select filterable v-model="form.direction" style="width:100%" placeholder="请选择课程方向" clearable>
+              <el-option v-for="item in direction_options" :key="item.id" :label="item.value" :value="item.id">
+              </el-option>
+            </el-select>
           </div>
         </div>
       </template>
-      <template v-slot:address_detail>
+      <template v-slot:address>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>签到地点：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>上课地点：
           </div>
           <div class="xy-table-item-content">
-            <avue-input-map v-model="mapform" :params="mapparams" style="width:100%" placeholder="请选择地图" />
+            <el-input style="width: 100%;" v-model="form.address" placeholder="请输入上课地点" clearable></el-input>
           </div>
         </div>
       </template>
-      <template v-slot:direction>
+      <template v-slot:address_detail>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>课程方向：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>签到地点：
           </div>
           <div class="xy-table-item-content">
-            <el-input style="width: 100%;" v-model="form.direction" placeholder="请输入课程方向" clearable></el-input>
+            <avue-input-map v-model="mapform" :params="mapparams" style="width:100%" placeholder="请选择地图" />
           </div>
         </div>
       </template>
+
       <template v-slot:remark>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
@@ -149,6 +164,7 @@
         </div>
       </template>
     </xy-dialog>
+    <addTeacher ref="addTeacher" @refresh="refreshTeacherList"></addTeacher>
   </div>
 </template>
 
@@ -161,9 +177,16 @@
   import {
     save as saveTeacher
   } from "@/api/info/teachers.js"
+  import { index as teacherIndex } from "@/api/info/teachers.js";
+  import addTeacher from '@/views/config/components/addTeacher.vue'
+  import {
+    getparameteritem
+} from "@/api/system/dictionary.js"
   export default {
     mixins: [myMixins],
-    components: {},
+    components: {
+      addTeacher
+    },
     data() {
       return {
         isShow: false,
@@ -174,19 +197,22 @@
         mapparams: {
           zoom: 11
         },
+        direction_options:[],
         mapform: [],
         form: {
           date: '',
           // timeRange: [],
           period:'',
           teacher_id: "",
+          teacher_introduce: '', // 授课老师简介
           theme: '',
+          direction: '', // 课程方向
           address: '',
           address_detail: '',
           latitude: '',
           longitude: '',
           course_id: '', // 添加课程ID字段
-          direction: '', // 课程方向
+          
           remark: '', // 备注
           // introduce: '',
           files: [], // 现有课件列表
@@ -205,22 +231,61 @@
         removedFileIds: [], // 已删除的文件ID列表
       }
     },
-    created() {},
+    created() {
+      this.getAllPara()
+    },
     methods: {
+      getAllPara() {
+        getparameteritem('course_direction').then(res => {
+          console.log("res", res)
+          this.direction_options = res.detail
+        })
+      },
       setTeachers(e) {
         this.teacher_options = e
       },
+      async getTeachers() {
+        try {
+          const res = await teacherIndex({
+            page: 1,
+            page_size: 999,
+          });
+          this.teacher_options = res.data;
+        } catch (error) {
+          console.error('获取授课老师列表失败:', error);
+          this.$message.error('获取授课老师列表失败');
+        }
+      },
       changeTeacher(e) {
         if (e) {
           this.teacher_options.map(item => {
             if (e === item.id) {
               this.form.teacher_id = item.id
+              // 自动填充授课老师简介
+              this.form.teacher_introduce = item.introduce || ''
               // this.form.introduce = item.introduce
             }
           })
         }
         console.log("e", e)
       },
+      addTeacher() {
+        this.$refs.addTeacher.isShow = true
+      },
+      refreshTeacherList() {
+        // 刷新授课老师列表，这里需要调用父组件的方法来重新获取授课老师列表
+        this.getTeachers().then(() => {
+          // 获取最新的授课老师列表后，自动选中新增的授课老师
+          if (this.teacher_options && this.teacher_options.length > 0) {
+            // 获取最新添加的授课老师（假设最新添加的授课老师在数组的最后）
+            const latestTeacher = this.teacher_options[0];
+            if (latestTeacher) {
+              this.form.teacher_id = latestTeacher.id;
+              // this.$message.success(`已自动选中新增的授课老师：${latestTeacher.name}`);
+            }
+          }
+        });
+      },
       changeTime(e) {
         console.log("eeee", e)
         if (e) {
@@ -251,6 +316,16 @@
           return
         }
 
+        // 检查授课老师简介是否发生变化，如果变化了则同时更新授课老师信息
+        let needUpdateTeacher = false
+        if (this.form.teacher_id && this.form.teacher_introduce !== undefined) {
+          // 找到当前选中的授课老师
+          const selectedTeacher = this.teacher_options.find(item => item.id === this.form.teacher_id)
+          if (selectedTeacher && selectedTeacher.introduce !== this.form.teacher_introduce) {
+            needUpdateTeacher = true
+          }
+        }
+
         // 处理课件文件ID
         const existingFileIds = this.form.files.map(file => file.id);
         const newFileIds = this.newFileList.map(file => {
@@ -269,21 +344,34 @@
         
         console.log('提交数据:', submitData) // 添加日志查看提交的数据
         
-        save(submitData).then(res => {
+        // 先保存课表信息
+        save(submitData).then(async (res) => {
           this.$message({
             type: 'success',
             message: this.type === 'add' ? '新增课表成功' : '编辑课表成功'
           })
-          // saveTeacher({
-          //   id: this.form.teacher_id
-          // }).then(res => {
-
-          // })
+          
+          // 如果授课老师简介发生变化，则同时更新授课老师信息
+          if (needUpdateTeacher) {
+            try {
+              await saveTeacher({
+                id: this.form.teacher_id,
+                introduce: this.form.teacher_introduce
+              })
+              this.$message.success('授课老师简介更新成功')
+            } catch (error) {
+              console.error('更新授课老师简介失败:', error)
+              this.$message.warning('课表保存成功，但授课老师简介更新失败')
+            }
+          }
+          
           this.isShow = false
           this.$emit('refresh')
           // this.active = 1
+        }).catch(error => {
+          console.error('保存课表失败:', error)
+          this.$message.error('保存课表失败')
         })
-
       },
       getDetail() {
         show({
@@ -292,6 +380,8 @@
         }).then(res => {
           this.form = this.base.requestToForm(res, this.form)
           this.form.files = res.files ? res.files : []
+          // 获取授课老师简介
+          this.form.teacher_introduce = res.teacher ? res.teacher.introduce || '' : ''
           // this.form.timeRange = [this.form.start_time ? this.form.start_time : '', this.form.end_time ? this.form
           //   .end_time : ''
           // ]
@@ -352,6 +442,8 @@
     watch: {
       isShow(newVal) {
         if (newVal) {
+          // 每次打开对话框时获取最新的授课老师列表
+          this.getTeachers()
           // 只有编辑时才获取详情
           if (this.type === 'editor') {
             this.getDetail()
@@ -366,6 +458,7 @@
             // timeRange: [],
             period:'',
             teacher_id: "",
+            teacher_introduce: '', // 重置授课老师简介
             theme: '',
             address: '',
             address_detail: '',
diff --git a/src/views/email/index.vue b/src/views/email/index.vue
index b61679b..c26b4ac 100644
--- a/src/views/email/index.vue
+++ b/src/views/email/index.vue
@@ -649,9 +649,12 @@
             clearable
             @keyup.enter="searchStudents">
           </el-input>
-          <el-select v-model="selectedCourseType" placeholder="请选择课程" clearable style="width: 200px;" @change="handleCourseTypeChange">
-            <el-option v-for="item in courseTypesList" :key="item.id" :label="item.name" :value="item.id">
+          <el-select v-model="selectedCourse" placeholder="请选择具体课程" clearable style="width: 200px;" @change="handleCourseChange">
+            <el-option v-for="item in courseList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
+          </el-select>
+          <el-select v-model="selectedStatus" placeholder="审核状态" clearable style="width: 160px;">
+            <el-option v-for="item in apply_status_list" :key="item.id" :label="item.value" :value="item.id"></el-option>
           </el-select>
                                 <el-button
               type="primary"
@@ -673,8 +676,31 @@
           <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column prop="name" label="姓名" width="120"></el-table-column>
           <el-table-column prop="email" label="邮箱" min-width="200"></el-table-column>
-          <el-table-column prop="courseName" label="课程名称" min-width="150"></el-table-column>
+          <el-table-column label="课程名称" min-width="200">
+            <template slot-scope="scope">
+              <div v-for="(item, index) in scope.row.course_signs" :key="index">
+                <div v-if="item.course" style="margin-bottom: 5px;">
+                  <div style="display: flex; justify-content: space-between; align-items: center;">
+                    <div>
+                      {{item.course.year?item.course.year:''}}{{item.course.type_detail?item.course.type_detail.name+' | ':''}}{{item.course.name}}
+                    </div>
+                    <template v-for="state in apply_status_list">
+                      <el-tag 
+                        v-if="item.status===state.id"
+                        :key="state.id"
+                        :type="state.type"
+                        size="mini"
+                        style="margin-left: 10px;">
+                        {{state.value}}
+                      </el-tag>
+                    </template>
+                  </div>
+                </div>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column prop="company" label="公司" min-width="150"></el-table-column>
+          <el-table-column prop="company_position" label="职务" min-width="120"></el-table-column>
         </el-table>
         
         <!-- 分页组件 -->
@@ -718,10 +744,12 @@
 import { saveEmailTemplate, getEmailTemplateList, deleteEmailTemplate } from '@/api/email/index'
 import { uploadEmailRecord } from '@/api/email/index'
 import { saveEmailRecord, getEmailRecordList, sendEmail } from '@/api/email/index'
-import { index as getCourseList } from '@/api/course/index'
+
+import { indexStudy } from '@/api/student/index.js'
 
 export default {
   name: 'EmailManagement',
+  mixins: [require('@/mixin/selectMixin.js').default],
   data() {
     return {
       activeTab: 'templates',
@@ -774,8 +802,9 @@ export default {
 
       // 系统数据导出相关
       systemStudentSearch: '',
-      selectedCourseType: '', // 选中的课程
-      courseTypesList: [], // 课程列表
+      selectedCourse: '', // 选中的具体课程
+      courseList: [], // 具体课程列表
+      selectedStatus: '', // 审核状态筛选
       selectedSystemStudents: [], // 当前页的选择
       allSelectedStudents: [], // 总的选择对象数组，保存所有分页中的选择
       studentsLoading: false,
@@ -1439,8 +1468,9 @@ export default {
       this.selectedSystemStudents = [] // 清空当前页选择
       this.allSelectedStudents = [] // 清空总选择数组
       this.systemStudentSearch = '' // 清空搜索关键词
-      this.selectedCourseType = '' // 清空课程选择
-      this.loadCourseTypes() // 加载课程列表
+      this.selectedCourse = '' // 清空具体课程选择
+      this.courseList = [] // 清空课程列表
+      this.loadCourses() // 加载课程列表
       this.loadStudents() // 加载数据
     },
 
@@ -1487,13 +1517,34 @@ export default {
 
       // 准备Excel数据
       const excelData = [
-        ['姓名', '邮箱', '课程名称', '公司'],
-        ...uniqueSelections.map(student => [
-          student.name,
-          student.email,
-          student.courseName || '',
-          student.company || ''
-        ])
+        ['姓名', '邮箱', '课程名称', '公司', '职务'],
+        ...uniqueSelections.map(student => {
+          // 构建课程名称和状态字符串
+          let courseInfo = ''
+          if (student.course_signs && student.course_signs.length > 0) {
+            const courseStrings = student.course_signs.map(item => {
+              if (item.course) {
+                const courseName = `${item.course.year || ''}${item.course.type_detail ? item.course.type_detail.name + ' | ' : ''}${item.course.name}`
+                // 查找对应的审核状态
+                const statusItem = this.apply_status_list.find(state => state.id === item.status)
+                const statusText = statusItem ? statusItem.value : '未知状态'
+                return `${courseName} (${statusText})`
+              }
+              return ''
+            }).filter(text => text) // 过滤空字符串
+            courseInfo = courseStrings.join('\n')
+          } else {
+            courseInfo = student.courseName || ''
+          }
+          
+          return [
+            student.name,
+            student.email,
+            courseInfo,
+            student.company || '',
+            student.company_position || ''
+          ]
+        })
       ]
 
       // 创建工作簿
@@ -1505,7 +1556,8 @@ export default {
         { wch: 15 }, // 姓名
         { wch: 25 }, // 邮箱
         { wch: 20 }, // 课程名称
-        { wch: 20 }  // 公司
+        { wch: 20 }, // 公司
+        { wch: 12 }  // 职务
       ]
       worksheet['!cols'] = colWidths
 
@@ -1581,244 +1633,200 @@ export default {
       this.$message.success(`已在控制台打印 ${uniqueSelections.length} 条数据（去重后，包含所有分页选择）`)
     },
 
-    // 加载课程列表
-    loadCourseTypes() {
-      getCourseList({
-        page: 1,
-        page_size: 999,
-        sort_name: 'id',
-        sort_type: 'ASC'
-      }).then(res => {
-        this.courseTypesList = res.data
-      }).catch(error => {
-        console.error('加载课程列表失败:', error)
-      })
-    },
+
 
     // 课程选择变化处理
-    handleCourseTypeChange(courseId) {
-      if (courseId) {
-        // 找到选中的课程
-        const selectedCourse = this.courseTypesList.find(course => course.id === courseId)
-        if (selectedCourse) {
-          // 将课程名称赋值给搜索框
-          this.systemStudentSearch = selectedCourse.name
-          // 清空当前页选择
-          this.selectedSystemStudents = []
-          // 重置分页到第一页
-          this.currentPage = 1
-          // 调用loadStudents进行搜索
-          this.loadStudents()
-        }
-      } else {
-        // 清空课程选择时，清空搜索框
-        this.systemStudentSearch = ''
-        // 清空当前页选择
-        this.selectedSystemStudents = []
-        // 重置分页到第一页
-        this.currentPage = 1
-        // 重新加载学员数据
-        this.loadStudents()
-      }
+    handleCourseChange() {
+      // 切换具体课程时，重置分页并刷新
+      this.selectedSystemStudents = []
+      this.currentPage = 1
+      this.loadStudents()
     },
 
     // 加载学员数据
     loadStudents() {
       this.studentsLoading = true
-      // 调用API获取学员数据
-      import('@/api/student/index').then(({ index }) => {
-        // 构建查询参数
-        const params = {
-          has_course: 1,
-          page: this.currentPage,
-          page_size: this.pageSize
-        }
-        
-        // 添加关键词搜索参数
-        if (this.systemStudentSearch && this.systemStudentSearch.trim()) {
-          params.keyword = this.systemStudentSearch.trim()
-        }
+      // 构建与学员列表一致的查询参数
+      const params = {
+        page: this.currentPage,
+        page_size: this.pageSize
+      }
+      if (this.systemStudentSearch && this.systemStudentSearch.trim()) {
+        params.keyword = this.systemStudentSearch.trim()
+      }
+      if (this.selectedCourse) {
+        params.course_id = this.selectedCourse
+      }
+      if (this.selectedStatus !== '' && this.selectedStatus !== null) {
+        params.status = this.selectedStatus
+      }
+
+      indexStudy(params).then(res => {
+        // 保存当前的选择状态
+        const currentSelection = [...this.selectedSystemStudents]
+        console.log('保存当前选择状态:', currentSelection.length)
+        console.log('当前总选择数组:', this.allSelectedStudents)
         
-        // 添加课程筛选参数
-        if (this.selectedCourseType) {
-          params.course_id = this.selectedCourseType
+        // 将当前页选择添加到总选择数组，并去重
+        if (currentSelection.length > 0) {
+          currentSelection.forEach(student => {
+            // 检查是否已存在相同ID的学员
+            const isDuplicate = this.allSelectedStudents.some(existing => Number(existing.id) === Number(student.id))
+            if (!isDuplicate) {
+              this.allSelectedStudents.push(student)
+              console.log(`✅ 新增学员到总选择: ${student.name} (ID: ${student.id})`)
+            } else {
+              console.log(`❌ 跳过重复学员: ${student.name} (ID: ${student.id})`)
+            }
+          })
         }
         
-        index(params, false).then(res => {
-          // 保存当前的选择状态
-          const currentSelection = [...this.selectedSystemStudents]
-          console.log('保存当前选择状态:', currentSelection.length)
-          console.log('当前总选择数组:', this.allSelectedStudents)
-          
-          // 将当前页选择添加到总选择数组，并去重
-          if (currentSelection.length > 0) {
-            currentSelection.forEach(student => {
-              // 检查是否已存在相同ID的学员
-              const isDuplicate = this.allSelectedStudents.some(existing => Number(existing.id) === Number(student.id))
-              if (!isDuplicate) {
-                this.allSelectedStudents.push(student)
-                console.log(`✅ 新增学员到总选择: ${student.name} (ID: ${student.id})`)
-              } else {
-                console.log(`❌ 跳过重复学员: ${student.name} (ID: ${student.id})`)
-              }
+        console.log('去重后的总选择数组:', this.allSelectedStudents)
+        // 处理API返回的数据（与学员列表一致的结构）
+        const listData = res.list && Array.isArray(res.list.data) ? res.list.data : []
+        if (Array.isArray(listData)) {
+            // 处理API返回的数据，确保包含必要的字段
+            console.log('开始处理学员数据，数量:', listData.length)
+            this.students = listData.map(student => {
+               // 获取最新的课程信息
+               let courseName = ''
+               let courseStartDate = ''
+               let courseEndDate = ''
+               
+               if (student.course_signs && student.course_signs.length > 0) {
+                 // 按时间排序，获取最新的一条课程记录
+                 const sortedSigns = student.course_signs.sort((a, b) => {
+                   const dateA = new Date(a.created_at || a.createdAt || a.sign_date || 0)
+                   const dateB = new Date(b.created_at || b.createdAt || b.sign_date || 0)
+                   return dateB - dateA // 降序排列，最新的在前
+                 })
+                 const latestSign = sortedSigns[0]
+                 
+                 // 从course对象中获取课程信息
+                 if (latestSign.course && latestSign.course.name) {
+                   courseName = latestSign.course.name
+                   courseStartDate = latestSign.course.start_date || ''
+                   courseEndDate = latestSign.course.end_date || ''
+                 } else {
+                   // 备用方案：从sign记录本身获取
+                   courseName = latestSign.course_name || latestSign.course || latestSign.courseName || ''
+                 }
+               } else {
+                 // 如果没有course_signs，使用备用字段
+                 courseName = student.course_name || student.course || ''
+               }
+
+               return {
+                 id: student.id,
+                 name: student.name || student.real_name || '',
+                 email: student.email || '-',
+                 company: student.company_name || student.work_unit || '',
+                 phone: student.phone || student.mobile || '',
+                 department: student.department || '',
+                 courseName: courseName,
+                 courseStartDate: courseStartDate,
+                 courseEndDate: courseEndDate,
+                 course_signs: student.course_signs || [],
+                 company_position: student.company_position || ''
+               }
+             })
+             
+            // 更新分页信息（来自 res.list）
+            if (res.list) {
+              this.totalStudents = res.list.total || 0
+              this.currentPage = res.list.current_page || 1
+              this.pageSize = res.list.per_page || this.pageSize
+            }
+            console.log('数据处理完成，this.students长度:', this.students.length)
+            console.log('分页信息更新:', {
+              total: this.totalStudents,
+              currentPage: this.currentPage,
+              pageSize: this.pageSize
             })
-          }
-          
-          console.log('去重后的总选择数组:', this.allSelectedStudents)
-          // 处理API返回的数据
-          console.log('API响应数据:', res) // 调试信息
-          console.log('res.data类型:', typeof res.data, '长度:', res.data ? res.data.length : 'undefined')
-          if (res.data) {
-              // 处理API返回的数据，确保包含必要的字段
-              console.log('开始处理学员数据，数量:', res.data.length)
-              this.students = res.data.map(student => {
-                // 获取最新的课程信息
-                let courseName = ''
-                let courseStartDate = ''
-                let courseEndDate = ''
-                
-                if (student.course_signs && student.course_signs.length > 0) {
-                  // 按时间排序，获取最新的一条课程记录
-                  const sortedSigns = student.course_signs.sort((a, b) => {
-                    const dateA = new Date(a.created_at || a.createdAt || a.sign_date || 0)
-                    const dateB = new Date(b.created_at || b.createdAt || b.sign_date || 0)
-                    return dateB - dateA // 降序排列，最新的在前
-                  })
-                  const latestSign = sortedSigns[0]
-                  
-                  // 从course对象中获取课程信息
-                  if (latestSign.course && latestSign.course.name) {
-                    courseName = latestSign.course.name
-                    courseStartDate = latestSign.course.start_date || ''
-                    courseEndDate = latestSign.course.end_date || ''
-                  } else {
-                    // 备用方案：从sign记录本身获取
-                    courseName = latestSign.course_name || latestSign.course || latestSign.courseName || ''
-                  }
-                } else {
-                  // 如果没有course_signs，使用备用字段
-                  courseName = student.course_name || student.course || ''
-                }
-
-                return {
-                  id: student.id,
-                  name: student.name || student.real_name || '',
-                  email: student.email || '-',
-                  company: student.company_name || student.work_unit || '',
-                  phone: student.phone || student.mobile || '',
-                  department: student.department || '',
-                  courseName: courseName,
-                  courseStartDate: courseStartDate,
-                  courseEndDate: courseEndDate
-                }
-              })
+            
+            // 恢复选择状态
+            this.$nextTick(() => {
+              this.selectedSystemStudents = currentSelection
+              console.log('已恢复选择状态，数量:', this.selectedSystemStudents.length)
               
-                          // 更新分页信息
-              this.totalStudents = res.total || 0
-              this.currentPage = res.current_page || 1
-              this.pageSize = res.per_page || 20
-              console.log('数据处理完成，this.students长度:', this.students.length)
-              console.log('分页信息更新:', {
-                total: this.totalStudents,
-                currentPage: this.currentPage,
-                pageSize: this.pageSize
-              })
+              // 恢复表格的视觉勾选状态
+              console.log('开始恢复表格勾选状态...')
+              console.log('当前页学员数据:', this.students.map(s => ({ id: s.id, name: s.name })))
+              console.log('当前页选择:', currentSelection.map(s => ({ id: s.id, name: s.name })))
+              console.log('总选择数组:', this.allSelectedStudents.map(s => ({ id: s.id, name: s.name })))
               
-              // 恢复选择状态
-              this.$nextTick(() => {
-                this.selectedSystemStudents = currentSelection
-                console.log('已恢复选择状态，数量:', this.selectedSystemStudents.length)
-                
-                // 恢复表格的视觉勾选状态
-                console.log('开始恢复表格勾选状态...')
-                console.log('当前页学员数据:', this.students.map(s => ({ id: s.id, name: s.name })))
-                console.log('当前页选择:', currentSelection.map(s => ({ id: s.id, name: s.name })))
-                console.log('总选择数组:', this.allSelectedStudents.map(s => ({ id: s.id, name: s.name })))
-                
-                // 恢复当前页的选择状态
-                if (currentSelection.length > 0) {
-                  currentSelection.forEach(selectedStudent => {
-                    // 在当前页数据中查找对应的学员
-                    const studentInCurrentPage = this.students.find(student => Number(student.id) === Number(selectedStudent.id))
-                    if (studentInCurrentPage) {
-                      // 使用 Element UI 的方法设置勾选状态
-                      this.$refs.systemStudentTable.toggleRowSelection(studentInCurrentPage, true)
-                      console.log(`✅ 已勾选学员: ${studentInCurrentPage.name} (ID: ${studentInCurrentPage.id})`)
-                    } else {
-                      console.log(`❌ 未找到学员: ${selectedStudent.name} (ID: ${selectedStudent.id})`)
-                    }
-                  })
-                }
-                
-                // 恢复总选择数组中在当前页显示的选择状态
-                this.students.forEach(student => {
-                  const isInAllSelected = this.allSelectedStudents.some(selected => Number(selected.id) === Number(student.id))
-                  const isInCurrentSelection = currentSelection.some(selected => Number(selected.id) === Number(student.id))
-                  
-                  if (isInAllSelected && !isInCurrentSelection) {
-                    // 这个学员在总选择数组中，但不在当前页选择中，需要勾选
-                    this.$refs.systemStudentTable.toggleRowSelection(student, true)
-                    console.log(`✅ 从总选择恢复勾选: ${student.name} (ID: ${student.id})`)
+              // 恢复当前页的选择状态
+              if (currentSelection.length > 0) {
+                currentSelection.forEach(selectedStudent => {
+                  // 在当前页数据中查找对应的学员
+                  const studentInCurrentPage = this.students.find(student => Number(student.id) === Number(selectedStudent.id))
+                  if (studentInCurrentPage) {
+                    // 使用 Element UI 的方法设置勾选状态
+                    this.$refs.systemStudentTable.toggleRowSelection(studentInCurrentPage, true)
+                    console.log(`✅ 已勾选学员: ${studentInCurrentPage.name} (ID: ${studentInCurrentPage.id})`)
+                  } else {
+                    console.log(`❌ 未找到学员: ${selectedStudent.name} (ID: ${selectedStudent.id})`)
                   }
                 })
+              }
+              
+              // 恢复总选择数组中在当前页显示的选择状态
+              this.students.forEach(student => {
+                const isInAllSelected = this.allSelectedStudents.some(selected => Number(selected.id) === Number(student.id))
+                const isInCurrentSelection = currentSelection.some(selected => Number(selected.id) === Number(student.id))
                 
-                console.log('表格勾选状态恢复完成')
+                if (isInAllSelected && !isInCurrentSelection) {
+                  // 这个学员在总选择数组中，但不在当前页选择中，需要勾选
+                  this.$refs.systemStudentTable.toggleRowSelection(student, true)
+                  console.log(`✅ 从总选择恢复勾选: ${student.name} (ID: ${student.id})`)
+                }
               })
-            } else {
-              this.students = []
-              // 即使没有数据，也要保持分页信息
-              if (res.total !== undefined) {
-                this.totalStudents = res.total
-              }
-              if (res.current_page !== undefined) {
-                this.currentPage = res.current_page
-              }
-              if (res.per_page !== undefined) {
-                this.pageSize = res.per_page
-              }
-              // 只有在真正没有数据时才显示警告
-              if (res.data && res.data.length === 0) {
-                this.$message.warning('当前页暂无学员数据')
-              }
+              
+              console.log('表格勾选状态恢复完成')
+            })
+          } else {
+            this.students = []
+            if (res.list) {
+              if (res.list.total !== undefined) this.totalStudents = res.list.total
+              if (res.list.current_page !== undefined) this.currentPage = res.list.current_page
+              if (res.list.per_page !== undefined) this.pageSize = res.list.per_page
             }
-        }).catch(error => {
-          console.error('加载学员数据失败:', error)
-          this.$message.error('加载学员数据失败')
-          // 加载失败时使用空数组
-          this.students = []
-        }).finally(() => {
-          this.studentsLoading = false
+            if (Array.isArray(listData) && listData.length === 0) {
+              this.$message.warning('当前页暂无学员数据')
+            }
+          }
+      }).catch(error => {
+        console.error('加载学员数据失败:', error)
+        this.$message.error('加载学员数据失败')
+        // 加载失败时使用空数组
+        this.students = []
+      }).finally(() => {
+        this.studentsLoading = false
+        
+        // 恢复之前的选择状态
+        this.$nextTick(() => {
+          console.log('在finally中恢复选择状态...')
+          console.log('当前页学员:', this.students.map(s => ({ id: s.id, name: s.name })))
+          console.log('当前页选择:', this.selectedSystemStudents.map(s => ({ id: s.id, name: s.name })))
+          console.log('总选择数组:', this.allSelectedStudents.map(s => ({ id: s.id, name: s.name })))
           
-          // 恢复之前的选择状态
-          this.$nextTick(() => {
-            console.log('在finally中恢复选择状态...')
-            console.log('当前页学员:', this.students.map(s => ({ id: s.id, name: s.name })))
-            console.log('当前页选择:', this.selectedSystemStudents.map(s => ({ id: s.id, name: s.name })))
-            console.log('总选择数组:', this.allSelectedStudents.map(s => ({ id: s.id, name: s.name })))
+          // 恢复所有应该勾选的学员（包括当前页选择和总选择数组中的）
+          this.students.forEach(student => {
+            const isInCurrentSelection = this.selectedSystemStudents.some(selected => Number(selected.id) === Number(student.id))
+            const isInAllSelected = this.allSelectedStudents.some(selected => Number(selected.id) === Number(student.id))
             
-            // 恢复所有应该勾选的学员（包括当前页选择和总选择数组中的）
-            this.students.forEach(student => {
-              const isInCurrentSelection = this.selectedSystemStudents.some(selected => Number(selected.id) === Number(student.id))
-              const isInAllSelected = this.allSelectedStudents.some(selected => Number(selected.id) === Number(student.id))
-              
-              if (isInCurrentSelection || isInAllSelected) {
-                // 使用 Element UI 的表格方法设置选择状态
-                this.$refs.systemStudentTable.toggleRowSelection(student, true)
-                if (isInCurrentSelection) {
-                  console.log(`✅ 在finally中恢复当前页勾选: ${student.name} (ID: ${student.id})`)
-                } else {
-                  console.log(`✅ 在finally中恢复总选择勾选: ${student.name} (ID: ${student.id})`)
-                }
+            if (isInCurrentSelection || isInAllSelected) {
+              // 使用 Element UI 的表格方法设置选择状态
+              this.$refs.systemStudentTable.toggleRowSelection(student, true)
+              if (isInCurrentSelection) {
+                console.log(`✅ 在finally中恢复当前页勾选: ${student.name} (ID: ${student.id})`)
+              } else {
+                console.log(`✅ 在finally中恢复总选择勾选: ${student.name} (ID: ${student.id})`)
               }
-            })
-            console.log('finally中已恢复选择状态')
+            }
           })
+          console.log('finally中已恢复选择状态')
         })
-      }).catch(error => {
-        console.error('导入API模块失败:', error)
-        this.$message.error('系统模块加载失败')
-        this.students = []
-        this.studentsLoading = false
       })
     },
 
@@ -1828,6 +1836,7 @@ export default {
       this.currentPage = 1 // 重置分页到第一页
       this.selectedSystemStudents = [] // 清空当前页选择
       this.allSelectedStudents = [] // 清空总选择数组
+      this.selectedCourse = '' // 清空具体课程选择
       this.loadStudents() // 执行搜索
     },
 
@@ -1861,6 +1870,21 @@ export default {
       document.body.removeChild(link)
 
       this.$message.success(`已导出 ${this.recipients.length} 个收件人数据`)
+    },
+
+    // 加载具体课程列表
+    loadCourses() {
+      // 直接加载所有课程列表
+      import('@/api/course/index').then(({ index }) => {
+        index({
+          page: 1,
+          page_size: 999
+        }).then(res => {
+          this.courseList = res.data || []
+        }).catch(error => {
+          console.error('加载课程列表失败:', error)
+        })
+      })
     }
   }
 }
diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index d3150a1..55a6429 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -85,12 +85,6 @@
                           </el-option>
                         </el-select>
                       </div>
-                      <div>
-                        <el-select v-model="select.is_black" placeholder="请选择是否黑名单" clearable>
-                          <el-option v-for="item in is_schoolmate_list" :key="item.id" :label="item.value" :value="item.id">
-                          </el-option>
-                        </el-select>
-                      </div>
                       <div>
                         <el-input v-model="select.company_position" placeholder="请输入职务"></el-input>
                       </div>
@@ -161,7 +155,7 @@
                   <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
                   <el-button type="primary" size="small" @click="importTable">导入</el-button>
                   <el-button type="primary" size="small" @click="updateSchoolmates(1)">批量设置校友库</el-button>
-                  <el-button type="primary" size="small" @click="updateSchoolmates(0)">批量取消校友库/加入黑名单</el-button>
+                  <el-button type="primary" size="small" @click="updateSchoolmates(0)">批量取消校友库</el-button>
                 </div>
               </div>
 
@@ -231,14 +225,14 @@
               </template>
             </el-table-column>
           </template>
-        <template v-slot:is_black>
+        <!-- <template v-slot:is_black>
           <el-table-column align='center' label="是否黑名单" width="120" header-align="center">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.is_black===1" type="">是</el-tag>
               <el-tag v-else type="info">否</el-tag>
             </template>
           </el-table-column>
-        </template>
+        </template> -->
         <template v-slot:is_vip>
           <el-table-column align='center' label="学员身份" width="120" header-align="center">
             <template slot-scope="scope">
@@ -335,7 +329,6 @@
           company_industry: '',
           is_vip: '',
           is_schoolmate: '',
-          is_black: '',
           courses_end_date: '',
           education: '',
           type: '',
@@ -423,11 +416,6 @@
           label: '是否校友库学员',
           align: 'center',
           width: 120,
-        }, {
-          prop: 'is_black',
-          label: '是否黑名单',
-          align: 'center',
-          width: 120,
         },{
           prop: 'is_vip',
           label: '学员身份',
@@ -524,7 +512,6 @@
         this.select.is_vip = ''
         this.select.courses_end_date = ''
         this.select.is_schoolmate = ''
-        this.select.is_black = ''
         this.select.education = ''
         this.select.type = ''
         this.select.status = ''
@@ -557,7 +544,6 @@
           is_vip: this.select.is_vip,
           courses_end_date: this.select.courses_end_date,
           is_schoolmate: this.select.is_schoolmate,
-          is_black: this.select.is_black,
           education: this.select.education,
           type: this.select.type,
           status: this.select.status,
@@ -589,7 +575,7 @@
       updateSchoolmates(vip) {
         if (this.seleSchoolmates.length > 0) {
           if (vip == 0) {
-            // 批量取消校友库 - 询问是否加入黑名单
+            // 批量取消校友库
             this.$confirm(
               `确定要将选中的 ${this.seleSchoolmates.length} 名学员从校友库移除吗？`,
               '提示',
@@ -599,24 +585,10 @@
                 type: 'warning'
               }
             ).then(() => {
-              // 第一个确认框选择确定后，弹出第二个确认框询问是否加入黑名单
-              this.$confirm(
-                '是否将这些学员加入黑名单？',
-                '黑名单确认',
-                {
-                  confirmButtonText: '是',
-                  cancelButtonText: '否',
-                  type: 'warning'
-                }
-              ).then(() => {
-                // 选择是，加入黑名单
-                this.submitUpdateSchoolmates(vip, 1);
-              }).catch(() => {
-                // 选择否，不加入黑名单
-                this.submitUpdateSchoolmates(vip, 0);
-              });
+              // 直接取消校友库，不加入黑名单
+              this.submitUpdateSchoolmates(vip);
             }).catch(() => {
-              // 第一个确认框选择取消，不执行任何操作
+              // 用户取消操作
               console.log('用户取消了操作');
             });
           } else {
@@ -640,7 +612,7 @@
               ).then(() => {
                 // 选择是，剔除黑名单学员后提交
                 if (otherUsers.length > 0) {
-                  this.submitUpdateSchoolmates(vip, 0, otherUsers);
+                  this.submitUpdateSchoolmates(vip, otherUsers);
                 } else {
                   this.$Message.warning('没有可设置为校友的学员');
                 }
@@ -659,7 +631,7 @@
                   type: 'warning'
                 }
               ).then(() => {
-                this.submitUpdateSchoolmates(vip, 0);
+                this.submitUpdateSchoolmates(vip);
               }).catch(() => {
                 console.log('用户取消了操作');
               });
@@ -671,7 +643,7 @@
         }
       },
       // 提交更新校友库状态
-      submitUpdateSchoolmates(vip, isBlack, users = null) {
+      submitUpdateSchoolmates(vip, users = null) {
         // 如果传入了users参数，使用传入的用户列表，否则使用默认的seleSchoolmates
         const targetUsers = users || this.seleSchoolmates;
         
@@ -683,9 +655,8 @@
         updateSchoolmate({
           is_schoolmate: vip,
           ids: ids.join(','),
-          is_black: isBlack
+          is_black: 0 // 固定设置为非黑名单
         }).then(res => {
-          const blackStatus = isBlack === 1 ? '并加入黑名单' : '但不加入黑名单';
           const userCount = targetUsers.length;
           const operation = vip === 1 ? '加入校友库' : '从校友库移除';
           
@@ -693,7 +664,7 @@
             // 如果有黑名单学员被剔除，显示特殊提示
             this.$Message.success(`批量${operation}成功，共处理 ${userCount} 名学员`)
           } else {
-            this.$Message.success(`批量${operation}成功，${blackStatus}`)
+            this.$Message.success(`批量${operation}成功`)
           }
           
           this.getList()
diff --git a/src/views/student/schoolmate.vue b/src/views/student/schoolmate.vue
index 2452678..32cf54a 100644
--- a/src/views/student/schoolmate.vue
+++ b/src/views/student/schoolmate.vue
@@ -153,7 +153,7 @@
                 <div>
                   <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
                   <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
-                  <el-button type="primary" size="small" @click="updateSchoolmates(0)">批量取消校友库/加入黑名单</el-button>
+                  <el-button type="primary" size="small" @click="updateSchoolmates(0)">批量取消校友库</el-button>
                 </div>
               </div>
 
@@ -553,7 +553,7 @@
       updateSchoolmates(vip) {
         if (this.seleSchoolmates.length > 0) {
           if (vip == 0) {
-            // 批量取消校友库 - 询问是否加入黑名单
+            // 批量取消校友库
             this.$confirm(
               `确定要将选中的 ${this.seleSchoolmates.length} 名学员从校友库移除吗？`,
               '提示',
@@ -563,24 +563,10 @@
                 type: 'warning'
               }
             ).then(() => {
-              // 第一个确认框选择确定后，弹出第二个确认框询问是否加入黑名单
-              this.$confirm(
-                '是否将这些学员加入黑名单？',
-                '黑名单确认',
-                {
-                  confirmButtonText: '是',
-                  cancelButtonText: '否',
-                  type: 'warning'
-                }
-              ).then(() => {
-                // 选择是，加入黑名单
-                this.submitUpdateSchoolmates(vip, 1);
-              }).catch(() => {
-                // 选择否，不加入黑名单
-                this.submitUpdateSchoolmates(vip, 0);
-              });
+              // 直接取消校友库，不加入黑名单
+              this.submitUpdateSchoolmates(vip, 0);
             }).catch(() => {
-              // 第一个确认框选择取消，不执行任何操作
+              // 用户取消操作
               console.log('用户取消了操作');
             });
           } else {
@@ -604,7 +590,7 @@
               ).then(() => {
                 // 选择是，剔除黑名单学员后提交
                 if (otherUsers.length > 0) {
-                  this.submitUpdateSchoolmates(vip, 0, otherUsers);
+                  this.submitUpdateSchoolmates(vip, otherUsers);
                 } else {
                   this.$Message.warning('没有可设置为校友的学员');
                 }
@@ -623,7 +609,7 @@
                   type: 'warning'
                 }
               ).then(() => {
-                this.submitUpdateSchoolmates(vip, 0);
+                this.submitUpdateSchoolmates(vip);
               }).catch(() => {
                 console.log('用户取消了操作');
               });
@@ -635,7 +621,7 @@
         }
       },
       // 提交更新校友库状态
-      submitUpdateSchoolmates(vip, isBlack, users = null) {
+      submitUpdateSchoolmates(vip, users = null) {
         // 如果传入了users参数，使用传入的用户列表，否则使用默认的seleSchoolmates
         const targetUsers = users || this.seleSchoolmates;
         
@@ -647,9 +633,8 @@
         updateSchoolmate({
           is_schoolmate: vip,
           ids: ids.join(','),
-          is_black: isBlack
+          is_black: 0 // 固定设置为非黑名单
         }).then(res => {
-          const blackStatus = isBlack === 1 ? '并加入黑名单' : '但不加入黑名单';
           const userCount = targetUsers.length;
           const operation = vip === 1 ? '加入校友库' : '从校友库移除';
           
@@ -657,7 +642,7 @@
             // 如果有黑名单学员被剔除，显示特殊提示
             this.$Message.success(`批量${operation}成功，共处理 ${userCount} 名学员（已剔除黑名单学员）`)
           } else {
-            this.$Message.success(`批量${operation}成功，${blackStatus}`)
+            this.$Message.success(`批量${operation}成功`)
           }
           
           this.getList()