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

Merge branch 'mayue_fix_bug#17342' into 'master'

Browse Source 
* Fix bug #17342.

See merge request easycorp/zentaopms!2670
This commit is contained in:
孙广明
2022-03-31 06:19:25 +00:00
parent 33811f8b8d ba263d1b90
commit 034cef1679
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/view/manage.html.php
+11 -10
View File
@@ -82,17 +82,18 @@
<td class='c-name flex branchName' title='<?php echo $branch->name;?>'>
<span class="text-ellipsis"><?php echo $branch->name;?>&nbsp;</span>
<?php
if($branch->default)
{
echo '<span class="label label-primary label-badge">' . $lang->branch->default . '</span>';
}
elseif($branch->status == 'active')
{
$setDefaultLink = helper::createLink('branch', 'setDefault', "productID=$productID&branchID=$branch->id", '', true);
$setDefaultHtml = html::a($setDefaultLink, "<span><i class='icon icon-hand-right'></i> {$lang->branch->setDefault}</span>", 'hiddenwin', "class='btn btn-icon-left btn-sm setDefault hidden'");
/* Fix bug#17342,由于默认分支的后续功能没做,暂时隐藏设置默认分支的功能 */
//if($branch->default)
//{
// echo '<span class="label label-primary label-badge">' . $lang->branch->default . '</span>';
//}
//elseif($branch->status == 'active')
//{
// $setDefaultLink = helper::createLink('branch', 'setDefault', "productID=$productID&branchID=$branch->id", '', true);
// $setDefaultHtml = html::a($setDefaultLink, "<span><i class='icon icon-hand-right'></i> {$lang->branch->setDefault}</span>", 'hiddenwin', "class='btn btn-icon-left btn-sm setDefault hidden'");
echo common::hasPriv('branch', 'setDefault') ? $setDefaultHtml : '';
}
// echo common::hasPriv('branch', 'setDefault') ? $setDefaultHtml : '';
//}
?>
</td>
<td><?php echo zget($lang->branch->statusList, $branch->status);?></td>