Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'

Browse Source 
Sprint/183 xieqiyu fixbug

See merge request easycorp/zentaopms!1660
This commit is contained in:
孙广明
2022-01-27 01:12:14 +00:00
parent d15e1dbf15 d9389586db
commit c96da59391
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/js/common.js
+4 -1
View File
@@ -79,6 +79,9 @@ function setTargetLane(targetLaneID)
*/
function locateView(module, objectID)
{
var dataApp = module == 'productplan' || module == 'release' ? 'product' : 'execution';
var dataApp = 'kanban';
if(module == 'productplan' || module == 'release') dataApp = 'product';
if(module == 'execution') dataApp = 'execution';
if(module == 'build') dataApp = 'project';
parent.$.apps.open(createLink(module, 'view', 'objectID=' + objectID), dataApp);
}
module/kanban/js/view.js
+1 -1
View File
@@ -591,7 +591,7 @@ function renderProductplanItem(item, $item)
var begin = $.zui.createDate(item.begin);
var end = $.zui.createDate(item.end);
var today = new Date();
var labelType = begin.getTime() <= today.getTime() && end.getTime() >= today.getTime() ? 'danger' : 'wait';
var labelType = (item.begin <= $.zui.formatDate(today, 'yyyy-MM-dd') && item.end >= $.zui.formatDate(today, 'yyyy-MM-dd')) ? 'danger' : 'wait';
var labelTitle = $.zui.formatDate(begin, 'MM-dd') + ' ' + productplanLang.to + ' ' + $.zui.formatDate(end, 'MM-dd');
if((item.begin == '2030-01-01' || item.end == '2030-01-01'))