diff --git a/app/Gdoo/Approach/Controllers/ApproachController.php b/app/Gdoo/Approach/Controllers/ApproachController.php index dd95fc5d..b298075b 100644 --- a/app/Gdoo/Approach/Controllers/ApproachController.php +++ b/app/Gdoo/Approach/Controllers/ApproachController.php @@ -67,12 +67,11 @@ class ApproachController extends WorkflowController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header, function($item) { + return Grid::dataFilters($rows, $header, function($item) { $item['master_cash_amount'] = ''.$item['master_cash_amount'].''; $item['master_product'] = '明细'; return $item; }); - return $items->toJson(); } $header['buttons'] = [ diff --git a/app/Gdoo/Approach/Controllers/MarketController.php b/app/Gdoo/Approach/Controllers/MarketController.php index 4dd75d4c..56d13fa2 100644 --- a/app/Gdoo/Approach/Controllers/MarketController.php +++ b/app/Gdoo/Approach/Controllers/MarketController.php @@ -57,8 +57,7 @@ class MarketController extends DefaultController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/Approach/Controllers/ReviewController.php b/app/Gdoo/Approach/Controllers/ReviewController.php index 7fbc3a67..51bb8618 100644 --- a/app/Gdoo/Approach/Controllers/ReviewController.php +++ b/app/Gdoo/Approach/Controllers/ReviewController.php @@ -58,8 +58,7 @@ class ReviewController extends WorkflowController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/Article/Controllers/ArticleController.php b/app/Gdoo/Article/Controllers/ArticleController.php index 8f39ef7a..238bf42c 100644 --- a/app/Gdoo/Article/Controllers/ArticleController.php +++ b/app/Gdoo/Article/Controllers/ArticleController.php @@ -80,10 +80,16 @@ class ArticleController extends DefaultController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); + + $header['cols'] = $cols; + $header['tabs'] = Article::$tabs; + $header['bys'] = Article::$bys; + $header['js'] = Grid::js($header); + $items = Grid::dataFilters($rows, $header, function($item) { return $item; }); - return $items->toJson(); + return $items; } $header['buttons'] = [ diff --git a/app/Gdoo/Customer/Controllers/ComplaintController.php b/app/Gdoo/Customer/Controllers/ComplaintController.php index 844b46ee..014adca5 100644 --- a/app/Gdoo/Customer/Controllers/ComplaintController.php +++ b/app/Gdoo/Customer/Controllers/ComplaintController.php @@ -62,9 +62,7 @@ class ComplaintController extends WorkflowController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/Customer/Controllers/ContactController.php b/app/Gdoo/Customer/Controllers/ContactController.php index 7fa70c30..f3a29184 100644 --- a/app/Gdoo/Customer/Controllers/ContactController.php +++ b/app/Gdoo/Customer/Controllers/ContactController.php @@ -59,8 +59,7 @@ class ContactController extends DefaultController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/Customer/Controllers/CustomerApplyController.php b/app/Gdoo/Customer/Controllers/CustomerApplyController.php index 35f10726..c2cc9f37 100644 --- a/app/Gdoo/Customer/Controllers/CustomerApplyController.php +++ b/app/Gdoo/Customer/Controllers/CustomerApplyController.php @@ -72,11 +72,9 @@ class CustomerApplyController extends WorkflowController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - - $items = Grid::dataFilters($rows, $header, function($item) { + return Grid::dataFilters($rows, $header, function($item) { return $item; }); - return $items->toJson(); } $header['buttons'] = [ diff --git a/app/Gdoo/Customer/Controllers/CustomerController.php b/app/Gdoo/Customer/Controllers/CustomerController.php index 16391483..bcc94af4 100644 --- a/app/Gdoo/Customer/Controllers/CustomerController.php +++ b/app/Gdoo/Customer/Controllers/CustomerController.php @@ -73,11 +73,9 @@ class CustomerController extends DefaultController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - - $items = Grid::dataFilters($rows, $header, function($item) { + return Grid::dataFilters($rows, $header, function($item) { return $item; }); - return $items->toJson(); } $header['buttons'] = [ diff --git a/app/Gdoo/Customer/Controllers/DeliveryAddressController.php b/app/Gdoo/Customer/Controllers/DeliveryAddressController.php index c8c0bec5..d75045c1 100644 --- a/app/Gdoo/Customer/Controllers/DeliveryAddressController.php +++ b/app/Gdoo/Customer/Controllers/DeliveryAddressController.php @@ -58,8 +58,7 @@ class DeliveryAddressController extends DefaultController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/Customer/Controllers/PriceController.php b/app/Gdoo/Customer/Controllers/PriceController.php index 225fe093..92de5a4f 100644 --- a/app/Gdoo/Customer/Controllers/PriceController.php +++ b/app/Gdoo/Customer/Controllers/PriceController.php @@ -63,8 +63,7 @@ class PriceController extends DefaultController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/Customer/Controllers/TaxController.php b/app/Gdoo/Customer/Controllers/TaxController.php index dc69c57a..22e44b77 100644 --- a/app/Gdoo/Customer/Controllers/TaxController.php +++ b/app/Gdoo/Customer/Controllers/TaxController.php @@ -60,8 +60,7 @@ class TaxController extends AuditController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/Customer/Controllers/TypeController.php b/app/Gdoo/Customer/Controllers/TypeController.php index e60c3e70..4e7eb96a 100644 --- a/app/Gdoo/Customer/Controllers/TypeController.php +++ b/app/Gdoo/Customer/Controllers/TypeController.php @@ -51,8 +51,7 @@ class TypeController extends DefaultController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/CustomerCost/Controllers/AdjustController.php b/app/Gdoo/CustomerCost/Controllers/AdjustController.php index 6eaa88c3..0fe84ea6 100644 --- a/app/Gdoo/CustomerCost/Controllers/AdjustController.php +++ b/app/Gdoo/CustomerCost/Controllers/AdjustController.php @@ -61,8 +61,7 @@ class AdjustController extends AuditController $header['select'][] = 'customer_cost_data.cost_id'; $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/CustomerCost/Controllers/CategoryController.php b/app/Gdoo/CustomerCost/Controllers/CategoryController.php index 96e1e4f7..1f17e178 100644 --- a/app/Gdoo/CustomerCost/Controllers/CategoryController.php +++ b/app/Gdoo/CustomerCost/Controllers/CategoryController.php @@ -49,8 +49,7 @@ class CategoryController extends DefaultController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/CustomerCost/Controllers/CompenController.php b/app/Gdoo/CustomerCost/Controllers/CompenController.php index 19bc7e1c..bd2d6978 100644 --- a/app/Gdoo/CustomerCost/Controllers/CompenController.php +++ b/app/Gdoo/CustomerCost/Controllers/CompenController.php @@ -61,8 +61,7 @@ class CompenController extends AuditController $header['select'][] = 'customer_cost_data.cost_id'; $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/CustomerCost/Controllers/CostController.php b/app/Gdoo/CustomerCost/Controllers/CostController.php index 71737768..25acb3c0 100644 --- a/app/Gdoo/CustomerCost/Controllers/CostController.php +++ b/app/Gdoo/CustomerCost/Controllers/CostController.php @@ -68,8 +68,7 @@ class CostController extends AuditController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/CustomerCost/Controllers/RebateController.php b/app/Gdoo/CustomerCost/Controllers/RebateController.php index 7939ef8a..d728e8ad 100644 --- a/app/Gdoo/CustomerCost/Controllers/RebateController.php +++ b/app/Gdoo/CustomerCost/Controllers/RebateController.php @@ -61,8 +61,7 @@ class RebateController extends AuditController $header['select'][] = 'customer_cost_data.cost_id'; $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header); - return $items->toJson(); + return Grid::dataFilters($rows, $header); } $header['buttons'] = [ diff --git a/app/Gdoo/File/Controllers/CertificateController.php b/app/Gdoo/File/Controllers/CertificateController.php index d82c5539..ba850b9b 100644 --- a/app/Gdoo/File/Controllers/CertificateController.php +++ b/app/Gdoo/File/Controllers/CertificateController.php @@ -47,11 +47,10 @@ class CertificateController extends DefaultController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header, function($item) { + return Grid::dataFilters($rows, $header, function($item) { $item['size'] = human_filesize($item['size']); return $item; }); - return $items->toJson(); } $header['buttons'] = [ diff --git a/app/Gdoo/File/Controllers/InspectReportController.php b/app/Gdoo/File/Controllers/InspectReportController.php index 964eeb65..fa8ecbe2 100644 --- a/app/Gdoo/File/Controllers/InspectReportController.php +++ b/app/Gdoo/File/Controllers/InspectReportController.php @@ -47,11 +47,10 @@ class InspectReportController extends DefaultController $model->select($header['select']); $rows = $model->paginate($query['limit'])->appends($query); - $items = Grid::dataFilters($rows, $header, function($item) { + return Grid::dataFilters($rows, $header, function($item) { $item['size'] = human_filesize($item['size']); return $item; }); - return $items->toJson(); } $header['buttons'] = [ diff --git a/app/Gdoo/Index/views/index/index.blade.php b/app/Gdoo/Index/views/index/index.blade.php index 65372138..6baf5fd7 100644 --- a/app/Gdoo/Index/views/index/index.blade.php +++ b/app/Gdoo/Index/views/index/index.blade.php @@ -38,6 +38,7 @@ +