From 1668a1dcee14d86f94aa46d5f69b8505102298d5 Mon Sep 17 00:00:00 2001
From: liuxi <357439530@qq.com>
Date: Fri, 14 Feb 2025 16:53:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/event-tracing/components/officeWriteDialog.vue   | 7 ++++---
 .../mediation-management/components/batchofficeWDialog.vue | 5 ++++-
 .../mediation-page/components/singleofficeWritPopover.vue  | 5 ++++-
 src/utils/util.js                                          | 7 +++++++
 4 files changed, 19 insertions(+), 5 deletions(-)

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 @@
                         </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>
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 ?'':''}}