From fb3d20def623dd67f121152c28924ec848f111bb Mon Sep 17 00:00:00 2001
From: liweijie <liweijie@fengyingkj.top>
Date: Wed, 23 Sep 2026 14:58:19 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AD=A6=E5=91=98=E9=98=9F=E6=9C=9F?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=EF=BC=9B=202=E3=80=81?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E6=94=B9=E4=B8=BA=E4=B8=A4=E8=A1=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jwgl/StudentRecordsController.java        |  9 +++++
 .../jwgl/service/StudentRecordsService.java   |  4 +++
 .../impl/StudentRecordsServiceImpl.java       |  7 ++++
 .../src/api/studentRecords/studentRecords.js  |  8 +++++
 .../src/views/student/studentInfo/index.vue   | 35 ++++++++++++++++---
 .../views/teachOffice/shiftSemester/index.vue | 26 ++++++++++----
 6 files changed, 79 insertions(+), 10 deletions(-)

diff --git a/backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/StudentRecordsController.java b/backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/StudentRecordsController.java
index eba93fad..27128d83 100644
--- a/backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/StudentRecordsController.java
+++ b/backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/StudentRecordsController.java
@@ -3,6 +3,7 @@ package com.roomroot.web.controller.jwgl;
 import com.roomroot.jwgl.entity.XYXX;
 import com.roomroot.jwgl.entity.XYDNDXQJBXXB;
 import com.roomroot.jwgl.entity.XYDB;
+import com.roomroot.jwgl.entity.XYDQB;
 import com.roomroot.jwgl.entity.PXRW;
 import com.roomroot.jwgl.entity.XYXJYDSQB;
 import com.roomroot.jwgl.entity.XYXJYJJGB;
@@ -94,6 +95,14 @@ public class StudentRecordsController {
         return Result.success(studentRecordsService.pageList(query, xyxx));
     }
 
+    /**
+     * 学员队期下拉选项（编号+名称），供学员信息表单选择学员队期编号。
+     */
+    @GetMapping("/period-options")
+    public Result<List<XYDQB>> periodOptions() {
+        return Result.success(studentRecordsService.listPeriodOptions());
+    }
+
     // ======================== 学员信息批量导入 ========================
 
     /**
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/StudentRecordsService.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/StudentRecordsService.java
index 0e64821f..56dce787 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/StudentRecordsService.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/StudentRecordsService.java
@@ -2,6 +2,7 @@ package com.roomroot.jwgl.service;
 
 import com.roomroot.jwgl.entity.XYXX;
 import com.roomroot.jwgl.entity.XYDB;
+import com.roomroot.jwgl.entity.XYDQB;
 import com.roomroot.jwgl.entity.PXRW;
 import com.roomroot.jwgl.entity.XYXJYDSQB;
 import com.roomroot.jwgl.entity.XYXJYJJGB;
@@ -39,6 +40,9 @@ public interface StudentRecordsService {
     /** 分页查询学员列表 */
     PageResult<XYXX> pageList(PageQuery query, XYXX xyxx);
 
+    /** 学员队期下拉选项（编号+名称） */
+    List<XYDQB> listPeriodOptions();
+
     /** 学籍异动——留级 */
     void retainGrade(String bh);
 
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/StudentRecordsServiceImpl.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/StudentRecordsServiceImpl.java
index 31053f89..f9b0b77c 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/StudentRecordsServiceImpl.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/StudentRecordsServiceImpl.java
@@ -240,6 +240,13 @@ public class StudentRecordsServiceImpl implements StudentRecordsService {
                 query.getPageNum(), query.getPageSize());
     }
 
+    @Override
+    public List<XYDQB> listPeriodOptions() {
+        return xydqbMapper.selectList(new LambdaQueryWrapper<XYDQB>()
+                .select(XYDQB::getBh, XYDQB::getMc, XYDQB::getXydbh)
+                .orderByAsc(XYDQB::getXydbh));
+    }
+
     /**
      * 当前班次编号关联学员队表、专业表、学员课程成绩，回显年级、专业、班次、考试情况、不及格门数、管理机构。
      */
