yinq
/
hwbm-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add 增加业务扩展

Browse Source
dev
gssong 4 months ago
parent ad7058b739
commit 5e5fca8f6b
10 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
src/api/workflow/instance/types.ts
Unescape Escape View File

@ -23,4 +23,6 @@ export interface FlowInstanceVO extends BaseEntity {
flowStatus: string; flowStatus: string;
flowStatusName: string; flowStatusName: string;
flowTaskList: FlowTaskVO[]; flowTaskList: FlowTaskVO[];
businessCode: string;
businessTitle: string;
} }

2
src/api/workflow/leave/types.ts
Unescape Escape View File

@ -1,5 +1,6 @@
export interface LeaveVO { export interface LeaveVO {
id: string | number; id: string | number;
applyCode?: string;
leaveType: string; leaveType: string;
startDate: string; startDate: string;
endDate: string; endDate: string;
@ -10,6 +11,7 @@ export interface LeaveVO {
export interface LeaveForm extends BaseEntity { export interface LeaveForm extends BaseEntity {
id?: string | number; id?: string | number;
applyCode?: string;
leaveType?: string; leaveType?: string;
startDate?: string; startDate?: string;
endDate?: string; endDate?: string;

2
src/api/workflow/task/types.ts
Unescape Escape View File

@ -31,6 +31,8 @@ export interface FlowTaskVO {
version?: string; version?: string;
applyNode?: boolean; applyNode?: boolean;
buttonList?: buttonList[]; buttonList?: buttonList[];
businessCode: string;
businessTitle: string;
} }
export interface buttonList { export interface buttonList {

1
src/api/workflow/workflowCommon/types.ts
Unescape Escape View File

@ -10,4 +10,5 @@ export interface StartProcessBo {
businessId: string | number; businessId: string | number;
flowCode: string; flowCode: string;
variables: any; variables: any;
flowInstanceBizExtBo: any;
} }

16
src/views/workflow/leave/leaveEdit.vue
Unescape Escape View File

@ -11,7 +11,7 @@
:id="form.id" :id="form.id"
:status="form.status" :status="form.status"
:pageType="routeParams.type" :pageType="routeParams.type"
:mode="false" :mode="true"
/> />
</el-card> </el-card>
<el-card shadow="never" style="height: 78vh; overflow-y: auto"> <el-card shadow="never" style="height: 78vh; overflow-y: auto">
@ -126,9 +126,11 @@ const leaveFormRef = ref<ElFormInstance>();
const submitFormData = ref<StartProcessBo>({ const submitFormData = ref<StartProcessBo>({
businessId: '', businessId: '',
flowCode: '', flowCode: '',
variables: {} variables: {},
flowInstanceBizExtBo: {}
}); });
const taskVariables = ref<Record<string, any>>({}); const taskVariables = ref<Record<string, any>>({});
const flowInstanceBizExtBo = ref<Record<string, any>>({});
const initFormData: LeaveForm = { const initFormData: LeaveForm = {
id: undefined, id: undefined,
@ -199,13 +201,13 @@ const submitForm = (status: string, mode: boolean) => {
buttonLoading.value = true; buttonLoading.value = true;
// 设置后端发起和不等于草稿状态 直接走流程发起 // 设置后端发起和不等于草稿状态 直接走流程发起
if (mode && status != 'draft') { if (mode && status != 'draft') {
let res = await submitAndFlowStart(form.value).finally(() => (buttonLoading.value = false)); const res = await submitAndFlowStart(form.value).finally(() => (buttonLoading.value = false));
form.value = res.data; form.value = res.data;
buttonLoading.value = false; buttonLoading.value = false;
proxy?.$modal.msgSuccess('操作成功'); proxy?.$modal.msgSuccess('操作成功');
proxy.$tab.closePage(proxy.$route); proxy.$tab.closePage(proxy.$route);
proxy.$router.go(-1); proxy.$router.go(-1);
} else{ } else {
let res; let res;
if (form.value.id) { if (form.value.id) {
res = await updateLeave(form.value).finally(() => (buttonLoading.value = false)); res = await updateLeave(form.value).finally(() => (buttonLoading.value = false));
@ -241,7 +243,13 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
// leave4/5 使用的流程变量 // leave4/5 使用的流程变量
userList: ['1', '3', '4'] userList: ['1', '3', '4']
}; };
//流程实例业务扩展字段
flowInstanceBizExtBo.value = {
businessTitle: '请假申请',
businessCode: data.applyCode
};
submitFormData.value.variables = taskVariables.value; submitFormData.value.variables = taskVariables.value;
submitFormData.value.flowInstanceBizExtBo = flowInstanceBizExtBo.value;
const resp = await startWorkFlow(submitFormData.value); const resp = await startWorkFlow(submitFormData.value);
if (submitVerifyRef.value) { if (submitVerifyRef.value) {
buttonLoading.value = false; buttonLoading.value = false;

14
src/views/workflow/processInstance/index.vue
Unescape Escape View File

@ -61,15 +61,17 @@
<el-table v-loading="loading" border :data="processInstanceList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="processInstanceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="60"></el-table-column> <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" label="流程定义名称"> <el-table-column :show-overflow-tooltip="true" prop="businessCode" align="center" label="业务编码"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="businessTitle" align="center" label="业务标题"></el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" width="120" label="流程定义名称">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.flowName }}v{{ scope.row.version }}</span> <span>{{ scope.row.flowName }}v{{ scope.row.version }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column> <el-table-column align="center" prop="flowCode" width="120" label="流程定义编码"></el-table-column>
<el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
<el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column> <el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
<el-table-column align="center" prop="createByName" label="申请人"></el-table-column> <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
<el-table-column align="center" prop="createByName" :show-overflow-tooltip="true" label="申请人"></el-table-column>
<el-table-column align="center" prop="version" label="版本号" width="90"> <el-table-column align="center" prop="version" label="版本号" width="90">
<template #default="scope"> v{{ scope.row.version }}.0</template> <template #default="scope"> v{{ scope.row.version }}.0</template>
</el-table-column> </el-table-column>
@ -79,14 +81,14 @@
<el-tag v-else type="danger">挂起</el-tag> <el-tag v-else type="danger">挂起</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="流程状态" min-width="70"> <el-table-column align="center" label="流程状态" min-width="80">
<template #default="scope"> <template #default="scope">
<dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag> <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="createTime" label="启动时间" width="160"></el-table-column> <el-table-column align="center" prop="createTime" label="启动时间" width="160"></el-table-column>
<el-table-column v-if="tab === 'finish'" align="center" prop="updateTime" label="结束时间" width="160"></el-table-column> <el-table-column v-if="tab === 'finish'" align="center" prop="updateTime" label="结束时间" width="160"></el-table-column>
<el-table-column label="操作" align="center" :width="165"> <el-table-column label="操作" align="center" :width="165" fixed="right">
<template #default="scope"> <template #default="scope">
<el-row v-if="tab === 'running'" :gutter="10" class="mb8"> <el-row v-if="tab === 'running'" :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">

10
src/views/workflow/task/allTaskWaiting.vue
Unescape Escape View File

@ -39,14 +39,16 @@
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="60"></el-table-column> <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column> <el-table-column :show-overflow-tooltip="true" prop="businessCode" align="center" label="业务编码"></el-table-column>
<el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column> <el-table-column :show-overflow-tooltip="true" prop="businessTitle" align="center" label="业务标题"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" width="120" label="流程定义名称"></el-table-column>
<el-table-column align="center" prop="flowCode" width="120" label="流程定义编码"></el-table-column>
<el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column> <el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
<el-table-column align="center" prop="version" label="版本号" width="90"> <el-table-column align="center" prop="version" label="版本号" width="90">
<template #default="scope"> v{{ scope.row.version }}.0</template> <template #default="scope"> v{{ scope.row.version }}.0</template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column> <el-table-column align="center" prop="nodeName" :show-overflow-tooltip="true" label="任务名称"></el-table-column>
<el-table-column align="center" prop="createByName" label="申请人"></el-table-column> <el-table-column align="center" prop="createByName" :show-overflow-tooltip="true" label="申请人"></el-table-column>
<el-table-column align="center" label="办理人"> <el-table-column align="center" label="办理人">
<template #default="scope"> <template #default="scope">
<template v-if="tab === 'waiting'"> <template v-if="tab === 'waiting'">

2
src/views/workflow/task/taskCopyList.vue
Unescape Escape View File

@ -31,6 +31,8 @@
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="60"></el-table-column> <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="businessCode" align="center" label="业务编码"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="businessTitle" align="center" label="业务标题"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column> <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column>
<el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column> <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
<el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column> <el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>

16
src/views/workflow/task/taskFinish.vue
Unescape Escape View File

@ -36,14 +36,16 @@
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="60"></el-table-column> <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
<el-table-column align="center" prop="flowName" label="流程定义名称"></el-table-column> <el-table-column :show-overflow-tooltip="true" prop="businessCode" align="center" label="业务编码"></el-table-column>
<el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column> <el-table-column :show-overflow-tooltip="true" prop="businessTitle" align="center" label="业务标题"></el-table-column>
<el-table-column align="center" prop="flowName" width="120" label="流程定义名称"></el-table-column>
<el-table-column align="center" prop="flowCode" width="120" label="流程定义编码"></el-table-column>
<el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column> <el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
<el-table-column align="center" prop="version" label="版本号" width="90"> <el-table-column align="center" prop="version" label="版本号" width="90">
<template #default="scope"> v{{ scope.row.version }}.0</template> <template #default="scope"> v{{ scope.row.version }}.0</template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column> <el-table-column align="center" prop="nodeName" :show-overflow-tooltip="true" label="任务名称"></el-table-column>
<el-table-column align="center" prop="createByName" label="申请人"></el-table-column> <el-table-column align="center" prop="createByName" :show-overflow-tooltip="true" label="申请人"></el-table-column>
<el-table-column align="center" prop="approverName" label="办理人"> <el-table-column align="center" prop="approverName" label="办理人">
<template #default="scope"> <template #default="scope">
<el-tag type="success"> <el-tag type="success">
@ -51,17 +53,17 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="流程状态" prop="flowStatus" min-width="70"> <el-table-column align="center" label="流程状态" prop="flowStatus" min-width="80">
<template #default="scope"> <template #default="scope">
<dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag> <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="任务状态" prop="flowTaskStatus" min-width="70"> <el-table-column align="center" label="任务状态" prop="flowTaskStatus" min-width="80">
<template #default="scope"> <template #default="scope">
<dict-tag :options="wf_task_status" :value="scope.row.flowTaskStatus"></dict-tag> <dict-tag :options="wf_task_status" :value="scope.row.flowTaskStatus"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column> <el-table-column align="center" prop="createTime" label="创建时间" :show-overflow-tooltip="true" width="150"></el-table-column>
<el-table-column label="操作" align="center" width="200"> <el-table-column label="操作" align="center" width="200">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button> <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>

2
src/views/workflow/task/taskWaiting.vue
Unescape Escape View File

@ -36,6 +36,8 @@
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="60"></el-table-column> <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="businessCode" align="center" label="业务编码"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="businessTitle" align="center" label="业务标题"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column> <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column>
<el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column> <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
<el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column> <el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>

Write Preview
Loading…
Cancel
Save