diff --git a/app/Gdoo/Approach/Controllers/ApproachController.php b/app/Gdoo/Approach/Controllers/ApproachController.php index b298075b..087139cb 100644 --- a/app/Gdoo/Approach/Controllers/ApproachController.php +++ b/app/Gdoo/Approach/Controllers/ApproachController.php @@ -36,6 +36,19 @@ class ApproachController extends WorkflowController $cols['master_product']['cellRenderer'] = 'htmlCellRenderer'; $cols['master_cash_amount']['cellRenderer'] = 'htmlCellRenderer'; + $header['buttons'] = [ + // ['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']], + ['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1], + ]; + + $header['left_buttons'] = [ + ['name' => '批量编辑', 'color' => 'default', 'icon' => 'fa-pencil-square-o', 'action' => 'batchEdit', 'display' => $this->access['batchEdit']], + ]; + + $header['cols'] = $cols; + $header['tabs'] = Approach::$tabs; + $header['bys'] = Approach::$bys; + $search = $header['search_form']; $query = $search['query']; @@ -74,20 +87,6 @@ class ApproachController extends WorkflowController }); } - $header['buttons'] = [ - // ['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']], - ['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1], - ]; - - $header['left_buttons'] = [ - ['name' => '批量编辑', 'color' => 'default', 'icon' => 'fa-pencil-square-o', 'action' => 'batchEdit', 'display' => $this->access['batchEdit']], - ]; - - $header['cols'] = $cols; - $header['tabs'] = Approach::$tabs; - $header['bys'] = Approach::$bys; - $header['js'] = Grid::js($header); - return $this->display([ 'header' => $header, ]); diff --git a/app/Gdoo/Approach/Controllers/MarketController.php b/app/Gdoo/Approach/Controllers/MarketController.php index eafe59e9..2b743a9f 100644 --- a/app/Gdoo/Approach/Controllers/MarketController.php +++ b/app/Gdoo/Approach/Controllers/MarketController.php @@ -33,6 +33,15 @@ class MarketController extends DefaultController 'display' => $this->access['edit'], ]]; + $header['buttons'] = [ + ['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']], + ['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1], + ]; + + $header['cols'] = $cols; + $header['tabs'] = ApproachMarket::$tabs; + $header['bys'] = ApproachMarket::$bys; + $search = $header['search_form']; $query = $search['query']; @@ -60,16 +69,6 @@ class MarketController extends DefaultController return Grid::dataFilters($rows, $header); } - $header['buttons'] = [ - ['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']], - ['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1], - ]; - - $header['cols'] = $cols; - $header['tabs'] = ApproachMarket::$tabs; - $header['bys'] = ApproachMarket::$bys; - $header['js'] = Grid::js($header); - return $this->display([ 'header' => $header, ]); diff --git a/app/Gdoo/Approach/Controllers/ReviewController.php b/app/Gdoo/Approach/Controllers/ReviewController.php index 51bb8618..bd5c8898 100644 --- a/app/Gdoo/Approach/Controllers/ReviewController.php +++ b/app/Gdoo/Approach/Controllers/ReviewController.php @@ -34,6 +34,18 @@ class ReviewController extends WorkflowController 'display' => $this->access['show'], ]]; + $header['buttons'] = [ + ['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1], + ]; + + $header['left_buttons'] = [ + ['name' => '批量编辑', 'color' => 'default', 'icon' => 'fa-pencil-square-o', 'action' => 'batchEdit', 'display' => $this->access['batchEdit']], + ]; + + $header['cols'] = $cols; + $header['tabs'] = ApproachReview::$tabs; + $header['bys'] = ApproachReview::$bys; + $search = $header['search_form']; $query = $search['query']; @@ -61,20 +73,6 @@ class ReviewController extends WorkflowController return Grid::dataFilters($rows, $header); } - $header['buttons'] = [ - //['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']], - ['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1], - ]; - - $header['left_buttons'] = [ - ['name' => '批量编辑', 'color' => 'default', 'icon' => 'fa-pencil-square-o', 'action' => 'batchEdit', 'display' => $this->access['batchEdit']], - ]; - - $header['cols'] = $cols; - $header['tabs'] = ApproachReview::$tabs; - $header['bys'] = ApproachReview::$bys; - $header['js'] = Grid::js($header); - return $this->display([ 'header' => $header, ]); diff --git a/app/Gdoo/Approach/views/approach/index.blade.php b/app/Gdoo/Approach/views/approach/index.blade.php index 29ee5a71..02a560ab 100644 --- a/app/Gdoo/Approach/views/approach/index.blade.php +++ b/app/Gdoo/Approach/views/approach/index.blade.php @@ -1,19 +1,32 @@ -{{$header["js"]}} - -
- - | -场景ID | -类型 | -到期时间 | -二维码链接 | -ID | -- |
---|---|---|---|---|---|---|
- - | -{{$vo['scene_id']}} | -- @if($vo['qr_type'] == 0) - 临时 - @else - 永久 - @endif - | -- @if($vo['qr_type'] == 0) - @datetime($vo['created_at'] + $vo['expire']) - @else - 长期有效 - @endif - | -- {{$vo['url']}} - | -- {{$vo['id']}} - | -- 查看 - | -
$2>")+h[2],o=h[0];o--;)a=a.lastChild;if(!u.leadingWhitespace&&st.test(s)&&g.push(e.createTextNode(st.exec(s)[0])),!u.tbody)for(o=(s="table"!==l||lt.test(s)?"