shish 2 жил өмнө
parent
commit
4bfdcd69f8

+ 8 - 0
app-ghs/controllers/ExpendController.php

@@ -142,6 +142,14 @@ class ExpendController extends BaseController
         $currentEndTime = $currentEndDate . ' 23:59:59';
         $currentEndTime = $currentEndDate . ' 23:59:59';
         $where['addTime'] = ['between', [$currentStartTime, $currentEndTime]];
         $where['addTime'] = ['between', [$currentStartTime, $currentEndTime]];
         $list = ExpendClass::getExpendList($where);
         $list = ExpendClass::getExpendList($where);
+        $map = dict::getDict('expendTypeMap');
+        if (!empty($list)) {
+            foreach ($list as $key => $val) {
+                $type = $val['type'] ?? 0;
+                $name = $map[$type] ?? '未命名';
+                $list[$key]['typeName'] = $name;
+            }
+        }
         util::success($list);
         util::success($list);
     }
     }
 
 

+ 1 - 1
common/components/dict.php

@@ -469,7 +469,7 @@ class dict
             'qt' => 5,//其它
             'qt' => 5,//其它
         ],
         ],
         'expendTypeMap' => [
         'expendTypeMap' => [
-            0 => '店租', 1 => '水电', 2 => '物业', 3 => '伙食', 4 => '房租', 5 => '其它', 6 => '物品',
+            0 => '店租', 1 => '水电', 2 => '物业', 3 => '伙食', 4 => '房租', 5 => '其它', 6 => '物品', 7 => '办公用品'
         ],
         ],
         'expendTypeList' => [
         'expendTypeList' => [
             ['id' => 7, 'name' => '办公用品'],
             ['id' => 7, 'name' => '办公用品'],