diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 9614347..3ee1f54 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -159,6 +159,7 @@ firstStatePhotos: '', // 现场情况图片 handleMessage: '', // 维护情况描述 handleStatePhotos: '', // 维护图片 + createTime: '', // 工单创建时间 getJobPerson: '', // 接单人员名称 getJobTime: '', // 接单时间 confirmJobPerson: '', // 确认人员名称 @@ -237,6 +238,10 @@ // 处理工单动态 // 若有getJobTime有值,表示有人接单 this.activities = [] + let handleJobPerson = job.handleJobPerson + if (!handleJobPerson) { + handleJobPerson = '系统' + } if (job.getJobTime) { const activity = { content: job.getJobPerson + '已接单', @@ -247,7 +252,7 @@ } else { // 否则添加空的状态 const activity = { content: '待处理', - timestamp: '' + timestamp: job.createTime } this.activities.push(activity) } @@ -266,25 +271,28 @@ timestamp: '' } this.activities.push(activity) + } else if (job.jobStatus === '2') { + const activity1 = { + content: handleJobPerson + '处理中', + timestamp: job.handleJobTime + } + this.activities.push(activity1) + this.activeStep += 1 } } if (job.handleJobTime) { // 若有处理时间,状态置为已完成或已取消 // 若没有处理人则处理人为系统 - let handleJobPerson = job.handleJobPerson - if (!handleJobPerson) { - handleJobPerson = '系统' - } if (job.jobStatus === '3') { // 正常完成 - const activity1 = { - content: handleJobPerson + '处理中', - timestamp: job.handleJobTime - } + // const activity1 = { + // content: handleJobPerson + '处理中', + // timestamp: job.handleJobTime + // } const activity2 = { content: handleJobPerson + '已完成', timestamp: job.handleJobTime } - this.activities.push(activity1) + // this.activities.push(activity1) this.activities.push(activity2) this.activeStep += 1 } else if (job.jobStatus === '4') { // 已取消