Commit 670727ae authored by hujun's avatar hujun

office_name

parent 7f99b356
...@@ -17,6 +17,7 @@ use app\model\AStore; ...@@ -17,6 +17,7 @@ use app\model\AStore;
use app\model\FApplyForFee; use app\model\FApplyForFee;
use app\model\FApplyForFeeCheck; use app\model\FApplyForFeeCheck;
use app\model\FImg; use app\model\FImg;
use app\model\FOffice;
use app\model\FSettingLog; use app\model\FSettingLog;
use app\model\FStoreCost; use app\model\FStoreCost;
use app\model\FStoreCostExt; use app\model\FStoreCostExt;
...@@ -320,7 +321,7 @@ class Cost extends Basic ...@@ -320,7 +321,7 @@ class Cost extends Basic
$data['setting_log'] = $list; $data['setting_log'] = $list;
} }
} }
$data['office_name'] = '';
//费用类型 1办公室成本 2上海总部成本 3分部成本 4同联发展基金 5门店单独成本 //费用类型 1办公室成本 2上海总部成本 3分部成本 4同联发展基金 5门店单独成本
switch($data['type']) { switch($data['type']) {
case 1 : case 1 :
...@@ -346,6 +347,9 @@ class Cost extends Basic ...@@ -346,6 +347,9 @@ class Cost extends Basic
$store_fee_where['setting_date'] = date('Y-m-d', strtotime('-1 month', strtotime($data['count_time']))); $store_fee_where['setting_date'] = date('Y-m-d', strtotime('-1 month', strtotime($data['count_time'])));
$data['office_attendance_num'] = $m_store_fee->getSumField('attendance_num', $store_fee_where); $data['office_attendance_num'] = $m_store_fee->getSumField('attendance_num', $store_fee_where);
} }
$m_office = new FOffice();
$data['office_name'] = $m_office->getFieldOneValue('office_name', ['id'=>$data['office_id']]);
} }
break; break;
case 2 : case 2 :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment