提交代码

web/src/api/xg/college/index.ts

@@ -0,0 +1,47 @@
+import request from '@/utils/request';
+import type { AxiosPromise } from 'axios';
+import type { CollegeVo, CollegeQuery } from './types';
+
+// 导出类型
+export type { CollegeVo, MajorVo, CollegeQuery } from './types';
+
+/**
+ * 查询学院列表（用于二级学院，parent_id = 101）
+ */
+export function list(query?: any): AxiosPromise<CollegeVo[]> {
+  return request({
+    url: '/xg/college/list',
+    method: 'get',
+    params: query
+  });
+}
+
+/**
+ * 获取学院和专业树形结构
+ */
+export function collegeTree(): AxiosPromise<CollegeVo[]> {
+  return request({
+    url: '/xg/college/tree',
+    method: 'get'
+  });
+}
+
+/**
+ * 根据学院ID获取专业列表
+ */
+export function listMajorsByCollegeId(collegeId: string | number): AxiosPromise<any[]> {
+  return request({
+    url: `/xg/college/majors/${collegeId}`,
+    method: 'get'
+  });
+}
+
+/**
+ * 查询学院详情
+ */
+export function getCollege(deptId: string | number): AxiosPromise<CollegeVo> {
+  return request({
+    url: `/xg/college/${deptId}`,
+    method: 'get'
+  });
+}

web/src/api/xg/college/types.ts

@@ -0,0 +1,37 @@
+/**
+ * 学院信息对象
+ */
+export interface CollegeVo {
+  deptId: number | string;
+  deptName: string;
+  parentId?: number | string;
+  orderNum?: number;
+  leader?: string;
+  phone?: string;
+  email?: string;
+  status?: string;
+  children?: CollegeVo[];
+}
+
+/**
+ * 专业信息对象
+ */
+export interface MajorVo {
+  deptId: number | string;
+  deptName: string;
+  parentId: number | string;
+  orderNum?: number;
+  leader?: string;
+  phone?: string;
+  email?: string;
+  status?: string;
+}
+
+/**
+ * 学院查询参数
+ */
+export interface CollegeQuery {
+  deptName?: string;
+  status?: string;
+  parentId?: number | string;
+}

web/src/api/xg/ejxyfgld/index.ts

@@ -0,0 +1,117 @@
+import request from '@/utils/request';
+
+/**
+ * 二级学院分管领导配置对象
+ */
+export interface CollegeLeaderBo {
+  id?: number | string;
+  collegeId?: number | string;
+  collegeName?: string;
+  leaderId?: number | string;
+  leaderName?: string;
+  remark?: string;
+}
+
+/**
+ * 二级学院分管领导配置视图对象
+ */
+export interface CollegeLeaderVo {
+  id: number | string;
+  collegeId: number | string;
+  collegeName: string;
+  leaderId: number | string;
+  leaderName: string;
+  remark?: string;
+  createTime?: string;
+  updateTime?: string;
+}
+
+/**
+ * 查询二级学院分管领导配置列表
+ * @param query 查询参数
+ * @returns 返回二级学院分管领导配置列表
+ */
+export function listCollegeLeader(query: any) {
+  return request({
+    url: '/xg/ejxyfgld/list',
+    method: 'get',
+    params: query
+  });
+}
+
+/**
+ * 根据学院ID查询分管领导列表
+ * @param collegeId 学院ID
+ * @returns 返回分管领导列表
+ */
+export function listCollegeLeaderByCollege(collegeId: number | string) {
+  return request({
+    url: `/xg/ejxyfgld/listByCollege/${collegeId}`,
+    method: 'get'
+  });
+}
+
+/**
+ * 获取二级学院分管领导配置详情
+ * @param id 主键ID
+ * @returns 返回二级学院分管领导配置详情
+ */
+export function getCollegeLeader(id: number | string) {
+  return request({
+    url: `/xg/ejxyfgld/${id}`,
+    method: 'get'
+  });
+}
+
+/**
+ * 新增二级学院分管领导配置
+ * @param data 二级学院分管领导配置信息
+ * @returns 返回添加结果
+ */
+export function addCollegeLeader(data: CollegeLeaderBo) {
+  return request({
+    url: '/xg/ejxyfgld',
+    method: 'post',
+    data: data
+  });
+}
+
+/**
+ * 修改二级学院分管领导配置
+ * @param data 二级学院分管领导配置信息
+ * @returns 返回修改结果
+ */
+export function updateCollegeLeader(data: CollegeLeaderBo) {
+  return request({
+    url: '/xg/ejxyfgld',
+    method: 'put',
+    data: data
+  });
+}
+
+/**
+ * 删除二级学院分管领导配置
+ * @param ids 主键ID数组
+ * @returns 返回删除结果
+ */
+export function delCollegeLeader(ids: number | string | (number | string)[]) {
+  return request({
+    url: `/xg/ejxyfgld/${ids instanceof Array ? ids.join(',') : ids}`,
+    method: 'delete'
+  });
+}
+
+/**
+ * 导出二级学院分管领导配置
+ * @param query 查询参数
+ * @returns 返回导出结果
+ */
+export function exportCollegeLeader(query: any) {
+  return request({
+    url: '/xg/ejxyfgld/export',
+    method: 'post',
+    params: query,
+    responseType: 'blob'
+  });
+}
+

