1

application/index/controller/CostDetail.php

@@ -124,7 +124,7 @@ class CostDetail extends Basic
         }
         //门店id
         if (!empty($params['store_id'])) {
-            $conditions["b.store_id"] = $params["store_id"];
+            $conditions["a.store_id"] = $params["store_id"];
         }
         //成本明细ID
         if (!empty($params['id'])) {
@@ -158,20 +158,21 @@ class CostDetail extends Basic
     public function getTypeName($type)
     {
         //费用类型 0办公室成本 1上海总部成本 2分部成本 3同联发展基金 4门店单独成本
+        //1办公室成本 2上海总部成本 3分部成本 4同联发展基金 5门店单独成本
         switch ($type) {
-            case 0 :
+            case 1 :
                 $str = '办公室成本';
                 break;
-            case 1 :
+            case 2 :
                 $str = '上海总部成本';
                 break;
-            case 2 :
+            case 3 :
                 $str = '分部成本';
                 break;
-            case 3 :
+            case 4 :
                 $str = '同联发展基金';
                 break;
-            case 4 :
+            case 5 :
                 $str = '门店单独成本';
                 break;
             default :
@@ -193,16 +194,19 @@ class CostDetail extends Basic
                 $str = '房租租金';
                 break;
             case 101 :
-                $str = '101水电费';
+                $str = '水电费';
                 break;
             case 102 :
-                $str = '102其他费用';
+                $str = '其他费用';
                 break;
             case 201 :
-                $str = '201总部固定成本';
+                $str = '总部固定成本';
                 break;
             case 301 :
-                $str = '301分部固定成本';
+                $str = '分部固定成本';
+                break;
+            case 302 :
+                $str = '分部其他成本';
                 break;
             case 401 :
                 $str = '同联发展基金';

application/index/controller/CostParameter.php

@@ -397,7 +397,7 @@ class CostParameter extends Basic
 
         $save_json = json_decode($params['save_json'],true);
         foreach ($save_json as $k => $v) {
-
+            $v['setting_date'] = $params['setting_date'];
             if(!is_numeric($v['type'])){
                 return $this->response("101", 'type不能为空');
             }
@@ -410,6 +410,7 @@ class CostParameter extends Basic
             } else {//新增
                 $this->saveCompanyData($v);
             }
+
         }
         return $this->response("200", "成功");
     }

application/model/FCompanyData.php

@@ -58,7 +58,8 @@ class FCompanyData extends BaseModel
 
     public function updateCompanyData($params)
     {
-        return $this->db_->update($params);
+        $res = $this->db_->update($params);
+        return $res;
     }
 
 }