diff --git a/public/components/property/maintainanceTaskDetail/maintainanceTaskDetail.html b/public/components/property/maintainanceTaskDetail/maintainanceTaskDetail.html index 0c0071025..663a3dc58 100755 --- a/public/components/property/maintainanceTaskDetail/maintainanceTaskDetail.html +++ b/public/components/property/maintainanceTaskDetail/maintainanceTaskDetail.html @@ -78,6 +78,9 @@ + + + @@ -89,8 +92,8 @@ {{maintainanceTask.planInsTime}}
{{maintainanceTask.planEndTime}} - {{maintainanceTask.maintainanceTime ? - maintainanceTask.maintainanceTime : '-'}} + {{maintainanceTask.inspectionTime ? + maintainanceTask.inspectionTime : '-'}} {{maintainanceTask.actUserName ? maintainanceTask.actUserName : '-'}} {{maintainanceTask.stateName}} @@ -104,6 +107,9 @@ {{maintainanceTask.createTime}} + + 详情 + diff --git a/public/components/property/maintainanceTaskDetail/maintainanceTaskDetail.js b/public/components/property/maintainanceTaskDetail/maintainanceTaskDetail.js index c619e74c8..dbb4d163d 100755 --- a/public/components/property/maintainanceTaskDetail/maintainanceTaskDetail.js +++ b/public/components/property/maintainanceTaskDetail/maintainanceTaskDetail.js @@ -38,13 +38,7 @@ function (json) { var _taskDetailInfo = JSON.parse(json); $that.maintainanceTaskDetailInfo.taskDetails = _taskDetailInfo.data; - $that.maintainanceTaskDetailInfo.taskDetails.forEach((item) => { - if(item.photos && item.photos.length>0){ - item.photos.forEach((photo) => { - photo.url = photoUrl + "?fileId=" + photo.url + "&communityId=-1&time=" + new Date() - }) - } - }) + vc.emit('maintainanceTaskDetail', 'paginationPlus', 'init', { total: _taskDetailInfo.records, currentPage: _page diff --git a/public/pages/property/maintainanceTaskDetailView/maintainanceTaskDetailView.html b/public/pages/property/maintainanceTaskDetailView/maintainanceTaskDetailView.html index 264e7d77a..a1ca662fa 100755 --- a/public/pages/property/maintainanceTaskDetailView/maintainanceTaskDetailView.html +++ b/public/pages/property/maintainanceTaskDetailView/maintainanceTaskDetailView.html @@ -63,7 +63,7 @@ - + diff --git a/public/pages/property/maintainanceTaskDetailView/maintainanceTaskDetailView.js b/public/pages/property/maintainanceTaskDetailView/maintainanceTaskDetailView.js index 2c2f11f59..751582282 100755 --- a/public/pages/property/maintainanceTaskDetailView/maintainanceTaskDetailView.js +++ b/public/pages/property/maintainanceTaskDetailView/maintainanceTaskDetailView.js @@ -10,7 +10,7 @@ planInsTime: '', planEndTime: '', actUserName: '', - maintainanceTime: '', + inspectionTime: '', stateName: '', description: '', photos: [], diff --git a/public/pages/property/maintainanceTaskDetails/maintainanceTaskDetails.html b/public/pages/property/maintainanceTaskDetails/maintainanceTaskDetails.html index 13e7678d5..aec748309 100644 --- a/public/pages/property/maintainanceTaskDetails/maintainanceTaskDetails.html +++ b/public/pages/property/maintainanceTaskDetails/maintainanceTaskDetails.html @@ -148,7 +148,7 @@ {{maintainanceTask.standardName}} {{maintainanceTask.planUserName}} {{maintainanceTask.planInsTime}}
{{maintainanceTask.planEndTime}} - {{maintainanceTask.maintainanceTime ? maintainanceTask.maintainanceTime : '-'}} + {{maintainanceTask.inspectionTime ? maintainanceTask.inspectionTime : '-'}} {{maintainanceTask.actUserName ? maintainanceTask.actUserName : '-'}} {{maintainanceTask.stateName}} diff --git a/public/pages/property/maintainanceTaskDetails/maintainanceTaskDetails.js b/public/pages/property/maintainanceTaskDetails/maintainanceTaskDetails.js index ccc6d9f12..fb52eaa7c 100644 --- a/public/pages/property/maintainanceTaskDetails/maintainanceTaskDetails.js +++ b/public/pages/property/maintainanceTaskDetails/maintainanceTaskDetails.js @@ -122,14 +122,6 @@ vc.component.maintainanceTaskDetailManageInfo.total = _maintainanceTaskDetailManageInfo.total; vc.component.maintainanceTaskDetailManageInfo.records = _maintainanceTaskDetailManageInfo.records; vc.component.maintainanceTaskDetailManageInfo.maintainanceTasks = _maintainanceTaskDetailManageInfo.data; - vc.component.maintainanceTaskDetailManageInfo.maintainanceTasks.forEach((item) => { - if(item.photos && item.photos.length>0){ - item.photos.forEach((photo) => { - photo.url = photoUrl + "?fileId=" + photo.url + "&communityId=-1&time=" + new Date() - console.log(photo.url); - }) - } - }) vc.emit('pagination', 'init', { total: vc.component.maintainanceTaskDetailManageInfo.records, dataCount: vc.component.maintainanceTaskDetailManageInfo.total,