From 389bdf12dece547d10a4b52cf42d97d5e502a3aa Mon Sep 17 00:00:00 2001
From: zhanyunjiu <787952492@qq.com>
Date: Tue, 2 Aug 2022 18:50:07 +0800
Subject: [PATCH] =?UTF-8?q?UI=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/farm/task/index.vue     | 2 +-
 src/views/farm/workHour/index.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/farm/task/index.vue b/src/views/farm/task/index.vue
index e8bcebf..484e175 100644
--- a/src/views/farm/task/index.vue
+++ b/src/views/farm/task/index.vue
@@ -151,7 +151,7 @@
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['farm:task:update']" v-if="scope.row.status != 'COMPLETE'">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['farm:task:delete']">删除</el-button>
+            v-hasPermi="['farm:task:delete']">撤回</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/farm/workHour/index.vue b/src/views/farm/workHour/index.vue
index c6afbdb..75a41d3 100644
--- a/src/views/farm/workHour/index.vue
+++ b/src/views/farm/workHour/index.vue
@@ -48,7 +48,7 @@
       </el-table-column>
       <el-table-column label="项目名" align="center" prop="projectId" >
         <template slot-scope="scope">
-          <span>{{projectList.find(t=>t.id == scope.row.projectId).name}}</span>
+          <span>{{scope.row.projectId}}</span>
         </template>
       </el-table-column>
       <el-table-column label="任务名" align="center" prop="taskId" >
@@ -83,7 +83,7 @@
             <el-option
               v-for="item in projectList"
               :key="item.id"
-              :label="item.name"
+              :label="item.id +'/'+item.name"
               :value="item.id">
               {{item.name}}
             </el-option>