UI提示优化

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>

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>