提交

web/src/api/xg/xsjcxx/classMsg/majormsg/index.ts

@@ -53,3 +53,21 @@ export const getCollegeTree = () => {
     params: { parentId: 101 } // 获取二级学院
   });
 };
+
+/** 专业合并影响预览 */
+export const previewMajorMerge = (data: { targetMajorId: string | number; selectedMajorIds: Array<string | number> }) => {
+  return request({
+    url: '/xg/major/merge/preview',
+    method: 'post',
+    data
+  });
+};
+
+/** 执行专业合并 */
+export const mergeMajors = (data: { targetMajorId: string | number; selectedMajorIds: Array<string | number> }) => {
+  return request({
+    url: '/xg/major/merge',
+    method: 'post',
+    data
+  });
+};

web/src/api/xg/xsjcxx/classMsg/majormsg/types.ts

@@ -52,3 +52,40 @@ export interface CollegeTreeNode {
   parentId: number | string;
   children?: CollegeTreeNode[];
 }
+
+/** 专业合并预览 */
+export interface MajorMergePreviewVO {
+  targetMajorId: number | string;
+  targetMajorName: string;
+  targetMajorCategory?: string;
+  collegeId?: number | string;
+  collegeName?: string;
+  totalClassCount: number;
+  totalStudentCount: number;
+  sources: Array<{
+    majorId: number | string;
+    majorName: string;
+    majorCategory?: string;
+    classCount: number;
+    studentCount: number;
+  }>;
+  tableHits: Array<{
+    table: string;
+    strategy: string;
+    rows: number;
+  }>;
+  warnings: string[];
+}
+
+/** 专业合并结果 */
+export interface MajorMergeResultVO {
+  success: boolean;
+  mergeBatchId: number | string;
+  targetMajorId: number | string;
+  targetMajorName: string;
+  movedClassCount: number;
+  updatedStudentCount: number;
+  disabledMajorCount: number;
+  snapshotRowCount: number;
+  tableUpdateSummary: Array<{ table: string; updated: number }>;
+}

web/src/views/xg/xsjcxx/classmsg/majormsg/index.vue

@@ -84,6 +84,17 @@
                   >删除</el-button
                 >
               </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="Connection"
+                  :disabled="ids.length < 2"
+                  @click="handleMergeOpen"
+                  v-hasPermi="['majormsg:major:merge']"
+                  >专业合并</el-button
+                >
+              </el-col>
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
             </el-row>
           </template>
@@ -141,6 +152,58 @@
       </div>
     </div>
 
+    <!-- 专业合并对话框 -->
+    <el-dialog title="专业合并" v-model="mergeDialog.visible" width="720px" append-to-body destroy-on-close>
+      <el-alert
+        type="warning"
+        :closable="false"
+        show-icon
+        title="合并说明"
+        description="将把源专业下的班级挂到目标专业（班级ID不变、同名班不合并）；学生及业务表中的专业ID与专业名称同步改为目标专业；源专业将被停用。操作前会写入行级快照。"
+        class="mb-3"
+      />
+      <el-form label-width="100px">
+        <el-form-item label="目标专业" required>
+          <el-radio-group v-model="mergeDialog.targetMajorId" @change="loadMergePreview">
+            <el-radio v-for="item in mergeDialog.selectedRows" :key="item.deptId" :value="item.deptId" class="mr-4 mb-2">
+              {{ item.deptName }}（{{ item.deptCategory }}）
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="已选专业">
+          <el-tag v-for="item in mergeDialog.selectedRows" :key="'tag-' + item.deptId" class="mr-2 mb-1" type="info">
+            {{ item.deptName }}
+          </el-tag>
+        </el-form-item>
+      </el-form>
+      <div v-if="mergeDialog.preview" class="merge-preview">
+        <div class="mb-2 text-sm">
+          影响预览：班级 {{ mergeDialog.preview.totalClassCount }} 个，学生 {{ mergeDialog.preview.totalStudentCount }} 人
+        </div>
+        <el-table :data="mergeDialog.preview.sources" border size="small" class="mb-3">
+          <el-table-column label="源专业" prop="majorName" min-width="160" />
+          <el-table-column label="类别编码" prop="majorCategory" min-width="140" />
+          <el-table-column label="班级数" prop="classCount" width="90" align="center" />
+          <el-table-column label="学生数" prop="studentCount" width="90" align="center" />
+        </el-table>
+        <el-table v-if="mergeDialog.preview.tableHits?.length" :data="mergeDialog.preview.tableHits" border size="small" max-height="220">
+          <el-table-column label="业务表" prop="table" min-width="220" />
+          <el-table-column label="策略" prop="strategy" width="120" />
+          <el-table-column label="影响行数" prop="rows" width="100" align="center" />
+        </el-table>
+        <div v-if="mergeDialog.preview.warnings?.length" class="mt-2 text-xs text-gray-500">
+          <div v-for="(w, idx) in mergeDialog.preview.warnings" :key="idx">• {{ w }}</div>
+        </div>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="mergeDialog.previewLoading" @click="loadMergePreview">刷新预览</el-button>
+          <el-button :loading="mergeDialog.submitting" type="primary" @click="submitMerge">确认合并</el-button>
+          <el-button @click="mergeDialog.visible = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
     <!-- 添加或修改专业对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="majorFormRef" :model="form" :rules="rules" label-width="100px">
