|
@@ -164,6 +164,7 @@ export default {
|
|
|
taskIds: {
|
|
|
handler(newV) {
|
|
|
if (newV) {
|
|
|
+ console.log(newV, 'hahah')
|
|
|
newV.map(item => {
|
|
|
this.judge = true
|
|
|
this.remoteMethod(item)
|
|
@@ -246,6 +247,7 @@ export default {
|
|
|
this.tasksDetailList.push(res.data[0])
|
|
|
this.taskId.push(res.data[0].id)
|
|
|
this.judge = false
|
|
|
+ console.log(this.tasksDetailList, 'cdscs')
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -293,17 +295,17 @@ export default {
|
|
|
data.reportName = this.from.reportName // 报告名称
|
|
|
data.releasePlanTime = this.from.releasePlanTime // 计划准出时间
|
|
|
data.releaseActualTime = this.from.releaseActualTime // 实际准出时间
|
|
|
- if (this.from.releasePlanTime > this.from.releaseActualTime) {
|
|
|
+ if (this.from.releasePlanTime < this.from.releaseActualTime) {
|
|
|
data.isDelay = 1// 准出是否延期 1 延期,0未延期
|
|
|
+ if (this.from.delayReason) {
|
|
|
+ data.delayReason = this.from.delayReason // 是否延期
|
|
|
+ } else {
|
|
|
+ this.$message({ type: 'warning', message: '准出原因不能为空' })
|
|
|
+ return false
|
|
|
+ }
|
|
|
} else {
|
|
|
data.isDelay = 0
|
|
|
}
|
|
|
- if (this.from.delayReason) {
|
|
|
- data.delayReason = this.from.delayReason // 是否延期
|
|
|
- } else {
|
|
|
- this.$message({ type: 'warning', message: '准出原因不能为空' })
|
|
|
- return false
|
|
|
- }
|
|
|
if (this.from.devPlanTimeStart) {
|
|
|
data.devPlanTimeStart = this.from.devPlanTimeStart[0] // 计划开发开始时间
|
|
|
data.devPlanTimeEnd = this.from.devPlanTimeStart[1] // 计划开发结束时间
|
|
@@ -343,17 +345,17 @@ export default {
|
|
|
data.reportName = this.from.reportName // 报告名称
|
|
|
data.releasePlanTime = this.from.releasePlanTime // 计划准出时间
|
|
|
data.releaseActualTime = this.from.releaseActualTime // 实际准出时间
|
|
|
- if (this.from.releasePlanTime > this.from.releaseActualTime) {
|
|
|
+ if (this.from.releasePlanTime < this.from.releaseActualTime) {
|
|
|
data.isDelay = 1// 准出是否延期 1 延期,0未延期
|
|
|
+ if (this.from.delayReason) {
|
|
|
+ data.delayReason = this.from.delayReason // 是否延期
|
|
|
+ } else {
|
|
|
+ this.$message({ type: 'warning', message: '准出原因不能为空' })
|
|
|
+ return false
|
|
|
+ }
|
|
|
} else {
|
|
|
data.isDelay = 0
|
|
|
}
|
|
|
- if (this.from.delayReason) {
|
|
|
- data.delayReason = this.from.delayReason // 是否延期
|
|
|
- } else {
|
|
|
- this.$message({ type: 'warning', message: '准出原因不能为空' })
|
|
|
- return false
|
|
|
- }
|
|
|
if (this.from.devPlanTimeStart) {
|
|
|
data.devPlanTimeStart = this.from.devPlanTimeStart[0] // 计划开发开始时间
|
|
|
data.devPlanTimeEnd = this.from.devPlanTimeStart[1] // 计划开发结束时间
|