代码生成器修改，流程新建，表单新建，流程审批等页面修改
This commit is contained in:
GAOANG
@ -36,16 +36,9 @@
|
||||
</a-dropdown>
|
||||
</a-space>
|
||||
</div>
|
||||
<FormInformation
|
||||
:key="renderKey"
|
||||
ref="formInformation"
|
||||
:disabled="readonly"
|
||||
:formAssignmentData="data.formAssignmentData"
|
||||
:formInfos="data.formInfos"
|
||||
:opinions="data.opinions"
|
||||
:opinionsComponents="data.opinionsComponents"
|
||||
@get-form-configs="(config) => (formConfigs = config)"
|
||||
/>
|
||||
<FormInformation :key="renderKey" ref="formInformation" :disabled="readonly"
|
||||
:formAssignmentData="data.formAssignmentData" :formInfos="data.formInfos" :opinions="data.opinions"
|
||||
:opinionsComponents="data.opinionsComponents" @get-form-configs="(config) => (formConfigs = config)" />
|
||||
<Title :font-size="18" default-value="流转信息"></Title>
|
||||
<flow-history :items="getTaskRecords()"></flow-history>
|
||||
<opinion-dialog ref="opinionDlg" />
|
||||
@ -54,231 +47,231 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { useRouter } from 'vue-router';
|
||||
import { onMounted, reactive, ref, unref } from 'vue';
|
||||
import FormInformation from '/@/views/secondDev/FormInformation.vue';
|
||||
import userTaskItem from '/@/views/workflow/task/hooks/userTaskItem';
|
||||
import { getApprovalProcess, postApproval, postGetNextTaskMaybeArrival } 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';
|
||||
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';
|
||||
import { useRouter } from 'vue-router';
|
||||
import { onMounted, reactive, ref, unref } from 'vue';
|
||||
import FormInformation from '/@/views/secondDev/FormInformation.vue';
|
||||
import userTaskItem from '/@/views/workflow/task/hooks/userTaskItem';
|
||||
import { getApprovalProcess, postApproval, postGetNextTaskMaybeArrival } 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';
|
||||
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 { data, approveUserData, initProcessData, notificationError, notificationSuccess } = userTaskItem();
|
||||
const { bus, FLOW_PROCESSED } = useEventBus();
|
||||
|
||||
const tabStore = useMultipleTabStore();
|
||||
const router = useRouter();
|
||||
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 readonly = ref(!!rQuery.readonly); // 查看流程会触发只读模式
|
||||
const renderKey = ref('');
|
||||
const formConfigs = ref();
|
||||
const opinionDlg = ref();
|
||||
const validateSuccess = ref(false);
|
||||
const formInformation = ref();
|
||||
const tabStore = useMultipleTabStore();
|
||||
const router = useRouter();
|
||||
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 readonly = ref(!!rQuery.readonly); // 查看流程会触发只读模式
|
||||
const renderKey = ref('');
|
||||
const formConfigs = ref();
|
||||
const opinionDlg = ref();
|
||||
const validateSuccess = ref(false);
|
||||
const formInformation = ref();
|
||||
|
||||
let approvalData = reactive({
|
||||
isCountersign: false,
|
||||
isAddOrSubSign: false,
|
||||
stampInfo: {
|
||||
stampId: '',
|
||||
password: ''
|
||||
},
|
||||
buttonConfigs: [],
|
||||
approvedType: ApproveType.AGREE,
|
||||
approvedResult: ApproveCode.AGREE,
|
||||
approvedContent: '',
|
||||
rejectNodeActivityId: '',
|
||||
rejectNodeActivityIds: [],
|
||||
circulateConfigs: [],
|
||||
nextTaskUser: {} // 格式为taskKey: 用户id（逗号分隔）
|
||||
});
|
||||
let approvedType = ref(ApproveType.AGREE);
|
||||
let approvalData = reactive({
|
||||
isCountersign: false,
|
||||
isAddOrSubSign: false,
|
||||
stampInfo: {
|
||||
stampId: '',
|
||||
password: ''
|
||||
},
|
||||
buttonConfigs: [],
|
||||
approvedType: ApproveType.AGREE,
|
||||
approvedResult: ApproveCode.AGREE,
|
||||
approvedContent: '',
|
||||
rejectNodeActivityId: '',
|
||||
rejectNodeActivityIds: [],
|
||||
circulateConfigs: [],
|
||||
nextTaskUser: {} // 格式为taskKey: 用户id（逗号分隔）
|
||||
});
|
||||
let approvedType = ref(ApproveType.AGREE);
|
||||
|
||||
function onMoreClick() {}
|
||||
function onMoreClick() { }
|
||||
|
||||
function close() {
|
||||
tabStore.closeTab(currentRoute, router);
|
||||
}
|
||||
function close() {
|
||||
tabStore.closeTab(currentRoute, router);
|
||||
}
|
||||
|
||||
async function onApproveClick() {
|
||||
await submit();
|
||||
const params = await getApproveParams();
|
||||
const nextNodes = await postGetNextTaskMaybeArrival(params);
|
||||
approvalData.approvedType = ApproveType.AGREE;
|
||||
approvalData.approvedResult = ApproveCode.AGREE;
|
||||
opinionDlg.value.toggleDialog({
|
||||
action: 'agree',
|
||||
nextNodes,
|
||||
callback: (args) => {
|
||||
approvalData.approvedContent = args.opinion;
|
||||
approvalData.nextTaskUser = args.nextTaskUser;
|
||||
onFinish({});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
async function onDenyClick() {
|
||||
approvalData.approvedType = ApproveType.REJECT;
|
||||
approvalData.approvedResult = ApproveCode.REJECT;
|
||||
opinionDlg.value.toggleDialog({
|
||||
action: 'reject',
|
||||
processId: processId.value,
|
||||
taskId: taskId.value,
|
||||
callback: (args) => {
|
||||
approvalData.approvedContent = args.opinion;
|
||||
approvalData.rejectNodeActivityId = args.rejectNodeId;
|
||||
approvalData.nextTaskUser = args.nextTaskUser;
|
||||
onFinish({});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
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 = {
|
||||
stampId: '',
|
||||
password: ''
|
||||
};
|
||||
approvalData.buttonConfigs = [];
|
||||
approvalData.approvedType = ApproveType.AGREE;
|
||||
approvalData.approvedContent = '';
|
||||
approvalData.rejectNodeActivityId = '';
|
||||
approvalData.rejectNodeActivityIds = [];
|
||||
approvalData.circulateConfigs = [];
|
||||
}
|
||||
|
||||
function getTaskRecords() {
|
||||
if (data?.taskApproveOpinions?.length) {
|
||||
return data.taskApproveOpinions || [];
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
if (unref(taskId)) {
|
||||
try {
|
||||
let res = await getApprovalProcess(unref(taskId), unref(processId));
|
||||
initProcessData(res);
|
||||
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 {
|
||||
async function onApproveClick() {
|
||||
await submit();
|
||||
const params = await getApproveParams();
|
||||
const nextNodes = await postGetNextTaskMaybeArrival(params);
|
||||
approvalData.approvedType = ApproveType.AGREE;
|
||||
approvalData.approvedResult = ApproveCode.AGREE;
|
||||
opinionDlg.value.toggleDialog({
|
||||
action: 'agree',
|
||||
nextNodes,
|
||||
callback: (args) => {
|
||||
approvalData.approvedContent = args.opinion;
|
||||
approvalData.nextTaskUser = args.nextTaskUser;
|
||||
onFinish({});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
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('审批流程失败'));
|
||||
async function onDenyClick() {
|
||||
approvalData.approvedType = ApproveType.REJECT;
|
||||
approvalData.approvedResult = ApproveCode.REJECT;
|
||||
opinionDlg.value.toggleDialog({
|
||||
action: 'reject',
|
||||
processId: processId.value,
|
||||
taskId: taskId.value,
|
||||
callback: (args) => {
|
||||
approvalData.approvedContent = args.opinion;
|
||||
approvalData.rejectNodeActivityId = args.rejectNodeId;
|
||||
approvalData.nextTaskUser = args.nextTaskUser;
|
||||
onFinish({});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
function flowSuccess() {
|
||||
opinionDlg.value.toggleDialog({
|
||||
isClose: true
|
||||
});
|
||||
message.success('操作成功');
|
||||
setTimeout(() => {
|
||||
bus.emit(FLOW_PROCESSED);
|
||||
close();
|
||||
}, 500);
|
||||
}
|
||||
|
||||
async function getApproveParams() {
|
||||
let formModels = await formInformation.value.getFormModels();
|
||||
let system = formInformation.value.getSystemType();
|
||||
let fileFolderIds = getUploadFileFolderIds(formModels);
|
||||
return {
|
||||
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,
|
||||
nextTaskUser: approvalData.nextTaskUser
|
||||
};
|
||||
}
|
||||
function flowFail() {
|
||||
opinionDlg.value.stopLoading();
|
||||
}
|
||||
|
||||
async function onFinish(values) {
|
||||
function reset() {
|
||||
approvalData.isAddOrSubSign = false;
|
||||
approvalData.stampInfo = {
|
||||
stampId: '',
|
||||
password: ''
|
||||
};
|
||||
approvalData.buttonConfigs = [];
|
||||
approvalData.approvedType = ApproveType.AGREE;
|
||||
approvalData.approvedContent = '';
|
||||
approvalData.rejectNodeActivityId = '';
|
||||
approvalData.rejectNodeActivityIds = [];
|
||||
approvalData.circulateConfigs = [];
|
||||
}
|
||||
|
||||
function getTaskRecords() {
|
||||
if (data?.taskApproveOpinions?.length) {
|
||||
return data.taskApproveOpinions || [];
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
if (unref(taskId)) {
|
||||
try {
|
||||
if (/*validateSuccess.value*/ true) {
|
||||
let params = await getApproveParams();
|
||||
await postApproval(params);
|
||||
flowSuccess();
|
||||
let res = await getApprovalProcess(unref(taskId), unref(processId));
|
||||
initProcessData(res);
|
||||
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 {
|
||||
}
|
||||
});
|
||||
|
||||
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) {
|
||||
flowFail();
|
||||
}
|
||||
} 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 getApproveParams() {
|
||||
let formModels = await formInformation.value.getFormModels();
|
||||
let system = formInformation.value.getSystemType();
|
||||
let fileFolderIds = getUploadFileFolderIds(formModels);
|
||||
return {
|
||||
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,
|
||||
nextTaskUser: approvalData.nextTaskUser
|
||||
};
|
||||
}
|
||||
|
||||
async function onFinish(values) {
|
||||
try {
|
||||
if (/*validateSuccess.value*/ true) {
|
||||
let params = await getApproveParams();
|
||||
await postApproval(params);
|
||||
flowSuccess();
|
||||
data.submitLoading = false;
|
||||
}
|
||||
} catch (error) {
|
||||
flowFail();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user