Finish task#7109.

This commit is contained in:
leiyong
2020-05-05 18:34:50 -07:00
parent b919ac88dd
commit 5870c95ec4
2 changed files with 15 additions and 4 deletions
+1
View File
@@ -198,6 +198,7 @@ $lang->task->createDenied = '你不能在該項目添加任務';
$lang->task->cannotDeleteParent = '不能刪除父任務。';
$lang->task->error = new stdclass();
$lang->task->error->totalNumber = '"總計消耗"必須為數字';
$lang->task->error->consumedNumber = '"本次消耗"必須為數字';
$lang->task->error->estimateNumber = '"預計剩餘"必須為數字';
$lang->task->error->recordMinus = '工時不能為負數';
+14 -4
View File
@@ -1208,9 +1208,14 @@ class taskModel extends model
public function recordEstimate($taskID)
{
$record = fixer::input('post')->get();
foreach($record->consumed as $item)
foreach($record->consumed as $id => $item)
{
if(!trim($item)) continue;
if(!trim($item))
{
$record->consumed[$id] = trim($item);
continue;
}
if(!is_numeric($item))
{
dao::$errors[] = $this->lang->task->error->totalNumber;
@@ -1218,9 +1223,14 @@ class taskModel extends model
}
}
foreach($record->left as $item)
foreach($record->left as $id => $item)
{
if(!trim($item)) continue;
if(!trim($item))
{
$record->left[$id] = trim($item);
continue;
}
if(!is_numeric($item))
{
dao::$errors[] = $this->lang->task->error->estimateNumber;