fix: 移除新增的tabKey，调整对应的路由设计，方便关闭路由和修改标题
feat: 新样式的退回操作对话框
This commit is contained in:
gaoyunqi
@ -24,9 +24,9 @@
|
||||
<a-dropdown>
|
||||
<template #overlay>
|
||||
<a-menu @click="onMoreClick">
|
||||
<a-menu-item key="1">退回</a-menu-item>
|
||||
<a-menu-item key="2">终止</a-menu-item>
|
||||
<a-menu-item key="3">转办</a-menu-item>
|
||||
<a-menu-item key="terminate">终止</a-menu-item>
|
||||
<a-menu-item key="transfer">转办</a-menu-item>
|
||||
<a-menu-item key="flowchart">查看流程图</a-menu-item>
|
||||
</a-menu>
|
||||
</template>
|
||||
<a-button>
|
||||
@ -56,22 +56,26 @@
|
||||
import { onMounted, reactive, ref, unref } from 'vue';
|
||||
import FormInformation from '/@/views/secondDev/FormInformation.vue';
|
||||
import userTaskItem from '/@/views/workflow/task/hooks/userTaskItem';
|
||||
import { getApprovalProcess } from '/@/api/workflow/task';
|
||||
import { getApprovalProcess, postApproval } from '/@/api/workflow/task';
|
||||
import { ApproveCode, ApproveType } from '/@/enums/workflowEnum';
|
||||
import { CheckCircleOutlined, StopOutlined, CloseOutlined, DownOutlined } from '@ant-design/icons-vue';
|
||||
import OpinionDialog from '/@/components/SecondDev/OpinionDialog.vue';
|
||||
import { separator } from '/@bpmn/config/info';
|
||||
|
||||
const { data, initProcessData } = userTaskItem();
|
||||
const { data, approveUserData, initProcessData, notificationError, notificationSuccess } = userTaskItem();
|
||||
|
||||
const router = useRouter();
|
||||
const { currentRoute } = router;
|
||||
const rParams = currentRoute.value.query;
|
||||
//const schemaId = ref(rParams.schemaId);
|
||||
const taskId = ref(rParams.taskId);
|
||||
const processId = ref(rParams.processId);
|
||||
const currentRoute = router.currentRoute.value;
|
||||
const rQuery = currentRoute.query;
|
||||
const rParams = currentRoute.params;
|
||||
const schemaId = ref(rParams.arg1);
|
||||
const taskId = ref(rQuery.taskId);
|
||||
const processId = ref(rParams.arg2);
|
||||
const renderKey = ref('');
|
||||
const formConfigs = ref();
|
||||
const opinionDlg = ref();
|
||||
const validateSuccess = ref(false);
|
||||
const formInformation = ref();
|
||||
|
||||
let approvalData = reactive({
|
||||
isCountersign: false,
|
||||
@ -92,18 +96,44 @@
|
||||
|
||||
function onMoreClick() {}
|
||||
|
||||
function onApproveClick() {
|
||||
async function onApproveClick() {
|
||||
await submit();
|
||||
approvalData.approvedType = ApproveType.AGREE;
|
||||
approvalData.approvedResult = ApproveCode.AGREE;
|
||||
opinionDlg.value.toggleDialog({
|
||||
action: 'approve'
|
||||
action: 'agree'
|
||||
});
|
||||
}
|
||||
|
||||
function onDenyClick() {
|
||||
async function onDenyClick() {
|
||||
approvalData.approvedType = ApproveType.REJECT;
|
||||
approvalData.approvedResult = ApproveCode.REJECT;
|
||||
opinionDlg.value.toggleDialog({
|
||||
action: 'deny'
|
||||
action: 'reject',
|
||||
processId: processId.value,
|
||||
taskId: taskId.value,
|
||||
callback: (args) => {
|
||||
approvalData.approvedContent = args.opinion;
|
||||
approvalData.rejectNodeActivityId = args.rejectNodeId;
|
||||
onFinish({});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function reset() {
|
||||
approvalData.isAddOrSubSign = false;
|
||||
approvalData.stampInfo = {
|
||||
stampId: '',
|
||||
password: ''
|
||||
};
|
||||
approvalData.buttonConfigs = [];
|
||||
approvalData.approvedType = ApproveType.AGREE;
|
||||
approvalData.approvedContent = '';
|
||||
approvalData.rejectNodeActivityId = '';
|
||||
approvalData.rejectNodeActivityIds = [];
|
||||
approvalData.circulateConfigs = [];
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
if (unref(taskId)) {
|
||||
try {
|
||||
@ -131,4 +161,100 @@
|
||||
} else {
|
||||
}
|
||||
});
|
||||
|
||||
async function submit() {
|
||||
data.submitLoading = true;
|
||||
validateSuccess.value = false;
|
||||
try {
|
||||
let validateForms = await formInformation.value.validateForm();
|
||||
if (validateForms.length > 0) {
|
||||
let successValidate = validateForms.filter((ele) => {
|
||||
return ele.validate;
|
||||
});
|
||||
if (successValidate.length == validateForms.length) {
|
||||
validateSuccess.value = true;
|
||||
data.submitLoading = false;
|
||||
} else {
|
||||
data.submitLoading = false;
|
||||
notificationError(t('审批流程'), t('表单校验未通过'));
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
data.submitLoading = false;
|
||||
notificationError(t('审批流程'), t('审批流程失败'));
|
||||
}
|
||||
}
|
||||
|
||||
function getUploadFileFolderIds(formModels) {
|
||||
let fileFolderIds = [];
|
||||
let uploadComponentIds = formInformation.value.getUploadComponentIds();
|
||||
uploadComponentIds.forEach((ids) => {
|
||||
if (ids.includes(separator)) {
|
||||
let arr = ids.split(separator);
|
||||
if (arr.length == 2 && formModels[arr[0]][arr[1]]) {
|
||||
fileFolderIds.push(formModels[arr[0]][arr[1]]);
|
||||
} else if (arr.length == 3 && formModels[arr[0]][arr[1]] && Array.isArray(formModels[arr[0]][arr[1]])) {
|
||||
formModels[arr[0]][arr[1]].forEach((o) => {
|
||||
fileFolderIds.push(o[arr[2]]);
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
return fileFolderIds;
|
||||
}
|
||||
|
||||
async function onFinish(values) {
|
||||
try {
|
||||
if (/*validateSuccess.value*/ true) {
|
||||
let formModels = await formInformation.value.getFormModels();
|
||||
let system = formInformation.value.getSystemType();
|
||||
let fileFolderIds = getUploadFileFolderIds(formModels);
|
||||
let params = {
|
||||
approvedType: approvalData.approvedType,
|
||||
approvedResult: approvalData.approvedResult, // approvalData.approvedType 审批结果 如果为 4 就需要传buttonCode
|
||||
approvedContent: approvalData.approvedContent,
|
||||
formData: formModels,
|
||||
rejectNodeActivityId: approvalData.rejectNodeActivityId,
|
||||
taskId: taskId.value,
|
||||
fileFolderIds,
|
||||
circulateConfigs: approvalData.circulateConfigs,
|
||||
stampId: values.stampId,
|
||||
stampPassword: values.password,
|
||||
isOldSystem: system
|
||||
};
|
||||
|
||||
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('审批流程'));
|
||||
}
|
||||
}
|
||||
} catch (error) {}
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -71,10 +71,11 @@
|
||||
|
||||
const { t } = useI18n();
|
||||
const { data, approveUserData, initProcessData, notificationSuccess, notificationError } = userTaskItem();
|
||||
const currentRoute = router.currentRoute;
|
||||
const rParams = currentRoute.value.query;
|
||||
const rSchemaId = rParams.schemaId;
|
||||
const rDraftsId = rParams.draftsId;
|
||||
const currentRoute = router.currentRoute.value;
|
||||
const rParams = currentRoute.params;
|
||||
const fullPath = currentRoute.fullPath;
|
||||
const rSchemaId = rParams.arg1;
|
||||
const rDraftsId = rParams.arg2;
|
||||
const draftsJsonStr = localStorage.getItem('draftsJsonStr');
|
||||
let formInformation = ref();
|
||||
let pageMode = 'new';
|
||||
@ -147,9 +148,8 @@
|
||||
let res = await getStartProcessInfo(rSchemaId);
|
||||
const title = res?.schemaInfo?.name;
|
||||
if (title) {
|
||||
const tabKey = `${pageMode}_${pageMode === 'new' ? rSchemaId : rDraftsId}`;
|
||||
const tabPrefix = pageMode === 'new' ? '新建' : '草稿';
|
||||
tabStore.changeTitle(tabKey, `${tabPrefix}：${title}`);
|
||||
tabStore.changeTitle(fullPath, `${tabPrefix}：${title}`);
|
||||
}
|
||||
initProcessData(res);
|
||||
}
|
||||
@ -179,7 +179,7 @@
|
||||
try {
|
||||
disableSubmit.value = true;
|
||||
let formModels = await formInformation.value.saveDraftData();
|
||||
if (rDraftsId) {
|
||||
if (rDraftsId !== '0') {
|
||||
let res = await putDraft(rSchemaId, formModels, rDraftsId, props.rowKeyData);
|
||||
showResult(res, t('保存草稿'));
|
||||
} else {
|
||||
|
||||
@ -94,17 +94,16 @@
|
||||
];
|
||||
const selectedKeys = ref(['ToDoTasks']);
|
||||
const query = unref(currentRoute).query;
|
||||
let id = query.name;
|
||||
const tabKey = query.tabKey as string;
|
||||
let id = 'ToDoTasks';
|
||||
const lHash = location.hash;
|
||||
if (lHash.indexOf('/draft') > 0) {
|
||||
id = 'Drafts';
|
||||
}
|
||||
let data = reactive({
|
||||
componentName: shallowRef(ToDoTasks)
|
||||
});
|
||||
if (id) {
|
||||
selectedKeys.value = [id.toString()];
|
||||
const tabName = treeData.find((item) => item.id === id)?.name;
|
||||
if (tabName && tabKey) {
|
||||
tabStore.changeTitle(tabKey, tabName);
|
||||
}
|
||||
handleSelect([id]);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user