From b2a415728547d5aa0fa77f5653ddb7b8e6a5a8a2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 24 一月 2025 13:08:48 +0800
Subject: [PATCH] !175 发布 5.3.0 新春版 祝大家新年快乐 Merge pull request !175 from 疯狂的狮子Li/dev
---
src/views/workflow/leave/leaveEdit.vue | 256 ++++++++++++++++++++++++++++++---------------------
1 files changed, 151 insertions(+), 105 deletions(-)
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index cdc7963..a8c1bfd 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -1,49 +1,20 @@
<template>
<div class="p-2">
<el-card shadow="never">
- <div style="display: flex;justify-content: space-between;">
- <div>
- <el-button :loading="buttonLoading"
- v-if="routeParams.type === 'add' || (routeParams.type === 'update' && form.processInstanceVo.businessStatus && (form.processInstanceVo.businessStatus === 'draft' || form.processInstanceVo.businessStatus === 'cancel' || form.processInstanceVo.businessStatus === 'back'))"
- type="info" @click="submitForm('draft')">鏆傚瓨</el-button>
- <el-button :loading="buttonLoading" v-if="routeParams.type === 'add' || (routeParams.type === 'update' && form.processInstanceVo && (form.processInstanceVo.businessStatus === 'draft' || form.processInstanceVo.businessStatus === 'cancel' || form.processInstanceVo.businessStatus === 'back'))"
- type="primary" @click="submitForm('submit')">鎻� 浜�</el-button>
- <el-button :loading="buttonLoading" v-if="routeParams.type === 'approval' && form.processInstanceVo && form.processInstanceVo.businessStatus === 'waiting'"
- type="primary" @click="approvalVerifyOpen">瀹℃壒</el-button>
- <el-button @click="handleApprovalRecord" type="primary" v-if="processInstanceId">娴佺▼杩涘害</el-button>
- </div>
- <div>
- <el-button style="float: right" @click="goBack()">杩斿洖</el-button>
- </div>
+ <div style="display: flex; justify-content: space-between">
+ <div>
+ <el-button v-if="submitButtonShow" :loading="buttonLoading" type="info" @click="submitForm('draft')">鏆傚瓨</el-button>
+ <el-button v-if="submitButtonShow" :loading="buttonLoading" type="primary" @click="submitForm('submit')">鎻� 浜�</el-button>
+ <el-button v-if="approvalButtonShow" :loading="buttonLoading" type="primary" @click="approvalVerifyOpen">瀹℃壒</el-button>
+ <el-button v-if="form && form.id && form.status !== 'draft'" type="primary" @click="handleApprovalRecord">娴佺▼杩涘害</el-button>
</div>
+ <div>
+ <el-button style="float: right" @click="goBack()">杩斿洖</el-button>
+ </div>
+ </div>
</el-card>
- <el-card shadow="never">
- <el-form ref="leaveFormRef" :disabled="routeParams.type ==='view'" v-loading="loading" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="璇峰亣绫诲瀷" prop="leaveType">
- <el-select v-model="form.leaveType" placeholder="璇烽�夋嫨璇峰亣绫诲瀷" style="width: 100%">
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
- </el-form-item>
- <el-form-item label="璇峰亣绫诲瀷" prop="leaveType">
- <el-select v-model="form.leaveType" placeholder="璇烽�夋嫨璇峰亣绫诲瀷" style="width: 100%">
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
- </el-form-item>
- <el-form-item label="璇峰亣绫诲瀷" prop="leaveType">
- <el-select v-model="form.leaveType" placeholder="璇烽�夋嫨璇峰亣绫诲瀷" style="width: 100%">
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
- </el-form-item>
- <el-form-item label="璇峰亣绫诲瀷" prop="leaveType">
- <el-select v-model="form.leaveType" placeholder="璇烽�夋嫨璇峰亣绫诲瀷" style="width: 100%">
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
- </el-form-item>
- <el-form-item label="璇峰亣绫诲瀷" prop="leaveType">
- <el-select v-model="form.leaveType" placeholder="璇烽�夋嫨璇峰亣绫诲瀷" style="width: 100%">
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
- </el-form-item>
+ <el-card shadow="never" style="height: 78vh; overflow-y: auto">
+ <el-form ref="leaveFormRef" v-loading="loading" :disabled="routeParams.type === 'view'" :model="form" :rules="rules" label-width="80px">
<el-form-item label="璇峰亣绫诲瀷" prop="leaveType">
<el-select v-model="form.leaveType" placeholder="璇烽�夋嫨璇峰亣绫诲瀷" style="width: 100%">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
@@ -52,10 +23,12 @@
<el-form-item label="璇峰亣鏃堕棿">
<el-date-picker
v-model="leaveTime"
+ value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
range-separator="To"
start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
+ :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
@change="changeLeaveTime()"
/>
</el-form-item>
@@ -71,6 +44,17 @@
<submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
<!-- 瀹℃壒璁板綍 -->
<approvalRecord ref="approvalRecordRef" />
+ <el-dialog v-model="dialogVisible.visible" :title="dialogVisible.title" :before-close="handleClose" width="500">
+ <el-select v-model="flowCode" placeholder="Select" style="width: 240px">
+ <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+ </el-select>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button @click="handleClose">鍙栨秷</el-button>
+ <el-button type="primary" @click="submitFlow()"> 纭 </el-button>
+ </div>
+ </template>
+ </el-dialog>
</div>
</template>
@@ -81,16 +65,14 @@
import SubmitVerify from '@/components/Process/submitVerify.vue';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
import { AxiosResponse } from 'axios';
-
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const buttonLoading = ref(false);
const loading = ref(true);
const leaveTime = ref<Array<string>>([]);
-//娴佺▼瀹炰緥id
-const processInstanceId = ref('');
-//璺敱鍙傛暟
-const routeParams = ref<Record<string, any>>({})
+//璺敱鍙傛暟
+const routeParams = ref<Record<string, any>>({});
const options = [
{
value: '1',
@@ -109,6 +91,35 @@
label: '濠氬亣'
}
];
+const flowCodeOptions = [
+ {
+ value: 'leave1',
+ label: '璇峰亣鐢宠-鏅��'
+ },
+ {
+ value: 'leave2',
+ label: '璇峰亣鐢宠-鎺掍粬缃戝叧'
+ },
+ {
+ value: 'leave3',
+ label: '璇峰亣鐢宠-骞惰缃戝叧'
+ },
+ {
+ value: 'leave4',
+ label: '璇峰亣鐢宠-浼氱'
+ },
+ {
+ value: 'leave5',
+ label: '璇峰亣鐢宠-骞惰浼氱缃戝叧'
+ }
+];
+
+const flowCode = ref<string>('');
+
+const dialogVisible = reactive<DialogOption>({
+ visible: false,
+ title: '娴佺▼瀹氫箟'
+});
//鎻愪氦缁勪欢
const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
//瀹℃壒璁板綍缁勪欢
@@ -116,13 +127,12 @@
const leaveFormRef = ref<ElFormInstance>();
-const submitFormData = ref<Record<string, any>>({
- businessKey: '',
- processKey: '',
+const submitFormData = ref<StartProcessBo>({
+ businessId: '',
+ flowCode: '',
variables: {}
});
const taskVariables = ref<Record<string, any>>({});
-
const initFormData: LeaveForm = {
id: undefined,
@@ -131,7 +141,7 @@
endDate: undefined,
leaveDays: undefined,
remark: undefined,
- processInstanceVo: {}
+ status: undefined
};
const data = reactive<PageData<LeaveForm, LeaveQuery>>({
form: { ...initFormData },
@@ -149,8 +159,12 @@
}
});
+const handleClose = () => {
+ dialogVisible.visible = false;
+ flowCode.value = '';
+ buttonLoading.value = false;
+};
const { form, rules } = toRefs(data);
-
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
@@ -163,11 +177,11 @@
const startDate = new Date(leaveTime.value[0]).getTime();
const endDate = new Date(leaveTime.value[1]).getTime();
const diffInMilliseconds = endDate - startDate;
- form.value.leaveDays = Math.floor(diffInMilliseconds / (1000 * 60 * 60 * 24));
+ form.value.leaveDays = Math.floor(diffInMilliseconds / (1000 * 60 * 60 * 24)) + 1;
};
/** 鑾峰彇璇︽儏 */
const getInfo = () => {
- loading.value = true
+ loading.value = true;
buttonLoading.value = false;
nextTick(async () => {
const res = await getLeave(routeParams.value.id);
@@ -175,10 +189,7 @@
leaveTime.value = [];
leaveTime.value.push(form.value.startDate);
leaveTime.value.push(form.value.endDate);
- if(form.value.processInstanceVo){
- processInstanceId.value = form.value.processInstanceVo.id
- }
- loading.value = false
+ loading.value = false;
buttonLoading.value = false;
});
};
@@ -189,74 +200,109 @@
proxy?.$modal.msgError('璇峰亣鏃堕棿涓嶈兘涓虹┖');
return;
}
- leaveFormRef.value?.validate(async (valid: boolean) => {
- form.value.startDate = leaveTime.value[0];
- form.value.endDate = leaveTime.value[1];
- if (valid) {
- buttonLoading.value = true;
- let res: AxiosResponse<LeaveVO>;
- if (form.value.id) {
- res = await updateLeave(form.value);
- } else {
- res = await addLeave(form.value);
+ try {
+ leaveFormRef.value?.validate(async (valid: boolean) => {
+ form.value.startDate = leaveTime.value[0];
+ form.value.endDate = leaveTime.value[1];
+ if (valid) {
+ buttonLoading.value = true;
+ let res: AxiosResponse<LeaveVO>;
+ if (form.value.id) {
+ res = await updateLeave(form.value);
+ } else {
+ res = await addLeave(form.value);
+ }
+ form.value = res.data;
+ if (status === 'draft') {
+ buttonLoading.value = false;
+ proxy?.$modal.msgSuccess('鏆傚瓨鎴愬姛');
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.go(-1);
+ } else {
+ if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+ flowCode.value = flowCodeOptions[0].value;
+ dialogVisible.visible = true;
+ return;
+ }
+ //璇存槑鍚姩杩囧厛闅忔剰绌夸釜鍙傛暟
+ if (flowCode.value === '' || flowCode.value === null) {
+ flowCode.value = 'xx';
+ }
+ await handleStartWorkFlow(res.data);
+ }
}
- form.value = res.data;
- if (status === 'draft') {
- buttonLoading.value = false;
- proxy?.$modal.msgSuccess('鏆傚瓨鎴愬姛');
- proxy.$tab.closePage(proxy.$route);
- proxy.$router.go(-1)
- } else {
- await handleStartWorkFlow(res.data);
- }
- }
- });
+ });
+ } finally {
+ buttonLoading.value = false;
+ }
};
+const submitFlow = async () => {
+ handleStartWorkFlow(form.value);
+ dialogVisible.visible = false;
+};
//鎻愪氦鐢宠
-const handleStartWorkFlow = async (data: LeaveVO) => {
- submitFormData.value.processKey = 'test';
- submitFormData.value.businessKey = data.id;
- //娴佺▼鍙橀噺
- taskVariables.value = {
- entity: data,
- leaveDays: data.leaveDays,
- userList: [1, 2],
- userList2: [1, 2]
- };
- submitFormData.value.variables = taskVariables.value;
- const resp = await startWorkFlow(submitFormData.value);
- if (submitVerifyRef.value) {
+const handleStartWorkFlow = async (data: LeaveForm) => {
+ try {
+ submitFormData.value.flowCode = flowCode.value;
+ submitFormData.value.businessId = data.id;
+ //娴佺▼鍙橀噺
+ taskVariables.value = {
+ leaveDays: data.leaveDays,
+ userList: ['1', '3', '4']
+ };
+ submitFormData.value.variables = taskVariables.value;
+ const resp = await startWorkFlow(submitFormData.value);
+ if (submitVerifyRef.value) {
+ buttonLoading.value = false;
+ submitVerifyRef.value.openDialog(resp.data.taskId);
+ }
+ } finally {
buttonLoading.value = false;
- submitVerifyRef.value.openDialog(resp.data.taskId);
}
};
//瀹℃壒璁板綍
const handleApprovalRecord = () => {
- approvalRecordRef.value.init(processInstanceId.value);
+ approvalRecordRef.value.init(form.value.id);
};
//鎻愪氦鍥炶皟
const submitCallback = async () => {
- proxy.$tab.closePage(proxy.$route);
- proxy.$router.go(-1)
+ await proxy.$tab.closePage(proxy.$route);
+ proxy.$router.go(-1);
};
//杩斿洖
const goBack = () => {
proxy.$tab.closePage(proxy.$route);
- proxy.$router.go(-1)
-}
+ proxy.$router.go(-1);
+};
//瀹℃壒
const approvalVerifyOpen = async () => {
- submitVerifyRef.value.openDialog(proxy.$route.query.taskId);
+ submitVerifyRef.value.openDialog(routeParams.value.taskId);
};
+//鏍￠獙鎻愪氦鎸夐挳鏄惁鏄剧ず
+const submitButtonShow = computed(() => {
+ return (
+ routeParams.value.type === 'add' ||
+ (routeParams.value.type === 'update' &&
+ form.value.status &&
+ (form.value.status === 'draft' || form.value.status === 'cancel' || form.value.status === 'back'))
+ );
+});
+
+//鏍￠獙瀹℃壒鎸夐挳鏄惁鏄剧ず
+const approvalButtonShow = computed(() => {
+ return routeParams.value.type === 'approval' && form.value.status && form.value.status === 'waiting';
+});
+
onMounted(() => {
nextTick(async () => {
- routeParams.value = proxy?.$route.params
- reset();
- if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
- getInfo()
- }
- })
+ routeParams.value = proxy.$route.query;
+ reset();
+ loading.value = false;
+ if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+ getInfo();
+ }
+ });
});
</script>
--
Gitblit v1.9.3