feat: 将我发起的流程列表独立出来，改为tab中打开，调整审批记录的样式
This commit is contained in:
gaoyunqi
@ -9,13 +9,13 @@
|
||||
</slot>
|
||||
关闭
|
||||
</a-button>
|
||||
<a-button type="primary" @click="onApproveClick">
|
||||
<a-button v-if="!readonly" type="primary" @click="onApproveClick">
|
||||
<slot name="icon">
|
||||
<check-circle-outlined />
|
||||
</slot>
|
||||
同意
|
||||
</a-button>
|
||||
<a-button @click="onDenyClick">
|
||||
<a-button v-if="!readonly" @click="onDenyClick">
|
||||
<slot name="icon">
|
||||
<stop-outlined />
|
||||
</slot>
|
||||
@ -24,8 +24,8 @@
|
||||
<a-dropdown>
|
||||
<template #overlay>
|
||||
<a-menu @click="onMoreClick">
|
||||
<a-menu-item key="terminate">终止</a-menu-item>
|
||||
<a-menu-item key="transfer">转办</a-menu-item>
|
||||
<a-menu-item v-if="!readonly" key="terminate">终止</a-menu-item>
|
||||
<a-menu-item v-if="!readonly" key="transfer">转办</a-menu-item>
|
||||
<a-menu-item key="flowchart">查看流程图</a-menu-item>
|
||||
</a-menu>
|
||||
</template>
|
||||
@ -39,7 +39,7 @@
|
||||
<FormInformation
|
||||
:key="renderKey"
|
||||
ref="formInformation"
|
||||
:disabled="false"
|
||||
:disabled="readonly"
|
||||
:formAssignmentData="data.formAssignmentData"
|
||||
:formInfos="data.formInfos"
|
||||
:opinions="data.opinions"
|
||||
@ -66,8 +66,11 @@
|
||||
import { useMultipleTabStore } from '/@/store/modules/multipleTab';
|
||||
import Title from '/@/components/Title/src/Title.vue';
|
||||
import FlowHistory from '/@/components/SecondDev/FlowHistory.vue';
|
||||
import { message } from 'ant-design-vue';
|
||||
import useEventBus from '/@/hooks/event/useEventBus';
|
||||
|
||||
const { data, approveUserData, initProcessData, notificationError, notificationSuccess } = userTaskItem();
|
||||
const { bus, FLOW_PROCESSED } = useEventBus();
|
||||
|
||||
const tabStore = useMultipleTabStore();
|
||||
const router = useRouter();
|
||||
@ -77,6 +80,7 @@
|
||||
const schemaId = ref(rParams.arg1);
|
||||
const taskId = ref(rQuery.taskId);
|
||||
const processId = ref(rParams.arg2);
|
||||
const readonly = ref(!!rQuery.readonly); // 查看流程会触发只读模式
|
||||
const renderKey = ref('');
|
||||
const formConfigs = ref();
|
||||
const opinionDlg = ref();
|
||||
@ -140,6 +144,21 @@
|
||||
});
|
||||
}
|
||||
|
||||
function flowSuccess() {
|
||||
opinionDlg.value.toggleDialog({
|
||||
isClose: true
|
||||
});
|
||||
message.success('操作成功');
|
||||
setTimeout(() => {
|
||||
bus.emit(FLOW_PROCESSED);
|
||||
close();
|
||||
}, 500);
|
||||
}
|
||||
|
||||
function flowFail() {
|
||||
opinionDlg.value.stopLoading();
|
||||
}
|
||||
|
||||
function reset() {
|
||||
approvalData.isAddOrSubSign = false;
|
||||
approvalData.stampInfo = {
|
||||
@ -155,8 +174,8 @@
|
||||
}
|
||||
|
||||
function getTaskRecords() {
|
||||
if (data.taskRecords.length) {
|
||||
return data.taskRecords[0]?.records || [];
|
||||
if (data?.taskApproveOpinions?.length) {
|
||||
return data.taskApproveOpinions || [];
|
||||
}
|
||||
}
|
||||
|
||||
@ -165,23 +184,24 @@
|
||||
try {
|
||||
let res = await getApprovalProcess(unref(taskId), unref(processId));
|
||||
initProcessData(res);
|
||||
if (res.buttonConfigs) {
|
||||
approvalData.buttonConfigs = res.buttonConfigs;
|
||||
}
|
||||
if (res.relationTasks) {
|
||||
data.predecessorTasks = res.relationTasks;
|
||||
}
|
||||
if (res.isAddOrSubSign) {
|
||||
approvalData.isAddOrSubSign = res.isAddOrSubSign;
|
||||
}
|
||||
|
||||
approvalData.approvedType = ApproveType.AGREE;
|
||||
approvedType.value = ApproveType.AGREE;
|
||||
approvalData.approvedContent = '';
|
||||
approvalData.rejectNodeActivityId = '';
|
||||
approvalData.rejectNodeActivityIds = [];
|
||||
approvalData.circulateConfigs = [];
|
||||
if (!readonly.value) {
|
||||
if (res.buttonConfigs) {
|
||||
approvalData.buttonConfigs = res.buttonConfigs;
|
||||
}
|
||||
if (res.relationTasks) {
|
||||
data.predecessorTasks = res.relationTasks;
|
||||
}
|
||||
if (res.isAddOrSubSign) {
|
||||
approvalData.isAddOrSubSign = res.isAddOrSubSign;
|
||||
}
|
||||
|
||||
approvalData.approvedType = ApproveType.AGREE;
|
||||
approvedType.value = ApproveType.AGREE;
|
||||
approvalData.approvedContent = '';
|
||||
approvalData.rejectNodeActivityId = '';
|
||||
approvalData.rejectNodeActivityIds = [];
|
||||
approvalData.circulateConfigs = [];
|
||||
}
|
||||
renderKey.value = Math.random() + '';
|
||||
} catch (error) {}
|
||||
} else {
|
||||
@ -253,38 +273,12 @@
|
||||
try {
|
||||
if (/*validateSuccess.value*/ true) {
|
||||
let params = await getApproveParams();
|
||||
let res = await postApproval(params);
|
||||
// 下一节点审批人
|
||||
let taskList = [];
|
||||
if (res && res.length > 0) {
|
||||
taskList = res
|
||||
.filter((ele) => {
|
||||
return ele.isMultiInstance == false && ele.isAppoint == true;
|
||||
})
|
||||
.map((ele) => {
|
||||
return {
|
||||
taskId: ele.taskId,
|
||||
taskName: ele.taskName,
|
||||
provisionalApprover: ele.provisionalApprover,
|
||||
selectIds: []
|
||||
};
|
||||
});
|
||||
if (taskList.length > 0) {
|
||||
approveUserData.list = taskList;
|
||||
approveUserData.schemaId = props.schemaId;
|
||||
approveUserData.visible = true;
|
||||
data.submitLoading = false;
|
||||
} else {
|
||||
opinionDlg.value.toggleDialog({ isClose: true });
|
||||
data.submitLoading = false;
|
||||
save(true, t('审批流程'));
|
||||
}
|
||||
} else {
|
||||
opinionDlg.value.toggleDialog({ isClose: true });
|
||||
data.submitLoading = false;
|
||||
save(true, t('审批流程'));
|
||||
}
|
||||
await postApproval(params);
|
||||
flowSuccess();
|
||||
data.submitLoading = false;
|
||||
}
|
||||
} catch (error) {}
|
||||
} catch (error) {
|
||||
flowFail();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user