fix: Bug #395 修复撤销审核前端调用与Controller重复映射问题
- 修复reportManagementController中重复的/revokeAudit映射 - 前端api.js增加revokeAuditCard接口 - handleRevokeAudit改用专用撤销审核API并传status=1 fix: Bug #398/#399 号源时间过滤不应影响已预约/已取号记录 - ScheduleSlotMapper.xml时间过滤仅应用于未预约(0)状态 - 已预约(1)、已取号(3)、已退号(5)、已退单(4)记录不受时间过滤
This commit is contained in:
@@ -89,6 +89,20 @@ export function auditInfectiousCard(data) {
|
||||
* @param {string} data.returnReason - 退回原因
|
||||
* @param {string} data.status - 审核状态(5:审核失败)
|
||||
*/
|
||||
/**
|
||||
* 撤销审核传染病报卡
|
||||
* @param {Object} data
|
||||
* @param {string} data.cardNo
|
||||
* @param {string} data.status
|
||||
*/
|
||||
export function revokeAuditCard(data) {
|
||||
return request({
|
||||
url: '/report-manage/infectiousDiseaseReport/revokeAudit',
|
||||
method: 'post',
|
||||
data,
|
||||
});
|
||||
}
|
||||
|
||||
export function returnInfectiousCard(data) {
|
||||
return request({
|
||||
url: '/report-manage/infectiousDiseaseReport/return',
|
||||
|
||||
@@ -573,6 +573,7 @@ import {
|
||||
getInfectiousCard,
|
||||
auditInfectiousCard,
|
||||
returnInfectiousCard,
|
||||
revokeAuditCard,
|
||||
batchAuditCards,
|
||||
batchReturnCards,
|
||||
getDeptTree,
|
||||
@@ -833,11 +834,11 @@ function handleView(row) {
|
||||
loadCardDetail(row.cardNo);
|
||||
}
|
||||
|
||||
// 撤销审核
|
||||
// 撤销审核(Bug #395 修复)
|
||||
async function handleRevokeAudit(row) {
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
'确定要撤销此报卡的审核吗?',
|
||||
`确定要撤销【${row.patientName}】的报卡审核吗?撤销后状态将变为"待审核"。`,
|
||||
'确认撤销',
|
||||
{
|
||||
confirmButtonText: '确定',
|
||||
@@ -845,12 +846,12 @@ async function handleRevokeAudit(row) {
|
||||
type: 'warning',
|
||||
}
|
||||
);
|
||||
|
||||
const res = await returnInfectiousCard({
|
||||
|
||||
const res = await revokeAuditCard({
|
||||
cardNo: row.cardNo,
|
||||
returnReason: '撤销审核'
|
||||
status: '1' // 撤销后状态变更为待审核
|
||||
});
|
||||
|
||||
|
||||
if (res.code === 200) {
|
||||
ElMessage.success('撤销审核成功');
|
||||
loadTableData();
|
||||
@@ -860,7 +861,6 @@ async function handleRevokeAudit(row) {
|
||||
}
|
||||
} catch (err) {
|
||||
if (err !== 'cancel') {
|
||||
ElMessage.error('撤销审核失败');
|
||||
console.error(err);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user