abu/wzj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 调整办理 驳回 终止等状态

Browse Source
This commit is contained in:
gssong 2024-10-27 13:21:01 +08:00
parent d8df0dbc1f
commit d678c54b1a
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/Process/approvalRecord.vue
View File

@ -15,10 +15,14 @@
<el-tag type="success">{{ scope.row.approveName || '无' }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="flowStatus" label="状态" sortable align="center">
<template #default="scope">
<dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="message" label="审批意见" sortable align="center"></el-table-column>
<el-table-column prop="createTime" label="开始时间" sortable align="center"></el-table-column>
<el-table-column prop="updateTime" label="结束时间" sortable align="center"></el-table-column>
<el-table-column prop="runDuration" label="运行时长" sortable align="center"></el-table-column>
<el-table-column prop="attachmentList" label="附件" sortable align="center">
<template #default="scope">
<el-popover v-if="scope.row.attachmentList && scope.row.attachmentList.length > 0" placement="right" :width="310" trigger="click">
@ -48,7 +52,7 @@ import processApi from '@/api/workflow/processInstance';
import { propTypes } from '@/utils/propTypes';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
const props = defineProps({
width: propTypes.string.def('70%'),
height: propTypes.string.def('100%')

19
src/components/Process/submitVerify.vue
View File

@ -24,16 +24,21 @@
<template #footer>
<span class="dialog-footer">
<el-button :disabled="buttonDisabled" type="primary" @click="handleCompleteTask"> 提交 </el-button>
<el-button v-if="task.flowStatus === '1'" :disabled="buttonDisabled" type="primary" @click="openDelegateTask"> 委托 </el-button>
<el-button v-if="task.flowStatus === '1'" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 转办 </el-button>
<el-button v-if="task.flowStatus === '1' && task.multiInstance" :disabled="buttonDisabled" type="primary" @click="addMultiInstanceUser">
<el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openDelegateTask"> 委托 </el-button>
<el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 转办 </el-button>
<el-button v-if="task.flowStatus === 'waiting' && task.multiInstance" :disabled="buttonDisabled" type="primary" @click="addMultiInstanceUser">
加签
</el-button>
<el-button v-if="task.flowStatus === '1' && task.multiInstance" :disabled="buttonDisabled" type="primary" @click="deleteMultiInstanceUser">
<el-button
v-if="task.flowStatus === 'waiting' && task.multiInstance"
:disabled="buttonDisabled"
type="primary"
@click="deleteMultiInstanceUser"
>
减签
</el-button>
<el-button v-if="task.flowStatus === '1'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 终止 </el-button>
<el-button v-if="task.flowStatus === '1'" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 退回 </el-button>
<el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 终止 </el-button>
<el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 退回 </el-button>
<el-button :disabled="buttonDisabled" @click="cancel">取消</el-button>
</span>
</template>
@ -48,7 +53,7 @@
<!-- 驳回开始 -->
<el-dialog v-model="backVisible" draggable title="驳回" width="40%" :close-on-click-modal="false">
<el-form v-if="task.flowStatus === '1'" v-loading="backLoading" :model="backForm" label-width="120px">
<el-form v-if="task.flowStatus === 'waiting'" v-loading="backLoading" :model="backForm" label-width="120px">
<el-form-item label="驳回节点">
<el-select v-model="backForm.nodeCode" clearable placeholder="请选择" style="width: 300px">
<el-option v-for="item in taskNodeList" :key="item.nodeCode" :label="item.nodeName" :value="item.nodeCode" />

11
src/views/workflow/leave/index.vue
View File

@ -59,7 +59,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
v-if="scope.row.status === '0' || scope.row.status === '9' || scope.row.status === '10'"
v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"
v-hasPermi="['workflow:leave:edit']"
size="small"
link
@ -68,14 +68,7 @@
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
v-if="scope.row.status === '0' || scope.row.status === '9' || scope.row.status === '10'"
v-hasPermi="['workflow:leave:remove']"
size="small"
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
<el-button v-hasPermi="['workflow:leave:remove']" size="small" link type="primary" icon="Delete" @click="handleDelete(scope.row)"
>删除</el-button
>
<el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>

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

@ -3,10 +3,10 @@
<el-card shadow="never">
<div style="display: flex; justify-content: space-between">
<div>
<el-button v-if="submitButtonShow" :loading="buttonLoading" type="info" @click="submitForm('0')">暂存</el-button>
<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 !== '0'" type="primary" @click="handleApprovalRecord">流程进度</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>
@ -230,13 +230,13 @@ const submitButtonShow = computed(() => {
routeParams.value.type === 'add' ||
(routeParams.value.type === 'update' &&
form.value.status &&
(form.value.status === '0' || form.value.status === '9' || form.value.status === '10'))
(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 === '1';
return routeParams.value.type === 'approval' && form.value.status && form.value.status === 'waiting';
});
onMounted(() => {