yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: [bpm] OA 请假流程重新发起问题修复

pull/354/head
jason 2026-06-04 14:11:30 +08:00
parent 8146ebde8c
commit a357dbf940
6 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/web-antd/src/api/bpm/oa/leave/index.ts
View File

@ -21,11 +21,6 @@ export async function createLeave(data: BpmOALeaveApi.Leave) {
return requestClient.post('/bpm/oa/leave/create', data); return requestClient.post('/bpm/oa/leave/create', data);
} }
/** 更新请假申请 */
export async function updateLeave(data: BpmOALeaveApi.Leave) {
return requestClient.post('/bpm/oa/leave/update', data);
}
/** 获得请假申请 */ /** 获得请假申请 */
export async function getLeave(id: number) { export async function getLeave(id: number) {
return requestClient.get<BpmOALeaveApi.Leave>(`/bpm/oa/leave/get?id=${id}`); return requestClient.get<BpmOALeaveApi.Leave>(`/bpm/oa/leave/get?id=${id}`);

6
apps/web-antd/src/views/bpm/oa/leave/create.vue
View File

@ -14,7 +14,7 @@ import { Button, Card, Col, message, Row, Space } from 'ant-design-vue';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { getProcessDefinition } from '#/api/bpm/definition'; import { getProcessDefinition } from '#/api/bpm/definition';
import { createLeave, getLeave, updateLeave } from '#/api/bpm/oa/leave'; import { createLeave, getLeave } from '#/api/bpm/oa/leave';
import { getApprovalDetail as getApprovalDetailApi } from '#/api/bpm/processInstance'; import { getApprovalDetail as getApprovalDetailApi } from '#/api/bpm/processInstance';
import { $t } from '#/locales'; import { $t } from '#/locales';
import { router } from '#/router'; import { router } from '#/router';
@ -88,9 +88,7 @@ async function onSubmit() {
}; };
try { try {
formLoading.value = true; formLoading.value = true;
await (formData.value?.id await createLeave(submitData);
? updateLeave(submitData)
: createLeave(submitData));
// 关闭并提示 // 关闭并提示
message.success($t('ui.actionMessage.operationSuccess')); message.success($t('ui.actionMessage.operationSuccess'));
await closeCurrentTab(); await closeCurrentTab();

5
apps/web-antdv-next/src/api/bpm/oa/leave/index.ts
View File

@ -21,11 +21,6 @@ export async function createLeave(data: BpmOALeaveApi.Leave) {
return requestClient.post('/bpm/oa/leave/create', data); return requestClient.post('/bpm/oa/leave/create', data);
} }
/** 更新请假申请 */
export async function updateLeave(data: BpmOALeaveApi.Leave) {
return requestClient.post('/bpm/oa/leave/update', data);
}
/** 获得请假申请 */ /** 获得请假申请 */
export async function getLeave(id: number) { export async function getLeave(id: number) {
return requestClient.get<BpmOALeaveApi.Leave>(`/bpm/oa/leave/get?id=${id}`); return requestClient.get<BpmOALeaveApi.Leave>(`/bpm/oa/leave/get?id=${id}`);

6
apps/web-antdv-next/src/views/bpm/oa/leave/create.vue
View File

@ -14,7 +14,7 @@ import { Button, Card, Col, message, Row, Space } from 'antdv-next';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { getProcessDefinition } from '#/api/bpm/definition'; import { getProcessDefinition } from '#/api/bpm/definition';
import { createLeave, getLeave, updateLeave } from '#/api/bpm/oa/leave'; import { createLeave, getLeave } from '#/api/bpm/oa/leave';
import { getApprovalDetail as getApprovalDetailApi } from '#/api/bpm/processInstance'; import { getApprovalDetail as getApprovalDetailApi } from '#/api/bpm/processInstance';
import { $t } from '#/locales'; import { $t } from '#/locales';
import { router } from '#/router'; import { router } from '#/router';
@ -88,9 +88,7 @@ async function onSubmit() {
}; };
try { try {
formLoading.value = true; formLoading.value = true;
await (formData.value?.id await createLeave(submitData);
? updateLeave(submitData)
: createLeave(submitData));
// 关闭并提示 // 关闭并提示
message.success($t('ui.actionMessage.operationSuccess')); message.success($t('ui.actionMessage.operationSuccess'));
await closeCurrentTab(); await closeCurrentTab();

4
apps/web-ele/src/api/bpm/oa/leave/index.ts
View File

@ -21,10 +21,6 @@ export async function createLeave(data: BpmOALeaveApi.Leave) {
return requestClient.post('/bpm/oa/leave/create', data); return requestClient.post('/bpm/oa/leave/create', data);
} }
/** 更新请假申请 */
export async function updateLeave(data: BpmOALeaveApi.Leave) {
return requestClient.post('/bpm/oa/leave/update', data);
}
/** 获得请假申请 */ /** 获得请假申请 */
export async function getLeave(id: number) { export async function getLeave(id: number) {

6
apps/web-ele/src/views/bpm/oa/leave/create.vue
View File

@ -21,7 +21,7 @@ import {
} from 'element-plus'; } from 'element-plus';
import { getProcessDefinition } from '#/api/bpm/definition'; import { getProcessDefinition } from '#/api/bpm/definition';
import { createLeave, getLeave, updateLeave } from '#/api/bpm/oa/leave'; import { createLeave, getLeave } from '#/api/bpm/oa/leave';
import { getApprovalDetail as getApprovalDetailApi } from '#/api/bpm/processInstance'; import { getApprovalDetail as getApprovalDetailApi } from '#/api/bpm/processInstance';
import { $t } from '#/locales'; import { $t } from '#/locales';
import { router } from '#/router'; import { router } from '#/router';
@ -95,9 +95,7 @@ async function onSubmit() {
}; };
try { try {
formLoading.value = true; formLoading.value = true;
await (formData.value?.id await createLeave(submitData);
? updateLeave(submitData)
: createLeave(submitData));
// 关闭并提示 // 关闭并提示
ElMessage.success($t('ui.actionMessage.operationSuccess')); ElMessage.success($t('ui.actionMessage.operationSuccess'));
await closeCurrentTab(); await closeCurrentTab();