update 调整流程状态

This commit is contained in:
gssong 2024-03-31 19:30:31 +08:00
parent 2ea1807f34
commit 4752b4eb01
6 changed files with 21 additions and 17 deletions

View File

@ -51,9 +51,9 @@
</el-table-column> </el-table-column>
<el-table-column label="请假天数" align="center" prop="leaveDays" /> <el-table-column label="请假天数" align="center" prop="leaveDays" />
<el-table-column label="请假原因" align="center" prop="remark" /> <el-table-column label="请假原因" align="center" prop="remark" />
<el-table-column align="center" prop="businessStatusName" label="流程状态" min-width="70"> <el-table-column align="center" label="流程状态" min-width="70">
<template #default="scope"> <template #default="scope">
<el-tag type="success">{{ scope.row.processInstanceVo.businessStatusName }}</el-tag> <dict-tag :options="wf_business_status" :value="scope.row.processInstanceVo.businessStatus"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -101,7 +101,7 @@ import { cancelProcessApply } from '@/api/workflow/processInstance';
import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types'; import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
const leaveList = ref<LeaveVO[]>([]); const leaveList = ref<LeaveVO[]>([]);
const loading = ref(true); const loading = ref(true);
const showSearch = ref(true); const showSearch = ref(true);

View File

@ -70,10 +70,10 @@
<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" prop="businessStatusName" label="流程状态" min-width="70"> <el-table-column align="center" label="流程状态" min-width="70">
<template #default="scope"> <template #default="scope">
<el-tag type="success">{{ scope.row.businessStatusName }}</el-tag> <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="startTime" label="启动时间" width="160"></el-table-column> <el-table-column align="center" prop="startTime" label="启动时间" width="160"></el-table-column>
<el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="结束时间" width="160"></el-table-column> <el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="结束时间" width="160"></el-table-column>
@ -165,6 +165,7 @@ import workflowCommon from '@/api/workflow/workflowCommon';
import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
// //
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
const queryFormRef = ref<ElFormInstance>(); const queryFormRef = ref<ElFormInstance>();
const categoryTreeRef = ref<ElTreeInstance>(); const categoryTreeRef = ref<ElTreeInstance>();

View File

@ -64,9 +64,9 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="businessStatusName" label="流程状态" min-width="70"> <el-table-column align="center" label="流程状态" min-width="70">
<template #default="scope"> <template #default="scope">
<el-tag v-if="tab === 'waiting'" type="success">{{ scope.row.businessStatusName }}</el-tag> <dict-tag v-if="tab === 'waiting'" :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
<el-tag v-else type="success">已完成</el-tag> <el-tag v-else type="success">已完成</el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -139,6 +139,7 @@ const userSelectRef = ref<InstanceType<typeof UserSelect>>();
const queryFormRef = ref<ElFormInstance>(); const queryFormRef = ref<ElFormInstance>();
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
// //
const loading = ref(true); const loading = ref(true);
// //

View File

@ -57,10 +57,10 @@
<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" prop="businessStatusName" label="流程状态" min-width="70"> <el-table-column align="center" label="流程状态" min-width="70">
<template #default="scope"> <template #default="scope">
<el-tag type="success">{{ scope.row.businessStatusName }}</el-tag> <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="startTime" label="启动时间" width="160"></el-table-column> <el-table-column align="center" prop="startTime" label="启动时间" width="160"></el-table-column>
<el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="结束时间" width="160"></el-table-column> <el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="结束时间" width="160"></el-table-column>
@ -120,6 +120,7 @@ import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processI
import workflowCommon from '@/api/workflow/workflowCommon'; import workflowCommon from '@/api/workflow/workflowCommon';
import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
const queryFormRef = ref<ElFormInstance>(); const queryFormRef = ref<ElFormInstance>();
const categoryTreeRef = ref<ElTreeInstance>(); const categoryTreeRef = ref<ElTreeInstance>();

View File

@ -48,9 +48,9 @@
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="businessStatusName" label="流程状态" min-width="70"> <el-table-column align="center" label="流程状态" min-width="70">
<template #default="scope"> <template #default="scope">
<el-tag type="success">{{ scope.row.businessStatusName }}</el-tag> <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="200"> <el-table-column label="操作" align="center" width="200">
@ -78,6 +78,7 @@ import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
// //
const queryFormRef = ref<ElFormInstance>(); const queryFormRef = ref<ElFormInstance>();
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
// //
const loading = ref(true); const loading = ref(true);
// //

View File

@ -48,9 +48,9 @@
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="businessStatusName" label="流程状态" min-width="70"> <el-table-column align="center" label="流程状态" min-width="70">
<template #default="scope"> <template #default="scope">
<el-tag type="success">{{ scope.row.businessStatusName }}</el-tag> <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></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>
@ -81,10 +81,10 @@ import { getPageByTaskWait, claim, returnTask } from '@/api/workflow/task';
import { TaskQuery, TaskVO } from '@/api/workflow/task/types'; import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
import workflowCommon from '@/api/workflow/workflowCommon'; import workflowCommon from '@/api/workflow/workflowCommon';
import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
// //
const queryFormRef = ref<ElFormInstance>(); const queryFormRef = ref<ElFormInstance>();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// //
const loading = ref(true); const loading = ref(true);
// //