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

Merge branch 'sprint/211_liumengyi_fixbug' into 'master'

Browse Source 
* Fix bug #24753,#24754.

See merge request easycorp/zentaopms!4361
This commit is contained in:
王怡栋
2022-07-06 01:48:53 +00:00
parent 4eb9fb5904 6464887f89
commit e97acef6d9
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/js/finish.js
+1 -4
View File
@@ -12,9 +12,6 @@ $(function()
$('#submit').click(function()
{
if(task.consumed != 0 && $('#currentConsumed').val() == 0)
{
return confirm(consumedEmpty);
}
if(task.consumed != 0 && $('#currentConsumed').val() == 0 && $('#currentConsumed').val() != '') return confirm(consumedEmpty);
})
})
module/task/model.php
+2 -2
View File
@@ -1737,8 +1737,8 @@ class taskModel extends model
if(!empty($record->work[$id]) or !empty($record->consumed[$id]))
{
if(!$record->consumed[$id]) return print(js::alert($this->lang->task->error->consumedThisTime));
if($record->left[$id] === '') return print(js::alert($this->lang->task->error->left));
if(!$record->consumed[$id]) helper::end(js::alert($this->lang->task->error->consumedThisTime));
if($record->left[$id] === '') helper::end(js::alert($this->lang->task->error->left));
$estimates[$id] = new stdclass();
$estimates[$id]->date = $record->dates[$id];