1

application/index/controller/CostDetail.php

@@ -122,6 +122,11 @@ class CostDetail extends Basic
         if (!empty($params['start_time']) && !empty($params['end_time'])) {
             $conditions['a.create_time'] = ['between', [$params['start_time'] . ' 00:00:00', $params['end_time'] . ' 23:59:59']];
         }
+
+        if (!empty($params['district_id'])) {
+            $conditions["d.district_id"] = $params["district_id"];
+        }
+
         //门店id
         if (!empty($params['store_id'])) {
             $conditions["a.store_id"] = $params["store_id"];
@@ -251,7 +256,7 @@ class CostDetail extends Basic
                 $str = '门店独有成本其他费用';
                 break;
             default :
-                $str = '暂无';
+                $str = '其他费用';
         }
         return $str;
     }

application/model/FStoreCostExt.php

@@ -47,6 +47,7 @@ class FStoreCostExt extends BaseModel
             ->alias('a')
             ->join('f_store_cost b', 'a.cost_id = b.id', 'left')
             ->join('f_apply_for_fee c', 'a.apply_for_id = c.id', 'left')
+            ->join('a_store d', 'a.store_id = d.id', 'left')
             ->where($params)
             ->limit($pageSize)
             ->page($pageNo)
@@ -64,6 +65,7 @@ class FStoreCostExt extends BaseModel
             ->alias('a')
             ->join('f_store_cost b', 'a.cost_id = b.id', 'left')
             ->join('f_apply_for_fee c', 'a.apply_for_id = c.id', 'left')
+            ->join('a_store d', 'a.store_id = d.id', 'left')
 
             ->where($params)
             ->count();