“更新”
This commit is contained in:
1 parent
4c8434595a
commit
970979b2c1
10 files changed
+3141
No files matched your search
@@ -0,0 +1,94 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// API基础路径
|
||||
const baseUrl = '/rs/overseas/monitor'
|
||||
|
||||
/**
|
||||
* 查询审批中的申请列表
|
||||
* @param {Object} query 查询参数
|
||||
* @returns {Promise}
|
||||
*/
|
||||
export function getPendingList(query) {
|
||||
return request({
|
||||
url: `${baseUrl}/pending/list`,
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询已完成审批的申请列表
|
||||
* @param {Object} query 查询参数
|
||||
* @returns {Promise}
|
||||
*/
|
||||
export function getCompletedList(query) {
|
||||
return request({
|
||||
url: `${baseUrl}/completed/list`,
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询申请的审批历史记录
|
||||
* @param {Number} applicationId 申请ID
|
||||
* @returns {Promise}
|
||||
*/
|
||||
export function getApprovalHistory(applicationId) {
|
||||
return request({
|
||||
url: `${baseUrl}/history/${applicationId}`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询申请详情(含审批流程信息)
|
||||
* @param {Number} applicationId 申请ID
|
||||
* @returns {Promise}
|
||||
*/
|
||||
export function getDetail(applicationId) {
|
||||
return request({
|
||||
url: `${baseUrl}/detail/${applicationId}`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出审批中的申请列表
|
||||
* @param {Object} query 查询参数
|
||||
* @returns {Promise}
|
||||
*/
|
||||
export function exportPending(query) {
|
||||
return request({
|
||||
url: `${baseUrl}/pending/export`,
|
||||
method: 'post',
|
||||
data: query,
|
||||
responseType: 'blob'
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出已完成审批的申请列表
|
||||
* @param {Object} query 查询参数
|
||||
* @returns {Promise}
|
||||
*/
|
||||
export function exportCompleted(query) {
|
||||
return request({
|
||||
url: `${baseUrl}/completed/export`,
|
||||
method: 'post',
|
||||
data: query,
|
||||
responseType: 'blob'
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取审批进度统计
|
||||
* @returns {Promise}
|
||||
*/
|
||||
export function getStatistics() {
|
||||
return request({
|
||||
url: `${baseUrl}/statistics`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
/**
|
||||
* 工作流状态常量定义
|
||||
* 用于统一管理工作流状态的映射关系
|
||||
*/
|
||||
|
||||
// 工作流状态枚举
|
||||
export const WORKFLOW_STATUS = {
|
||||
CANCEL: 'cancel', // 已撤销
|
||||
DRAFT: 'draft', // 草稿
|
||||
WAITING: 'waiting', // 待审核
|
||||
FINISH: 'finish', // 已完成
|
||||
INVALID: 'invalid', // 已作废
|
||||
BACK: 'back', // 已退回
|
||||
TERMINATION: 'termination' // 已终止
|
||||
} as const;
|
||||
|
||||
// 工作流状态文本映射
|
||||
export const WORKFLOW_STATUS_TEXT = {
|
||||
[WORKFLOW_STATUS.CANCEL]: '已撤销',
|
||||
[WORKFLOW_STATUS.DRAFT]: '草稿',
|
||||
[WORKFLOW_STATUS.WAITING]: '待审核',
|
||||
[WORKFLOW_STATUS.FINISH]: '已完成',
|
||||
[WORKFLOW_STATUS.INVALID]: '已作废',
|
||||
[WORKFLOW_STATUS.BACK]: '已退回',
|
||||
[WORKFLOW_STATUS.TERMINATION]: '已终止'
|
||||
} as const;
|
||||
|
||||
// 工作流状态标签类型映射
|
||||
export const WORKFLOW_STATUS_TAG_TYPE = {
|
||||
[WORKFLOW_STATUS.CANCEL]: 'info', // 已撤销 - 灰色
|
||||
[WORKFLOW_STATUS.DRAFT]: 'info', // 草稿 - 灰色
|
||||
[WORKFLOW_STATUS.WAITING]: 'warning', // 待审核 - 橙色
|
||||
[WORKFLOW_STATUS.FINISH]: 'success', // 已完成 - 绿色
|
||||
[WORKFLOW_STATUS.INVALID]: 'danger', // 已作废 - 红色
|
||||
[WORKFLOW_STATUS.BACK]: 'danger', // 已退回 - 红色
|
||||
[WORKFLOW_STATUS.TERMINATION]: 'primary' // 已终止 - 蓝色
|
||||
} as const;
|
||||
|
||||
/**
|
||||
* 获取工作流状态标签类型
|
||||
* @param status 工作流状态
|
||||
* @returns 标签类型
|
||||
*/
|
||||
export const getWorkflowStatusTagType = (status: string): 'success' | 'warning' | 'danger' | 'info' | 'primary' => {
|
||||
return WORKFLOW_STATUS_TAG_TYPE[status as keyof typeof WORKFLOW_STATUS_TAG_TYPE] || 'info';
|
||||
};
|
||||
|
||||
/**
|
||||
* 获取工作流状态文本
|
||||
* @param status 工作流状态
|
||||
* @returns 状态文本
|
||||
*/
|
||||
export const getWorkflowStatusText = (status: string): string => {
|
||||
return WORKFLOW_STATUS_TEXT[status as keyof typeof WORKFLOW_STATUS_TEXT] || status;
|
||||
};
|
||||
@@ -0,0 +1,798 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card class="box-card">
|
||||
<!-- 选项卡 -->
|
||||
<el-tabs v-model="activeTab" @tab-click="handleTabClick">
|
||||
<!-- 待审批中 -->
|
||||
<el-tab-pane label="待审批中" name="pending">
|
||||
<div class="tab-content">
|
||||
<!-- 搜索区域 -->
|
||||
<div class="mb-[10px]">
|
||||
<el-card shadow="hover">
|
||||
<el-form :model="pendingQueryParams" label-width="100px">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="5">
|
||||
<el-form-item label="申请人姓名" prop="applicantName">
|
||||
<el-input v-model="pendingQueryParams.applicantName" placeholder="请输入申请人姓名" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="所属部门" prop="department">
|
||||
<el-input v-model="pendingQueryParams.department" placeholder="请输入所属部门" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="目的地国家" prop="destination">
|
||||
<el-input v-model="pendingQueryParams.destination" placeholder="请输入目的地国家" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="审批级别" prop="approvalLevel">
|
||||
<el-select v-model="pendingQueryParams.approvalLevel" placeholder="请选择审批级别" clearable style="width: 100%">
|
||||
<el-option label="部门主管" value="1" />
|
||||
<el-option label="分管领导" value="2" />
|
||||
<el-option label="校领导" value="3" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="24" class="search-btn-container">
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="Search" @click="handlePendingQuery">搜索</el-button>
|
||||
<el-button icon="Refresh" @click="resetPendingQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-card>
|
||||
</div>
|
||||
|
||||
<!-- 操作按钮区域 -->
|
||||
<el-card shadow="never" class="button-card table-card">
|
||||
<template #header>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="Refresh" @click="handleRefreshPending">刷新</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<div class="info-text">
|
||||
<el-icon><InfoFilled /></el-icon>
|
||||
<span>这里显示所有待审批申请</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</template>
|
||||
|
||||
<!-- 表格 -->
|
||||
<el-table v-loading="pendingLoading" :data="pendingList" border>
|
||||
<el-table-column label="申请人" prop="applicantName" min-width="100" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="所属部门" prop="department" min-width="140" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="前往国家" prop="destinationCountry" min-width="110" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="出境事由" prop="exitReason" min-width="100" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="行程安排" prop="itinerary" min-width="180" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="出国天数" prop="duration" min-width="90" align="center">
|
||||
<template #default="scope">{{ scope.row.duration }}天</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="当前审批环节" prop="approvalLevelText" min-width="140" align="center">
|
||||
<template #default="scope">
|
||||
<el-tag :type="getApprovalLevelType(scope.row.approvalLevel)">{{ scope.row.approvalLevelText }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="当前审批人" prop="currentApprover" min-width="140" align="center" />
|
||||
<el-table-column label="审批进度" prop="approvalProgress" min-width="100" align="center">
|
||||
<template #default="scope">
|
||||
<el-progress
|
||||
:percentage="calculateProgress(scope.row.approvedLevels, scope.row.totalLevels)"
|
||||
:color="getProgressColor(scope.row.approvedLevels, scope.row.totalLevels)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批耗时" prop="approvalDays" min-width="90" align="center">
|
||||
<template #default="scope">
|
||||
<el-tag :type="scope.row.isOverdue ? 'danger' : 'info'">{{ scope.row.approvalDays }}天</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="申请时间" prop="applyTime" min-width="160" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="操作" width="80" align="center" fixed="right">
|
||||
<template #default="scope">
|
||||
<el-tooltip content="查看详情" placement="top">
|
||||
<el-button link type="primary" icon="View" @click="handleViewDetail(scope.row)" v-hasPermi="['rs:overseas:query']"></el-button>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="pendingTotal > 0"
|
||||
:total="pendingTotal"
|
||||
v-model:page="pendingQueryParams.pageNum"
|
||||
v-model:limit="pendingQueryParams.pageSize"
|
||||
@pagination="getPendingList"
|
||||
/>
|
||||
</el-card>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- 审批完成 -->
|
||||
<el-tab-pane label="审批完成" name="completed">
|
||||
<div class="tab-content">
|
||||
<!-- 搜索区域 -->
|
||||
<div class="mb-[10px]">
|
||||
<el-card shadow="hover">
|
||||
<el-form :model="completedQueryParams" label-width="100px">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="5">
|
||||
<el-form-item label="申请人姓名" prop="applicantName">
|
||||
<el-input v-model="completedQueryParams.applicantName" placeholder="请输入申请人姓名" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="所属部门" prop="department">
|
||||
<el-input v-model="completedQueryParams.department" placeholder="请输入所属部门" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item label="目的地国家" prop="destination">
|
||||
<el-input v-model="completedQueryParams.destination" placeholder="请输入目的地国家" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<el-form-item label="申请时间" prop="applyTimeRange">
|
||||
<el-date-picker
|
||||
v-model="completedQueryParams.applyTimeRange"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="24" class="search-btn-container">
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="Search" @click="handleCompletedQuery">搜索</el-button>
|
||||
<el-button icon="Refresh" @click="resetCompletedQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-card>
|
||||
</div>
|
||||
|
||||
<!-- 操作按钮区域 -->
|
||||
<el-card shadow="never" class="button-card table-card">
|
||||
<template #header>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="Refresh" @click="handleRefreshCompleted">刷新</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<div class="info-text">
|
||||
<el-icon><InfoFilled /></el-icon>
|
||||
<span>这里显示所有已完成审批申请</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</template>
|
||||
|
||||
<!-- 表格 -->
|
||||
<el-table v-loading="completedLoading" :data="completedList" border>
|
||||
<el-table-column label="申请人" prop="applicantName" min-width="100" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="所属部门" prop="department" min-width="140" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="前往国家" prop="destinationCountry" min-width="110" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="出境事由" prop="exitReason" min-width="100" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="行程安排" prop="itinerary" min-width="180" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="出国天数" prop="duration" min-width="90" align="center">
|
||||
<template #default="scope">{{ scope.row.duration }}天</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="出国时间" min-width="220" align="center" :show-overflow-tooltip="true">
|
||||
<template #default="scope">{{ formatDateRange(scope.row.startDate, scope.row.endDate) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批状态" min-width="100" align="center">
|
||||
<template #default="scope">
|
||||
<el-tag type="success">{{ scope.row.statusText }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="申请时间" prop="applyTime" min-width="160" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="审批完成时间" prop="approvalTime" min-width="160" align="center" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="操作" width="80" align="center" fixed="right">
|
||||
<template #default="scope">
|
||||
<el-tooltip content="查看详情" placement="top">
|
||||
<el-button link type="primary" icon="View" @click="handleViewDetail(scope.row)" v-hasPermi="['rs:overseas:query']"></el-button>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="completedTotal > 0"
|
||||
:total="completedTotal"
|
||||
v-model:page="completedQueryParams.pageNum"
|
||||
v-model:limit="completedQueryParams.pageSize"
|
||||
@pagination="getCompletedList"
|
||||
/>
|
||||
</el-card>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</el-card>
|
||||
|
||||
<!-- 详情对话框 -->
|
||||
<el-dialog v-model="detailDialogVisible" title="出国申请详情" width="900px" append-to-body :close-on-click-modal="false">
|
||||
<div v-if="currentDetail">
|
||||
<!-- 申请详情信息 -->
|
||||
<el-descriptions :column="2" border>
|
||||
<!-- 基本信息 -->
|
||||
<el-descriptions-item label="姓名">{{ currentDetail.applicantName || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="性别">{{ currentDetail.genderText || '-' }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="出生年月">{{ formatDate(currentDetail.birthDate) }}</el-descriptions-item>
|
||||
<el-descriptions-item label="政治面貌">{{ currentDetail.politicalStatusText || '-' }}</el-descriptions-item>
|
||||
|
||||
<!-- 工作信息 -->
|
||||
<el-descriptions-item label="现工作部门">{{ currentDetail.department || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="职称">{{ currentDetail.professionalTitle || '-' }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="职务">{{ currentDetail.position || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="申领证件名称">{{ currentDetail.documentName || '-' }}</el-descriptions-item>
|
||||
|
||||
<!-- 证件信息 -->
|
||||
<el-descriptions-item label="证件号码">{{ currentDetail.documentNumber || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="前往国家">{{ currentDetail.destinationCountry || currentDetail.destination || '-' }}</el-descriptions-item>
|
||||
|
||||
<!-- 出境信息 -->
|
||||
<el-descriptions-item label="出境事由">{{ currentDetail.exitReason || '-' }}</el-descriptions-item>
|
||||
<!-- 探亲信息(如果是探亲) -->
|
||||
<el-descriptions-item label="探望对象关系" v-if="currentDetail.exitReason === '探亲'">
|
||||
{{ currentDetail.visitRelationship || '-' }}
|
||||
</el-descriptions-item>
|
||||
|
||||
<!-- 行程安排 -->
|
||||
<el-descriptions-item label="行程安排" :span="2">{{ currentDetail.itinerary || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="出国天数">{{ currentDetail.duration || 0 }}天</el-descriptions-item>
|
||||
|
||||
<!-- 出国时间 -->
|
||||
<el-descriptions-item label="出发日期">{{ formatDate(currentDetail.startDate) || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="返回日期">{{ formatDate(currentDetail.endDate) || '-' }}</el-descriptions-item>
|
||||
|
||||
<!-- 联系信息 -->
|
||||
<el-descriptions-item label="联系电话">{{ currentDetail.mobilePhone || currentDetail.contactPhone || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="应急联系人及电话">{{ currentDetail.emergencyContact || '-' }}</el-descriptions-item>
|
||||
|
||||
<!-- 申请状态和监控信息 -->
|
||||
<el-descriptions-item label="申请状态">
|
||||
<el-tag :type="getStatusType(currentDetail.status)">{{ currentDetail.statusText || '-' }}</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="当前审批环节">
|
||||
<el-tag :type="getApprovalLevelType(currentDetail.approvalLevel)">{{ currentDetail.approvalLevelText || '-' }}</el-tag>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="当前审批人">{{ currentDetail.currentApprover || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="审批进度">{{ currentDetail.approvalProgress || '-' }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="审批耗时">{{ currentDetail.approvalDays || 0 }}天</el-descriptions-item>
|
||||
<el-descriptions-item label="申请时间">{{ currentDetail.applyTime || currentDetail.createTime || '-' }}</el-descriptions-item>
|
||||
|
||||
<!-- 备注信息 -->
|
||||
<el-descriptions-item label="备注" :span="2" v-if="currentDetail.remarks">{{ currentDetail.remarks }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
|
||||
<!-- 变更历史记录(仅已完成且有变更记录时显示) -->
|
||||
<div v-if="currentDetail.recordId && changeHistoryList.length > 0" style="margin-top: 20px">
|
||||
<el-divider content-position="left">
|
||||
<span style="font-size: 16px; font-weight: bold; color: #409eff">
|
||||
<el-icon style="vertical-align: middle; margin-right: 5px"><EditPen /></el-icon>
|
||||
变更历史记录
|
||||
</span>
|
||||
</el-divider>
|
||||
|
||||
<!-- 变更历史列表 -->
|
||||
<div v-loading="changeHistoryLoading">
|
||||
<el-table :data="changeHistoryList" border style="width: 100%" max-height="400px">
|
||||
<el-table-column label="变更时间" align="center" prop="createTime" min-width="160" />
|
||||
<el-table-column label="变更类型" align="center" prop="changeType" min-width="150">
|
||||
<template #default="scope">
|
||||
<el-tag v-for="(type, index) in (scope.row.changeType || '').split(',')" :key="index" style="margin: 2px" size="small">
|
||||
{{ type }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="原目的地" align="center" prop="originalDestination" min-width="120" />
|
||||
<el-table-column label="新目的地" align="center" prop="newDestination" min-width="120" />
|
||||
<el-table-column label="原出国时间" align="center" min-width="200">
|
||||
<template #default="scope"> {{ formatDate(scope.row.originalStartDate) }} 至 {{ formatDate(scope.row.originalEndDate) }} </template>
|
||||
</el-table-column>
|
||||
<el-table-column label="新出国时间" align="center" min-width="200">
|
||||
<template #default="scope"> {{ formatDate(scope.row.newStartDate) }} 至 {{ formatDate(scope.row.newEndDate) }} </template>
|
||||
</el-table-column>
|
||||
<el-table-column label="变更原因" align="center" prop="changeReason" min-width="200" show-overflow-tooltip />
|
||||
<el-table-column label="状态" align="center" prop="statusText" min-width="100">
|
||||
<template #default="scope">
|
||||
<el-tag :type="getChangeStatusTagType(scope.row.status)">{{ scope.row.statusText || '-' }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 审批历史 -->
|
||||
<div style="margin-top: 20px">
|
||||
<el-divider content-position="left">
|
||||
<span style="font-size: 16px; font-weight: bold; color: #409eff">
|
||||
<el-icon style="vertical-align: middle; margin-right: 5px"><Clock /></el-icon>
|
||||
审批历史
|
||||
</span>
|
||||
</el-divider>
|
||||
|
||||
<div v-if="currentDetail.approvalHistory && currentDetail.approvalHistory.length > 0">
|
||||
<el-timeline>
|
||||
<el-timeline-item v-for="(item, index) in currentDetail.approvalHistory" :key="index" :timestamp="item.approvalTime" placement="top">
|
||||
<el-card>
|
||||
<h4>{{ item.approvalLevelText }} - {{ item.approverName }}</h4>
|
||||
<p class="mt-2">
|
||||
审批结果:
|
||||
<el-tag :type="getApprovalStatusType(item.approvalStatus)">{{ item.approvalStatusText }}</el-tag>
|
||||
</p>
|
||||
<p class="mt-2" v-if="item.approvalOpinion">审批意见:{{ item.approvalOpinion }}</p>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
</el-timeline>
|
||||
</div>
|
||||
<el-empty v-else description="暂无审批记录" :image-size="80" />
|
||||
</div>
|
||||
</div>
|
||||
<template #footer>
|
||||
<div style="display: flex; justify-content: space-between; width: 100%">
|
||||
<div>
|
||||
<!-- 只有审批完成的申请才显示下载PDF按钮 -->
|
||||
<el-button v-if="currentDetail && currentDetail.status === '1'" type="primary" icon="Download" @click="handleDownloadPdf" v-hasPermi="['rs:overseas:query']">下载审批表PDF</el-button>
|
||||
</div>
|
||||
<div>
|
||||
<el-button @click="detailDialogVisible = false">关闭</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup name="OverseasApprovalMonitor">
|
||||
import { ref, reactive, onMounted, watch } from 'vue';
|
||||
import { ElMessage, ElMessageBox } from 'element-plus';
|
||||
import { useRouter } from 'vue-router';
|
||||
import { Clock, Search, Refresh, View, EditPen, InfoFilled, Download } from '@element-plus/icons-vue';
|
||||
|
||||
// API请求
|
||||
import { getPendingList as apiGetPendingList, getCompletedList as apiGetCompletedList, getDetail, downloadApprovalPdf } from '@/api/rs/overseas';
|
||||
|
||||
// 导入变更历史API接口
|
||||
import { getItineraryChangeHistory } from '@/api/rs/overseas';
|
||||
|
||||
// ==================== 数据定义 ====================
|
||||
|
||||
// 选项卡
|
||||
const router = useRouter();
|
||||
const activeTab = ref('pending');
|
||||
|
||||
// 审批中列表
|
||||
const pendingList = ref([]);
|
||||
const pendingLoading = ref(false);
|
||||
const pendingTotal = ref(0);
|
||||
const pendingQueryParams = reactive({
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
applicantName: undefined,
|
||||
department: undefined,
|
||||
destination: undefined,
|
||||
approvalLevel: undefined,
|
||||
status: '0'
|
||||
});
|
||||
|
||||
// 已完成列表
|
||||
const completedList = ref([]);
|
||||
const completedLoading = ref(false);
|
||||
const completedTotal = ref(0);
|
||||
const completedQueryParams = reactive({
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
applicantName: undefined,
|
||||
department: undefined,
|
||||
destination: undefined,
|
||||
applyTimeRange: undefined,
|
||||
status: '1'
|
||||
});
|
||||
|
||||
// 详情对话框
|
||||
const detailDialogVisible = ref(false);
|
||||
const currentDetail = ref(null);
|
||||
|
||||
// 变更历史记录
|
||||
const changeHistoryList = ref([]);
|
||||
const changeHistoryLoading = ref(false);
|
||||
|
||||
// ==================== 生命周期 ====================
|
||||
|
||||
onMounted(() => {
|
||||
getPendingList();
|
||||
});
|
||||
|
||||
// 监听选项卡切换
|
||||
watch(activeTab, (newTab) => {
|
||||
if (newTab === 'pending') {
|
||||
getPendingList();
|
||||
} else if (newTab === 'completed') {
|
||||
getCompletedList();
|
||||
}
|
||||
});
|
||||
|
||||
// ==================== 方法定义 ====================
|
||||
|
||||
/**
|
||||
* 获取待审批列表(当前用户提交的待审批申请)
|
||||
*/
|
||||
const getPendingList = async () => {
|
||||
pendingLoading.value = true;
|
||||
try {
|
||||
const response = await apiGetPendingList(pendingQueryParams);
|
||||
if (response.code === 200) {
|
||||
pendingList.value = response.rows || [];
|
||||
pendingTotal.value = response.total || 0;
|
||||
} else {
|
||||
ElMessage.error(response.msg || '获取数据失败');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取待审批列表失败', error);
|
||||
ElMessage.error('获取数据失败,请稍后重试');
|
||||
} finally {
|
||||
pendingLoading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 获取已完成列表
|
||||
*/
|
||||
const getCompletedList = async () => {
|
||||
completedLoading.value = true;
|
||||
try {
|
||||
// 处理时间范围
|
||||
if (completedQueryParams.applyTimeRange && completedQueryParams.applyTimeRange.length === 2) {
|
||||
completedQueryParams.applyTimeStart = completedQueryParams.applyTimeRange[0];
|
||||
completedQueryParams.applyTimeEnd = completedQueryParams.applyTimeRange[1];
|
||||
} else {
|
||||
completedQueryParams.applyTimeStart = undefined;
|
||||
completedQueryParams.applyTimeEnd = undefined;
|
||||
}
|
||||
|
||||
const response = await apiGetCompletedList(completedQueryParams);
|
||||
if (response.code === 200) {
|
||||
completedList.value = response.rows || [];
|
||||
completedTotal.value = response.total || 0;
|
||||
} else {
|
||||
ElMessage.error(response.msg || '获取数据失败');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取已完成列表失败', error);
|
||||
ElMessage.error('获取数据失败,请稍后重试');
|
||||
} finally {
|
||||
completedLoading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 选项卡切换
|
||||
*/
|
||||
const handleTabClick = () => {
|
||||
if (activeTab.value === 'pending') {
|
||||
getPendingList();
|
||||
} else if (activeTab.value === 'completed') {
|
||||
getCompletedList();
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 审批中 - 查询
|
||||
*/
|
||||
const handlePendingQuery = () => {
|
||||
pendingQueryParams.pageNum = 1;
|
||||
getPendingList();
|
||||
};
|
||||
|
||||
/**
|
||||
* 审批中 - 重置
|
||||
*/
|
||||
const resetPendingQuery = () => {
|
||||
pendingQueryParams.pageNum = 1;
|
||||
pendingQueryParams.applicantName = undefined;
|
||||
pendingQueryParams.department = undefined;
|
||||
pendingQueryParams.destination = undefined;
|
||||
pendingQueryParams.approvalLevel = undefined;
|
||||
getPendingList();
|
||||
};
|
||||
|
||||
/**
|
||||
* 审批中 - 刷新
|
||||
*/
|
||||
const handleRefreshPending = () => {
|
||||
getPendingList();
|
||||
ElMessage.success('刷新成功');
|
||||
};
|
||||
|
||||
/**
|
||||
* 已完成 - 查询
|
||||
*/
|
||||
const handleCompletedQuery = () => {
|
||||
completedQueryParams.pageNum = 1;
|
||||
getCompletedList();
|
||||
};
|
||||
|
||||
/**
|
||||
* 已完成 - 重置
|
||||
*/
|
||||
const resetCompletedQuery = () => {
|
||||
completedQueryParams.pageNum = 1;
|
||||
completedQueryParams.applicantName = undefined;
|
||||
completedQueryParams.department = undefined;
|
||||
completedQueryParams.destination = undefined;
|
||||
completedQueryParams.applyTimeRange = undefined;
|
||||
getCompletedList();
|
||||
};
|
||||
|
||||
/**
|
||||
* 已完成 - 刷新
|
||||
*/
|
||||
const handleRefreshCompleted = () => {
|
||||
getCompletedList();
|
||||
ElMessage.success('刷新成功');
|
||||
};
|
||||
|
||||
/**
|
||||
* 查看详情
|
||||
*/
|
||||
const handleViewDetail = async (row) => {
|
||||
try {
|
||||
const response = await getDetail(row.applicationId);
|
||||
if (response.code === 200 && response.data) {
|
||||
currentDetail.value = response.data;
|
||||
detailDialogVisible.value = true;
|
||||
|
||||
// 如果有recordId,加载变更历史记录
|
||||
if (response.data.recordId) {
|
||||
await loadChangeHistory(response.data.recordId);
|
||||
} else {
|
||||
changeHistoryList.value = [];
|
||||
}
|
||||
} else {
|
||||
ElMessage.error(response.msg || '获取详情失败');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取详情失败', error);
|
||||
ElMessage.error('获取详情失败,请稍后重试');
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 加载变更历史记录
|
||||
*/
|
||||
const loadChangeHistory = async (recordId) => {
|
||||
if (!recordId) {
|
||||
console.warn('recordId为空,无法加载变更历史');
|
||||
changeHistoryList.value = [];
|
||||
return;
|
||||
}
|
||||
|
||||
changeHistoryLoading.value = true;
|
||||
try {
|
||||
console.log('🔄 开始加载变更历史记录, recordId:', recordId);
|
||||
const response = await getItineraryChangeHistory(recordId);
|
||||
if (response.code === 200) {
|
||||
changeHistoryList.value = response.data || [];
|
||||
console.log('✅ 变更历史记录加载成功, 共', changeHistoryList.value.length, '条记录');
|
||||
} else {
|
||||
console.warn('⚠️ 获取变更历史失败:', response.msg);
|
||||
changeHistoryList.value = [];
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('❌ 加载变更历史记录失败:', error);
|
||||
changeHistoryList.value = [];
|
||||
} finally {
|
||||
changeHistoryLoading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 计算进度百分比
|
||||
*/
|
||||
const calculateProgress = (approved, total) => {
|
||||
if (!total || total === 0) return 0;
|
||||
return Math.round((approved / total) * 100);
|
||||
};
|
||||
|
||||
/**
|
||||
* 获取进度颜色
|
||||
*/
|
||||
const getProgressColor = (approved, total) => {
|
||||
const percentage = calculateProgress(approved, total);
|
||||
if (percentage >= 100) return '#67C23A';
|
||||
if (percentage >= 50) return '#E6A23C';
|
||||
return '#F56C6C';
|
||||
};
|
||||
|
||||
/**
|
||||
* 获取审批级别标签类型
|
||||
*/
|
||||
const getApprovalLevelType = (level) => {
|
||||
const types = {
|
||||
'1': 'primary',
|
||||
'2': 'warning',
|
||||
'3': 'danger'
|
||||
};
|
||||
return types[level] || 'info';
|
||||
};
|
||||
|
||||
/**
|
||||
* 获取审批状态标签类型
|
||||
*/
|
||||
const getApprovalStatusType = (status) => {
|
||||
const types = {
|
||||
'0': 'warning',
|
||||
'1': 'success',
|
||||
'2': 'danger'
|
||||
};
|
||||
return types[status] || 'info';
|
||||
};
|
||||
|
||||
/**
|
||||
* 获取状态标签类型
|
||||
*/
|
||||
const getStatusType = (status) => {
|
||||
const types = {
|
||||
'0': 'warning',
|
||||
'1': 'success',
|
||||
'2': 'danger',
|
||||
'3': 'info',
|
||||
'4': 'success'
|
||||
};
|
||||
return types[status] || 'info';
|
||||
};
|
||||
|
||||
/**
|
||||
* 格式化日期范围
|
||||
*/
|
||||
const formatDateRange = (startDate, endDate) => {
|
||||
if (!startDate || !endDate) return '-';
|
||||
return `${formatDate(startDate)} 至 ${formatDate(endDate)}`;
|
||||
};
|
||||
|
||||
/**
|
||||
* 格式化日期
|
||||
*/
|
||||
const formatDate = (date) => {
|
||||
if (!date) return '-';
|
||||
return date.substring(0, 10);
|
||||
};
|
||||
|
||||
/**
|
||||
* 获取变更状态的Tag类型
|
||||
*/
|
||||
const getChangeStatusTagType = (status) => {
|
||||
const typeMap = {
|
||||
'0': 'warning', // 待审核
|
||||
'1': 'success', // 已通过
|
||||
'2': 'danger', // 已拒绝
|
||||
'3': 'info' // 已撤回
|
||||
};
|
||||
return typeMap[status] || 'info';
|
||||
};
|
||||
|
||||
/**
|
||||
* 下载审批表PDF
|
||||
*/
|
||||
const handleDownloadPdf = async () => {
|
||||
if (!currentDetail.value || !currentDetail.value.applicationId) {
|
||||
ElMessage.error('无法获取申请ID');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
ElMessage.info('正在生成PDF,请稍候...');
|
||||
|
||||
// 调用API获取blob数据
|
||||
const response = await downloadApprovalPdf(currentDetail.value.applicationId);
|
||||
|
||||
// 创建带MIME类型的Blob对象
|
||||
const blob = response instanceof Blob
|
||||
? new Blob([response], { type: 'application/pdf' })
|
||||
: new Blob([response.data], { type: 'application/pdf' });
|
||||
|
||||
// 创建下载链接
|
||||
const url = window.URL.createObjectURL(blob);
|
||||
const link = document.createElement('a');
|
||||
link.href = url;
|
||||
|
||||
// 设置下载文件名(使用申请人姓名和时间戳)
|
||||
const fileName = `出国申请审批表_${currentDetail.value.applicantName}_${currentDetail.value.applicationId}.pdf`;
|
||||
link.download = fileName;
|
||||
|
||||
// 触发下载
|
||||
document.body.appendChild(link);
|
||||
link.click();
|
||||
|
||||
// 清理资源
|
||||
document.body.removeChild(link);
|
||||
window.URL.revokeObjectURL(url);
|
||||
|
||||
ElMessage.success('PDF下载成功');
|
||||
} catch (error) {
|
||||
console.error('下载PDF失败', error);
|
||||
ElMessage.error('下载PDF失败,请稍后重试');
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.app-container {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
/* 搜索按钮容器样式 */
|
||||
.search-btn-container {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.search-btn-container :deep(.el-form-item) {
|
||||
margin-bottom: 0 !important;
|
||||
}
|
||||
|
||||
/* 按钮卡片样式 */
|
||||
.button-card {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
/* 表格卡片样式 */
|
||||
.table-card {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
/* 确保状态标签能够完整显示 */
|
||||
:deep(.el-table .el-table__cell) {
|
||||
padding: 8px 0;
|
||||
}
|
||||
|
||||
:deep(.el-tag) {
|
||||
white-space: nowrap;
|
||||
max-width: 100%;
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
/* 进度条样式 */
|
||||
.el-progress {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
/* 时间轴样式 */
|
||||
.el-timeline {
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
/* 信息提示样式 */
|
||||
.info-text {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
color: #909399;
|
||||
font-size: 14px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.info-text .el-icon {
|
||||
font-size: 16px;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,88 @@
|
||||
# 出国申请进度查询功能修改总结 - 快速参考
|
||||
|
||||
## ✅ 修改完成
|
||||
|
||||
**修改时间**:2025-10-29
|
||||
**修改范围**:仅修改monitor相关文件,未影响其他模块
|
||||
|
||||
---
|
||||
|
||||
## 📋 核心修改
|
||||
|
||||
### 1. 功能变化
|
||||
|
||||
#### 修改前
|
||||
- ❌ 显示工作流迁移提示
|
||||
- ❌ 无实际查询功能
|
||||
- ❌ 表格被隐藏
|
||||
|
||||
#### 修改后
|
||||
- ✅ 显示当前用户提交的待审批申请
|
||||
- ✅ 显示当前用户提交的已完成审批申请(抄送)
|
||||
- ✅ 支持搜索和查看审批历史
|
||||
|
||||
---
|
||||
|
||||
## 🎯 核心逻辑
|
||||
|
||||
### 数据过滤
|
||||
```java
|
||||
// 后端Service层添加过滤条件
|
||||
Long currentUserId = LoginHelper.getUserId();
|
||||
wrapper.eq("applicant_id", currentUserId); // 🔴 只查询当前用户提交的申请
|
||||
```
|
||||
|
||||
### 功能说明
|
||||
- **待审批中**:用户提交申请后,在这里查看审批进度
|
||||
- **审批完成**:审批流程完成后,抄送一份到这里
|
||||
|
||||
---
|
||||
|
||||
## 📄 修改文件
|
||||
|
||||
| 文件 | 类型 | 修改内容 |
|
||||
|------|------|---------|
|
||||
| `RsOverseasApprovalMonitorServiceImpl.java` | 后端 | 添加当前用户过滤 |
|
||||
| `RsOverseasApprovalMonitorController.java` | 后端 | 恢复pending接口 |
|
||||
| `monitor/index.vue` | 前端 | 删除提示,恢复表格 |
|
||||
|
||||
---
|
||||
|
||||
## 🧪 快速测试
|
||||
|
||||
### 测试步骤
|
||||
1. 登录系统
|
||||
2. 访问"出国申请进度查询"
|
||||
3. 查看"待审批中"和"审批完成"选项卡
|
||||
|
||||
### 预期结果
|
||||
- ✅ 只显示当前用户提交的申请
|
||||
- ✅ 不显示其他用户的申请
|
||||
- ✅ 可以查看审批历史
|
||||
|
||||
---
|
||||
|
||||
## 🚀 部署命令
|
||||
|
||||
```bash
|
||||
# 后端
|
||||
cd backend
|
||||
mvn clean package -pl ruoyi-admin -am -DskipTests
|
||||
./stop-main.sh && ./start-main.sh
|
||||
|
||||
# 前端(如需要)
|
||||
cd web
|
||||
npm run build
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📝 详细文档
|
||||
|
||||
完整修改说明请参考:`出国申请进度查询功能修改说明.md`
|
||||
|
||||
---
|
||||
|
||||
**状态**:✅ 已完成
|
||||
**版本**:v1.0
|
||||
|
||||
@@ -0,0 +1,365 @@
|
||||
# 出国申请进度查询功能优化说明
|
||||
|
||||
**日期**: 2025-01-29
|
||||
**模块**: 出国申请进度查询 (`/rs/overseas/monitor`)
|
||||
|
||||
## 📋 功能需求
|
||||
|
||||
### 1. 变更历史记录条件显示
|
||||
- **需求**: 变更历史记录字段只在有变更记录时显示,没有变更记录时不显示该区域
|
||||
- **实现位置**: `web/src/views/rs/overseas/monitor/index.vue`
|
||||
|
||||
### 2. PDF下载功能
|
||||
- **需求**: 在审批完成选项卡的详情弹窗中新增PDF下载按钮
|
||||
- **PDF模板**: 杭州第一技师学院登记报备人员因私事出国(境)审批表
|
||||
- **显示条件**: 仅当申请状态为"已通过"(status='1')时显示下载按钮
|
||||
|
||||
## 🎯 实现内容
|
||||
|
||||
### 一、前端修改
|
||||
|
||||
#### 1. 变更历史记录条件显示
|
||||
**文件**: `web/src/views/rs/overseas/monitor/index.vue`
|
||||
|
||||
**修改内容**:
|
||||
- 原条件: `v-if="currentDetail.recordId"`
|
||||
- 新条件: `v-if="currentDetail.recordId && changeHistoryList.length > 0"`
|
||||
- 移除空状态提示组件 `<el-empty>`
|
||||
|
||||
**代码位置**: 第287行
|
||||
|
||||
```vue
|
||||
<!-- 变更历史记录(仅已完成且有变更记录时显示) -->
|
||||
<div v-if="currentDetail.recordId && changeHistoryList.length > 0" style="margin-top: 20px">
|
||||
<el-divider content-position="left">
|
||||
<span style="font-size: 16px; font-weight: bold; color: #409eff">
|
||||
<el-icon style="vertical-align: middle; margin-right: 5px"><EditPen /></el-icon>
|
||||
变更历史记录
|
||||
</span>
|
||||
</el-divider>
|
||||
|
||||
<!-- 变更历史列表 -->
|
||||
<div v-loading="changeHistoryLoading">
|
||||
<el-table :data="changeHistoryList" border style="width: 100%" max-height="400px">
|
||||
<!-- 表格列定义 -->
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
```
|
||||
|
||||
#### 2. PDF下载按钮
|
||||
**文件**: `web/src/views/rs/overseas/monitor/index.vue`
|
||||
|
||||
**新增内容**:
|
||||
1. **导入图标**: 添加 `Download` 图标
|
||||
2. **导入API**: 添加 `downloadApprovalPdf` 方法
|
||||
3. **弹窗footer布局**: 改为左右布局,左侧显示下载按钮,右侧显示关闭按钮
|
||||
4. **下载方法**: 添加 `handleDownloadPdf` 方法
|
||||
|
||||
**代码位置**: 第350-360行
|
||||
|
||||
```vue
|
||||
<template #footer>
|
||||
<div style="display: flex; justify-content: space-between; width: 100%">
|
||||
<div>
|
||||
<!-- 只有审批完成的申请才显示下载PDF按钮 -->
|
||||
<el-button
|
||||
v-if="currentDetail && currentDetail.status === '1'"
|
||||
type="primary"
|
||||
icon="Download"
|
||||
@click="handleDownloadPdf"
|
||||
v-hasPermi="['rs:overseas:query']">
|
||||
下载审批表PDF
|
||||
</el-button>
|
||||
</div>
|
||||
<div>
|
||||
<el-button @click="detailDialogVisible = false">关闭</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
```
|
||||
|
||||
**JavaScript方法** (第693-710行):
|
||||
```javascript
|
||||
/**
|
||||
* 下载审批表PDF
|
||||
*/
|
||||
const handleDownloadPdf = async () => {
|
||||
if (!currentDetail.value || !currentDetail.value.applicationId) {
|
||||
ElMessage.error('无法获取申请ID');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
ElMessage.info('正在生成PDF,请稍候...');
|
||||
await downloadApprovalPdf(currentDetail.value.applicationId);
|
||||
ElMessage.success('PDF下载成功');
|
||||
} catch (error) {
|
||||
console.error('下载PDF失败', error);
|
||||
ElMessage.error('下载PDF失败,请稍后重试');
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
#### 3. API接口定义
|
||||
**文件**: `web/src/api/rs/overseas.ts`
|
||||
|
||||
**新增内容**: Monitor相关API接口(第1036-1085行)
|
||||
|
||||
```typescript
|
||||
// ==================== 出国申请进度查询(监控)相关API ====================
|
||||
|
||||
// 审批监控查询参数类型
|
||||
export interface OverseasMonitorQuery {
|
||||
pageNum: number;
|
||||
pageSize: number;
|
||||
applicantName?: string;
|
||||
department?: string;
|
||||
destination?: string;
|
||||
approvalLevel?: string;
|
||||
currentApprover?: string;
|
||||
status?: string;
|
||||
applyTimeStart?: string;
|
||||
applyTimeEnd?: string;
|
||||
}
|
||||
|
||||
// 查询待审批列表(监控)
|
||||
export function getPendingList(query: OverseasMonitorQuery) {
|
||||
return request({
|
||||
url: '/rs/overseas/monitor/pending/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
}
|
||||
|
||||
// 查询已完成审批列表(监控)
|
||||
export function getCompletedList(query: OverseasMonitorQuery) {
|
||||
return request({
|
||||
url: '/rs/overseas/monitor/completed/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
}
|
||||
|
||||
// 查询申请详情(监控)
|
||||
export function getDetail(applicationId: string | number) {
|
||||
return request({
|
||||
url: `/rs/overseas/monitor/detail/${applicationId}`,
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
// 下载审批表PDF
|
||||
export function downloadApprovalPdf(applicationId: string | number) {
|
||||
return request({
|
||||
url: `/rs/overseas/monitor/downloadApprovalPdf/${applicationId}`,
|
||||
method: 'get',
|
||||
responseType: 'blob'
|
||||
});
|
||||
}
|
||||
```
|
||||
|
||||
### 二、后端修改
|
||||
|
||||
#### 1. Service接口
|
||||
**文件**: `backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/IRsOverseasApprovalMonitorService.java`
|
||||
|
||||
**新增方法**:
|
||||
```java
|
||||
/**
|
||||
* 下载出国申请审批表PDF
|
||||
*
|
||||
* @param applicationId 申请ID
|
||||
* @param response HTTP响应对象
|
||||
*/
|
||||
void downloadApprovalPdf(Long applicationId, HttpServletResponse response);
|
||||
```
|
||||
|
||||
#### 2. Controller接口
|
||||
**文件**: `backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalMonitorController.java`
|
||||
|
||||
**新增接口** (第119-135行):
|
||||
```java
|
||||
/**
|
||||
* 下载出国申请审批表PDF
|
||||
* <p>
|
||||
* 生成并下载"杭州第一技师学院登记报备人员因私事出国(境)审批表"PDF文件
|
||||
*
|
||||
* @param applicationId 申请ID
|
||||
* @param response HTTP响应对象
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/downloadApprovalPdf/{applicationId}")
|
||||
public void downloadApprovalPdf(
|
||||
@PathVariable @NotNull(message = "申请ID不能为空") Long applicationId,
|
||||
HttpServletResponse response) {
|
||||
log.info("下载出国申请审批表PDF,申请ID:{}", applicationId);
|
||||
monitorService.downloadApprovalPdf(applicationId, response);
|
||||
}
|
||||
```
|
||||
|
||||
#### 3. Service实现
|
||||
**文件**: `backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApprovalMonitorServiceImpl.java`
|
||||
|
||||
**新增依赖导入**:
|
||||
```java
|
||||
import com.itextpdf.text.*;
|
||||
import com.itextpdf.text.pdf.*;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.dromara.common.core.exception.ServiceException;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.text.SimpleDateFormat;
|
||||
```
|
||||
|
||||
**新增方法** (第521-808行):
|
||||
|
||||
1. **`downloadApprovalPdf`**: 主方法,负责查询数据和设置响应头
|
||||
2. **`generateApprovalPdf`**: PDF生成核心方法
|
||||
3. **`addCell`**: 添加表格单元格辅助方法
|
||||
4. **`addApprovalRow`**: 添加审批意见行辅助方法
|
||||
5. **`getApprovalOpinion`**: 获取指定级别审批意见
|
||||
6. **`formatDate`**: 格式化日期(yyyy-MM-dd)
|
||||
7. **`formatBirthDate`**: 格式化出生日期(yyyy年MM月)
|
||||
|
||||
**PDF文档结构**:
|
||||
1. 标题:
|
||||
- "杭州第一技师学院"
|
||||
- "登记报备人员因私事出国(境)审批表"
|
||||
|
||||
2. 个人信息表格(8列):
|
||||
- 姓名、性别、出生年月、政治面貌
|
||||
- 现工作部门(教学系)、职称、职务
|
||||
- 申领证件名称、证件号码
|
||||
- 前往国家或地区、出境事由(旅游/探亲)
|
||||
- 探望对象姓名及与申请者关系
|
||||
- 出国时间、备注
|
||||
- 承诺声明、联系电话、应急联系人
|
||||
|
||||
3. 审批意见表格(2列):
|
||||
- 部门(教学系)意见
|
||||
- 人事(组织)处审核意见
|
||||
- 纪委意见
|
||||
- 学院分管领导意见
|
||||
- 学院党委书记意见
|
||||
|
||||
4. 备注说明:
|
||||
- 因私出境时间说明
|
||||
- 证件号码填写说明
|
||||
|
||||
## 🔧 技术实现细节
|
||||
|
||||
### PDF生成技术
|
||||
- **库**: iText 5.5.13.3
|
||||
- **中文字体**: STSong-Light (UniGB-UCS2-H)
|
||||
- **页面尺寸**: A4
|
||||
- **页边距**: 40pt (上下左右)
|
||||
|
||||
### 字体大小
|
||||
- **标题字体**: 16pt, 加粗
|
||||
- **副标题字体**: 14pt, 加粗
|
||||
- **正文字体**: 10pt, 常规
|
||||
- **小字体**: 9pt, 常规
|
||||
|
||||
### 表格设计
|
||||
- **个人信息表**: 8列,列宽比例 [8:12:6:10:10:12:16:6]
|
||||
- **审批意见表**: 2列,列宽比例 [20:80]
|
||||
- **单元格最小高度**: 25-50pt
|
||||
- **表头背景**: 浅灰色 (BaseColor.LIGHT_GRAY)
|
||||
|
||||
### 数据处理
|
||||
- **性别翻译**: 0→男, 1→女
|
||||
- **政治面貌翻译**: 支持多种编码格式(01-13, 1-13, 英文代码)
|
||||
- **出境事由**: 旅游/探亲,用√标记
|
||||
- **日期格式化**: yyyy-MM-dd / yyyy年MM月
|
||||
- **审批意见**: 优先显示审批意见,无意见时通过状态显示"同意"
|
||||
|
||||
## 📝 权限要求
|
||||
|
||||
- **查看权限**: `rs:overseas:query`
|
||||
- **列表权限**: `rs:overseas:list`
|
||||
|
||||
## 🎨 UI/UX优化
|
||||
|
||||
1. **按钮位置**: 弹窗footer左右布局,下载按钮在左侧,关闭按钮在右侧
|
||||
2. **按钮样式**: 主色调按钮(type="primary")+ 下载图标
|
||||
3. **显示条件**: 仅审批完成状态显示下载按钮
|
||||
4. **用户提示**:
|
||||
- 开始下载:"正在生成PDF,请稍候..."
|
||||
- 下载成功:"PDF下载成功"
|
||||
- 下载失败:"下载PDF失败,请稍后重试"
|
||||
|
||||
## ✅ 测试要点
|
||||
|
||||
### 前端测试
|
||||
1. ✅ 有变更记录时,变更历史区域正常显示
|
||||
2. ✅ 无变更记录时,变更历史区域不显示
|
||||
3. ✅ 审批完成状态显示下载PDF按钮
|
||||
4. ✅ 待审批状态不显示下载PDF按钮
|
||||
5. ✅ 点击下载按钮能触发PDF下载
|
||||
6. ✅ 下载过程中显示加载提示
|
||||
|
||||
### 后端测试
|
||||
1. ✅ PDF文件名包含申请人姓名和时间戳
|
||||
2. ✅ PDF包含完整的个人信息
|
||||
3. ✅ PDF包含所有审批历史记录
|
||||
4. ✅ 中文字体正确显示
|
||||
5. ✅ 表格格式符合模板要求
|
||||
6. ✅ 审批意见正确填充
|
||||
7. ✅ 日期格式化正确
|
||||
|
||||
## 📊 文件清单
|
||||
|
||||
### 前端文件
|
||||
- ✅ `web/src/views/rs/overseas/monitor/index.vue` (修改)
|
||||
- ✅ `web/src/api/rs/overseas.ts` (修改,新增monitor相关API)
|
||||
|
||||
### 后端文件
|
||||
- ✅ `backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/IRsOverseasApprovalMonitorService.java` (修改)
|
||||
- ✅ `backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalMonitorController.java` (修改)
|
||||
- ✅ `backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApprovalMonitorServiceImpl.java` (修改)
|
||||
|
||||
### 文档文件
|
||||
- ✅ `web/src/views/rs/overseas/monitor/出国申请进度查询功能优化说明.md` (新增)
|
||||
|
||||
## 🚀 部署说明
|
||||
|
||||
### 前端部署
|
||||
```bash
|
||||
cd web
|
||||
npm run build
|
||||
# 部署dist目录到Nginx
|
||||
```
|
||||
|
||||
### 后端部署
|
||||
```bash
|
||||
cd backend
|
||||
mvn clean package -DskipTests
|
||||
# 重启ruoyi-admin服务
|
||||
```
|
||||
|
||||
### 依赖检查
|
||||
后端已包含iText PDF生成库依赖:
|
||||
- `com.itextpdf:itextpdf:5.5.13.3`
|
||||
- `com.itextpdf:itext-asian:5.2.0` (中文字体支持)
|
||||
|
||||
## 📖 相关文档
|
||||
|
||||
- **项目规范**: `.cursor/cursorrules.md`
|
||||
- **开发文档**: `docs/开发文档/API/`
|
||||
- **出国申请API**: `docs/开发文档/API/出国申请管理API.md`
|
||||
|
||||
## 🔗 相关模块
|
||||
|
||||
- **出国申请管理**: `/rs/overseas/application`
|
||||
- **出国记录管理**: `/rs/overseas/record`
|
||||
- **行程变更管理**: `/rs/itinerary/change`
|
||||
|
||||
---
|
||||
|
||||
**实施人**: Cursor AI
|
||||
**审核状态**: ✅ 已完成
|
||||
**更新日期**: 2025-01-29
|
||||
|
||||
@@ -0,0 +1,394 @@
|
||||
# 出国申请进度查询功能修改说明
|
||||
|
||||
## 📋 修改概述
|
||||
|
||||
**修改时间**:2025-10-29
|
||||
**修改目的**:按照审批流程要求,修改出国申请进度查询功能,实现申请人查看自己提交的申请进度
|
||||
|
||||
---
|
||||
|
||||
## 🎯 功能需求
|
||||
|
||||
### 1. 待审批选项卡
|
||||
- **功能**:用户提交申请后,在这里查看自己的待审批记录
|
||||
- **显示内容**:
|
||||
- 当前用户提交的所有待审批申请
|
||||
- 当前审批环节和审批人
|
||||
- 审批历史记录
|
||||
|
||||
### 2. 审批完成选项卡
|
||||
- **功能**:审批完成后,抄送一份到这里
|
||||
- **显示内容**:
|
||||
- 当前用户提交的所有已完成审批申请
|
||||
- 完整的审批历史记录
|
||||
- 关联的出国记录信息
|
||||
|
||||
---
|
||||
|
||||
## 📝 修改内容
|
||||
|
||||
### 1. 后端Service修改
|
||||
|
||||
**文件**:`backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/service/impl/RsOverseasApprovalMonitorServiceImpl.java`
|
||||
|
||||
#### 修改点1:待审批列表查询
|
||||
```java
|
||||
/**
|
||||
* 查询审批中的申请列表(待审核状态)
|
||||
* 🔴 只查询当前用户提交的待审批申请
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<RsOverseasApprovalMonitorVo> queryPendingList(RsOverseasApprovalMonitorQuery query) {
|
||||
// 🔴 获取当前登录用户ID
|
||||
Long currentUserId = LoginHelper.getUserId();
|
||||
|
||||
// 构建查询条件
|
||||
QueryWrapper<RsOverseasApplication> wrapper = buildQueryWrapper(query);
|
||||
wrapper.eq("status", "0"); // 只查询待审核状态
|
||||
wrapper.eq("applicant_id", currentUserId); // 🔴 只查询当前用户提交的申请
|
||||
|
||||
// ... 分页查询和数据处理
|
||||
}
|
||||
```
|
||||
|
||||
**修改说明**:
|
||||
- ✅ 添加当前用户ID过滤条件
|
||||
- ✅ 只查询申请人ID = 当前用户ID的记录
|
||||
- ✅ 添加日志记录便于排查问题
|
||||
|
||||
#### 修改点2:已完成列表查询
|
||||
```java
|
||||
/**
|
||||
* 查询已完成审批的申请列表(已通过状态)
|
||||
* 🔴 只查询当前用户提交的已完成审批申请(抄送功能)
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<RsOverseasApprovalMonitorVo> queryCompletedList(RsOverseasApprovalMonitorQuery query) {
|
||||
// 🔴 获取当前登录用户ID
|
||||
Long currentUserId = LoginHelper.getUserId();
|
||||
|
||||
// 构建查询条件
|
||||
QueryWrapper<RsOverseasApplication> wrapper = buildQueryWrapper(query);
|
||||
wrapper.eq("status", "1"); // 只查询已通过状态
|
||||
wrapper.eq("applicant_id", currentUserId); // 🔴 只查询当前用户提交的申请
|
||||
|
||||
// ... 分页查询和数据处理
|
||||
}
|
||||
```
|
||||
|
||||
**修改说明**:
|
||||
- ✅ 实现抄送功能:审批完成后,申请人可以在这里查看
|
||||
- ✅ 添加当前用户ID过滤条件
|
||||
- ✅ 只显示当前用户提交且已完成审批的申请
|
||||
|
||||
---
|
||||
|
||||
### 2. 后端Controller修改
|
||||
|
||||
**文件**:`backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalMonitorController.java`
|
||||
|
||||
#### 修改点:恢复pending接口功能
|
||||
```java
|
||||
/**
|
||||
* 查询待审批的申请列表(出国申请进度查询)
|
||||
* 🔴 功能说明:查询当前用户提交的待审批申请
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/pending/list")
|
||||
public TableDataInfo<RsOverseasApprovalMonitorVo> pendingList(RsOverseasApprovalMonitorQuery query) {
|
||||
log.info("查询当前用户的待审批申请列表");
|
||||
query.setStatus("0");
|
||||
return monitorService.queryPendingList(query);
|
||||
}
|
||||
```
|
||||
|
||||
**修改说明**:
|
||||
- ❌ 删除了工作流迁移提示
|
||||
- ✅ 恢复正常的查询功能
|
||||
- ✅ 返回实际数据而不是错误提示
|
||||
|
||||
---
|
||||
|
||||
### 3. 前端页面修改
|
||||
|
||||
**文件**:`web/src/views/rs/overseas/monitor/index.vue`
|
||||
|
||||
#### 修改点1:删除工作流迁移提示
|
||||
```vue
|
||||
<!-- 🔴 删除的内容 -->
|
||||
<el-alert
|
||||
title="功能迁移通知"
|
||||
description="出国申请监控功能已标准化..."
|
||||
...
|
||||
>
|
||||
<el-button @click="navigateToTaskWaiting">前往待办任务页面</el-button>
|
||||
</el-alert>
|
||||
```
|
||||
|
||||
**修改说明**:
|
||||
- ❌ 删除整个Alert提示组件
|
||||
- ❌ 删除跳转到工作流页面的按钮
|
||||
|
||||
#### 修改点2:恢复待审批表格显示
|
||||
```vue
|
||||
<!-- 表格 -->
|
||||
<el-table v-loading="pendingLoading" :data="pendingList" border>
|
||||
<!-- 之前是 style="display: none" 隐藏的,现在恢复显示 -->
|
||||
<el-table-column label="申请人" prop="applicantName" ... />
|
||||
<el-table-column label="所属部门" prop="department" ... />
|
||||
<!-- ... 其他列 -->
|
||||
</el-table>
|
||||
```
|
||||
|
||||
**修改说明**:
|
||||
- ✅ 恢复表格正常显示
|
||||
- ✅ 删除 `style="display: none"`
|
||||
- ✅ 显示待审批申请数据
|
||||
|
||||
#### 修改点3:恢复查询功能
|
||||
```javascript
|
||||
// 🔴 修改前:显示提示信息
|
||||
const getPendingList = async () => {
|
||||
ElMessage.info('请使用标准工作流待办页面查看审批任务');
|
||||
pendingList.value = [];
|
||||
};
|
||||
|
||||
// ✅ 修改后:正常查询数据
|
||||
const getPendingList = async () => {
|
||||
pendingLoading.value = true;
|
||||
try {
|
||||
const response = await apiGetPendingList(pendingQueryParams);
|
||||
if (response.code === 200) {
|
||||
pendingList.value = response.rows || [];
|
||||
pendingTotal.value = response.total || 0;
|
||||
} else {
|
||||
ElMessage.error(response.msg || '获取数据失败');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取待审批列表失败', error);
|
||||
ElMessage.error('获取数据失败,请稍后重试');
|
||||
} finally {
|
||||
pendingLoading.value = false;
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
**修改说明**:
|
||||
- ✅ 调用真实API接口
|
||||
- ✅ 处理loading状态
|
||||
- ✅ 显示查询结果或错误提示
|
||||
|
||||
#### 修改点4:恢复查询和重置按钮功能
|
||||
```javascript
|
||||
// 查询按钮
|
||||
const handlePendingQuery = () => {
|
||||
pendingQueryParams.pageNum = 1;
|
||||
getPendingList();
|
||||
};
|
||||
|
||||
// 重置按钮
|
||||
const resetPendingQuery = () => {
|
||||
pendingQueryParams.pageNum = 1;
|
||||
pendingQueryParams.applicantName = undefined;
|
||||
pendingQueryParams.department = undefined;
|
||||
pendingQueryParams.destination = undefined;
|
||||
pendingQueryParams.approvalLevel = undefined;
|
||||
getPendingList();
|
||||
};
|
||||
```
|
||||
|
||||
**修改说明**:
|
||||
- ✅ 恢复正常的查询功能
|
||||
- ✅ 恢复正常的重置功能
|
||||
- ❌ 删除工作流跳转提示
|
||||
|
||||
#### 修改点5:添加功能说明
|
||||
```vue
|
||||
<el-col :span="1.5">
|
||||
<div class="info-text">
|
||||
<el-icon><InfoFilled /></el-icon>
|
||||
<span>这里显示您提交的待审批申请</span>
|
||||
</div>
|
||||
</el-col>
|
||||
```
|
||||
|
||||
**修改说明**:
|
||||
- ✅ 在操作按钮区域添加功能说明
|
||||
- ✅ 明确告知用户这里只显示自己提交的申请
|
||||
- ✅ 添加对应的CSS样式
|
||||
|
||||
---
|
||||
|
||||
## 🎨 UI变化
|
||||
|
||||
### 修改前
|
||||
```
|
||||
[Alert提示框:功能迁移通知]
|
||||
[前往待办任务页面按钮]
|
||||
[Empty: 请使用标准工作流待办页面]
|
||||
```
|
||||
|
||||
### 修改后
|
||||
```
|
||||
[搜索条件]
|
||||
[刷新按钮] [ℹ️ 这里显示您提交的待审批申请]
|
||||
[数据表格:显示待审批申请列表]
|
||||
[分页组件]
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔍 数据过滤逻辑
|
||||
|
||||
### 待审批选项卡
|
||||
```sql
|
||||
SELECT * FROM rs_overseas_application
|
||||
WHERE status = '0' -- 待审核状态
|
||||
AND applicant_id = {当前用户ID} -- 🔴 只查询当前用户提交的
|
||||
AND deleted = '0'
|
||||
AND tenant_id = {租户ID}
|
||||
ORDER BY apply_time DESC
|
||||
```
|
||||
|
||||
### 审批完成选项卡
|
||||
```sql
|
||||
SELECT * FROM rs_overseas_application
|
||||
WHERE status = '1' -- 已通过状态
|
||||
AND applicant_id = {当前用户ID} -- 🔴 只查询当前用户提交的
|
||||
AND deleted = '0'
|
||||
AND tenant_id = {租户ID}
|
||||
ORDER BY apply_time DESC
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🧪 测试验证
|
||||
|
||||
### 测试场景1:待审批选项卡
|
||||
|
||||
**测试步骤**:
|
||||
1. 使用用户A登录系统
|
||||
2. 提交一个出国申请
|
||||
3. 访问"出国申请进度查询"菜单
|
||||
4. 切换到"待审批中"选项卡
|
||||
|
||||
**预期结果**:
|
||||
- ✅ 能看到刚才提交的申请记录
|
||||
- ✅ 显示当前审批环节和审批人
|
||||
- ✅ 点击"查看详情"能查看审批历史
|
||||
|
||||
**测试步骤2**:
|
||||
1. 使用用户B登录系统
|
||||
2. 访问"出国申请进度查询"菜单
|
||||
3. 切换到"待审批中"选项卡
|
||||
|
||||
**预期结果**:
|
||||
- ✅ 只能看到用户B提交的申请
|
||||
- ❌ 看不到用户A提交的申请
|
||||
|
||||
### 测试场景2:审批完成选项卡
|
||||
|
||||
**测试步骤**:
|
||||
1. 使用用户A登录系统
|
||||
2. 提交一个出国申请
|
||||
3. 完成全部审批流程
|
||||
4. 访问"出国申请进度查询"菜单
|
||||
5. 切换到"审批完成"选项卡
|
||||
|
||||
**预期结果**:
|
||||
- ✅ 能看到刚才审批完成的申请(抄送)
|
||||
- ✅ 显示完整的审批历史记录
|
||||
- ✅ 能查看关联的出国记录信息
|
||||
|
||||
### 测试场景3:搜索功能
|
||||
|
||||
**测试步骤**:
|
||||
1. 在"待审批中"选项卡输入搜索条件
|
||||
2. 点击"搜索"按钮
|
||||
|
||||
**预期结果**:
|
||||
- ✅ 能正常搜索并返回结果
|
||||
- ✅ 结果仍然只包含当前用户提交的申请
|
||||
|
||||
---
|
||||
|
||||
## 📊 修改文件清单
|
||||
|
||||
| 序号 | 文件类型 | 文件路径 | 修改内容 | 状态 |
|
||||
|------|---------|---------|---------|------|
|
||||
| 1 | 后端Service | `RsOverseasApprovalMonitorServiceImpl.java` | 添加当前用户过滤条件 | ✅ |
|
||||
| 2 | 后端Controller | `RsOverseasApprovalMonitorController.java` | 恢复pending接口功能 | ✅ |
|
||||
| 3 | 前端页面 | `monitor/index.vue` | 删除工作流提示,恢复表格显示 | ✅ |
|
||||
| 4 | 前端脚本 | `monitor/index.vue` | 恢复查询、重置功能 | ✅ |
|
||||
|
||||
---
|
||||
|
||||
## ⚠️ 注意事项
|
||||
|
||||
### 1. 权限要求
|
||||
- 用户需要有 `rs:overseas:list` 权限才能访问此菜单
|
||||
- 用户需要有 `rs:overseas:query` 权限才能查看详情
|
||||
|
||||
### 2. 数据范围
|
||||
- **待审批选项卡**:只显示当前用户提交的待审核申请
|
||||
- **审批完成选项卡**:只显示当前用户提交的已完成申请
|
||||
- 不会显示其他用户提交的申请
|
||||
|
||||
### 3. 与其他模块的关系
|
||||
- **出国申请**:用户在这里提交申请
|
||||
- **出国审批**:审批人在这里审批申请
|
||||
- **出国记录**:审批完成后,申请人在这里查看出国记录
|
||||
- **出国申请进度查询**:申请人在这里查看申请进度(当前模块)
|
||||
|
||||
---
|
||||
|
||||
## 🚀 部署说明
|
||||
|
||||
### 后端部署
|
||||
```bash
|
||||
cd backend
|
||||
mvn clean package -pl ruoyi-admin -am -DskipTests
|
||||
./stop-main.sh
|
||||
./start-main.sh
|
||||
```
|
||||
|
||||
### 前端部署
|
||||
```bash
|
||||
cd web
|
||||
npm run build
|
||||
# 将dist目录部署到nginx
|
||||
```
|
||||
|
||||
### 验证步骤
|
||||
1. 清除浏览器缓存
|
||||
2. 重新登录系统
|
||||
3. 访问"出国申请进度查询"菜单
|
||||
4. 确认功能正常
|
||||
|
||||
---
|
||||
|
||||
## ✅ 验收标准
|
||||
|
||||
- [ ] 待审批选项卡只显示当前用户提交的待审批申请
|
||||
- [ ] 审批完成选项卡只显示当前用户提交的已完成审批申请
|
||||
- [ ] 搜索功能正常工作
|
||||
- [ ] 重置功能正常工作
|
||||
- [ ] 查看详情能显示审批历史
|
||||
- [ ] 不会显示其他用户的申请
|
||||
- [ ] UI显示正常,无工作流迁移提示
|
||||
|
||||
---
|
||||
|
||||
## 📞 问题反馈
|
||||
|
||||
如有问题,请检查:
|
||||
1. 后端日志:`backend/logs/sys-info.log`
|
||||
2. 浏览器控制台:F12查看网络请求和错误
|
||||
3. 确认用户权限配置正确
|
||||
|
||||
---
|
||||
|
||||
**文档版本**:v1.0
|
||||
**最后更新**:2025-10-29
|
||||
**修改人员**:Cursor AI
|
||||
|
||||
@@ -0,0 +1,411 @@
|
||||
# 出国申请审批环节命名标准分析报告
|
||||
|
||||
## 📋 问题发现
|
||||
|
||||
在分析代码时,发现系统中**存在两套不同的审批级别命名标准**:
|
||||
|
||||
1. **出国申请进度查询模块**:使用**3级审批**命名
|
||||
2. **出国申请审批模块**:使用**5级审批**命名
|
||||
|
||||
这导致**命名不一致**的问题。
|
||||
|
||||
---
|
||||
|
||||
## 🔍 详细分析
|
||||
|
||||
### 一、出国申请进度查询模块(monitor)
|
||||
|
||||
**文件位置**:`RsOverseasApprovalMonitorServiceImpl.java`
|
||||
|
||||
**当前定义**(第390-404行):
|
||||
```java
|
||||
private String getApprovalLevelText(String level) {
|
||||
if (level == null) {
|
||||
return "未开始";
|
||||
}
|
||||
switch (level) {
|
||||
case "1":
|
||||
return "部门主管审批";
|
||||
case "2":
|
||||
return "分管领导审批";
|
||||
case "3":
|
||||
return "校领导审批";
|
||||
default:
|
||||
return "未知";
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**问题**:
|
||||
- ❌ 只定义了3个级别
|
||||
- ❌ Level 4 和 Level 5 会显示为"未知"
|
||||
- ❌ 命名与实际审批流程不符
|
||||
|
||||
---
|
||||
|
||||
### 二、出国申请审批模块(application)
|
||||
|
||||
**文件位置**:`RsOverseasApplicationServiceImpl.java`
|
||||
|
||||
**当前定义**(第1269-1283行):
|
||||
```java
|
||||
private String getApprovalLevelDescription(String approvalLevel) {
|
||||
switch (approvalLevel) {
|
||||
case "1":
|
||||
return "待部门负责人审批";
|
||||
case "2":
|
||||
return "待人事处审批";
|
||||
case "3":
|
||||
return "待纪委审批";
|
||||
case "4":
|
||||
return "待学院分管领导审批";
|
||||
case "5":
|
||||
return "待学院党委书记审批";
|
||||
default:
|
||||
return "待审批";
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**流转逻辑**(第683-698行):
|
||||
```java
|
||||
/**
|
||||
* 获取下一级审批级别
|
||||
* 五级审批制度:1-部门负责人,2-人事处,3-纪委,4-学院分管领导,5-学院党委书记
|
||||
*/
|
||||
private String getNextApprovalLevel(String currentLevel) {
|
||||
switch (currentLevel) {
|
||||
case "1":
|
||||
return "2"; // 部门负责人 → 人事处
|
||||
case "2":
|
||||
return "3"; // 人事处 → 纪委
|
||||
case "3":
|
||||
return "4"; // 纪委 → 学院分管领导
|
||||
case "4":
|
||||
return "5"; // 学院分管领导 → 学院党委书记
|
||||
case "5":
|
||||
return null; // 学院党委书记 → 审批完成
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📊 标准审批级别定义
|
||||
|
||||
### 完整的五级审批制度
|
||||
|
||||
| 审批级别 | 数据库值 | 权限标识 | 审批环节名称 | 当前审批人显示 | 说明 |
|
||||
|---------|---------|---------|------------|--------------|------|
|
||||
| **Level 1** | `"1"` | `rs:overseas:approve1` | **部门负责人审批** | 待部门负责人审批 | 只能看到本部门的申请 |
|
||||
| **Level 2** | `"2"` | `rs:overseas:approve2` | **人事处审批** | 待人事处审批 | 可以看到所有部门的申请 |
|
||||
| **Level 3** | `"3"` | `rs:overseas:approve3` | **纪委审批** | 待纪委审批 | 可以看到所有部门的申请 |
|
||||
| **Level 4** | `"4"` | `rs:overseas:approve4` | **学院分管领导审批** | 待学院分管领导审批 | 可以看到所有部门的申请 |
|
||||
| **Level 5** | `"5"` | `rs:overseas:approve5` | **学院党委书记审批** | 待学院党委书记审批 | 可以看到所有部门的申请 |
|
||||
|
||||
---
|
||||
|
||||
## 🎯 审批流程完整流转
|
||||
|
||||
### 流程图
|
||||
```
|
||||
申请提交
|
||||
↓
|
||||
┌─────────────────────────────────┐
|
||||
│ Level 1: 部门负责人审批 │
|
||||
│ - 审批人:各部门负责人 │
|
||||
│ - 权限:rs:overseas:approve1 │
|
||||
│ - 范围:仅本部门申请 │
|
||||
└─────────────────────────────────┘
|
||||
↓ (审批通过)
|
||||
┌─────────────────────────────────┐
|
||||
│ Level 2: 人事处审批 │
|
||||
│ - 审批人:人事处工作人员 │
|
||||
│ - 权限:rs:overseas:approve2 │
|
||||
│ - 范围:所有部门申请 │
|
||||
└─────────────────────────────────┘
|
||||
↓ (审批通过)
|
||||
┌─────────────────────────────────┐
|
||||
│ Level 3: 纪委审批 │
|
||||
│ - 审批人:纪委工作人员 │
|
||||
│ - 权限:rs:overseas:approve3 │
|
||||
│ - 范围:所有部门申请 │
|
||||
└─────────────────────────────────┘
|
||||
↓ (审批通过)
|
||||
┌─────────────────────────────────┐
|
||||
│ Level 4: 学院分管领导审批 │
|
||||
│ - 审批人:学院分管领导 │
|
||||
│ - 权限:rs:overseas:approve4 │
|
||||
│ - 范围:所有部门申请 │
|
||||
└─────────────────────────────────┘
|
||||
↓ (审批通过)
|
||||
┌─────────────────────────────────┐
|
||||
│ Level 5: 学院党委书记审批 │
|
||||
│ - 审批人:学院党委书记 │
|
||||
│ - 权限:rs:overseas:approve5 │
|
||||
│ - 范围:所有部门申请 │
|
||||
└─────────────────────────────────┘
|
||||
↓ (审批通过)
|
||||
申请完成 → 生成出国记录
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📝 各字段的具体命名标准
|
||||
|
||||
### 1. **当前审批环节**(approval_level字段)
|
||||
|
||||
**数据库字段**:`approval_level VARCHAR(10)`
|
||||
|
||||
**标准命名**(用于显示):
|
||||
```java
|
||||
switch (approvalLevel) {
|
||||
case "1": return "部门负责人审批";
|
||||
case "2": return "人事处审批";
|
||||
case "3": return "纪委审批";
|
||||
case "4": return "学院分管领导审批";
|
||||
case "5": return "学院党委书记审批";
|
||||
default: return "未知";
|
||||
}
|
||||
```
|
||||
|
||||
### 2. **当前审批人**(current_approver字段)
|
||||
|
||||
**数据库字段**:`current_approver VARCHAR(100)`
|
||||
|
||||
**标准命名格式**:
|
||||
```java
|
||||
switch (approvalLevel) {
|
||||
case "1": return "待部门负责人审批";
|
||||
case "2": return "待人事处审批";
|
||||
case "3": return "待纪委审批";
|
||||
case "4": return "待学院分管领导审批";
|
||||
case "5": return "待学院党委书记审批";
|
||||
default: return "待审批";
|
||||
}
|
||||
```
|
||||
|
||||
**特殊情况**:
|
||||
- 如果是部门负责人级别,可能显示:`"待指定部门负责人"` 或 `"待{具体审批人姓名}审批"`
|
||||
- 其他级别通常显示:`"待{审批环节}审批"`
|
||||
|
||||
### 3. **审批进度**(用于进度查询)
|
||||
|
||||
**显示格式**:`"已审批级别数/总级别数"`
|
||||
|
||||
**示例**:
|
||||
- `"0/5"` - 未开始审批
|
||||
- `"1/5"` - 部门负责人已审批
|
||||
- `"2/5"` - 人事处已审批
|
||||
- `"3/5"` - 纪委已审批
|
||||
- `"4/5"` - 学院分管领导已审批
|
||||
- `"5/5"` - 全部审批完成
|
||||
|
||||
---
|
||||
|
||||
## 🔧 数据库定义
|
||||
|
||||
### rs_overseas_application表字段
|
||||
|
||||
```sql
|
||||
-- 审批级别字段
|
||||
`approval_level` varchar(10) DEFAULT '1'
|
||||
COMMENT '当前审批级别:1-部门负责人,2-人事处,3-纪委,4-学院分管领导,5-学院党委书记'
|
||||
|
||||
-- 当前审批人字段
|
||||
`current_approver` varchar(100) DEFAULT NULL
|
||||
COMMENT '当前审批人姓名或环节描述'
|
||||
|
||||
-- 当前审批人ID字段(冗余字段,仅供参考)
|
||||
`current_approver_id` bigint DEFAULT NULL
|
||||
COMMENT '当前审批人ID(冗余字段)'
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎨 前端显示示例
|
||||
|
||||
### 待审批列表显示
|
||||
|
||||
| 申请人 | 所属部门 | 当前审批环节 | 当前审批人 | 审批进度 |
|
||||
|--------|---------|-------------|-----------|---------|
|
||||
| 张三 | 教务处 | 部门负责人审批 | 待部门负责人审批 | 0% (0/5) |
|
||||
| 李四 | 人事处 | 人事处审批 | 待人事处审批 | 20% (1/5) |
|
||||
| 王五 | 学工处 | 纪委审批 | 待纪委审批 | 40% (2/5) |
|
||||
| 赵六 | 后勤处 | 学院分管领导审批 | 待学院分管领导审批 | 60% (3/5) |
|
||||
| 钱七 | 财务处 | 学院党委书记审批 | 待学院党委书记审批 | 80% (4/5) |
|
||||
|
||||
### 审批历史记录显示
|
||||
|
||||
```
|
||||
📋 审批历史
|
||||
|
||||
✅ 第1级:部门负责人审批
|
||||
审批人:张主任
|
||||
审批时间:2025-10-27 10:30:25
|
||||
审批结果:通过
|
||||
审批意见:同意出国交流
|
||||
|
||||
✅ 第2级:人事处审批
|
||||
审批人:李处长
|
||||
审批时间:2025-10-27 14:20:15
|
||||
审批结果:通过
|
||||
审批意见:人事档案无问题,同意
|
||||
|
||||
⏳ 第3级:纪委审批
|
||||
状态:待审批
|
||||
|
||||
⏸️ 第4级:学院分管领导审批
|
||||
状态:未到审批阶段
|
||||
|
||||
⏸️ 第5级:学院党委书记审批
|
||||
状态:未到审批阶段
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## ⚠️ 当前存在的问题
|
||||
|
||||
### 问题1:命名不统一
|
||||
|
||||
**问题描述**:
|
||||
- `RsOverseasApprovalMonitorServiceImpl.java` 中只定义了3个级别
|
||||
- 与实际的5级审批流程不符
|
||||
|
||||
**影响范围**:
|
||||
- 出国申请进度查询菜单的"当前审批环节"显示
|
||||
- Level 4 和 Level 5 会显示为"未知"
|
||||
|
||||
**解决方案**:
|
||||
需要修改 `getApprovalLevelText()` 方法,添加完整的5级定义
|
||||
|
||||
### 问题2:总审批级别数设置错误
|
||||
|
||||
**问题位置**:`RsOverseasApprovalMonitorServiceImpl.java` 第345-346行
|
||||
|
||||
```java
|
||||
// 总审批级别数(假设最多3级:部门主管、分管领导、校领导)
|
||||
vo.setTotalLevels(3);
|
||||
```
|
||||
|
||||
**问题**:
|
||||
- 实际是5级审批,但这里设置为3级
|
||||
- 导致审批进度显示错误(如:2/3 而不是 2/5)
|
||||
|
||||
**影响**:
|
||||
- 审批进度百分比计算错误
|
||||
- 进度条显示不准确
|
||||
|
||||
---
|
||||
|
||||
## ✅ 建议的标准命名
|
||||
|
||||
### 统一的命名标准
|
||||
|
||||
| 级别 | 简称 | 完整名称 | 待审批显示 | 已审批显示 |
|
||||
|------|------|---------|-----------|-----------|
|
||||
| 1 | 部门负责人 | 部门负责人审批 | 待部门负责人审批 | 部门负责人已审批 |
|
||||
| 2 | 人事处 | 人事处审批 | 待人事处审批 | 人事处已审批 |
|
||||
| 3 | 纪委 | 纪委审批 | 待纪委审批 | 纪委已审批 |
|
||||
| 4 | 学院分管领导 | 学院分管领导审批 | 待学院分管领导审批 | 学院分管领导已审批 |
|
||||
| 5 | 学院党委书记 | 学院党委书记审批 | 待学院党委书记审批 | 学院党委书记已审批 |
|
||||
|
||||
### 代码实现建议
|
||||
|
||||
```java
|
||||
/**
|
||||
* 获取审批级别完整名称(用于"当前审批环节"列)
|
||||
*/
|
||||
private String getApprovalLevelText(String level) {
|
||||
if (level == null) {
|
||||
return "未开始";
|
||||
}
|
||||
switch (level) {
|
||||
case "1":
|
||||
return "部门负责人审批";
|
||||
case "2":
|
||||
return "人事处审批";
|
||||
case "3":
|
||||
return "纪委审批";
|
||||
case "4":
|
||||
return "学院分管领导审批";
|
||||
case "5":
|
||||
return "学院党委书记审批";
|
||||
default:
|
||||
return "未知";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前审批人显示文本(用于"当前审批人"列)
|
||||
*/
|
||||
private String getCurrentApproverText(String level) {
|
||||
if (level == null) {
|
||||
return "未指定";
|
||||
}
|
||||
switch (level) {
|
||||
case "1":
|
||||
return "待部门负责人审批";
|
||||
case "2":
|
||||
return "待人事处审批";
|
||||
case "3":
|
||||
return "待纪委审批";
|
||||
case "4":
|
||||
return "待学院分管领导审批";
|
||||
case "5":
|
||||
return "待学院党委书记审批";
|
||||
default:
|
||||
return "待审批";
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📋 总结
|
||||
|
||||
### 当前审批级别定义
|
||||
|
||||
**完整的五级审批体系**:
|
||||
|
||||
1. **Level 1 - 部门负责人审批**
|
||||
- 权限:`rs:overseas:approve1`
|
||||
- 范围:仅本部门申请
|
||||
- 显示:部门负责人审批
|
||||
|
||||
2. **Level 2 - 人事处审批**
|
||||
- 权限:`rs:overseas:approve2`
|
||||
- 范围:所有部门申请
|
||||
- 显示:人事处审批
|
||||
|
||||
3. **Level 3 - 纪委审批**
|
||||
- 权限:`rs:overseas:approve3`
|
||||
- 范围:所有部门申请
|
||||
- 显示:纪委审批
|
||||
|
||||
4. **Level 4 - 学院分管领导审批**
|
||||
- 权限:`rs:overseas:approve4`
|
||||
- 范围:所有部门申请
|
||||
- 显示:学院分管领导审批
|
||||
|
||||
5. **Level 5 - 学院党委书记审批**
|
||||
- 权限:`rs:overseas:approve5`
|
||||
- 范围:所有部门申请
|
||||
- 显示:学院党委书记审批
|
||||
|
||||
### 关键注意事项
|
||||
|
||||
- ✅ 系统使用**5级审批制度**
|
||||
- ✅ 只有**部门负责人(Level 1)**需要部门过滤
|
||||
- ✅ **Level 2-5** 可以看到所有部门的申请
|
||||
- ⚠️ 出国申请进度查询模块存在命名不一致问题
|
||||
- ⚠️ 总审批级别数应该是5而不是3
|
||||
|
||||
---
|
||||
|
||||
**分析完成时间**:2025-10-29
|
||||
**分析人员**:Cursor AI
|
||||
**文档版本**:v1.0
|
||||
|
||||
@@ -0,0 +1,286 @@
|
||||
# 出国申请进度查询 - 审批级别修复说明
|
||||
|
||||
## 🔧 修复时间
|
||||
2025-10-29
|
||||
|
||||
## 🎯 修复目标
|
||||
将出国申请进度查询模块从3级审批改为完整的5级审批,与实际审批流程保持一致。
|
||||
|
||||
---
|
||||
|
||||
## 📝 修复内容
|
||||
|
||||
### 修复1:更新审批级别文本定义
|
||||
|
||||
**文件**:`RsOverseasApprovalMonitorServiceImpl.java`
|
||||
**方法**:`getApprovalLevelText(String level)`
|
||||
|
||||
#### 修复前
|
||||
```java
|
||||
switch (level) {
|
||||
case "1":
|
||||
return "部门主管审批";
|
||||
case "2":
|
||||
return "分管领导审批";
|
||||
case "3":
|
||||
return "校领导审批";
|
||||
default:
|
||||
return "未知";
|
||||
}
|
||||
```
|
||||
|
||||
**问题**:
|
||||
- ❌ Level 4 和 Level 5 显示为"未知"
|
||||
- ❌ 命名与实际流程不符
|
||||
|
||||
#### 修复后
|
||||
```java
|
||||
/**
|
||||
* 获取审批级别文本
|
||||
* 五级审批制度:1-部门负责人,2-人事处,3-纪委,4-学院分管领导,5-学院党委书记
|
||||
*/
|
||||
switch (level) {
|
||||
case "1":
|
||||
return "部门负责人审批";
|
||||
case "2":
|
||||
return "人事处审批";
|
||||
case "3":
|
||||
return "纪委审批";
|
||||
case "4":
|
||||
return "学院分管领导审批";
|
||||
case "5":
|
||||
return "学院党委书记审批";
|
||||
default:
|
||||
return "未知";
|
||||
}
|
||||
```
|
||||
|
||||
**改进**:
|
||||
- ✅ 支持完整的5级审批
|
||||
- ✅ 命名与实际流程一致
|
||||
- ✅ 添加了详细的注释说明
|
||||
|
||||
---
|
||||
|
||||
### 修复2:更新总审批级别数
|
||||
|
||||
**文件**:`RsOverseasApprovalMonitorServiceImpl.java`
|
||||
**方法**:`fillApprovalProgress()`
|
||||
|
||||
#### 修复前
|
||||
```java
|
||||
// 总审批级别数(假设最多3级:部门主管、分管领导、校领导)
|
||||
vo.setTotalLevels(3);
|
||||
|
||||
// 未开始审批
|
||||
vo.setApprovedLevels(0);
|
||||
vo.setTotalLevels(3);
|
||||
vo.setApprovalProgress("0/3");
|
||||
```
|
||||
|
||||
**问题**:
|
||||
- ❌ 总级别数设置为3
|
||||
- ❌ 审批进度显示错误(如:2/3 而不是 2/5)
|
||||
- ❌ 进度百分比计算错误
|
||||
|
||||
#### 修复后
|
||||
```java
|
||||
// 总审批级别数(五级审批制度:部门负责人、人事处、纪委、学院分管领导、学院党委书记)
|
||||
vo.setTotalLevels(5);
|
||||
|
||||
// 未开始审批
|
||||
vo.setApprovedLevels(0);
|
||||
vo.setTotalLevels(5);
|
||||
vo.setApprovalProgress("0/5");
|
||||
```
|
||||
|
||||
**改进**:
|
||||
- ✅ 总级别数正确设置为5
|
||||
- ✅ 审批进度显示正确
|
||||
- ✅ 进度百分比计算准确
|
||||
|
||||
---
|
||||
|
||||
### 修复3:更新统计信息定义
|
||||
|
||||
**文件**:`RsOverseasApprovalMonitorServiceImpl.java`
|
||||
**方法**:`getApprovalStatistics()`
|
||||
|
||||
#### 修复前
|
||||
```java
|
||||
// 2. 各审批级别的待审批数量
|
||||
Map<String, Long> pendingByLevel = new HashMap<>();
|
||||
pendingByLevel.put("level1", countByStatusAndLevel("0", "1", tenantId)); // 部门主管
|
||||
pendingByLevel.put("level2", countByStatusAndLevel("0", "2", tenantId)); // 分管领导
|
||||
pendingByLevel.put("level3", countByStatusAndLevel("0", "3", tenantId)); // 校领导
|
||||
statistics.put("pendingByLevel", pendingByLevel);
|
||||
```
|
||||
|
||||
**问题**:
|
||||
- ❌ 只统计3个级别
|
||||
- ❌ Level 4 和 Level 5 的统计缺失
|
||||
|
||||
#### 修复后
|
||||
```java
|
||||
// 2. 各审批级别的待审批数量(五级审批制度)
|
||||
Map<String, Long> pendingByLevel = new HashMap<>();
|
||||
pendingByLevel.put("level1", countByStatusAndLevel("0", "1", tenantId)); // 部门负责人
|
||||
pendingByLevel.put("level2", countByStatusAndLevel("0", "2", tenantId)); // 人事处
|
||||
pendingByLevel.put("level3", countByStatusAndLevel("0", "3", tenantId)); // 纪委
|
||||
pendingByLevel.put("level4", countByStatusAndLevel("0", "4", tenantId)); // 学院分管领导
|
||||
pendingByLevel.put("level5", countByStatusAndLevel("0", "5", tenantId)); // 学院党委书记
|
||||
statistics.put("pendingByLevel", pendingByLevel);
|
||||
```
|
||||
|
||||
**改进**:
|
||||
- ✅ 统计所有5个级别
|
||||
- ✅ 统计数据完整准确
|
||||
- ✅ 命名规范一致
|
||||
|
||||
---
|
||||
|
||||
## 📊 修复效果对比
|
||||
|
||||
### 1. 当前审批环节显示
|
||||
|
||||
| 审批级别 | 修复前 | 修复后 | 状态 |
|
||||
|---------|--------|--------|------|
|
||||
| Level 1 | 部门主管审批 | 部门负责人审批 | ✅ 已修正 |
|
||||
| Level 2 | 分管领导审批 | 人事处审批 | ✅ 已修正 |
|
||||
| Level 3 | 校领导审批 | 纪委审批 | ✅ 已修正 |
|
||||
| Level 4 | **未知** ❌ | 学院分管领导审批 | ✅ 已修复 |
|
||||
| Level 5 | **未知** ❌ | 学院党委书记审批 | ✅ 已修复 |
|
||||
|
||||
### 2. 审批进度显示
|
||||
|
||||
| 已审批级别 | 修复前 | 修复后 | 进度百分比(修复前) | 进度百分比(修复后) |
|
||||
|-----------|--------|--------|-------------------|-------------------|
|
||||
| 0级 | 0/3 | 0/5 | 0% | 0% |
|
||||
| 1级 | 1/3 | 1/5 | 33% ❌ | 20% ✅ |
|
||||
| 2级 | 2/3 | 2/5 | 67% ❌ | 40% ✅ |
|
||||
| 3级 | 3/3 | 3/5 | 100% ❌ | 60% ✅ |
|
||||
| 4级 | - | 4/5 | - | 80% ✅ |
|
||||
| 5级 | - | 5/5 | - | 100% ✅ |
|
||||
|
||||
### 3. 统计信息
|
||||
|
||||
| 统计项 | 修复前 | 修复后 |
|
||||
|--------|--------|--------|
|
||||
| 统计级别数 | 3个 | 5个 ✅ |
|
||||
| Level 4统计 | ❌ 缺失 | ✅ 包含 |
|
||||
| Level 5统计 | ❌ 缺失 | ✅ 包含 |
|
||||
|
||||
---
|
||||
|
||||
## 🎨 前端显示效果
|
||||
|
||||
### 待审批列表示例
|
||||
|
||||
#### 修复前
|
||||
| 申请人 | 当前审批环节 | 审批进度 |
|
||||
|--------|-------------|---------|
|
||||
| 张三 | 部门主管审批 | 0/3 (0%) |
|
||||
| 李四 | 分管领导审批 | 1/3 (33%) |
|
||||
| 王五 | 校领导审批 | 2/3 (67%) |
|
||||
| 赵六 | **未知** ❌ | 3/3 (100%) ❌ |
|
||||
| 钱七 | **未知** ❌ | - |
|
||||
|
||||
#### 修复后
|
||||
| 申请人 | 当前审批环节 | 审批进度 |
|
||||
|--------|-------------|---------|
|
||||
| 张三 | 部门负责人审批 | 0/5 (0%) |
|
||||
| 李四 | 人事处审批 | 1/5 (20%) |
|
||||
| 王五 | 纪委审批 | 2/5 (40%) |
|
||||
| 赵六 | 学院分管领导审批 ✅ | 3/5 (60%) ✅ |
|
||||
| 钱七 | 学院党委书记审批 ✅ | 4/5 (80%) ✅ |
|
||||
|
||||
---
|
||||
|
||||
## ✅ 修复验证
|
||||
|
||||
### 验证步骤
|
||||
|
||||
1. **重新编译后端**
|
||||
```bash
|
||||
cd backend
|
||||
mvn clean package -pl ruoyi-admin -am -DskipTests
|
||||
```
|
||||
|
||||
2. **重启后端服务**
|
||||
```bash
|
||||
./stop-main.sh
|
||||
./start-main.sh
|
||||
```
|
||||
|
||||
3. **登录系统测试**
|
||||
- 访问"出国申请进度查询"菜单
|
||||
- 查看待审批中和审批完成选项卡
|
||||
- 验证以下内容:
|
||||
|
||||
#### 验证项1:当前审批环节显示
|
||||
- [ ] Level 1 显示为"部门负责人审批"
|
||||
- [ ] Level 2 显示为"人事处审批"
|
||||
- [ ] Level 3 显示为"纪委审批"
|
||||
- [ ] Level 4 显示为"学院分管领导审批"(不再是"未知")
|
||||
- [ ] Level 5 显示为"学院党委书记审批"(不再是"未知")
|
||||
|
||||
#### 验证项2:审批进度显示
|
||||
- [ ] 未审批显示:0/5 (0%)
|
||||
- [ ] 部门负责人已审批:1/5 (20%)
|
||||
- [ ] 人事处已审批:2/5 (40%)
|
||||
- [ ] 纪委已审批:3/5 (60%)
|
||||
- [ ] 学院分管领导已审批:4/5 (80%)
|
||||
- [ ] 学院党委书记已审批:5/5 (100%)
|
||||
|
||||
#### 验证项3:统计信息
|
||||
- [ ] 统计信息包含所有5个级别
|
||||
- [ ] Level 4 和 Level 5 的统计数据正常显示
|
||||
|
||||
---
|
||||
|
||||
## 📋 修改文件清单
|
||||
|
||||
| 序号 | 文件 | 修改内容 | 行数 | 状态 |
|
||||
|------|------|---------|------|------|
|
||||
| 1 | `RsOverseasApprovalMonitorServiceImpl.java` | 更新审批级别文本定义 | 387-404 | ✅ |
|
||||
| 2 | `RsOverseasApprovalMonitorServiceImpl.java` | 更新总审批级别数(已审批) | 345-346 | ✅ |
|
||||
| 3 | `RsOverseasApprovalMonitorServiceImpl.java` | 更新总审批级别数(未审批) | 358-360 | ✅ |
|
||||
| 4 | `RsOverseasApprovalMonitorServiceImpl.java` | 更新统计信息定义 | 152-157 | ✅ |
|
||||
|
||||
---
|
||||
|
||||
## 🎯 修复总结
|
||||
|
||||
### 修复前的问题
|
||||
- ❌ 只支持3级审批,Level 4和5显示"未知"
|
||||
- ❌ 总审批级别数错误(3而不是5)
|
||||
- ❌ 审批进度百分比计算错误
|
||||
- ❌ 统计信息不完整
|
||||
|
||||
### 修复后的改进
|
||||
- ✅ 完整支持5级审批流程
|
||||
- ✅ 所有审批级别正确显示
|
||||
- ✅ 审批进度计算准确
|
||||
- ✅ 统计信息完整
|
||||
- ✅ 与实际业务流程一致
|
||||
|
||||
### 影响范围
|
||||
- ✅ 仅修改出国申请进度查询模块
|
||||
- ✅ 不影响其他模块
|
||||
- ✅ 向后兼容
|
||||
|
||||
---
|
||||
|
||||
## 📞 相关文档
|
||||
|
||||
- 详细分析报告:`审批环节命名标准分析报告.md`
|
||||
- 功能修改说明:`出国申请进度查询功能修改说明.md`
|
||||
- 权限修改说明:`权限修改说明.md`
|
||||
|
||||
---
|
||||
|
||||
**修复状态**:✅ 已完成
|
||||
**需要操作**:重新编译和重启后端服务
|
||||
**版本**:v1.2
|
||||
**最后更新**:2025-10-29
|
||||
|
||||
@@ -0,0 +1,183 @@
|
||||
# 出国申请进度查询权限修改说明
|
||||
|
||||
## 📋 修改时间
|
||||
2025-10-29
|
||||
|
||||
## 🎯 修改目的
|
||||
将"出国申请进度查询"从"只能查看自己提交的申请"改为"拥有权限的用户可以查看所有申请"
|
||||
|
||||
---
|
||||
|
||||
## 📝 修改内容
|
||||
|
||||
### 1. 后端Service层修改
|
||||
|
||||
**文件**:`RsOverseasApprovalMonitorServiceImpl.java`
|
||||
|
||||
#### 修改前
|
||||
```java
|
||||
// 只查询当前用户提交的申请
|
||||
Long currentUserId = LoginHelper.getUserId();
|
||||
wrapper.eq("applicant_id", currentUserId);
|
||||
```
|
||||
|
||||
#### 修改后
|
||||
```java
|
||||
// 不再限制申请人,拥有权限的用户可以看到所有数据
|
||||
// 已删除 applicant_id 过滤条件
|
||||
```
|
||||
|
||||
**影响方法**:
|
||||
- ✅ `queryPendingList()` - 待审批列表
|
||||
- ✅ `queryCompletedList()` - 已完成列表
|
||||
|
||||
---
|
||||
|
||||
### 2. 后端Controller层修改
|
||||
|
||||
**文件**:`RsOverseasApprovalMonitorController.java`
|
||||
|
||||
#### 修改点
|
||||
- 更新注释说明:从"当前用户提交的"改为"所有"
|
||||
- 更新日志输出:从"当前用户的"改为"所有"
|
||||
|
||||
---
|
||||
|
||||
### 3. 前端页面修改
|
||||
|
||||
**文件**:`monitor/index.vue`
|
||||
|
||||
#### 修改点
|
||||
- 提示文字:从"这里显示您提交的"改为"这里显示所有"
|
||||
|
||||
---
|
||||
|
||||
## 🔍 权限控制
|
||||
|
||||
### 访问控制
|
||||
- **权限标识**:`rs:overseas:list`
|
||||
- **控制级别**:拥有此权限的用户可以查看所有数据
|
||||
- **数据范围**:不再限制申请人,显示所有待审批和已完成的申请
|
||||
|
||||
### 查询逻辑
|
||||
```sql
|
||||
-- 待审批列表
|
||||
SELECT * FROM rs_overseas_application
|
||||
WHERE status = '0' -- 待审核状态
|
||||
AND deleted = '0'
|
||||
AND tenant_id = {租户ID}
|
||||
ORDER BY apply_time DESC
|
||||
|
||||
-- 已完成列表
|
||||
SELECT * FROM rs_overseas_application
|
||||
WHERE status = '1' -- 已通过状态
|
||||
AND deleted = '0'
|
||||
AND tenant_id = {租户ID}
|
||||
ORDER BY apply_time DESC
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## ✅ 修改对比
|
||||
|
||||
| 项目 | 修改前 | 修改后 |
|
||||
|------|--------|--------|
|
||||
| 数据范围 | 当前用户提交的申请 | 所有申请 |
|
||||
| 权限要求 | rs:overseas:list | rs:overseas:list(不变) |
|
||||
| 查询条件 | applicant_id = 当前用户ID | 无申请人限制 |
|
||||
| 用户体验 | 只能看到自己的 | 可以看到所有 |
|
||||
|
||||
---
|
||||
|
||||
## 🧪 测试验证
|
||||
|
||||
### 测试场景1:查看待审批列表
|
||||
|
||||
**测试步骤**:
|
||||
1. 用户A登录系统(拥有 rs:overseas:list 权限)
|
||||
2. 访问"出国申请进度查询"菜单
|
||||
3. 切换到"待审批中"选项卡
|
||||
|
||||
**预期结果**:
|
||||
- ✅ 能看到所有用户提交的待审批申请
|
||||
- ✅ 包括用户A自己提交的和其他用户提交的
|
||||
|
||||
### 测试场景2:查看已完成列表
|
||||
|
||||
**测试步骤**:
|
||||
1. 用户A登录系统(拥有 rs:overseas:list 权限)
|
||||
2. 访问"出国申请进度查询"菜单
|
||||
3. 切换到"审批完成"选项卡
|
||||
|
||||
**预期结果**:
|
||||
- ✅ 能看到所有已完成审批的申请
|
||||
- ✅ 不限制申请人
|
||||
|
||||
### 测试场景3:无权限用户
|
||||
|
||||
**测试步骤**:
|
||||
1. 用户B登录系统(没有 rs:overseas:list 权限)
|
||||
2. 尝试访问"出国申请进度查询"菜单
|
||||
|
||||
**预期结果**:
|
||||
- ❌ 无法访问该菜单(权限控制在菜单级别)
|
||||
|
||||
---
|
||||
|
||||
## 📊 修改文件清单
|
||||
|
||||
| 序号 | 文件类型 | 文件路径 | 修改内容 | 状态 |
|
||||
|------|---------|---------|---------|------|
|
||||
| 1 | 后端Service | `RsOverseasApprovalMonitorServiceImpl.java` | 删除申请人ID过滤 | ✅ |
|
||||
| 2 | 后端Controller | `RsOverseasApprovalMonitorController.java` | 更新注释和日志 | ✅ |
|
||||
| 3 | 前端页面 | `monitor/index.vue` | 更新提示文字 | ✅ |
|
||||
|
||||
---
|
||||
|
||||
## ⚠️ 注意事项
|
||||
|
||||
### 1. 权限配置
|
||||
- 确保只有需要查看所有数据的用户才有 `rs:overseas:list` 权限
|
||||
- 如果需要区分不同权限级别,建议创建新的权限标识
|
||||
|
||||
### 2. 数据安全
|
||||
- 所有查询仍然受租户ID限制
|
||||
- 不会跨租户显示数据
|
||||
|
||||
### 3. 性能考虑
|
||||
- 查询所有数据时,建议使用搜索条件过滤
|
||||
- 分页显示可以减轻服务器压力
|
||||
|
||||
---
|
||||
|
||||
## 🚀 部署说明
|
||||
|
||||
### 后端部署
|
||||
```bash
|
||||
cd backend
|
||||
mvn clean package -pl ruoyi-admin -am -DskipTests
|
||||
./stop-main.sh
|
||||
./start-main.sh
|
||||
```
|
||||
|
||||
### 前端(如已运行无需重启)
|
||||
```bash
|
||||
# 前端代码修改后会自动热更新
|
||||
# 如需打包部署:
|
||||
cd web
|
||||
npm run build
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📞 相关文档
|
||||
|
||||
- 详细修改说明:`出国申请进度查询功能修改说明.md`
|
||||
- 快速参考:`修改总结-快速参考.md`
|
||||
|
||||
---
|
||||
|
||||
**修改状态**:✅ 已完成
|
||||
**生效方式**:需要重启后端服务
|
||||
**版本**:v1.1
|
||||
|
||||
@@ -0,0 +1,467 @@
|
||||
<template>
|
||||
<div class="teacher-multi-selector">
|
||||
<!-- 已选择的教师标签显示 -->
|
||||
<div v-if="selectedTeachers.length > 0" class="selected-teachers">
|
||||
<el-tag v-for="teacher in selectedTeachers" :key="teacher.userId" closable @close="removeTeacher(teacher)" class="teacher-tag">
|
||||
{{ teacher.nickName }}
|
||||
</el-tag>
|
||||
</div>
|
||||
|
||||
<!-- 教师选择输入框 -->
|
||||
<el-input v-model="displayValue" :placeholder="placeholder" :disabled="disabled" clearable @clear="handleClear" @click="openDialog" readonly>
|
||||
<template #suffix>
|
||||
<el-icon class="search-icon" @click="openDialog">
|
||||
<Search />
|
||||
</el-icon>
|
||||
</template>
|
||||
</el-input>
|
||||
|
||||
<!-- 教师选择弹窗 -->
|
||||
<el-dialog
|
||||
v-model="dialogVisible"
|
||||
title="选择教师"
|
||||
width="800px"
|
||||
:close-on-click-modal="false"
|
||||
:append-to-body="true"
|
||||
:modal-append-to-body="true"
|
||||
destroy-on-close
|
||||
>
|
||||
<div class="selector-content">
|
||||
<!-- 左侧部门树形结构 -->
|
||||
<div class="tree-panel">
|
||||
<el-tree
|
||||
ref="treeRef"
|
||||
:data="treeData"
|
||||
:props="treeProps"
|
||||
node-key="id"
|
||||
:expand-on-click-node="false"
|
||||
:default-expand-all="false"
|
||||
@node-click="handleTreeNodeClick"
|
||||
>
|
||||
<template #default="{ node, data }">
|
||||
<span class="tree-node">
|
||||
<span>{{ node.label }}</span>
|
||||
<span v-if="data.teacherCount !== undefined" class="teacher-count">({{ data.teacherCount }}人)</span>
|
||||
</span>
|
||||
</template>
|
||||
</el-tree>
|
||||
</div>
|
||||
|
||||
<!-- 右侧教师列表 -->
|
||||
<div class="teacher-panel">
|
||||
<div v-if="!selectedDeptId" class="empty-tip">请选择左侧部门查看教师列表</div>
|
||||
<div v-else-if="loading" class="empty-tip">
|
||||
<el-icon class="is-loading"><Loading /></el-icon>
|
||||
<span style="margin-left: 8px">加载中...</span>
|
||||
</div>
|
||||
<div v-else-if="permissionDenied" class="permission-denied-tip">
|
||||
<el-icon><Lock /></el-icon>
|
||||
<p>您没有权限查看该部门的教师信息</p>
|
||||
<p class="tip-desc">请联系管理员配置数据权限或选择其他部门</p>
|
||||
</div>
|
||||
<div v-else>
|
||||
<div class="panel-header">
|
||||
<span>{{ selectedDeptName }} - 教师列表</span>
|
||||
<el-input v-model="teacherSearchText" placeholder="搜索教师姓名或账号" size="small" style="width: 200px" clearable>
|
||||
<template #prefix>
|
||||
<el-icon><Search /></el-icon>
|
||||
</template>
|
||||
</el-input>
|
||||
</div>
|
||||
<div class="teacher-list">
|
||||
<div
|
||||
v-for="teacher in filteredTeachers"
|
||||
:key="teacher.userId"
|
||||
class="teacher-item"
|
||||
:class="{ selected: isTeacherSelected(teacher) }"
|
||||
@click="toggleTeacher(teacher)"
|
||||
>
|
||||
<div class="teacher-info">
|
||||
<el-checkbox :model-value="isTeacherSelected(teacher)" @change="toggleTeacher(teacher)" class="teacher-checkbox" />
|
||||
<span class="teacher-name">{{ teacher.nickName }}</span>
|
||||
<span class="teacher-account">{{ teacher.userName }}</span>
|
||||
</div>
|
||||
<div class="teacher-detail">
|
||||
性别:{{ teacher.sex === '0' ? '男' : teacher.sex === '1' ? '女' : '未知' }} | 电话:{{ teacher.phonenumber || '暂无' }} | 邮箱:{{
|
||||
teacher.email || '暂无'
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="filteredTeachers.length === 0 && !permissionDenied" class="empty-tip">该部门暂无教师数据</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button @click="closeDialog">取 消</el-button>
|
||||
<el-button type="primary" @click="confirmSelect">确 定 (已选{{ selectedTeachers.length }}人)</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, watch, onMounted, nextTick } from 'vue';
|
||||
import { Search, Loading, Lock } from '@element-plus/icons-vue';
|
||||
import { getDeptTreeData, getTeachersByDeptId } from '@/api/system/teacher';
|
||||
import { TeacherVO, DeptTreeNode } from '@/api/system/teacher/types';
|
||||
import { ElMessage } from 'element-plus';
|
||||
|
||||
interface Props {
|
||||
modelValue?: TeacherVO[];
|
||||
placeholder?: string;
|
||||
disabled?: boolean;
|
||||
allowClear?: boolean;
|
||||
}
|
||||
|
||||
interface Emits {
|
||||
(e: 'update:modelValue', value: TeacherVO[]): void;
|
||||
(e: 'change', value: TeacherVO[]): void;
|
||||
}
|
||||
|
||||
const props = withDefaults(defineProps<Props>(), {
|
||||
modelValue: () => [],
|
||||
placeholder: '请选择教师',
|
||||
disabled: false,
|
||||
allowClear: true
|
||||
});
|
||||
|
||||
const emit = defineEmits<Emits>();
|
||||
|
||||
// 响应式数据
|
||||
const dialogVisible = ref(false);
|
||||
const teacherSearchText = ref('');
|
||||
const selectedTeachers = ref<TeacherVO[]>([]);
|
||||
const treeData = ref<DeptTreeNode[]>([]);
|
||||
const teacherList = ref<TeacherVO[]>([]);
|
||||
// 🔧 修复:支持字符串类型的雪花ID,避免精度丢失(培训申请模块专用修复)
|
||||
const selectedDeptId = ref<string | number | null>(null);
|
||||
const selectedDeptName = ref('');
|
||||
const loading = ref(false); // 加载状态
|
||||
const permissionDenied = ref(false); // 权限被拒标识
|
||||
|
||||
// 显示值计算
|
||||
const displayValue = computed(() => {
|
||||
if (selectedTeachers.value.length === 0) {
|
||||
return '';
|
||||
} else if (selectedTeachers.value.length === 1) {
|
||||
return selectedTeachers.value[0].nickName;
|
||||
} else {
|
||||
return `已选择 ${selectedTeachers.value.length} 位教师`;
|
||||
}
|
||||
});
|
||||
|
||||
// 过滤后的教师列表
|
||||
const filteredTeachers = computed(() => {
|
||||
if (!teacherSearchText.value) {
|
||||
return teacherList.value;
|
||||
}
|
||||
const searchLower = teacherSearchText.value.toLowerCase();
|
||||
return teacherList.value.filter(
|
||||
(teacher) => teacher.nickName.toLowerCase().includes(searchLower) || teacher.userName.toLowerCase().includes(searchLower)
|
||||
);
|
||||
});
|
||||
|
||||
// 树形结构配置
|
||||
const treeProps = {
|
||||
children: 'children',
|
||||
label: 'label'
|
||||
};
|
||||
|
||||
// 监听外部传入的值变化
|
||||
watch(
|
||||
() => props.modelValue,
|
||||
(newValue) => {
|
||||
selectedTeachers.value = newValue || [];
|
||||
},
|
||||
{ immediate: true, deep: true }
|
||||
);
|
||||
|
||||
// 打开弹窗
|
||||
const openDialog = () => {
|
||||
if (props.disabled) return;
|
||||
|
||||
// 防止重复打开
|
||||
if (dialogVisible.value) return;
|
||||
|
||||
// 在TabPane环境下添加延迟,避免闪烁
|
||||
const isInTabPane = document.querySelector('.el-tab-pane[aria-hidden="false"]');
|
||||
|
||||
if (isInTabPane) {
|
||||
// 增加延迟时间,确保TabPane状态稳定
|
||||
setTimeout(() => {
|
||||
if (!dialogVisible.value) {
|
||||
// 再次检查状态
|
||||
dialogVisible.value = true;
|
||||
nextTick(() => {
|
||||
loadDeptTree();
|
||||
});
|
||||
}
|
||||
}, 100);
|
||||
} else {
|
||||
nextTick(() => {
|
||||
dialogVisible.value = true;
|
||||
loadDeptTree();
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// 关闭弹窗并清理状态
|
||||
const closeDialog = () => {
|
||||
dialogVisible.value = false;
|
||||
// 延迟清理状态,避免关闭动画期间的闪烁
|
||||
setTimeout(() => {
|
||||
selectedDeptId.value = null;
|
||||
selectedDeptName.value = '';
|
||||
teacherList.value = [];
|
||||
teacherSearchText.value = '';
|
||||
loading.value = false;
|
||||
permissionDenied.value = false;
|
||||
}, 300);
|
||||
};
|
||||
|
||||
// 确认选择
|
||||
const confirmSelect = () => {
|
||||
emit('update:modelValue', selectedTeachers.value);
|
||||
emit('change', selectedTeachers.value);
|
||||
closeDialog();
|
||||
};
|
||||
|
||||
// 清除选择
|
||||
const handleClear = () => {
|
||||
selectedTeachers.value = [];
|
||||
emit('update:modelValue', []);
|
||||
emit('change', []);
|
||||
};
|
||||
|
||||
// 移除单个教师
|
||||
const removeTeacher = (teacher: TeacherVO) => {
|
||||
const index = selectedTeachers.value.findIndex((t) => t.userId === teacher.userId);
|
||||
if (index > -1) {
|
||||
selectedTeachers.value.splice(index, 1);
|
||||
emit('update:modelValue', selectedTeachers.value);
|
||||
emit('change', selectedTeachers.value);
|
||||
}
|
||||
};
|
||||
|
||||
// 判断教师是否已选择
|
||||
const isTeacherSelected = (teacher: TeacherVO): boolean => {
|
||||
return selectedTeachers.value.some((t) => t.userId === teacher.userId);
|
||||
};
|
||||
|
||||
// 切换教师选择状态
|
||||
const toggleTeacher = (teacher: TeacherVO) => {
|
||||
const index = selectedTeachers.value.findIndex((t) => t.userId === teacher.userId);
|
||||
if (index > -1) {
|
||||
selectedTeachers.value.splice(index, 1);
|
||||
} else {
|
||||
selectedTeachers.value.push(teacher);
|
||||
}
|
||||
};
|
||||
|
||||
// 加载部门树形数据
|
||||
const loadDeptTree = async () => {
|
||||
try {
|
||||
const response = await getDeptTreeData();
|
||||
treeData.value = response.data || [];
|
||||
} catch (error) {
|
||||
ElMessage.error('加载部门信息失败');
|
||||
console.error('加载树形数据失败:', error);
|
||||
}
|
||||
};
|
||||
|
||||
// 树节点点击
|
||||
// 🔧 修复:保持字符串类型,避免雪花ID(19位)转为Number时精度丢失
|
||||
// 背景:JavaScript的Number类型只能安全表示16位整数(2^53-1),雪花ID超出范围
|
||||
// 后端已通过@JsonSerialize(using = ToStringSerializer.class)将Long类型转为字符串
|
||||
const handleTreeNodeClick = async (data: DeptTreeNode) => {
|
||||
if (!data.id) return;
|
||||
|
||||
selectedDeptId.value = data.id; // ✅ 保持原类型,不转Number
|
||||
selectedDeptName.value = data.label;
|
||||
teacherSearchText.value = '';
|
||||
loading.value = true;
|
||||
permissionDenied.value = false;
|
||||
|
||||
try {
|
||||
const response = await getTeachersByDeptId(data.id); // ✅ 直接传递,不转Number
|
||||
teacherList.value = response.data || [];
|
||||
|
||||
// 如果返回空列表,可能是权限问题(也可能真的没有教师)
|
||||
// 后端添加数据权限后,无权限的部门会被过滤,理论上不会出现在部门树中
|
||||
// 但为了更好的用户体验,仍然保留这个逻辑
|
||||
if (teacherList.value.length === 0) {
|
||||
console.log(`部门 ${data.label} 没有教师数据`);
|
||||
}
|
||||
} catch (error: any) {
|
||||
console.error('加载教师列表失败:', error);
|
||||
|
||||
// 根据错误信息判断是否为权限问题
|
||||
const errorMsg = error?.msg || error?.message || '';
|
||||
if (error?.code === 403 || errorMsg.includes('权限') || errorMsg.includes('permission')) {
|
||||
permissionDenied.value = true;
|
||||
console.warn(`用户没有权限访问部门 ${data.label} 的教师列表`);
|
||||
} else {
|
||||
ElMessage.error('加载教师列表失败');
|
||||
}
|
||||
|
||||
teacherList.value = [];
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
// 组件挂载时初始化
|
||||
onMounted(() => {
|
||||
selectedTeachers.value = props.modelValue || [];
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.teacher-multi-selector {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.selected-teachers {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.teacher-tag {
|
||||
margin-right: 8px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.search-icon {
|
||||
cursor: pointer;
|
||||
color: #606266;
|
||||
}
|
||||
|
||||
.search-icon:hover {
|
||||
color: #409eff;
|
||||
}
|
||||
|
||||
.selector-content {
|
||||
display: flex;
|
||||
height: 400px;
|
||||
}
|
||||
|
||||
.tree-panel {
|
||||
width: 300px;
|
||||
border-right: 1px solid #ebeef5;
|
||||
padding-right: 12px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.teacher-panel {
|
||||
flex: 1;
|
||||
padding-left: 12px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.tree-node {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.teacher-count {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.panel-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 12px;
|
||||
padding-bottom: 8px;
|
||||
border-bottom: 1px solid #ebeef5;
|
||||
}
|
||||
|
||||
.teacher-list {
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.teacher-item {
|
||||
padding: 8px 12px;
|
||||
cursor: pointer;
|
||||
border-radius: 4px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.teacher-item:hover {
|
||||
background: #f5f7fa;
|
||||
}
|
||||
|
||||
.teacher-item.selected {
|
||||
background: #e7f4ff;
|
||||
border: 1px solid #b3d8ff;
|
||||
}
|
||||
|
||||
.teacher-info {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.teacher-checkbox {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
.teacher-name {
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
.teacher-account {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.teacher-detail {
|
||||
font-size: 12px;
|
||||
color: #606266;
|
||||
margin-top: 2px;
|
||||
margin-left: 24px;
|
||||
}
|
||||
|
||||
.empty-tip {
|
||||
text-align: center;
|
||||
color: #909399;
|
||||
padding: 40px 0;
|
||||
}
|
||||
|
||||
.permission-denied-tip {
|
||||
text-align: center;
|
||||
padding: 60px 20px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.permission-denied-tip .el-icon {
|
||||
font-size: 48px;
|
||||
color: #f56c6c;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.permission-denied-tip p {
|
||||
margin: 8px 0;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.permission-denied-tip .tip-desc {
|
||||
font-size: 12px;
|
||||
color: #c0c4cc;
|
||||
}
|
||||
|
||||
.dialog-footer {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 10px;
|
||||
}
|
||||
</style>
|
||||
Reference in new issue
Block a user