From de1e47ae069dacccee2062f214e2874816b0d1fb Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Sun, 23 Feb 2025 19:46:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=87=E6=9C=9F=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |  2 +-
 .../com/ruoyi/common/config/RuoYiConfig.java  |  2 +-
 ruoyi-ui/src/views/workflow/work/finished.vue | 20 ++++++++-----------
 ruoyi-ui/src/views/workflow/work/todo.vue     |  6 +++---
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 8a619c5..d839269 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -13,7 +13,7 @@ ruoyi:
   # 缓存懒加载
   cacheLazy: false
   # 文件路径
-  profile: /home/wangyu/oa/uploadPath
+  profile: /home/wy/oa/uploadPath
 #  profile: F:\work\fad_oa系统\fad_oa\temp
 
 captcha:
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
index 26a9577..4f2f679 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
@@ -43,7 +43,7 @@ public class RuoYiConfig {
 
     /** 上传路径 */
     @Getter
-    private static String profile = "/home/wangyu/oa/uploadPath";
+    private static String profile = "/home/wy/oa/uploadPath";
 //
 //    /** 上传路径 */
 //    @Getter
diff --git a/ruoyi-ui/src/views/workflow/work/finished.vue b/ruoyi-ui/src/views/workflow/work/finished.vue
index 487d3a9..02ab8a7 100644
--- a/ruoyi-ui/src/views/workflow/work/finished.vue
+++ b/ruoyi-ui/src/views/workflow/work/finished.vue
@@ -40,24 +40,20 @@
     </el-row>
 
     <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="left">
-        <template slot-scope="scope">
-          <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="left" prop="procDefName":show-overflow-tooltip="true"/>
 <!--      <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">
           <label>{{scope.row.startUserName}}({{scope.row.deptName}})</label>
         </template>
       </el-table-column>
-      <el-table-column label="接收时间" align="center" prop="createTime" width="180"/>
-      <el-table-column label="审批时间" align="center" prop="finishTime" width="180"/>
-      <el-table-column label="耗时" align="center" prop="duration" width="100"/>
-      <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
+      <el-table-column label="接收时间" align="center" prop="createTime" />
+      <el-table-column label="审批时间" align="center" prop="finishTime" />
+      <el-table-column label="耗时" align="center" prop="duration"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
diff --git a/ruoyi-ui/src/views/workflow/work/todo.vue b/ruoyi-ui/src/views/workflow/work/todo.vue
index 6396f1c..643fbc7 100644
--- a/ruoyi-ui/src/views/workflow/work/todo.vue
+++ b/ruoyi-ui/src/views/workflow/work/todo.vue
@@ -54,14 +54,14 @@
     <el-table v-loading="loading" :data="todoList" @selection-change="handleSelectionChange">
       <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" width="180" prop="procDefName"/>
-      <el-table-column label="任务节点" align="center" width="155" prop="taskName"/>
+      <el-table-column label="流程名称" align="center"  prop="procDefName"/>
+      <el-table-column label="任务节点" align="center"  prop="taskName"/>
       <el-table-column label="流程版本" align="center" width="80">
         <template slot-scope="scope">
           <el-tag size="medium" >v{{scope.row.procDefVersion}}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="流程发起人" align="center" width="180">
+      <el-table-column label="流程发起人" align="center" >
         <template slot-scope="scope">
           <label>{{scope.row.startUserName}}({{scope.row.deptName}})</label>
         </template>