|
@@ -34,6 +34,14 @@ $cate = function() use ($auth)
|
|
|
}
|
|
|
return $array;
|
|
|
};
|
|
|
+
|
|
|
+$zhou = Dever::input('search_zhou');
|
|
|
+if ($zhou) {
|
|
|
+ $group = 'cate_id';
|
|
|
+} else {
|
|
|
+ $group = 'day_int,cate_id';
|
|
|
+}
|
|
|
+
|
|
|
$list = array
|
|
|
(
|
|
|
# 匹配的正则或函数 选填项
|
|
@@ -48,14 +56,14 @@ $list = array
|
|
|
),
|
|
|
'type' => 'all',
|
|
|
'order' => array('day_int' => 'desc', 'id' => 'desc'),
|
|
|
- 'group' => 'day_int,cate_id',
|
|
|
+ 'group' => $group,
|
|
|
'page' => array(20, 'list'),
|
|
|
'col' => 'id,sum(order_num) as order_num,sum(order_yes_num) as order_yes_num,sum(order_no_num) as order_no_num,sum(buy_num) as buy_num,sum(buy_cash) as buy_cash,cdate,journal_id,day_int,day_string,cate_id',
|
|
|
);
|
|
|
|
|
|
//$search = Dever::input('search_option_journal_id');
|
|
|
$search = Dever::input('search_linkage_cate_journal');
|
|
|
-if ($search && $search != -1 && isset($search[1]) && $search[1] > 0) {
|
|
|
+if (!$zhou && $search && $search != -1 && isset($search[1]) && $search[1] > 0) {
|
|
|
Dever::setInput('search_option_journal_id', $search[1]);
|
|
|
unset($list['group']);
|
|
|
$list['col'] = '*';
|
|
@@ -64,6 +72,7 @@ if ($search && $search != -1 && isset($search[1]) && $search[1] > 0) {
|
|
|
if ($auth) {
|
|
|
$list['option']['cate_id'] = array($auth, 'in');
|
|
|
}
|
|
|
+
|
|
|
return array
|
|
|
(
|
|
|
# 表名
|
|
@@ -94,7 +103,7 @@ return array
|
|
|
'match' => 'is_string',
|
|
|
'update' => 'text',
|
|
|
//'search' => 'fulltext',
|
|
|
- 'list' => true,
|
|
|
+ 'list' => $zhou ? false : true,
|
|
|
),
|
|
|
|
|
|
'day_int' => array
|
|
@@ -143,7 +152,7 @@ return array
|
|
|
'update' => 'select',
|
|
|
//'search' => 'select',
|
|
|
'option' => $journal,
|
|
|
- 'list' => 'Dever::load("stat/lib/manage.info", {journal_id})',
|
|
|
+ 'list' => $zhou ? false : 'Dever::load("stat/lib/manage.info", {journal_id})',
|
|
|
),
|
|
|
|
|
|
'order_num' => array
|