merge http_mock

src/views/projectManage/requirement/requirementDetail.vue

@@ -371,6 +371,7 @@ export default {
       this.taskScheduleList = res1.data.scheduleDetailRespons
       this.isScheduleLocked = res1.data.isScheduleLocked // 锁定状态1锁定0未锁定
       this.$refs.ScheduleEvent.listByTask(this.requirementId)
+      this.getRequirementById()
     },
     async clickScheduling(ele) {
       this.showunlock = false

src/views/projectManage/taskList/taskViewDetail.vue

@@ -8,7 +8,7 @@
               <img v-if="form_query.stage === 1" :src="normalImg">
               <img v-if="form_query.stage === 2" :src="stageImg">
               <img v-if="form_query.stage === 3" :src="warningImg">
-              <el-tooltip class="item" effect="dark" :content="form_query.stageString + '：' + returnEmpty(form_query.lateMsg)" placement="bottom">
+              <el-tooltip class="item" effect="dark" :disabled="form_query.lateMsg===null" :content="form_query.stageString + '：' + form_query.lateMsg" placement="bottom">
                 <div class="task-stage-title">
                   <span :class="{'small-size':form_query.stage === 2}">{{ form_query.stageString }}</span>
                 </div>
@@ -412,6 +412,7 @@ export default {
       this.tips = res1.data.tips
       this.isParentRequireScheduleLocked = res1.data.isParentRequireScheduleLocked
       this.$refs.taskSchedule.listByTask(this.taskId)
+      this.taskGet()
     },
     async getSchedule() {
       this.scheduleVisble = false
@@ -519,10 +520,10 @@ export default {
       if (e.status === 70 || e.status === 90 || e.status === 100) {
         this.taskIds = this.form_query
         this.allStatus.map(item => {
-          item.code === e.value ? this.taskIds.statusString = e.label : ''
+          item.code === e.status ? this.taskIds.statusString = e.label : ''
         })
         this.showTaskDialog = true
-        this.taskIds.status = e.value
+        this.taskIds.status = e.status
         return
       } else {
         const user = {
@@ -531,7 +532,7 @@ export default {
           id: ''
         }
         const taskInfoDO = this.form_query
-        taskInfoDO.status = e.value
+        taskInfoDO.status = e.status
         const resTask = await taskUpdate({ taskInfoDO, user })
         if (resTask.code === 200) {
           this.$message({ message: '修改成功', type: 'success', offset: 150 })