diff --git a/src/pages/event-tracing/components/officeWriteDialog.vue b/src/pages/event-tracing/components/officeWriteDialog.vue index ec74f5e..937dd94 100644 --- a/src/pages/event-tracing/components/officeWriteDialog.vue +++ b/src/pages/event-tracing/components/officeWriteDialog.vue @@ -78,7 +78,8 @@ @@ -93,8 +94,8 @@ diff --git a/src/pages/mediation-management/components/batchofficeWDialog.vue b/src/pages/mediation-management/components/batchofficeWDialog.vue index 291338f..b53a7ca 100644 --- a/src/pages/mediation-management/components/batchofficeWDialog.vue +++ b/src/pages/mediation-management/components/batchofficeWDialog.vue @@ -109,7 +109,10 @@ import api from "@/services/caseManagement"; const year = nextDate.getFullYear(); const month = (nextDate.getMonth() + 1).toString().padStart(2, '0'); const day = nextDate.getDate().toString().padStart(2, '0'); - this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' 23:23:59' + const nowtime = nextDate.getHours().toString().padStart(2, '0')+':'+ + nextDate.getMinutes().toString().padStart(2, '0')+':'+nextDate.getSeconds().toString().padStart(2, '0'); + // this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' 23:23:59' + this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' '+ nowtime this.ObjectInfo.caseIdList = this.eventTraDialog.caseids; api.traceSignBatchCreate(this.ObjectInfo).then((res) => { diff --git a/src/pages/mediation-page/components/singleofficeWritPopover.vue b/src/pages/mediation-page/components/singleofficeWritPopover.vue index 813a339..304370b 100644 --- a/src/pages/mediation-page/components/singleofficeWritPopover.vue +++ b/src/pages/mediation-page/components/singleofficeWritPopover.vue @@ -115,7 +115,10 @@ import api from "@/services/caseManagement"; const year = nextDate.getFullYear(); const month = (nextDate.getMonth() + 1).toString().padStart(2, '0'); const day = nextDate.getDate().toString().padStart(2, '0'); - this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' 23:23:59' + const nowtime = nextDate.getHours().toString().padStart(2, '0')+':'+ + nextDate.getMinutes().toString().padStart(2, '0')+':'+nextDate.getSeconds().toString().padStart(2, '0'); + // this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' 23:23:59' + this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' '+ nowtime this.ObjectInfo.caseId = this.caseId api.traceSignCreate(this.ObjectInfo).then((res) => { diff --git a/src/utils/util.js b/src/utils/util.js index 7d904ae..c236f7a 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -370,6 +370,13 @@ const util = { const day = date.getDate().toString().padStart(2, '0'); // 日期前面补0 return `${year}-${month}-${day}`; }, + + // 和当前时间对比,判断是否大于当前时间 + getTimeContrast(timeString) { + const timedate = moment(timeString); + return timedate > new Date() + }, + // {{scope.row.linkedSituation == 2 ?'':''}} // {{scope.row.linkedSituation == 3 ?'':''}} // {{scope.row.linkedSituation == 4 ?'':''}}