diff --git a/web/src/views/bzrkh/assessmentPlan/index.vue b/web/src/views/bzrkh/assessmentPlan/index.vue
index 9f8f0e3e..1e1f55d1 100644
--- a/web/src/views/bzrkh/assessmentPlan/index.vue
+++ b/web/src/views/bzrkh/assessmentPlan/index.vue
@@ -454,7 +454,16 @@ const submitForm = () => {
/** 删除按钮操作 */
const handleDelete = async (row?: AssessmentPlanVO) => {
const _ids = row?.id || ids.value;
- await proxy?.$modal.confirm('是否确认删除考核计划编号为"' + _ids + '"的数据项？').then(async () => {
+
+ let confirmMessage = '';
+ if (row) {
+ const semesterText = row.semester === '1' ? '上学期' : '下学期';
+ confirmMessage = `是否确认删除考核计划"${row.planName}"（${row.academicYear}学年${semesterText}）？`;
+ } else {
+ confirmMessage = `是否确认删除选中的${ids.value.length}条考核计划？`;
+ }
+
+ await proxy?.$modal.confirm(confirmMessage).then(async () => {
await delAssessmentPlan(_ids).then(() => {
getList();
proxy?.$modal.msgSuccess('删除成功');
diff --git a/web/src/views/bzrkh/assessmentScheme/index.vue b/web/src/views/bzrkh/assessmentScheme/index.vue
index 7c7e950d..4a025634 100644
--- a/web/src/views/bzrkh/assessmentScheme/index.vue
+++ b/web/src/views/bzrkh/assessmentScheme/index.vue
@@ -382,8 +382,16 @@ const submitForm = () => {
/** 删除按钮操作 */
const handleDelete = async (row?: BmzrAssessmentSchemeVO) => {
const _ids = row?.id || ids.value;
+
+ let confirmMessage = '';
+ if (row) {
+ confirmMessage = `是否确认删除考核方案"${row.schemeName}"（${row.academicYear}学年第${row.semester}学期）？`;
+ } else {
+ confirmMessage = `是否确认删除选中的${ids.value.length}条考核方案？`;
+ }
+
try {
- await proxy?.$modal.confirm('是否确认删除考核方案编号为"' + _ids + '"的数据项？');
+ await proxy?.$modal.confirm(confirmMessage);
await delBmzrAssessmentScheme(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
diff --git a/web/src/views/rs/overseas/index.vue b/web/src/views/rs/overseas/index.vue
index 2ffe5db4..b990f4dd 100644
--- a/web/src/views/rs/overseas/index.vue
+++ b/web/src/views/rs/overseas/index.vue
@@ -824,7 +824,7 @@ const handleCancelApplication = (row: OverseasApplicationVO) => {
// 删除申请
const handleDeleteApplication = (row: OverseasApplicationVO) => {
- ElMessageBox.confirm(`确认删除申请"${row.applicationId}"?`, '提示', {
+ ElMessageBox.confirm(`确认删除申请人"${row.applicantName}"前往"${row.destination}"的出国申请？`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/web/src/views/rs/overseasApproval/index.vue b/web/src/views/rs/overseasApproval/index.vue
index 0b908f40..caac4c17 100644
--- a/web/src/views/rs/overseasApproval/index.vue
+++ b/web/src/views/rs/overseasApproval/index.vue
@@ -663,8 +663,16 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _approvalIds = row.approvalId || ids.value;
+
+ let confirmMessage = '';
+ if (row) {
+ confirmMessage = `是否确认删除申请人"${row.applicantName}"前往"${row.destination}"的审批记录？`;
+ } else {
+ confirmMessage = `是否确认删除选中的${ids.value.length}条审批记录？`;
+ }
+
proxy.$modal
- .confirm('是否确认删除出国审批编号为"' + _approvalIds + '"的数据项？')
+ .confirm(confirmMessage)
.then(function () {
return delOverseasApproval(_approvalIds);
})
diff --git a/web/src/views/rs/training/index.vue b/web/src/views/rs/training/index.vue
index 8a03c695..fccb774f 100644
--- a/web/src/views/rs/training/index.vue
+++ b/web/src/views/rs/training/index.vue
@@ -1587,10 +1587,12 @@ function handleCancelApplication(row: any) {
proxy?.$modal.msgSuccess('申请已撤回');
})
.catch((error) => {
- if (error !== 'cancel') {
- console.error('撤回申请失败:', error);
- proxy?.$modal.msgError(`撤回失败: ${error.message || '未知错误'}`);
+ // 如果是用户取消操作，不显示错误提示
+ if (error === 'cancel' || error === 'close' || error.message === 'cancel') {
+ return;
}
+ console.error('撤回申请失败:', error);
+ proxy?.$modal.msgError(`撤回失败: ${error.message || '未知错误'}`);
});
}
@@ -1651,6 +1653,10 @@ function handleDeleteApplication(row: any) {
proxy?.$modal.msgSuccess('删除成功');
})
.catch((error) => {
+ // 如果是用户取消操作，不显示错误提示
+ if (error === 'cancel' || error === 'close' || error.message === 'cancel') {
+ return;
+ }
console.error('删除失败:', error);
proxy?.$modal.msgError(`删除失败: ${error.message || '未知错误'}`);
});
@@ -1702,6 +1708,10 @@ function handleUpdateStatus(row: any, status: string) {
}
})
.catch((error) => {
+ // 如果是用户取消操作，不显示错误提示
+ if (error === 'cancel' || error === 'close' || error.message === 'cancel') {
+ return;
+ }
console.error('更新申请状态失败:', error);
proxy?.$modal.msgError(`${text}申请失败: ${error.message || '未知错误'}`);
});
@@ -2124,7 +2134,11 @@ function handleDeleteRecord(row?: RecordVO) {
getRecordList();
proxy?.$modal.msgSuccess('删除成功');
})
- .catch(() => {
+ .catch((error) => {
+ // 如果是用户取消操作，不显示错误提示
+ if (error === 'cancel' || error === 'close' || error.message === 'cancel') {
+ return;
+ }
// 模拟删除成功，实际应使用API
setTimeout(() => {
getRecordList();
diff --git a/web/src/views/rs/trainingApproval/index.vue b/web/src/views/rs/trainingApproval/index.vue
index b70a9f96..df2b4991 100644
--- a/web/src/views/rs/trainingApproval/index.vue
+++ b/web/src/views/rs/trainingApproval/index.vue
@@ -235,6 +235,11 @@
+
+
+
+
+
@@ -260,6 +265,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -363,6 +387,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -843,7 +886,11 @@ const handleViewApprovalRecord = async (row: any) => {
reason: applicationData.reason, // 从申请数据获取申请理由
remark: applicationData.remark,
adminRemark: row.opinion, // 从审批记录获取审批意见
- certificatePath: applicationData.certificatePath
+ certificatePath: applicationData.certificatePath,
+ // 添加时间相关字段
+ startTime: applicationData.startTime, // 培训开始时间
+ endTime: applicationData.endTime, // 培训结束时间
+ duration: applicationData.duration // 培训学时
});
// 获取审批历史记录