diff --git a/application/admin/controller/salary/Detail.php b/application/admin/controller/salary/Detail.php index d2d7f6f..65432c5 100644 --- a/application/admin/controller/salary/Detail.php +++ b/application/admin/controller/salary/Detail.php @@ -115,18 +115,21 @@ class Detail extends Backend $itemKey = 'item_' . $item['id']; + $value = 0; + if (!empty($queryRes[$adminId][$item['id']])) { - $res[$adminId][$itemKey] = $this->clean_number($queryRes[$adminId][$item['id']]); - $attrValue[$idAttr[$item['id']]] = $queryRes[$adminId][$item['id']]; + $value = $this->clean_number($queryRes[$adminId][$item['id']]); $total = $this->calc_total($total, $item['type'], $queryRes[$adminId][$item['id']]); - continue; } - $attrValue[$item['attr']] = 0; - $res[$adminId][$itemKey] = 0; + $attrValue[$item['attr']] = $value; + if ($item['attr'] == 'TD') { + $value = $value . '%'; + } + $res[$adminId][$itemKey] = $value; } - $jxTotal = ($attrValue['ZWJX'] - $attrValue['YYCB']) * $attrValue['TD']; + $jxTotal = ($attrValue['ZWJX'] - $attrValue['YYCB']) * $attrValue['TD'] / 100; $res[$adminId]['jx_total'] = $this->clean_number($jxTotal); $res[$adminId]['total'] = $this->clean_number($total + $jxTotal); } diff --git a/application/admin/controller/salary/Item.php b/application/admin/controller/salary/Item.php index 0d57c6c..e41f0e5 100644 --- a/application/admin/controller/salary/Item.php +++ b/application/admin/controller/salary/Item.php @@ -22,6 +22,7 @@ class Item extends Backend { parent::_initialize(); $this->model = new \app\admin\model\salary\Item; + $this->view->assign("typeList", $this->model->getTypeList()); } diff --git a/application/admin/view/salary/item/add.html b/application/admin/view/salary/item/add.html index a23a087..1707432 100644 --- a/application/admin/view/salary/item/add.html +++ b/application/admin/view/salary/item/add.html @@ -24,18 +24,6 @@ -