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 @@
-
+
@@ -51,8 +59,13 @@
},
// 父级html
parentNode: { type: Object as PropType
},
+ claim: {
+ type: Boolean,
+ default: false,
+ },
},
- setup(props) {
+ emits: ['success', 'claimSuccess'],
+ setup(props, { emit }) {
const height = window.innerHeight - 120 + 'px';
/**
@@ -136,11 +149,21 @@
return /^http[s]?:\/\/.*/.test(s);
}
+ function handleSuccess() {
+ emit('success');
+ }
+
+ function handleClaimSuccess() {
+ emit('claimSuccess');
+ }
+
return {
height,
iframeUrl,
currentComponent,
- designFormInfo
+ designFormInfo,
+ handleSuccess,
+ handleClaimSuccess
};
},
};
diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue
index 5ad25e2..1109d4e 100644
--- a/src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue
+++ b/src/views/super/bpm/process/personalOffice/myHandleTask/content/MyHandleContent.vue
@@ -1,6 +1,6 @@
- 我的审批
+
@@ -20,9 +20,9 @@
-
-
-
+
+
+
@@ -41,7 +41,7 @@
-
+
{{ item.NAME_ }}
diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue
index 023ecc3..53ef832 100644
--- a/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue
+++ b/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue
@@ -14,13 +14,20 @@
附加单据
-
+
-
- 任务处理
-
-
+
+
+
+
流程图
@@ -73,6 +80,7 @@
});
const activeKey = ref('1');
+ const isEmbeddedHandleForm = computed(() => taskFormUrl.value?.includes('BgPartymatterBPMForm'));
// desformView 父级滚动条,只有传了此参数才会突破内部弹窗
const modalRef = ref();
@@ -100,7 +108,8 @@
claimStatus,
claimSuccess,
modalRef,
- parentNode
+ parentNode,
+ isEmbeddedHandleForm
};
},
};