From f284e48a617352233189416236e8d29f03e47ec0 Mon Sep 17 00:00:00 2001
From: sunliang <593170460@qq.com>
Date: Wed, 31 Jan 2024 13:56:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BE=85=E5=8A=9E=E4=B8=AD?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E5=90=8E=E5=B0=B1=E6=98=BE=E7=A4=BA=E9=80=BE?=
 =?UTF-8?q?=E6=9C=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CCFlow/CCFlow/WF/Todolist.htm | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/CCFlow/CCFlow/WF/Todolist.htm b/CCFlow/CCFlow/WF/Todolist.htm
index d63f8810..1acf47fe 100644
--- a/CCFlow/CCFlow/WF/Todolist.htm
+++ b/CCFlow/CCFlow/WF/Todolist.htm
@@ -355,20 +355,18 @@
                     var edt = work.SDTOfNode.replace(/\-/g, "/");
                     edt = new Date(Date.parse(edt.replace(/-/g, "/")));
                     passTime = GetSpanTime(date, edt);
-                    //判断流程是否逾期
-                    if (date.getTime() > edt.getTime())//&& work.WFState == 2 && entStr != "01" && work.RDT != work.SDT
-                    //&& paras.indexOf("&IsCC=1") == -1)
-                    {
-                        listbox += "<td><font color=red>" + window.lang.yuqi + "</font></td>";
-                    }
-                    else {
-                        if (passTime >= 0 && passTime < 2 * 24 * 3600 * 1000) {
-                            listbox += "<td><font color='#ffac38'>" + window.lang.jinggao + "</font></td>";
-                        } else {
-                            listbox += "<td><font color=green>" + window.lang.zhengchang + "</font></td>";
-                        }
-                    }
-
+                    //判断流程是否逾期 @BKGY
+                    var node = new Entity("BP.WF.Node", work.FK_Node);
+                    if (node.CHWay == 1) { //时效判断
+                        var TianShu = node.TimeLimit;
+                        if (passTime >= 0 && passTime < TianShu  * 24 * 3600 * 1000) {
+                                listbox += "<td><font color='#ffac38'>" + window.lang.jinggao + "</font></td>";
+                            } else {
+                                listbox += "<td><font color=green>" + window.lang.zhengchang + "</font></td>";
+                            }
+                     }else {
+                        listbox += "<td><font color=green>" + window.lang.zhengchang + "</font></td>";
+                     }
                     listbox += "<td>" + GetState(work.WFState, work.Auther) + "</td>";
                     listbox += "<td>" + GetPRI(work.PRI) + "</td>";