diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 0b8abc0..3847c36 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -240,26 +240,31 @@ const timeList = [] const jobForm = this.jobForm if(jobForm.createTime && jobForm.createTime!='0000-00-00 00:00:00'){ - timeList.push({time:jobForm.createTime,name:'派单时间'}) + timeList.push({time:jobForm.createTime,name:'派单时间',num :1}) } if(jobForm.getJobTime && jobForm.getJobTime!='0000-00-00 00:00:00'){ - timeList.push({time:jobForm.getJobTime,name:'接单时间'}) + timeList.push({time:jobForm.getJobTime,name:'接单时间',num :2}) } if(jobForm.confirmJobTime && jobForm.confirmJobTime!='0000-00-00 00:00:00'){ - timeList.push({time:jobForm.confirmJobTime,name:'确认时间'}) + timeList.push({time:jobForm.confirmJobTime,name:'确认时间',num :3}) } if(jobForm.handleJobTime && jobForm.handleJobTime!='0000-00-00 00:00:00'){ - timeList.push({time:jobForm.handleJobTime,name:'完成时间'}) + timeList.push({time:jobForm.handleJobTime,name:'完成时间',num :4}) } if(jobForm.flow && jobForm.flow.length>0){ for(const item of jobForm.flow){ - timeList.push({time:item.time, name:'转单时间'}) + timeList.push({time:item.time, name:'转单时间',num :4}) } } if(timeList.length>1){ timeList.sort((a,b)=>{ - console.log(compareCalendar(a.time,b.time)) - return compareCalendar(a.time,b.time) + const cmp = compareCalendar(a.time,b.time) + if(cmp==0){ + if(a.num>b.num) return -1 + else return 1 + }else{ + return compareCalendar(a.time,b.time) + } }) } return timeList diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 0b8abc0..3847c36 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -240,26 +240,31 @@ const timeList = [] const jobForm = this.jobForm if(jobForm.createTime && jobForm.createTime!='0000-00-00 00:00:00'){ - timeList.push({time:jobForm.createTime,name:'派单时间'}) + timeList.push({time:jobForm.createTime,name:'派单时间',num :1}) } if(jobForm.getJobTime && jobForm.getJobTime!='0000-00-00 00:00:00'){ - timeList.push({time:jobForm.getJobTime,name:'接单时间'}) + timeList.push({time:jobForm.getJobTime,name:'接单时间',num :2}) } if(jobForm.confirmJobTime && jobForm.confirmJobTime!='0000-00-00 00:00:00'){ - timeList.push({time:jobForm.confirmJobTime,name:'确认时间'}) + timeList.push({time:jobForm.confirmJobTime,name:'确认时间',num :3}) } if(jobForm.handleJobTime && jobForm.handleJobTime!='0000-00-00 00:00:00'){ - timeList.push({time:jobForm.handleJobTime,name:'完成时间'}) + timeList.push({time:jobForm.handleJobTime,name:'完成时间',num :4}) } if(jobForm.flow && jobForm.flow.length>0){ for(const item of jobForm.flow){ - timeList.push({time:item.time, name:'转单时间'}) + timeList.push({time:item.time, name:'转单时间',num :4}) } } if(timeList.length>1){ timeList.sort((a,b)=>{ - console.log(compareCalendar(a.time,b.time)) - return compareCalendar(a.time,b.time) + const cmp = compareCalendar(a.time,b.time) + if(cmp==0){ + if(a.num>b.num) return -1 + else return 1 + }else{ + return compareCalendar(a.time,b.time) + } }) } return timeList diff --git a/src/utils/string.js b/src/utils/string.js index c803c05..ea79538 100644 --- a/src/utils/string.js +++ b/src/utils/string.js @@ -22,6 +22,8 @@ var logoutdate = new Date(arys2[0], parseInt(arys2[1] - 1), arys2[2]); if (logindate > logoutdate) { return -1; + } else if(logindate == logoutdate){ + return 0; } else { return 1; } @@ -43,9 +45,11 @@ var allLoginDate = new Date(arrloginDate[0], arrloginDate[1], arrloginDate[2], arrloginTime[0], arrloginTime[1], arrloginTime[2]); var allLogoutDate = new Date(arrlogoutDate[0], arrlogoutDate[1], arrlogoutDate[2], arrlogoutTime[0], arrlogoutTime[1], arrlogoutTime[2]); - if (allLoginDate.getTime() >= allLogoutDate.getTime()) { + if (allLoginDate.getTime() > allLogoutDate.getTime()) { return -1; - } else { + } else if(allLoginDate.getTime() == allLogoutDate.getTime()){ + return 0; + } else { return 1; } } else {