admin/lx-admin-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 调整我的发起，流程定义按钮

Browse Source
This commit is contained in:
gssong 2024-03-21 21:49:34 +08:00
parent 66a31b620b
commit ad8565d29a
3 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/workflow/leave/leaveEdit.vue
View File

@ -5,7 +5,7 @@
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<div> <div>
<el-button :loading="buttonLoading" <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'))" v-if="routeParams.type === 'add' || (routeParams.type === 'update' && form.processInstanceVo && form.processInstanceVo.businessStatus && (form.processInstanceVo.businessStatus === 'draft' || form.processInstanceVo.businessStatus === 'cancel' || form.processInstanceVo.businessStatus === 'back'))"
type="info" @click="submitForm('draft')">暂存</el-button> 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'))" <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> type="primary" @click="submitForm('submit')">提 交</el-button>

3
src/views/workflow/processDefinition/index.vue
View File

@ -211,6 +211,9 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button link type="primary" icon="Sort" size="small" @click="handleConvertToModel(scope.row)"> 转换模型 </el-button> <el-button link type="primary" icon="Sort" size="small" @click="handleConvertToModel(scope.row)"> 转换模型 </el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button link type="primary" icon="Setting" size="small" @click="handleFormOpen(scope.row)"> 表单配置 </el-button>
</el-col>
</el-row> </el-row>
</template> </template>
</el-table-column> </el-table-column>

72
src/views/workflow/task/myDocument.vue
View File

@ -64,28 +64,36 @@
</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>
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-row :gutter="10" class="mb8"> <el-tooltip
<el-col :span="1.5"> v-if="
<el-button link type="primary" size="small" icon="Document" @click="handleApprovalRecord(scope.row.id)">审批记录</el-button> scope.row.businessStatus === 'draft' ||
</el-col> scope.row.businessStatus === 'cancel' ||
<el-col scope.row.businessStatus === 'back'
v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'" "
:span="1.5" content="修改"
> placement="top"
<el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button> >
</el-col> <el-button v-hasPermi="['demo:leave:edit']" link type="primary" icon="Edit" @click="handleOpen(scope.row,'update')"></el-button>
<el-col v-if="scope.row.businessStatus === 'waiting'" :span="1.5"> </el-tooltip>
<el-button link type="primary" size="small" icon="Notification" @click="handleCancelProcessApply(scope.row.id)">撤销</el-button> <el-tooltip
</el-col> v-if="
<el-col scope.row.businessStatus === 'draft' ||
v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'" scope.row.businessStatus === 'cancel' ||
:span="1.5" scope.row.businessStatus === 'back'
> "
<el-button link type="primary" size="small" icon="Edit" @click="submitVerifyOpen(scope.row.taskVoList[0].id)">提交</el-button> content="删除"
</el-col> placement="top"
</el-row> >
<el-button v-hasPermi="['demo:leave:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
</el-tooltip>
<el-tooltip placement="top" content="查看" >
<el-button link type="primary" icon="View" @click="handleOpen(scope.row,'view')"></el-button>
</el-tooltip>
<el-tooltip v-if="scope.row.businessStatus === 'waiting'" content="撤销" placement="top">
<el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.id)"></el-button>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -99,8 +107,6 @@
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<!-- 审批记录 -->
<approvalRecord ref="approvalRecordRef" />
<!-- 提交组件 --> <!-- 提交组件 -->
<submitVerify ref="submitVerifyRef" @submit-callback="getList" /> <submitVerify ref="submitVerifyRef" @submit-callback="getList" />
</div> </div>
@ -108,15 +114,9 @@
<script lang="ts" setup> <script lang="ts" setup>
import { getPageByCurrent, deleteRunAndHisInstance, cancelProcessApply } from '@/api/workflow/processInstance'; import { getPageByCurrent, deleteRunAndHisInstance, cancelProcessApply } from '@/api/workflow/processInstance';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
import SubmitVerify from '@/components/Process/submitVerify.vue';
import { listCategory } from '@/api/workflow/category'; import { listCategory } from '@/api/workflow/category';
import { CategoryVO } from '@/api/workflow/category/types'; import { CategoryVO } from '@/api/workflow/category/types';
import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types'; import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
//提交组件
const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
//审批记录组件
const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const queryFormRef = ref<ElFormInstance>(); const queryFormRef = ref<ElFormInstance>();
const categoryTreeRef = ref<ElTreeInstance>(); const categoryTreeRef = ref<ElTreeInstance>();
@ -247,10 +247,16 @@ const handleCancelProcessApply = async (processInstanceId: string) => {
} }
proxy?.$modal.msgSuccess('撤销成功'); proxy?.$modal.msgSuccess('撤销成功');
}; };
//提交
const submitVerifyOpen = async (id: string) => { //办理
if (submitVerifyRef.value) { const handleOpen = async (row,type) => {
submitVerifyRef.value.openDialog(id); if(row.wfFormDefinitionVo){
proxy.$tab.closePage(proxy.$route);
proxy.$router.push({
path: `${row.wfFormDefinitionVo.path}/${row.businessKey}/${type}`
})
}else{
proxy?.$modal.msgError('请到流程定义菜单配置路由！');
} }
}; };
</script> </script>