From 82b0b6af3ae8acc04b34c81de1118bec14366de9 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Mon, 10 Feb 2025 13:52:34 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D](pet=5F?=
 =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81):=20=20=20-=20bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../longCarPort/CarInfo/components/list.vue       | 15 +++++++++++++--
 .../zgUnit/carPort/carInfo/components/list.vue    |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue b/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
index ed90b70..1258766 100644
--- a/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
+++ b/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
@@ -99,9 +99,9 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="400">
         <template slot-scope="{row}">
-          <el-button v-if="row.IS_AUDIT === '3'" type="success" icon="el-icon-edit" size="mini" @click="remark(row)">查看原因</el-button>
-          <el-button v-if="row.IS_AUDIT === '3'" type="primary" icon="el-icon-edit" size="mini" @click="apply(row)">重新申请</el-button>
           <el-button v-if="row.IS_AUDIT !== '3'" type="warning" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button>
+          <el-button v-if="row.IS_AUDIT === '3'" type="success" icon="el-icon-edit" size="mini" @click="remark(row)">查看原因</el-button>
+          <el-button v-if="row.IS_AUDIT === '3' || getButton(row.VISIT_END_TIME)" type="primary" icon="el-icon-edit" size="mini" @click="apply(row)">重新申请</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -458,6 +458,15 @@ export default {
     this.getPageList() // 获取分页列表要展示的数据
   },
   methods: {
+    getButton(END_TIME) {
+      const currentTime = new Date();
+      const endTime = new Date(END_TIME);
+      if (endTime > currentTime) {
+        return false; // END_TIME 大于当前时间
+      } else {
+        return true; // END_TIME 小于或等于当前时间
+      }
+    },
     getAuditType(IS_AUDIT){
       if (IS_AUDIT === '2'){
         return '已审核'
@@ -551,6 +560,8 @@ export default {
       this.userList = []
       this.addForm.DEPARTMENT_NAME = ''
       this.addForm.DEPARTMENT_ID = ''
+      this.addForm.VISIT_START_TIME = ''
+      this.addForm.VISIT_END_TIME = ''
     },
     // 获得部门树
     getDepartmentTreeData() {
diff --git a/src/views/zgUnit/carPort/carInfo/components/list.vue b/src/views/zgUnit/carPort/carInfo/components/list.vue
index 68fb0d2..74170cc 100644
--- a/src/views/zgUnit/carPort/carInfo/components/list.vue
+++ b/src/views/zgUnit/carPort/carInfo/components/list.vue
@@ -865,7 +865,7 @@ export default {
             this.ISCHECK = false
           })
         } else {
-          this.$message.success('车牌号不规范')
+          this.$message.error('车牌号不规范')
           this.ISCHECK = false
         }
       }
@@ -896,7 +896,7 @@ export default {
               this.ISCHECK = false
             })
           } else {
-            this.$message.success('车牌号不规范')
+            this.$message.error('车牌号不规范')
             this.ISCHECK = false
           }
         }