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

* Adjust codes.

Browse Source
This commit is contained in:
caoyanyi
2022-07-25 10:37:59 +08:00
parent f8cd6fe1cb
commit 78e6133a0f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/js/view.js
+7 -7
View File
@@ -1,17 +1,17 @@
$(document).ready(function()
{
$('#mergeButton,.mergeButton').click(function()
{
{
link = $(this).attr('href');
$.getJSON(link, function(response)
{
{
if(response.result == 'success')
{
$.zui.messager.success(response.message);
setTimeout(function(){ location.href=response.locate }, 2500);
$.zui.messager.success(response.message);
setTimeout(function(){ location.href=response.locate }, 2500);
}
if(response.result == 'fail') $.zui.messager.danger(response.message);
});
});
return false;
});
});
});
});
module/mr/view/view.html.php
+2 -2
View File
@@ -37,7 +37,7 @@
</div>
</div>
<div id="mainContent" class="main-content">
<div class="main-content">
<div class='tabs' id='tabsNav'>
<ul class='nav nav-tabs'>
<li class='active'><?php echo html::a('###', $lang->mr->view);?></li>
@@ -46,7 +46,7 @@
<li><?php echo html::a(inlink('link', "MRID={$MR->id}&type=bug"), html::icon($lang->icons['bug'], 'text-red') . ' ' . $lang->productplan->linkedBugs);?></a></li>
<li><?php echo html::a(inlink('link', "MRID={$MR->id}&type=task"), html::icon('todo', 'text-info') . ' ' . $lang->mr->linkedTasks);?></a></li>
</ul>
<div class='tab-content main-row'>
<div class='tab-content main-row' id="mainContent">
<div class="main-col col-8">
<div class="cell">
<div class="detail">