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 += "" + window.lang.yuqi + ""; - } - else { - if (passTime >= 0 && passTime < 2 * 24 * 3600 * 1000) { - listbox += "" + window.lang.jinggao + ""; - } else { - listbox += "" + window.lang.zhengchang + ""; - } - } - + //判断流程是否逾期 @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 += "" + window.lang.jinggao + ""; + } else { + listbox += "" + window.lang.zhengchang + ""; + } + }else { + listbox += "" + window.lang.zhengchang + ""; + } listbox += "" + GetState(work.WFState, work.Auther) + ""; listbox += "" + GetPRI(work.PRI) + "";