|
|
@@ -116,7 +116,7 @@
|
|
|
<div class="title-left-name">
|
|
|
<div>任务计划
|
|
|
<el-tooltip class="item" effect="dark" :content="isScheduleLocked === 1? '点击解锁排期' : '点击锁定排期'" placement="top">
|
|
|
- <span class="titleStatus" @click="changeSchedule"><img :src="isScheduleLocked === 1 ? lock: Unlock" style="width: 13px;display: inline-block; vertical-align: inherit"> {{ isScheduleLocked === 1 ? '已锁定' : '未锁定' }}</span>
|
|
|
+ <span class="titleStatus" :class="isScheduleLocked === 1 ? 'el-icon-lock' : 'el-icon-unlock'" @click="changeSchedule"> {{ isScheduleLocked === 1 ? '已锁定' : '未锁定' }}</span>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -129,23 +129,23 @@
|
|
|
<span v-if="tips" style="color:#e88792;">当前任务归属的需求计划排期呈锁定状态，当前任务的排期无法同步到需求计划中去，请将归属需求的排期解锁！</span>
|
|
|
</div>
|
|
|
<div class="Layout_space_between">
|
|
|
- <div v-show="BackToTheLatest === false" class="Scheduling" style="margin-right: 160px;" @click="clickBackToTheLatest"><i class="el-icon-refresh" /> 回到最新</div>
|
|
|
- <div v-show="BackToTheLatest === true" class="Scheduling" style="margin-right: 160px;" @click="clickAddScheduling()"><i class="el-icon-circle-plus-outline" />添加排期</div>
|
|
|
- <div align="left" class="Scheduling" @click="scheduleHiHide"><img :src="scheduling"> 排期变更记录</div>
|
|
|
+ <div v-show="BackToTheLatest === false" class="Scheduling" style="margin-right: 20px;" @click="clickBackToTheLatest"><i class="el-icon-refresh" /> 回到最新</div>
|
|
|
+ <div v-show="BackToTheLatest === true" class="Scheduling" style="margin-right: 20px;" @click="clickAddScheduling()"><i class="el-icon-circle-plus-outline" />添加排期</div>
|
|
|
+ <div align="left" class="Scheduling" @click="scheduleHiHide"><div class="el-icon-document" /> 排期变更记录</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</section>
|
|
|
<el-container>
|
|
|
<el-main style="padding: 0;">
|
|
|
- <schedule-list :id="taskId" ref="taskSchedule" :type-list="taskScheduleEvent" class-name="white" />
|
|
|
+ <schedule-list :id="taskId" ref="taskSchedule" :showunlock="showunlock" :type-list="taskScheduleEvent" class-name="white" />
|
|
|
</el-main>
|
|
|
<el-aside v-if="lockHide" class="SchedulingAside">
|
|
|
<div v-for="(item, index) in SchedulingContent" :key="index" class="SchedulingDiv" @click="clickScheduling(item)">
|
|
|
<i v-show="index < SchedulingContent.length - 1" />
|
|
|
<div class="timeline">
|
|
|
<div class="SchedulingTow" :class="{'vss' : item.id === ScheduId}">
|
|
|
- <img v-if="item.operationType === 0" :src="item.id === ScheduId ? Unlockblur : Unlock" class="image">
|
|
|
- <img v-if="item.operationType === 1" :src="item.id === ScheduId ? lockblur : lock " class="image">
|
|
|
+ <div v-if="item.operationType === 0" class="el-icon-unlock image" />
|
|
|
+ <div v-if="item.operationType === 1" class="el-icon-lock image" />
|
|
|
</div>
|
|
|
<div class="modifyTime">{{ item.modifyTime }}</div>
|
|
|
<div>{{ item.operatorObject.name !== null ? item.operatorObject.name : '' }} <span class="btn">{{ item.operation }}</span></div>
|
|
|
@@ -284,11 +284,6 @@ import stage1 from '@/assets/detailPage/正常状态.png'
|
|
|
import stage2 from '@/assets/detailPage/延期状态.png'
|
|
|
import taskDialog from '@/views/projectManage/taskList/dialog/taskDialog' // 任务状态修改（已上线/已提测/已准出）
|
|
|
import bugTableDialog from '@/views/projectManage/bugList/details/bugTableDialog' // 缺陷表格
|
|
|
-import scheduling from '@/assets/scheduling.png'
|
|
|
-import lock from '@/assets/lock.png' // 排期锁定图标
|
|
|
-import Unlock from '@/assets/Unlock.png' // 排期锁定图标
|
|
|
-import lockblur from '@/assets/锁蓝1.png' // 排期锁定图标
|
|
|
-import Unlockblur from '@/assets/锁蓝色.png' // 排期锁定图标
|
|
|
import '@/styles/PublicStyle/index.scss'
|
|
|
import schedule from '@/views/projectManage/schedule' // 排期锁定弹窗
|
|
|
export default {
|
|
|
@@ -320,17 +315,13 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ showunlock: true,
|
|
|
ScheduId: '', // 排期ID
|
|
|
LockState: {}, // 锁定状态
|
|
|
- Unlock: Unlock, // 解锁排期
|
|
|
- lock: lock, // 锁定排期
|
|
|
- Unlockblur: Unlockblur, // 解锁排期
|
|
|
- lockblur: lockblur, // 锁定排期
|
|
|
tips: '', // 后加入需求的任务排期提示
|
|
|
scheduleVisble: false, // 排期锁定
|
|
|
isParentRequireScheduleLocked: '',
|
|
|
BackToTheLatest: true, // 显示添加排期按钮
|
|
|
- scheduling: scheduling, // 排期变更记录图标
|
|
|
lockHide: false, // 隐藏排期变更记录
|
|
|
SchedulingContent: [], // 排期历史变更记录
|
|
|
stageImg: stage,
|
|
|
@@ -393,14 +384,17 @@ export default {
|
|
|
this.isScheduleLocked = res1.data.isScheduleLocked
|
|
|
this.tips = res1.data.tips
|
|
|
this.isParentRequireScheduleLocked = res1.data.isParentRequireScheduleLocked
|
|
|
+ this.$refs.taskSchedule.listByTask(this.taskId)
|
|
|
},
|
|
|
async clickScheduling(ele) {
|
|
|
+ this.showunlock = false
|
|
|
this.ScheduId = ele.id
|
|
|
const res = await scheduleGetHistoryScheduleById(ele.id)
|
|
|
this.taskScheduleEvent = res.data.schedulDetailResponses
|
|
|
this.BackToTheLatest = false
|
|
|
},
|
|
|
clickBackToTheLatest() {
|
|
|
+ this.showunlock = true
|
|
|
this.BackToTheLatest = true
|
|
|
this.lockHide = false
|
|
|
this.$refs.taskSchedule.listByTask(this.taskId)
|
|
|
@@ -514,6 +508,7 @@ export default {
|
|
|
scheduleHiHide() { // 排期变更显示隐藏
|
|
|
this.lockHide = !this.lockHide
|
|
|
this.BackToTheLatest = true
|
|
|
+ this.showunlock = true
|
|
|
this.ScheduId = ''
|
|
|
},
|
|
|
childVal(val) {
|
|
|
@@ -710,5 +705,6 @@ export default {
|
|
|
}
|
|
|
.vss {
|
|
|
border:1px solid #409EFF !important;
|
|
|
+ color:#409EFF !important;
|
|
|
}
|
|
|
</style>
|
qinzhipeng_v