diff --git a/src/views/super/bpm/process/personalOffice/myCcTask/CcTaskListContent.vue b/src/views/super/bpm/process/personalOffice/myCcTask/CcTaskListContent.vue
index 5e5d9d7..23efa47 100644
--- a/src/views/super/bpm/process/personalOffice/myCcTask/CcTaskListContent.vue
+++ b/src/views/super/bpm/process/personalOffice/myCcTask/CcTaskListContent.vue
@@ -97,6 +97,7 @@
formData,
formUrl,
title: '流程历史',
+ showSupplementApprovalOpinion: true,
});
if (props.isRead === 0 && record?.ccId) {
await reload();
diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/TaskHistoryList.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/TaskHistoryList.vue
index 66d3ecf..5de6f0f 100644
--- a/src/views/super/bpm/process/personalOffice/myHandleTask/TaskHistoryList.vue
+++ b/src/views/super/bpm/process/personalOffice/myHandleTask/TaskHistoryList.vue
@@ -34,6 +34,7 @@
formData,
formUrl,
title: '流程历史',
+ showSupplementApprovalOpinion: true,
});
}
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 d12d0b3..daead58 100644
--- a/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue
+++ b/src/views/super/bpm/process/personalOffice/myHandleTask/modal/TaskHandleModal.vue
@@ -37,6 +37,11 @@
流程图
+
+
+ 增补意见
+
+
@@ -47,11 +52,12 @@
*/
import { BasicModal, useModalInner } from '/@/components/Modal';
import { ref , nextTick , computed, watch } from 'vue';
- import { UserOutlined, PartitionOutlined, FileTextOutlined, HistoryOutlined } from '@ant-design/icons-vue';
+ import { UserOutlined, PartitionOutlined, FileTextOutlined, HistoryOutlined, FormOutlined } from '@ant-design/icons-vue';
import TaskHandleInnerContent from '../content/TaskHandleInnerContent.vue';
import TaskTraceContent from '../content/TaskTraceContent.vue';
import BpmDynamicForm from '/@/views/super/bpm/process/components/BpmDynamicForm.vue';
import TaskApprovalHistoryContent from '../content/TaskApprovalHistoryContent.vue';
+ import TaskSupplementApprovalOpinionContent from '../content/TaskSupplementApprovalOpinionContent.vue';
export default {
name: 'TaskHandleModal',
@@ -61,16 +67,20 @@
FileTextOutlined,
PartitionOutlined,
HistoryOutlined,
+ FormOutlined,
TaskHandleInnerContent,
TaskTraceContent,
BpmDynamicForm,
TaskApprovalHistoryContent,
+ TaskSupplementApprovalOpinionContent,
},
emits: ['success', 'register'],
setup(_p, { emit }) {
const title = ref('流程办理');
const taskFormData = ref({});
const taskFormUrl = ref('');
+ const showSupplementApprovalOpinion = ref(false);
+ const activeKey = ref('1');
//是否需要签收
const claimStatus = ref(false);
//useModalInner
@@ -79,6 +89,8 @@
taskFormData.value = data.formData;
taskFormUrl.value = data.formUrl;
title.value = data.title;
+ activeKey.value = '1';
+ showSupplementApprovalOpinion.value = !!data.showSupplementApprovalOpinion;
if(data.isSignTask==true){
claimStatus.value = true
}else{
@@ -86,7 +98,6 @@
}
});
- const activeKey = ref('1');
const isEmbeddedHandleForm = computed(() => taskFormUrl.value?.includes('BgPartymatterBPMForm'));
const approvalHistoryRef = ref();
@@ -106,6 +117,12 @@
claimStatus.value = false;
}
+ function handleSupplementSuccess() {
+ nextTick(() => {
+ approvalHistoryRef.value?.reload();
+ });
+ }
+
watch(activeKey, (key) => {
if (key === '2') {
nextTick(() => {
@@ -122,8 +139,10 @@
taskFormData,
taskFormUrl,
handleSuccess,
+ handleSupplementSuccess,
claimStatus,
claimSuccess,
+ showSupplementApprovalOpinion,
modalRef,
parentNode,
isEmbeddedHandleForm
diff --git a/src/views/taskApprovalOpinion/TaskApprovalOpinion.api.ts b/src/views/taskApprovalOpinion/TaskApprovalOpinion.api.ts
index 680195b..3d925d6 100644
--- a/src/views/taskApprovalOpinion/TaskApprovalOpinion.api.ts
+++ b/src/views/taskApprovalOpinion/TaskApprovalOpinion.api.ts
@@ -7,6 +7,7 @@ enum Api {
list = '/taskapprovalopinion/taskApprovalOpinion/list',
save='/taskapprovalopinion/taskApprovalOpinion/add',
edit='/taskapprovalopinion/taskApprovalOpinion/edit',
+ supplement = '/taskapprovalopinion/taskApprovalOpinion/supplement',
deleteOne = '/taskapprovalopinion/taskApprovalOpinion/delete',
deleteBatch = '/taskapprovalopinion/taskApprovalOpinion/deleteBatch',
importExcel = '/taskapprovalopinion/taskApprovalOpinion/importExcel',
@@ -70,3 +71,11 @@ export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url: url, params }, { isTransformResponse: false });
}
+
+/**
+ * 提交增补审批意见,只写入 task_approval_opinion。
+ * @param params
+ */
+export const saveSupplementOpinion = (params) => {
+ return defHttp.post({ url: Api.supplement, data: params });
+}