Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/StagesController.java

@@ -166,7 +166,7 @@ public class StagesController {
      * @return
      */
     @RequestMapping("/list")
-    public HttpRespMsg list(Stages item, String order, boolean isDesc) {
+    public HttpRespMsg list(Stages item, String order, boolean isDesc,boolean hideCompleted) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<Stages> stagesQueryWrapper = new QueryWrapper<Stages>();
         stagesQueryWrapper.eq("group_id", item.getGroupId());
@@ -197,6 +197,10 @@ public class StagesController {
         } else {
             queryWrapper.orderByAsc(order);
         }
+        //是否隐藏已完成的任务
+        if(hideCompleted){
+            queryWrapper.eq("task_status",0);
+        }
         List<Task> tasks = taskService.simpleList(queryWrapper,null,null);
         //没有权限只能看到自己创建的，负责的和待分配的任务
         List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部任务");

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -138,10 +138,13 @@
                     
                     <el-main style="background:#f7f7f7;padding:0px;position: relative;">
                         <el-row style="color:#999;margin-top:10px;padding: 0px 10px;" :gutter="10">
-                            <el-col :span="12">
+                            <el-col :span="8">
                                 <el-link @click="toggleGroup"><i v-if="selectedGroup != null" :class="groupWidth==0?'el-icon-d-arrow-right':'el-icon-d-arrow-left'" style="margin-top:10px;">{{selectedGroup.name}}</i></el-link>
                             </el-col>
-                            <el-col :span="8" style="float:right;width:420px">
+                            
+                            <el-col :span="16" style="float:right;" class="hideCompletedFelx">
+                                <!-- 隐藏已完成任务 -->
+                                <el-checkbox v-model="hideCompleted" style="margin-right: 10px" @change="getStageList">隐藏已完成任务</el-checkbox>
                                 <el-select v-model="order" size="small" style="background:#fff;display:inline-block;" @change="orderChange">
                                     <el-option v-for="item in orderList" :key="item.id" :label="item.name" :value="item.id">
                                         <span>{{item.name}}</span>
@@ -1452,7 +1455,9 @@
 
                 taskComponentFlg: false,
                 integrationTask: {},
-                integrationTaskNingwai: {}
+                integrationTaskNingwai: {},
+
+                hideCompleted: false
             };
             
         },
@@ -2941,7 +2946,7 @@
                     order: this.order,
                     isDesc: this.isDesc
                 }
-                this.http.post('/stages/list',{groupId: this.selectedGroup.id, projectId: this.selectedGroup.projectId, order: this.order, isDesc: this.isDesc},
+                this.http.post('/stages/list',{groupId: this.selectedGroup.id, projectId: this.selectedGroup.projectId, order: this.order, isDesc: this.isDesc,hideCompleted: this.hideCompleted},
                 res => {
                     if (res.code == "ok") {
                         this.stageList = res.data.list;
@@ -3639,6 +3644,11 @@
 </script>
 
 <style lang="scss" scoped>
+.hideCompletedFelx {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+}
     .Daily p {
         margin: 0 !important;
         padding: 0 0 10px 0 !important;