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

Merge branch 'sprint/tsj_fixbug' into 'master'

Browse Source 
Sprint/tsj fixbug

See merge request easycorp/zentaopms!6667
This commit is contained in:
孙广明
2023-01-03 05:54:09 +00:00
parent 0a41c01b88 b2142bed14
commit c29776bbfe
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/block/view/printassigntomeblock.html.php
View File

@@ -99,6 +99,8 @@ function changeMoreBtn(type, label)
var $moreBtn = $('#assigntomeBlock .moreBtn');
var text = $(label).html();
text += '<span class="caret"></span>';
$moreBtn.html(text);
setTimeout(function()

2
module/execution/view/build.html.php
View File

@@ -69,7 +69,7 @@
<?php if($showBranch):?>
<td class="c-name text-left <?php echo $hidden;?>" title='<?php echo $build->branchName;?>'><?php echo $build->branchName;?></td>
<?php endif;?>
<td class="c-name"><?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?></td>
<td class="c-name" title="<?php echo $build->name;?>"><?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?></td>
<td class="c-url text-left">
<?php
if($build->scmPath)

4
module/project/config.php
View File

@@ -125,14 +125,14 @@ $config->project->datatable->fieldList['consume']['pri'] = '7';
$config->project->datatable->fieldList['progress']['title'] = 'progress';
$config->project->datatable->fieldList['progress']['fixed'] = 'no';
$config->project->datatable->fieldList['progress']['width'] = '60';
$config->project->datatable->fieldList['progress']['width'] = '65';
$config->project->datatable->fieldList['progress']['required'] = 'no';
$config->project->datatable->fieldList['progress']['sort'] = 'no';
$config->project->datatable->fieldList['progress']['pri'] = '6';
$config->project->datatable->fieldList['actions']['title'] = 'actions';
$config->project->datatable->fieldList['actions']['fixed'] = 'right';
$config->project->datatable->fieldList['actions']['width'] = '180';
$config->project->datatable->fieldList['actions']['width'] = '165';
$config->project->datatable->fieldList['actions']['required'] = 'yes';
$config->project->datatable->fieldList['actions']['pri'] = '1';

3
module/project/view/manageproducts.html.php
View File

@@ -11,6 +11,9 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php if(isonlybody()):?>
<style> .body-modal #mainMenu.clearfix > .btn-toolbar {width: unset;}</style>
<?php endif;?>
<?php js::set('unmodifiableProducts', $unmodifiableProducts);?>
<?php js::set('unmodifiableBranches', $unmodifiableBranches);?>
<?php js::set('unmodifiableMainBranches', $unmodifiableMainBranches);?>

5
module/project/view/view.html.php
View File

@@ -12,6 +12,9 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php if(!common::checkNotCN()):?>
<style> table.data-stats > tbody > tr.statsTr > td:first-child {width: 60px;}</style>
<?php endif;?>
<div id='mainContent' class="main-row">
<div class="col-8 main-col">
<div class="row">
@@ -195,7 +198,7 @@
<div class="detail-content">
<table class='table table-data data-stats'>
<tbody>
<tr class='statsTr'><td class='w-100px'></td><td></td><td></td><td></td></tr>
<tr class='statsTr'><td></td><td></td><td></td><td></td></tr>
<tr>
<td colspan="4">
<?php $progress = $project->model == 'waterfall' ? $this->project->getWaterfallProgress($project->id) : (($workhour->totalConsumed + $workhour->totalLeft) ? floor($workhour->totalConsumed / ($workhour->totalConsumed + $workhour->totalLeft) * 1000) / 1000 * 100 : 0);?>