DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

假期问题修复2

Browse Source
This commit is contained in:
86156
2025-02-23 19:46:14 +08:00
parent 11918241bb
commit de1e47ae06
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application.yml
View File

@@ -13,7 +13,7 @@ ruoyi:
# 缓存懒加载 # 缓存懒加载
cacheLazy: false cacheLazy: false
# 文件路径 # 文件路径
profile: /home/wangyu/oa/uploadPath profile: /home/wy/oa/uploadPath
# profile: F:\work\fad_oa系统\fad_oa\temp # profile: F:\work\fad_oa系统\fad_oa\temp
captcha: captcha:

2
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
View File

@@ -43,7 +43,7 @@ public class RuoYiConfig {
/** 上传路径 */ /** 上传路径 */
@Getter @Getter
private static String profile = "/home/wangyu/oa/uploadPath"; private static String profile = "/home/wy/oa/uploadPath";
// //
// /** 上传路径 */ // /** 上传路径 */
// @Getter // @Getter

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

@@ -40,24 +40,20 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="finishedList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="finishedList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="80" align="center" /> <el-table-column type="selection" align="center" />
<!-- <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true"/>--> <!-- <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true"/>-->
<el-table-column label="流程标题" align="left">
<template slot-scope="scope"> <el-table-column label="流程名称" align="left" prop="procDefName":show-overflow-tooltip="true"/>
<label>{{scope.row.procVars.description}}</label>
</template>
</el-table-column>
<el-table-column label="流程名称" align="left" prop="procDefName" width="180" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="任务节点" align="center" prop="taskName" />--> <!-- <el-table-column label="任务节点" align="center" prop="taskName" />-->
<el-table-column label="发起人" align="center" width="180"> <el-table-column label="发起人" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<label>{{scope.row.startUserName}}({{scope.row.deptName}})</label> <label>{{scope.row.startUserName}}({{scope.row.deptName}})</label>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="接收时间" align="center" prop="createTime" width="180"/> <el-table-column label="接收时间" align="center" prop="createTime" />
<el-table-column label="审批时间" align="center" prop="finishTime" width="180"/> <el-table-column label="审批时间" align="center" prop="finishTime" />
<el-table-column label="耗时" align="center" prop="duration" width="100"/> <el-table-column label="耗时" align="center" prop="duration"/>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"

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

@@ -54,14 +54,14 @@
<el-table v-loading="loading" :data="todoList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="todoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<!-- <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true"/>--> <!-- <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true"/>-->
<el-table-column label="流程名称" align="center" width="180" prop="procDefName"/> <el-table-column label="流程名称" align="center" prop="procDefName"/>
<el-table-column label="任务节点" align="center" width="155" prop="taskName"/> <el-table-column label="任务节点" align="center" prop="taskName"/>
<el-table-column label="流程版本" align="center" width="80"> <el-table-column label="流程版本" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag size="medium" >v{{scope.row.procDefVersion}}</el-tag> <el-tag size="medium" >v{{scope.row.procDefVersion}}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="流程发起人" align="center" width="180"> <el-table-column label="流程发起人" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<label>{{scope.row.startUserName}}({{scope.row.deptName}})</label> <label>{{scope.row.startUserName}}({{scope.row.deptName}})</label>
</template> </template>