shish преди 1 година
родител
ревизия
5c655ea1a7
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      app-ghs/controllers/ExpendController.php

+ 2 - 2
app-ghs/controllers/ExpendController.php

@@ -67,13 +67,13 @@ class ExpendController extends BaseController
                     //总支出
                     $arr[$staffId]['totalAmount'] = bcadd($arr[$staffId]['totalAmount'], $currentAmount);
                     //已报销
-                    $arr[$staffId]['hasAmount'] = bcadd($arr[$staffId]['hasAmount'], $hasAmount);
+                    $arr[$staffId]['hasAmount'] = floatval(bcadd($arr[$staffId]['hasAmount'], $hasAmount));
                     //待报销
                     $arr[$staffId]['amount'] = floatval(bcadd($arr[$staffId]['amount'], $unAmount));
                     $arr[$staffId]['num'] = bcadd($arr[$staffId]['num'], 1);
                 } else {
                     $arr[$staffId]['totalAmount'] = $currentAmount;
-                    $arr[$staffId]['hasAmount'] = $hasAmount;
+                    $arr[$staffId]['hasAmount'] = floatval($hasAmount);
                     $arr[$staffId]['amount'] = floatval($unAmount);
                     $arr[$staffId]['staffName'] = $staffName;
                     $arr[$staffId]['num'] = 1;