Merge branch 'sprint/244_tianshujie_70494' into 'master'

Sprint/244 tianshujie 70494

See merge request easycorp/zentaopms!5627
This commit is contained in:
孙广明
2022-09-29 09:17:37 +00:00
5 changed files with 41 additions and 2 deletions
+2
View File
@@ -73,6 +73,8 @@ $lang->productplan->cannotDeleteParent = 'Cannot delete parent plan';
$lang->productplan->selectProjects = "Please select the project";
$lang->productplan->projectNotEmpty = 'Project cannot be empty.';
$lang->productplan->nextStep = "Next step";
$lang->productplan->summary = "Total: <strong>%s</strong>, Parents: <strong>%s</strong>, Children: <strong>%s</strong>.";
$lang->productplan->checkedSummary = "Seleted: <strong>%total%</strong>, Parents: <strong>%parent%</strong>, Children: <strong>%child%</strong>.";
$lang->productplan->id = 'ID';
$lang->productplan->product = $lang->productCommon;
+2
View File
@@ -73,6 +73,8 @@ $lang->productplan->cannotDeleteParent = 'Cannot delete parent plan';
$lang->productplan->selectProjects = "Please select the project";
$lang->productplan->projectNotEmpty = 'Project cannot be empty.';
$lang->productplan->nextStep = "Next step";
$lang->productplan->summary = "Total: <strong>%s</strong>, Parents: <strong>%s</strong>, Children: <strong>%s</strong>.";
$lang->productplan->checkedSummary = "Seleted: <strong>%total%</strong>, Parents: <strong>%parent%</strong>, Children: <strong>%child%</strong>.";
$lang->productplan->id = 'ID';
$lang->productplan->product = $lang->productCommon;
+2
View File
@@ -73,6 +73,8 @@ $lang->productplan->cannotDeleteParent = 'Impossible de supprimer le plan parent
$lang->productplan->selectProjects = "Please select the project";
$lang->productplan->projectNotEmpty = 'Project cannot be empty.';
$lang->productplan->nextStep = "Next step";
$lang->productplan->summary = "Total: <strong>%s</strong>, Parents: <strong>%s</strong>, Children: <strong>%s</strong>.";
$lang->productplan->checkedSummary = "Seleted: <strong>%total%</strong>, Parents: <strong>%parent%</strong>, Children: <strong>%child%</strong>.";
$lang->productplan->id = 'ID';
$lang->productplan->product = $lang->productCommon;
+2
View File
@@ -73,6 +73,8 @@ $lang->productplan->cannotDeleteParent = "不能删除父计划";
$lang->productplan->selectProjects = "请选择所属项目";
$lang->productplan->projectNotEmpty = '所属项目不能为空。';
$lang->productplan->nextStep = "下一步";
$lang->productplan->summary = "本页共 <strong>%s</strong> 个计划,父计划 <strong>%s</strong>,子计划 <strong>%s</strong>。";
$lang->productplan->checkedSummary = "共选中 <strong>%total%</strong> 个计划,父计划 <strong>%parent%</strong>,子计划 <strong>%child%</strong>。";
$lang->productplan->id = '编号';
$lang->productplan->product = $lang->productCommon;
+33 -2
View File
@@ -33,6 +33,8 @@
</div>
<div class="cell<?php if($browseType == 'bySearch') echo ' show';?>" id="queryBox" data-module='productplan'></div>
<div id="mainContent">
<?php $totalParent = 0;?>
<?php $totalChild = 0;?>
<?php if(empty($plans)):?>
<div class="table-empty-tip">
<p>
@@ -43,7 +45,7 @@
</p>
</div>
<?php else:?>
<form class='main-table table-productplan' data-ride='table' method='post' id='productplanForm' action='<?php echo inlink('batchEdit', "productID=$product->id&branch=$branch")?>'>
<form class='main-table table-productplan' method='post' id='productplanForm' action='<?php echo inlink('batchEdit', "productID=$product->id&branch=$branch")?>'>
<table class='table has-sort-head' id="productplanList">
<thead>
<?php $vars = "productID=$productID&branch=$branch&browseType=$browseType&queryID=$queryID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
@@ -89,10 +91,13 @@
{
$parent = $plan->id;
$children = isset($plan->children) ? $plan->children : 0;
$totalParent ++;
}
if($plan->parent == 0) $parent = 0;
if(!empty($parent) and $plan->parent > 0 and $plan->parent != $parent) $parent = 0;
if($plan->parent <= 0) $i = 0;
if($plan->parent > 0) $totalChild ++;
$class = '';
if(!empty($parent) and $plan->parent == $parent)
@@ -103,7 +108,7 @@
$i++;
}
?>
<tr class='<?php echo $class;?>'>
<tr class='<?php echo $class;?>' data-parent="<?php echo $plan->parent;?>">
<td class='cell-id'>
<?php if(common::hasPriv('productplan', 'batchEdit') or common::hasPriv('productplan', 'batchChangeStatus')):?>
<?php echo html::checkbox('planIDList', array($plan->id => ''), '', $attribute) . html::a(helper::createLink('productplan', 'view', "planID=$plan->id"), sprintf('%03d', $plan->id));?>
@@ -179,8 +184,34 @@
</div>
<?php endif;?>
</div>
<div class="table-statistic"><?php echo sprintf($lang->productplan->summary, count($plans), $totalParent, $totalChild);?></div>
<?php $pager->show('right', 'pagerjs');?>
</div>
</form>
<?php endif;?>
</div>
<script>
$(function()
{
var pageSummary = '<?php echo sprintf($lang->productplan->summary, count($plans), $totalParent, $totalChild);?>';
var checkedSummary = '<?php echo $lang->productplan->checkedSummary?>';
$('#productplanForm').table(
{
replaceId: 'productplanList',
statisticCreator: function(table)
{
var $table = table.getTable();
var $checkedRows = $table.find('tbody>tr.checked');
var checkedTotal = $checkedRows.length;
var checkedParent = $checkedRows.filter("[data-parent=-1]").length;
var checkedNormal = $checkedRows.filter("[data-parent=0]").length;
var checkedChild = checkedTotal - checkedParent - checkedNormal;
var summary = checkedSummary.replace('%total%', checkedTotal)
.replace('%parent%', checkedParent)
.replace('%child%', checkedChild);
return checkedTotal ? summary : pageSummary;
}
});
});
</script>