修改bug
This commit is contained in:
parent
14a1a35610
commit
1668a1dcee
@ -78,7 +78,8 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="签字状态" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.status.desc }}</span>
|
||||
<span v-if="$util.getTimeContrast(scope.row.deadline)">{{ scope.row.status.desc }}</span>
|
||||
<span v-else>已过期</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="failureReason" label="失败原因" show-overflow-tooltip ></el-table-column>
|
||||
@ -93,8 +94,8 @@
|
||||
<template slot-scope="scope">
|
||||
<div class="flex-row align-items-center">
|
||||
<el-button size="mini" @click="handleDetail(scope)">明细</el-button>
|
||||
<el-button v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" size="mini" @click="handleAgain(scope)">重试</el-button>
|
||||
<el-button v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" size="mini" @click="handleCancel(scope)">取消</el-button>
|
||||
<el-button v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2 && scope.row.status.code !== 1" size="mini" @click="handleAgain(scope)">重试</el-button>
|
||||
<el-button v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2 && scope.row.status.code !== 1" size="mini" @click="handleCancel(scope)">取消</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
@ -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) => {
|
||||
|
||||
@ -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) => {
|
||||
|
||||
@ -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 ?'':''}}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user