web/src/api/xg/sysUser.ts

@@ -6,16 +6,17 @@ import { AxiosPromise } from 'axios';
  */
 export interface XgSysUser {
   userId: number | string;
-  userName: string;
+  userName?: string;
   nickName: string;
-  email: string;
+  email?: string;
   phonenumber: string;
-  sex: string;
-  status: string;
-  createTime: string;
-  updateTime: string;
-  deptId: number;
-  deptName: string;
+  sex?: string;
+  status?: string;
+  accountType?: string;
+  createTime?: string;
+  updateTime?: string;
+  deptId?: number;
+  deptName?: string;
 }
 
 /**
@@ -27,3 +28,8 @@ export function getActiveUserList(): AxiosPromise<XgSysUser[]> {
     method: 'get'
   });
 }
+
+/**
+ * 查询有效用户列表（别名，用于兼容）
+ */
+export const activeList = getActiveUserList;

web/src/api/xg/xsjcxx/studentMsg/studentMsg/index.ts

@@ -106,3 +106,14 @@ export const getCollegeLeaveApprovers = (studentId: string | number): AxiosPromi
     method: 'get'
   });
 };
+
+/**
+ * 根据学生ID获取二级学院分管领导ID列表
+ * @param studentId 学生ID
+ */
+export const getCollegeLeaders = (studentId: string | number): AxiosPromise<{ data: number[] }> => {
+  return request({
+    url: `/studentMsg/studentMsg/getCollegeLeaders/${studentId}`,
+    method: 'get'
+  });
+};

web/src/views/xg/ejxyfgld/index.vue

