admin_stock_113_2
This commit is contained in:
@@ -140,17 +140,13 @@ class Stock extends HD_Controller
|
||||
$res = $this->monthSelect($params);
|
||||
$fileName = $res['_title'];
|
||||
foreach ($res['biz'] as $k => $v) {
|
||||
$month = date('Y年m月', strtotime($v['month']));
|
||||
$temp['biz_name'] = $v['biz_name'];
|
||||
$temp['month'] = $month;
|
||||
$temp['data'] = $v['data'];
|
||||
$data[] = $temp;
|
||||
$data[] = $v;
|
||||
}
|
||||
$indexs = ['biz_name' => '门店'];
|
||||
foreach ($res['date_months'] as $v) {
|
||||
$month = date('Y年m月', strtotime($v));
|
||||
$indexs[$v] = $month;
|
||||
}
|
||||
$indexs = [
|
||||
'biz_name' => '门店',
|
||||
'month' => '月份',
|
||||
'data' => '库存数据',
|
||||
];
|
||||
array_unshift($data, $indexs);
|
||||
$this->load->library('excel');
|
||||
$this->excel->out_csv($data, $indexs, $fileName . "_" . date('YmdHis'));
|
||||
@@ -167,7 +163,7 @@ class Stock extends HD_Controller
|
||||
$typeAry[$k] = $v;
|
||||
}
|
||||
}
|
||||
$biz = $res_biz = $dateMonths = [];
|
||||
$biz = $res_biz = $date_months = $dateMonths = [];
|
||||
if ($params['type'] || $params['biz_id'] || $params['city_id']) {
|
||||
$start_date = date('Y-m', strtotime("-11 month"));//取最近12个月
|
||||
$end_date = date('Y-m');
|
||||
@@ -190,6 +186,9 @@ class Stock extends HD_Controller
|
||||
$res_biz = $this->mdBiz->select($where_biz, 'id desc', 0, 0, 'id,biz_name');
|
||||
foreach ($res_biz as $v) {
|
||||
$months = [];
|
||||
if ($params['export'] == 1) {
|
||||
$months['biz_name'] = $v['biz_name'];
|
||||
}
|
||||
foreach ($dateMonths as $v2) {
|
||||
$where2 = $where3 = ['biz_id' => $v['id'], 'log_date>=' => $v2['firstDay'], 'log_date<=' => $v2['lastDay']];
|
||||
$res_log = $this->mdStockLog->select_groupby('s_id', $where2, 'id desc', 0, 0, 'brand_id,s_id');
|
||||
@@ -209,12 +208,14 @@ class Stock extends HD_Controller
|
||||
}
|
||||
}
|
||||
if ($params['export'] == 1) {
|
||||
$biz[] = ['biz_name' => $v['biz_name'], 'month' => $v2['name'], 'data' => $data];
|
||||
$months[$v2['name']] = $data;
|
||||
} else {
|
||||
$months[] = ['name' => $v2['name'], 'data' => $data];
|
||||
}
|
||||
}
|
||||
if ($params['export'] != 1) {
|
||||
if ($params['export'] == 1) {
|
||||
$biz[] = $months;
|
||||
} else {
|
||||
$biz[] = ['biz_name' => $v['biz_name'], 'months' => $months];
|
||||
}
|
||||
}
|
||||
@@ -226,6 +227,7 @@ class Stock extends HD_Controller
|
||||
$showData['typeStr'] = $typeStr;
|
||||
$data['showData'] = $showData;
|
||||
$data['biz'] = $biz;
|
||||
$data['date_months'] = $date_months;
|
||||
$data['params'] = $params;
|
||||
$data['_title'] = '库存统计';
|
||||
return $data;
|
||||
|
||||
Reference in New Issue
Block a user