Merge branch release/21.7.5 of zentao/zentaopms (#11373)

This commit is contained in:
刘刚
2025-09-09 14:04:52 +08:00
committed by Gitfox
2 changed files with 2 additions and 3 deletions
+1 -1
View File
@@ -612,7 +612,7 @@ function initGantt()
if(editBtn.hasClass('icon-confirm'))
{
let pointAttr = reviewPoints;
let pointAttr = JSON.parse($('#gantt_here').attr('data-reviewpoints'));
let category = id.split("-")[1];
if(pointAttr[category]['disabled'])
+1 -2
View File
@@ -77,7 +77,6 @@ class gantt extends wg
jsVar('method', $app->rawMethod),
jsVar('jsRoot', $app->getWebRoot()),
jsVar('fileName', $fileName),
jsVar('reviewPoints', $reviewPoints),
jsVar('ganttType', $ganttType),
jsVar('showFields', $showFields),
jsVar('showChart', $showChart),
@@ -97,7 +96,7 @@ class gantt extends wg
setID('ganttContainer'),
on::click('.toggle-all-icon')->call('toggleAllTasks'),
div(setID($id), setClass('gantt is-collapsed')),
div(setID('myCover'), div(setID('gantt_here')))
div(setID('myCover'), div(setID('gantt_here'), setData('reviewpoints', json_encode($reviewPoints))))
);
}
}