diff --git a/frontend/src/api/studentRecords/studentRecords.js b/frontend/src/api/studentRecords/studentRecords.js
index cc25fb6d..8a6894b9 100644
--- a/frontend/src/api/studentRecords/studentRecords.js
+++ b/frontend/src/api/studentRecords/studentRecords.js
@@ -9,6 +9,14 @@ export function listStudentRecord(query) {
   })
 }
 
+// 学员队期下拉选项（bh 编号、mc 名称、xydbh 学员队编号）
+export function listPeriodOptions() {
+  return request({
+    url: '/student-records/period-options',
+    method: 'get'
+  })
+}
+
 // 查询学员信息详情（bh 编号必传）
 export function getStudentRecord(bh) {
   return request({
diff --git a/frontend/src/views/student/studentInfo/index.vue b/frontend/src/views/student/studentInfo/index.vue
index 7fd2a74c..0e5a1937 100644
--- a/frontend/src/views/student/studentInfo/index.vue
+++ b/frontend/src/views/student/studentInfo/index.vue
@@ -222,12 +222,12 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="12"><el-form-item label="学员队期编号" prop="xydqbh"><el-input v-model="formData.xydqbh" placeholder="请输入学员队期编号" /></el-form-item></el-col>
+          <el-col :span="12"><el-form-item label="学员队期编号" prop="xydqbh"><el-select v-model="formData.xydqbh" filterable clearable placeholder="请选择学员队期" class="full-width"><el-option v-for="item in periodOptions" :key="item.bh" :label="item.mc" :value="item.bh" /></el-select></el-form-item></el-col>
           <el-col :span="12"><el-form-item label="证件号码" prop="zjhm"><el-input v-model="formData.zjhm" placeholder="请输入证件号码" /></el-form-item></el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12"><el-form-item label="所属军区" prop="ssjq"><el-input v-model="formData.ssjq" placeholder="请输入所属军区" /></el-form-item></el-col>
-          <el-col :span="12"><el-form-item label="当前班次编号" prop="dqbzbh"><el-input v-model="formData.dqbzbh" placeholder="请输入当前班次编号" /></el-form-item></el-col>
+          <el-col :span="12"><el-form-item label="当前班次编号" prop="dqbzbh"><el-select v-model="formData.dqbzbh" filterable clearable placeholder="请选择班次" class="full-width"><el-option v-for="item in teamOptions" :key="item.xydbh" :label="item.xydmc" :value="item.xydbh" /></el-select></el-form-item></el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12"><el-form-item label="军人证件类型" prop="jrzjlx"><el-input v-model="formData.jrzjlx" placeholder="请输入军人证件类型" /></el-form-item></el-col>
@@ -327,6 +327,7 @@
 <script>
 import {
   listStudentRecord,
+  listPeriodOptions,
   getStudentRecord,
   addStudentRecord,
   updateStudentRecord,
@@ -336,6 +337,7 @@ import {
   exportStudentGrades,
   exportStudentProcessGrades
 } from "@/api/studentRecords/studentRecords"
+import { listTeam } from '@/api/studentRecords/team'
 import { getDicts } from '@/api/system/dict/data'
 import { optionselect } from '@/api/system/dict/type'
 
@@ -423,10 +425,14 @@ export default {
       dialogVisible: false,
       dialogTitle: '新增学员',
       submitting: false,
+      periodOptions: [],
+      periodOptionsLoaded: false,
+      teamOptions: [],
+      teamOptionsLoaded: false,
       formData: this.createEmptyForm(),
       formRules: {
         xm: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-        xydqbh: [{ required: true, message: '请输入学员队期编号', trigger: 'blur' }],
+        xydqbh: [{ required: true, message: '请选择学员队期', trigger: 'change' }],
         zjhm: [
           { required: true, message: '请输入证件号码', trigger: 'blur' },
           { validator: validateCertificateNumber, trigger: 'blur' }
@@ -444,7 +450,7 @@ export default {
         ssjq: [{ required: true, message: '请输入所属军区', trigger: 'blur' }],
         gfs: [{ required: true, message: '请选择国防生', trigger: 'change' }],
         yxckcj: [{ required: true, message: '请选择允许查看成绩', trigger: 'change' }],
-        dqbzbh: [{ required: true, message: '请输入当前班次编号', trigger: 'blur' }],
+        dqbzbh: [{ required: true, message: '请选择当前班次', trigger: 'change' }],
         yzc: [{ required: true, message: '请选择已注册', trigger: 'change' }],
         jrzjlx: [{ required: true, message: '请输入军人证件类型', trigger: 'blur' }],
         lxdh: [{ validator: validatePhoneNumber, trigger: 'blur' }]
@@ -620,15 +626,36 @@ export default {
       })
     },
 
+    loadPeriodOptions() {
+      if (this.periodOptionsLoaded) return
+      listPeriodOptions().then(res => {
+        this.periodOptions = (res && res.data) || []
+        this.periodOptionsLoaded = true
+      }).catch(() => {})
+    },
+
+    loadTeamOptions() {
+      if (this.teamOptionsLoaded) return
+      listTeam({ pageNum: 1, pageSize: 1000 }).then(res => {
+        const data = (res && res.data) || {}
+        this.teamOptions = data.records || []
+        this.teamOptionsLoaded = true
+      }).catch(() => {})
+    },
+
     handleAdd() {
       this.dialogTitle = '新增学员'
       this.resetForm()
+      this.loadPeriodOptions()
+      this.loadTeamOptions()
       this.dialogVisible = true
     },
 
     handleEdit(row) {
       this.dialogTitle = '编辑学员'
       this.resetForm()
+      this.loadPeriodOptions()
+      this.loadTeamOptions()
       if (!row.bh) {
         Object.assign(this.formData, this.createEmptyForm(), row)
         this.dialogVisible = true
diff --git a/frontend/src/views/teachOffice/shiftSemester/index.vue b/frontend/src/views/teachOffice/shiftSemester/index.vue
index aa5ef37c..a81e18c2 100644
--- a/frontend/src/views/teachOffice/shiftSemester/index.vue
+++ b/frontend/src/views/teachOffice/shiftSemester/index.vue
@@ -120,13 +120,15 @@
           </template>
         </el-table-column>
         <el-table-column prop="bz" label="备注" min-width="120" align="left" header-align="center" show-overflow-tooltip />
-        <el-table-column label="操作" width="310" align="center" fixed="right" class-name="table-action-column">
+        <el-table-column label="操作" width="210" align="center" fixed="right" class-name="table-action-column">
           <template slot-scope="{ row }">
-            <el-button type="text" size="small" @click="handleEdit(row)">编辑</el-button>
-            <el-button type="text" size="small" @click="handleEditEventCalendar(row)">班历</el-button>
-            <el-button type="text" size="small" @click="handleEditCalendar(row)">班次课程</el-button>
-            <el-button type="text" size="small" @click="handleSchedule(row)">排课</el-button>
-            <el-button type="text" size="small" class="text-danger" @click="handleDeleteRow(row)">删除</el-button>
+            <div class="op-btn-grid">
+              <el-button type="text" size="small" @click="handleEdit(row)">编辑</el-button>
+              <el-button type="text" size="small" @click="handleEditEventCalendar(row)">班历</el-button>
+              <el-button type="text" size="small" @click="handleEditCalendar(row)">班次课程</el-button>
+              <el-button type="text" size="small" @click="handleSchedule(row)">排课</el-button>
+              <el-button type="text" size="small" class="text-danger" @click="handleDeleteRow(row)">删除</el-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -1034,6 +1036,18 @@ export default {
       width: 100%;
     }
 
+    // ========== 操作列：按钮分两行（三列网格）显示 ==========
+    .op-btn-grid {
+      display: grid;
+      grid-template-columns: repeat(3, 1fr);
+      justify-items: center;
+      row-gap: 2px;
+
+      .el-button {
+        margin-left: 0;
+      }
+    }
+
     .text-danger {
       color: #f56c6c;
     }