@@ -176,8 +239,8 @@
 </template>
 
 <script setup name="MajorMsg" lang="ts">
-import { listMajor, getMajor, delMajor, addMajor, updateMajor, getCollegeTree } from '@/api/xg/xsjcxx/classmsg/majormsg';
-import { MajorVO, MajorQuery, MajorForm, CollegeTreeNode } from '@/api/xg/xsjcxx/classmsg/majormsg/types';
+import { listMajor, getMajor, delMajor, addMajor, updateMajor, getCollegeTree, previewMajorMerge, mergeMajors } from '@/api/xg/xsjcxx/classmsg/majormsg';
+import { MajorVO, MajorQuery, MajorForm, CollegeTreeNode, MajorMergePreviewVO } from '@/api/xg/xsjcxx/classmsg/majormsg/types';
 import { ComponentInternalInstance, ref, reactive, toRefs, onMounted, getCurrentInstance } from 'vue';
 import type { FormInstance as ElFormInstance } from 'element-plus';
 import type { ElTree } from 'element-plus';
@@ -200,6 +263,7 @@ const buttonLoading = ref(false);
 const loading = ref(false);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
+const selectedRows = ref<MajorVO[]>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
@@ -222,6 +286,15 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+const mergeDialog = reactive({
+  visible: false,
+  targetMajorId: undefined as string | number | undefined,
+  selectedRows: [] as MajorVO[],
+  preview: null as MajorMergePreviewVO | null,
+  previewLoading: false,
+  submitting: false
+});
+
 const initFormData: MajorForm = {
   deptId: undefined,
   parentId: undefined,
@@ -349,10 +422,76 @@ const resetQuery = () => {
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: MajorVO[]) => {
   ids.value = selection.map((item) => item.deptId);
+  selectedRows.value = selection;
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 };
 
+/** 打开专业合并弹窗 */
+const handleMergeOpen = async () => {
+  if (selectedRows.value.length < 2) {
+    proxy?.$modal.msgWarning('请至少选择两个专业');
+    return;
+  }
+  const collegeIds = [...new Set(selectedRows.value.map((item) => String(item.parentId)))];
+  if (collegeIds.length > 1) {
+    proxy?.$modal.msgWarning('仅允许同一学院下的专业合并');
+    return;
+  }
+  mergeDialog.selectedRows = [...selectedRows.value];
+  mergeDialog.targetMajorId = mergeDialog.selectedRows[0]?.deptId;
+  mergeDialog.preview = null;
+  mergeDialog.visible = true;
+  await loadMergePreview();
+};
+
+/** 加载合并影响预览 */
+const loadMergePreview = async () => {
+  if (!mergeDialog.targetMajorId) {
+    proxy?.$modal.msgWarning('请选择目标专业');
+    return;
+  }
+  mergeDialog.previewLoading = true;
+  try {
+    const res: any = await previewMajorMerge({
+      targetMajorId: mergeDialog.targetMajorId,
+      selectedMajorIds: mergeDialog.selectedRows.map((item) => item.deptId)
+    });
+    mergeDialog.preview = res.data;
+  } finally {
+    mergeDialog.previewLoading = false;
+  }
+};
+
+/** 提交专业合并 */
+const submitMerge = async () => {
+  if (!mergeDialog.targetMajorId) {
+    proxy?.$modal.msgWarning('请选择目标专业');
+    return;
+  }
+  const target = mergeDialog.selectedRows.find((item) => item.deptId === mergeDialog.targetMajorId);
+  const sources = mergeDialog.selectedRows.filter((item) => item.deptId !== mergeDialog.targetMajorId);
+  const sourceNames = sources.map((item) => item.deptName).join('、');
+  await proxy?.$modal.confirm(
+    `确认将【${sourceNames}】合并到目标专业【${target?.deptName}】？\n源专业将停用；班级只改归属不做班级合并；专业ID与名称将同步更新。此操作写入快照后执行。`
+  );
+  mergeDialog.submitting = true;
+  try {
+    const res: any = await mergeMajors({
+      targetMajorId: mergeDialog.targetMajorId,
+      selectedMajorIds: mergeDialog.selectedRows.map((item) => item.deptId)
+    });
+    const data = res.data || {};
+    proxy?.$modal.msgSuccess(
+      `合并成功：迁移班级 ${data.movedClassCount || 0} 个，更新学生 ${data.updatedStudentCount || 0} 人，快照 ${data.snapshotRowCount || 0} 行（批次 ${data.mergeBatchId || '-'}）`
+    );
+    mergeDialog.visible = false;
+    await getList();
+  } finally {
+    mergeDialog.submitting = false;
+  }
+};
+
 /** 新增按钮操作 */
 const handleAdd = () => {
   if (!selectedCollegeId.value) {