DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(办公管理): 完善权限按钮标识

Browse Source
This commit is contained in:
konbai
2022-07-23 21:31:27 +08:00
parent 0c293e0284
commit ad9132e857
7 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.workflow;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.workflow.domain.bo.WfTaskBo;
@@ -37,6 +38,7 @@ public class WfTaskController {
@ApiOperation(value = "取消申请", response = WfTaskVo.class)
@PostMapping(value = "/stopProcess")
@SaCheckPermission("workflow:process:cancel")
public R stopProcess(@RequestBody WfTaskBo bo) {
flowTaskService.stopProcess(bo);
return R.ok();
@@ -44,6 +46,7 @@ public class WfTaskController {
@ApiOperation(value = "撤回流程", response = WfTaskVo.class)
@PostMapping(value = "/revokeProcess")
@SaCheckPermission("workflow:process:revoke")
public R revokeProcess(@RequestBody WfTaskBo bo) {
flowTaskService.revokeProcess(bo);
return R.ok();
@@ -51,12 +54,14 @@ public class WfTaskController {
@ApiOperation(value = "获取流程变量", response = WfTaskVo.class)
@GetMapping(value = "/processVariables/{taskId}")
@SaCheckPermission("workflow:process:query")
public R processVariables(@ApiParam(value = "流程任务Id") @PathVariable(value = "taskId") String taskId) {
return R.ok(flowTaskService.getProcessVariables(taskId));
}
@ApiOperation(value = "审批任务")
@PostMapping(value = "/complete")
@SaCheckPermission("workflow:process:approval")
public R complete(@RequestBody WfTaskBo bo) {
flowTaskService.complete(bo);
return R.ok();
@@ -65,6 +70,7 @@ public class WfTaskController {
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
@SaCheckPermission("workflow:process:approval")
public R taskReject(@RequestBody WfTaskBo bo) {
flowTaskService.taskReject(bo);
return R.ok();
@@ -72,6 +78,7 @@ public class WfTaskController {
@ApiOperation(value = "退回任务")
@PostMapping(value = "/return")
@SaCheckPermission("workflow:process:approval")
public R taskReturn(@RequestBody WfTaskBo bo) {
flowTaskService.taskReturn(bo);
return R.ok();
@@ -79,12 +86,14 @@ public class WfTaskController {
@ApiOperation(value = "获取所有可回退的节点")
@PostMapping(value = "/returnList")
@SaCheckPermission("workflow:process:query")
public R findReturnTaskList(@RequestBody WfTaskBo bo) {
return R.ok(flowTaskService.findReturnTaskList(bo));
}
@ApiOperation(value = "删除任务")
@DeleteMapping(value = "/delete")
@SaCheckPermission("workflow:process:approval")
public R delete(@RequestBody WfTaskBo bo) {
flowTaskService.deleteTask(bo);
return R.ok();
@@ -92,6 +101,7 @@ public class WfTaskController {
@ApiOperation(value = "认领/签收任务")
@PostMapping(value = "/claim")
@SaCheckPermission("workflow:process:claim")
public R claim(@RequestBody WfTaskBo bo) {
flowTaskService.claim(bo);
return R.ok();
@@ -99,6 +109,7 @@ public class WfTaskController {
@ApiOperation(value = "取消认领/签收任务")
@PostMapping(value = "/unClaim")
@SaCheckPermission("workflow:process:claim")
public R unClaim(@RequestBody WfTaskBo bo) {
flowTaskService.unClaim(bo);
return R.ok();
@@ -106,6 +117,7 @@ public class WfTaskController {
@ApiOperation(value = "委派任务")
@PostMapping(value = "/delegate")
@SaCheckPermission("workflow:process:approval")
public R delegate(@RequestBody WfTaskBo bo) {
if (ObjectUtil.hasNull(bo.getTaskId(), bo.getUserId())) {
return R.fail("参数错误！");
@@ -116,6 +128,7 @@ public class WfTaskController {
@ApiOperation(value = "转办任务")
@PostMapping(value = "/transfer")
@SaCheckPermission("workflow:process:approval")
public R transfer(@RequestBody WfTaskBo bo) {
if (ObjectUtil.hasNull(bo.getTaskId(), bo.getUserId())) {
return R.fail("参数错误！");
@@ -126,6 +139,7 @@ public class WfTaskController {
@ApiOperation(value = "获取下一节点")
@PostMapping(value = "/nextFlowNode")
@SaCheckPermission("workflow:process:query")
public R getNextFlowNode(@RequestBody WfTaskBo bo) {
WfNextDto wfNextDto = flowTaskService.getNextFlowNode(bo);
return wfNextDto != null ? R.ok(wfNextDto) : R.ok("流程已完结", null);

4
ruoyi-ui/src/views/workflow/model/index.vue
View File

@@ -129,7 +129,7 @@
<el-dropdown-item
icon="el-icon-view"
@click.native="handleProcessView(scope.row)"
v-hasPermi="['workflow:model:view']"
v-hasPermi="['workflow:model:query']"
>流程图</el-dropdown-item>
<el-dropdown-item
icon="el-icon-price-tag"
@@ -257,7 +257,7 @@
type="text"
size="mini"
icon="el-icon-star-off"
v-hasPermi="['workflow:model:designer']"
v-hasPermi="['workflow:model:save']"
@click.native="handleLatest(scope.row)"
>设为最新</el-button>
</template>

1
ruoyi-ui/src/views/workflow/work/claim.vue
View File

@@ -44,6 +44,7 @@
type="text"
icon="el-icon-s-claim"
@click="handleClaim(scope.row)"
v-hasPermi="['workflow:process:claim']"
>签收
</el-button>
</template>

3
ruoyi-ui/src/views/workflow/work/copy.vue
View File

@@ -31,7 +31,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['workflow:copy:export']"
v-hasPermi="['workflow:process:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -55,6 +55,7 @@
type="text"
icon="el-icon-tickets"
@click="handleFlowRecord(scope.row)"
v-hasPermi="['workflow:process:query']"
>详情</el-button>
</template>
</el-table-column>

4
ruoyi-ui/src/views/workflow/work/finished.vue
View File

@@ -33,7 +33,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:deployment:remove']"
v-hasPermi="['workflow:process:remove']"
>删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -59,12 +59,14 @@
type="text"
icon="el-icon-tickets"
@click="handleFlowRecord(scope.row)"
v-hasPermi="['workflow:process:query']"
>流转记录</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-tickets"
@click="handleRevoke(scope.row)"
v-hasPermi="['workflow:process:revoke']"
>撤回
</el-button>
</template>

37
ruoyi-ui/src/views/workflow/work/own.vue
View File

@@ -74,22 +74,27 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-dropdown>
<span class="el-dropdown-link">
更多操作<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-tickets" @click.native="handleFlowRecord(scope.row)">
详情
</el-dropdown-item>
<el-dropdown-item icon="el-icon-circle-close" @click.native="handleStop(scope.row)">
取消申请
</el-dropdown-item>
<el-dropdown-item icon="el-icon-delete" @click.native="handleDelete(scope.row)">
删除
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button
type="text"
size="mini"
icon="el-icon-tickets"
@click="handleFlowRecord(scope.row)"
v-hasPermi="['workflow:process:query']"
>详情</el-button>
<el-button
type="text"
size="mini"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['workflow:process:remove']"
>删除</el-button>
<el-button
type="text"
size="mini"
icon="el-icon-circle-close"
@click="handleStop(scope.row)"
v-hasPermi="['workflow:process:cancel']"
>取消</el-button>
</template>
</el-table-column>
</el-table>

3
ruoyi-ui/src/views/workflow/work/todo.vue
View File

@@ -62,7 +62,8 @@
type="text"
icon="el-icon-edit-outline"
@click="handleProcess(scope.row)"
>处理
v-hasPermi="['workflow:process:approval']"
>办理
</el-button>
</template>
</el-table-column>