1

application/index/controller/CostParameter.php

@@ -308,6 +308,7 @@ class CostParameter extends Basic
             $list_ = $this->m_company_data->findByOne($f_field, $f_params);
             if(!$list_){
                 $list_['type'] = $v;//费用类型 0上海总部成本   1杭州总部成本 2深圳总部成本 3广州总部成本  4北京总部成本  5同联发展基金   6总经理基薪
+                //费用类型 1办公室成本 2上海总部成本 3分部成本 4同联发展基金 5门店单独成本',
                 $list_['fixed_fee'] = 0;//本月固定成本
                 $list_['discounts'] = 0;//百分比
             }
@@ -424,8 +425,7 @@ class CostParameter extends Basic
         if((isset($params['fixed_fee'])) && ($params['fixed_fee'] > 0))
             $data['fixed_fee'] = $params['fixed_fee'];
 
-        if((isset($params['apply_for_fee'])) && ($params['apply_for_fee'] > 0))
-            $data['apply_for_fee'] = $params['apply_for_fee'];
+        $data['apply_for_fee'] = $this->getApplyForFee($params['type'],$params['setting_date']);//本月报销费用 (其他费用);;
 
         if((isset($params['discounts'])) && ($params['discounts'] > 0))
             $data['discounts'] = $params['discounts'];
@@ -447,8 +447,7 @@ class CostParameter extends Basic
         if((isset($params['fixed_fee'])) && ($params['fixed_fee'] > 0))
             $data['fixed_fee'] = $params['fixed_fee'];
 
-        if((isset($params['apply_for_fee'])) && ($params['apply_for_fee'] > 0))
-            $data['apply_for_fee'] = $params['apply_for_fee'];
+        $data['apply_for_fee'] = $this->getApplyForFee($params['type'],$params['setting_date']);//本月报销费用 (其他费用);
 
         if((isset($params['discounts'])) && ($params['discounts'] > 0))
             $data['discounts'] = $params['discounts'];