diff --git a/src/views/bg/bgpartymatter/BgPartymatter.api.ts b/src/views/bg/bgpartymatter/BgPartymatter.api.ts index ba5f6c8..0363b12 100644 --- a/src/views/bg/bgpartymatter/BgPartymatter.api.ts +++ b/src/views/bg/bgpartymatter/BgPartymatter.api.ts @@ -13,6 +13,7 @@ enum Api { importExcel = '/bgpartymatter/bgPartymatter/importExcel', exportXls = '/bgpartymatter/bgPartymatter/exportXls', saveBpmForm = '/bgpartymatter/bgPartymatter/saveBpmForm', + setProcessVariable = '/act/process/setProcessVariable', bgPartymatterFeedbackList = '/bgpartymatter/bgPartymatter/listBgPartymatterFeedbackByMainId', bgPartymatterFeedbackSave= '/bgpartymatter/bgPartymatter/addBgPartymatterFeedback', bgPartymatterFeedbackEdit= '/bgpartymatter/bgPartymatter/editBgPartymatterFeedback', @@ -78,6 +79,10 @@ export const saveBpmForm = (params) => { return defHttp.post({ url: Api.saveBpmForm, params }, { isTransformResponse: false }); } +export const setProcessVariable = (params) => { + return defHttp.post({ url: Api.setProcessVariable, params }, { isTransformResponse: false }); +} + /** * 列表接口 * @param params diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue index 30321ef..5ec5a76 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue @@ -144,6 +144,17 @@ 保存反馈 + + @@ -155,18 +166,20 @@ import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue'; import { bgPartymatterFeedbackList, bgPartymatterFeedbackSaveOrUpdate, saveBpmForm } from '../BgPartymatter.api'; import { usePermission } from '/@/hooks/web/usePermission'; + import TaskHandleInnerContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue'; const { isDisabledAuth, hasPermission, initBpmFormData} = usePermission(); const props = defineProps({ formDisabled: { type: Boolean, default: false }, formData: { type: Object, default: () => ({}) }, formBpm: { type: Boolean, default: true }, + claim: { type: Boolean, default: false }, }); initBpmFormData(props.formData); - const emit = defineEmits(['ok']); + const emit = defineEmits(['ok', 'success', 'claimSuccess']); const { createMessage } = useMessage(); const queryByIdUrl = '/bgpartymatter/bgPartymatter/queryById'; @@ -238,6 +251,8 @@ return props.formDisabled; }); + const showProcessHandle = computed(() => props.formBpm && !!props.formData?.taskId); + const processInfo = computed(() => ({ taskId: props.formData?.taskId, taskDefKey: props.formData?.taskDefKey, @@ -341,6 +356,14 @@ } } + function handleProcessSuccess() { + emit('success'); + } + + function handleClaimSuccess() { + emit('claimSuccess'); + } + defineExpose({ submitForm, initFormData, diff --git a/src/views/super/bpm/process/components/BpmDynamicForm.vue b/src/views/super/bpm/process/components/BpmDynamicForm.vue index 838bc79..5653948 100644 --- a/src/views/super/bpm/process/components/BpmDynamicForm.vue +++ b/src/views/super/bpm/process/components/BpmDynamicForm.vue @@ -15,7 +15,15 @@