From 7ea0ac13e6429702e2630faf90d89028b88f1313 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Tue, 3 Dec 2024 17:58:57 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D](dev):=20?=
 =?UTF-8?q?=20=20-=20=E8=AF=81=E4=BB=B6=E4=BF=A1=E6=81=AF=E5=8D=B3?=
 =?UTF-8?q?=E5=B0=86=E8=BF=87=E6=9C=9F=E6=98=BE=E7=A4=BA=E6=9C=AA=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=E6=B2=A1=E6=9C=89=E9=87=8D=E6=96=B0=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/corpUserList.vue               | 29 ++++++++++---------
 src/views/xgf/flow/components/sendUtil.vue    |  5 ++++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/views/classMessage/cardOverdueList/components/corpUserList.vue b/src/views/classMessage/cardOverdueList/components/corpUserList.vue
index 73057ea..f4492f5 100644
--- a/src/views/classMessage/cardOverdueList/components/corpUserList.vue
+++ b/src/views/classMessage/cardOverdueList/components/corpUserList.vue
@@ -183,20 +183,23 @@ export default {
     this.getTreeList()
   },
   methods: {
-    getCardStatus(VALIDITY_PERIOD_END){
-      const nowDate = new Date()
-      const nextDate = new Date((new Date).getFullYear() + '-' + ((new Date).getMonth() + 3) + '-' + (new Date).getDate())
-      console.log('当前时间 ==>'+nowDate)
-      console.log('两个月后的时间 ==>'+nextDate)
-      console.log('证件到期日 ==>'+new Date(VALIDITY_PERIOD_END))
-      if (nowDate > new Date(VALIDITY_PERIOD_END)){
-        return 1
-      }else if (new Date(VALIDITY_PERIOD_END) > nowDate && new Date(VALIDITY_PERIOD_END) < nextDate){
-        return 2
-      }else {
-        return 0
-      }
+    getCardStatus(VALIDITY_PERIOD_END) {
+      const now = new Date(); // 当前时间
+      const threeMonthsLater = new Date(now); // 三个月后的时间
+      threeMonthsLater.setMonth(threeMonthsLater.getMonth() + 3); // 设置为未来三个月后的时间
+      // 将VALIDITY_PERIOD_END转换为Date对象（假设它是一个有效的日期字符串）
+      const validityPeriodEnd = new Date(VALIDITY_PERIOD_END);
 
+      // 比较日期并返回状态
+      if (now > validityPeriodEnd) {
+        // 证件已过期
+        return 1;
+      } else if (validityPeriodEnd > now && validityPeriodEnd <= threeMonthsLater) {
+        // 证件即将到期
+        return 2;
+      } else {
+        return 0;
+      }
     },
     filterNode(value, data) {
       if (!value) return true
diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index e6fc77a..f937dc5 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -349,6 +349,8 @@ export default {
         APPOINT_USER_ID: '',
         APPOINT_USER_NAME: '',
         OPINION: '',
+        BACK_NAME:'',
+        BACK_STEP: '',
         user: '',
         list: [],
         tm: new Date().getTime()
@@ -365,6 +367,8 @@ export default {
         APPOINT_USER_ID: '',
         APPOINT_USER_NAME: '',
         OPINION: '',
+        BACK_NAME:'',
+        BACK_STEP: '',
         user: '',
         list: [],
         tm: new Date().getTime()
@@ -406,6 +410,7 @@ export default {
       })
     },
     backPoint(num, name) {
+      console.log(this.form)
       this.form.BACK_STEP = num
       this.form.BACK_NAME = name
       this.$forceUpdate()