|
@@ -138,10 +138,13 @@
|
|
|
|
|
|
<el-main style="background:#f7f7f7;padding:0px;position: relative;">
|
|
<el-main style="background:#f7f7f7;padding:0px;position: relative;">
|
|
<el-row style="color:#999;margin-top:10px;padding: 0px 10px;" :gutter="10">
|
|
<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-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>
|
|
- <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-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">
|
|
<el-option v-for="item in orderList" :key="item.id" :label="item.name" :value="item.id">
|
|
<span>{{item.name}}</span>
|
|
<span>{{item.name}}</span>
|
|
@@ -1452,7 +1455,9 @@
|
|
|
|
|
|
taskComponentFlg: false,
|
|
taskComponentFlg: false,
|
|
integrationTask: {},
|
|
integrationTask: {},
|
|
- integrationTaskNingwai: {}
|
|
|
|
|
|
+ integrationTaskNingwai: {},
|
|
|
|
+
|
|
|
|
+ hideCompleted: false
|
|
};
|
|
};
|
|
|
|
|
|
},
|
|
},
|
|
@@ -2941,7 +2946,7 @@
|
|
order: this.order,
|
|
order: this.order,
|
|
isDesc: this.isDesc
|
|
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 => {
|
|
res => {
|
|
if (res.code == "ok") {
|
|
if (res.code == "ok") {
|
|
this.stageList = res.data.list;
|
|
this.stageList = res.data.list;
|
|
@@ -3639,6 +3644,11 @@
|
|
</script>
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
<style lang="scss" scoped>
|
|
|
|
+.hideCompletedFelx {
|
|
|
|
+ display: flex;
|
|
|
|
+ align-items: center;
|
|
|
|
+ justify-content: flex-end;
|
|
|
|
+}
|
|
.Daily p {
|
|
.Daily p {
|
|
margin: 0 !important;
|
|
margin: 0 !important;
|
|
padding: 0 0 10px 0 !important;
|
|
padding: 0 0 10px 0 !important;
|