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

* [bug#62725,done,0.1h] get total value.

Browse Source
This commit is contained in:
liumengyi
2025-05-23 10:05:15 +08:00
committed by 刘刚
parent a9b2ea84a7
commit 7fa5cfb673
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+7 -4
View File
@@ -1501,10 +1501,13 @@ class executionModel extends model
foreach($executions as $execution)
{
$execution->productName = isset($productList[$execution->id]) ? trim($productList[$execution->id]->productName, ',') : '';
$execution->product = $productID;
$execution->productID = $productID;
$execution->delay = 0;
$execution->productName = isset($productList[$execution->id]) ? trim($productList[$execution->id]->productName, ',') : '';
$execution->product = $productID;
$execution->productID = $productID;
$execution->delay = 0;
$execution->totalEstimate = $execution->estimate;
$execution->totalConsumed = $execution->consumed;
$execution->totalLeft = $execution->left;
if($execution->end) $execution->end = date(DT_DATE1, strtotime($execution->end));
if(!isset($execution->projectName)) $execution->projectName = $project->name;
if(!isset($execution->projectModel)) $execution->projectModel = $project->model;
module/project/js/execution.ui.js
+1 -1
View File
@@ -93,7 +93,7 @@ window.onRenderCell = function(result, {col, row})
return result;
}
if(col.name == 'rawID' && data.parent && !data.isExecution) result.push({className: 'ml-5'});
if(['estimate', 'consumed', 'left'].includes(col.name) && result) result[0] = data.type == 'point' ? '' : {html: result[0] + ' h'};
if(['estimate', 'consumed', 'left', 'totalEstimate', 'totalConsumed', 'totalLeft'].includes(col.name) && result && typeof result[0] != 'undefined') result[0] = data.type == 'point' ? '' : {html: result[0] + ' h'};
if(col.name == 'progress' && data.type == 'point') result[0] = '';
return result;