@@ -0,0 +1,322 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" label-width="100px" :inline="true">
+            <el-form-item label="学院名称" prop="collegeName">
+              <el-input v-model="queryParams.collegeName" placeholder="请输入学院名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="领导姓名" prop="leaderName">
+              <el-input v-model="queryParams.leaderName" placeholder="请输入领导姓名" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['xg:ejxyfgld:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['xg:ejxyfgld:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['xg:ejxyfgld:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="collegeLeaderList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="学院名称" align="center" prop="collegeName" />
+        <el-table-column label="领导姓名" align="center" prop="leaderName" />
+        <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['xg:ejxyfgld:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['xg:ejxyfgld:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改二级学院分管领导对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body>
+      <el-form ref="collegeLeaderFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="二级学院" prop="collegeId">
+          <el-select v-model="form.collegeId" placeholder="请选择二级学院" clearable filterable style="width: 100%" @change="handleCollegeChange">
+            <el-option v-for="college in collegeList" :key="college.deptId" :label="college.deptName" :value="college.deptId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="分管领导" prop="leaderId">
+          <el-select v-model="form.leaderId" placeholder="请选择分管领导" clearable filterable style="width: 100%" @change="handleLeaderChange">
+            <el-option v-for="user in teacherList" :key="user.userId" :label="`${user.nickName}(${user.userName})`" :value="user.userId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注信息" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="CollegeLeader" lang="ts">
+import { ref, reactive, toRefs, getCurrentInstance } from 'vue';
+import type { FormInstance } from 'element-plus';
+import {
+  listCollegeLeader,
+  getCollegeLeader,
+  addCollegeLeader,
+  updateCollegeLeader,
+  delCollegeLeader,
+  exportCollegeLeader,
+  type CollegeLeaderBo,
+  type CollegeLeaderVo
+} from '@/api/xg/ejxyfgld';
+import { list as listCollege } from '@/api/xg/college';
+import { activeList as listTeacher } from '@/api/xg/sysUser';
+
+interface ComponentInternalInstance {
+  proxy?: any;
+}
+
+interface DialogOption {
+  visible: boolean;
+  title: string;
+}
+
+interface QueryParams {
+  pageNum: number;
+  pageSize: number;
+  collegeName?: string;
+  leaderName?: string;
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const collegeLeaderList = ref<CollegeLeaderVo[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+// 学院列表和教师列表
+const collegeList = ref<any[]>([]);
+const teacherList = ref<any[]>([]);
+
+const queryFormRef = ref<FormInstance>();
+const collegeLeaderFormRef = ref<FormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: CollegeLeaderBo = {
+  id: undefined,
+  collegeId: undefined,
+  collegeName: undefined,
+  leaderId: undefined,
+  leaderName: undefined,
+  remark: undefined
+};
+
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    collegeName: undefined,
+    leaderName: undefined
+  } as QueryParams,
+  rules: {
+    collegeId: [{ required: true, message: '二级学院不能为空', trigger: 'change' }],
+    leaderId: [{ required: true, message: '分管领导不能为空', trigger: 'change' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询二级学院分管领导列表 */
+const getList = async () => {
+  loading.value = true;
+  try {
+    const res = await listCollegeLeader(queryParams.value);
+    collegeLeaderList.value = res.rows;
+    total.value = res.total;
+  } finally {
+    loading.value = false;
+  }
+};
+
+/** 加载学院列表 */
+const loadCollegeList = async () => {
+  try {
+    const res = await listCollege();
+    collegeList.value = res.data || [];
+  } catch (error) {
+    console.error('加载学院列表失败:', error);
+  }
+};
+
+/** 加载教师列表 */
+const loadTeacherList = async () => {
+  try {
+    const res = await listTeacher();
+    // 后端已经过滤出教职工（account_type = 1），直接使用
+    teacherList.value = res.data || [];
+    console.log('加载教师列表成功，共', teacherList.value.length, '条数据');
+  } catch (error) {
+    console.error('加载教师列表失败:', error);
+  }
+};
+
+/** 学院选择变更 */
+const handleCollegeChange = (val: any) => {
+  const college = collegeList.value.find((c: any) => c.deptId === val);
+  if (college) {
+    form.value.collegeName = college.deptName;
+  }
+};
+
+/** 领导选择变更 */
+const handleLeaderChange = (val: any) => {
+  const teacher = teacherList.value.find((t: any) => t.userId === val);
+  if (teacher) {
+    form.value.leaderName = teacher.nickName;
+  }
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  collegeLeaderFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CollegeLeaderVo[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length !== 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = async () => {
+  reset();
+  await loadCollegeList();
+  await loadTeacherList();
+  dialog.visible = true;
+  dialog.title = '添加二级学院分管领导';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CollegeLeaderVo) => {
+  reset();
+  await loadCollegeList();
+  await loadTeacherList();
+  const id = row?.id || ids.value[0];
+  const res = await getCollegeLeader(id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改二级学院分管领导';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  collegeLeaderFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      try {
+        if (form.value.id) {
+          await updateCollegeLeader(form.value);
+          proxy?.$modal.msgSuccess('修改成功');
+        } else {
+          await addCollegeLeader(form.value);
+          proxy?.$modal.msgSuccess('新增成功');
+        }
+        dialog.visible = false;
+        await getList();
+      } catch (error) {
+        console.error('提交失败:', error);
+      } finally {
+        buttonLoading.value = false;
+      }
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CollegeLeaderVo) => {
+  const deleteIds = row?.id ? [row.id] : ids.value;
+  await proxy?.$modal.confirm('是否确认删除选中的配置？');
+  try {
+    await delCollegeLeader(deleteIds);
+    await getList();
+    proxy?.$modal.msgSuccess('删除成功');
+  } catch (error) {
+    console.error('删除失败:', error);
+  }
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.$download(
+    'xg/ejxyfgld/export',
+    {
+      ...queryParams.value
+    },
+    `二级学院分管领导_${new Date().getTime()}.xlsx`
+  );
+};
+
+// 初始化
+getList();
+</script>
+
+<style scoped lang="scss"></style>

web/src/views/xg/xsjcxx/xsqj/dialog.vue

@@ -307,7 +307,7 @@ import ApprovalButton from '@/components/Process/approvalButton.vue';
 import { AxiosResponse } from 'axios';
 import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
 import { addStudentLeave, getStudentLeave, updateStudentLeave } from '@/api/workflow/studentLeave/studentLeave';
-import { getStudentMsg, getClassTeacherId, getCollegeLeaveApprovers } from '@/api/xg/xsjcxx/studentMsg/studentMsg';
+import { getStudentMsg, getClassTeacherId, getCollegeLeaveApprovers, getCollegeLeaders } from '@/api/xg/xsjcxx/studentMsg/studentMsg';
 import { startWorkFlow } from '@/api/workflow/task';
 import { StudentLeaveForm, StudentLeaveVO } from '@/api/workflow/studentLeave/studentLeave/types';
 import { StudentMsgVO } from '@/api/xg/xsjcxx/studentMsg/studentMsg/types';
@@ -890,7 +890,7 @@ const handleStartWorkFlow = async (data: StudentLeaveForm) => {
     // 1. 调用接口获取班主任ID
     let classTeacherId: number | null = null;
     try {
-      const classTeacherResponse = await getClassTeacherId(data.studentId);
+      const classTeacherResponse: any = await getClassTeacherId(data.studentId);
       if (classTeacherResponse && classTeacherResponse.data) {
         classTeacherId = classTeacherResponse.data;
         console.log('获取到班主任ID:', classTeacherId);
@@ -908,7 +908,7 @@ const handleStartWorkFlow = async (data: StudentLeaveForm) => {
     // 2. 调用接口获取学院请假审批人列表
     let collegeApprovers: number[] = [];
     try {
-      const collegeApproversResponse = await getCollegeLeaveApprovers(data.studentId);
+      const collegeApproversResponse: any = await getCollegeLeaveApprovers(data.studentId);
       if (collegeApproversResponse && collegeApproversResponse.data) {
         collegeApprovers = collegeApproversResponse.data;
         console.log('获取到学院请假审批人列表:', collegeApprovers);
@@ -923,6 +923,24 @@ const handleStartWorkFlow = async (data: StudentLeaveForm) => {
       return; // 停止后续操作
     }
 
+    // 3. 调用接口获取二级学院分管领导ID列表
+    let collegeLeaders: number[] = [];
+    try {
+      const collegeLeadersResponse: any = await getCollegeLeaders(data.studentId);
+      if (collegeLeadersResponse && collegeLeadersResponse.data) {
+        collegeLeaders = collegeLeadersResponse.data;
+        console.log('获取到二级学院分管领导ID列表:', collegeLeaders);
+      } else {
+        console.warn('获取二级学院分管领导ID列表失败');
+        ElMessage.error('获取二级学院分管领导信息失败，请稍后重试');
+        return; // 停止后续操作
+      }
+    } catch (error) {
+      console.error('调用获取二级学院分管领导接口失败:', error);
+      ElMessage.error('获取二级学院分管领导信息失败，请稍后重试');
+      return; // 停止后续操作
+    }
+
     submitFormData.value.flowCode = flowCode.value;
     submitFormData.value.businessId = data.id;
     // 流程变量
@@ -935,7 +953,8 @@ const handleStartWorkFlow = async (data: StudentLeaveForm) => {
       // userList: ['1', '3', '4'],
       // 新增的流程变量
       bzrspr: classTeacherId,
-      ejxyspr: collegeApprovers
+      ejxyspr: collegeApprovers,
+      ejxyfgld: collegeLeaders
     };
     submitFormData.value.variables = taskVariables.value;
     const resp = await startWorkFlow(submitFormData.value);