hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

去掉列表输出tojson方法

Browse Source 
加入json中文不转换中间件
修改菜单关闭按钮样式
This commit is contained in:
hawind
2021-03-09 06:28:33 +08:00
parent 89bab045dd
commit b3ee45674f
62 changed files with 107 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Approach/Controllers/ApproachController.php
+1 -2
View File
@@ -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'] = '<a href="javascript:;" data-toggle="event" data-action="fee_detail" data-master_id="'.$item['master_id'].'" class="option">'.$item['master_cash_amount'].'</a>';
$item['master_product'] = '<a href="javascript:;" data-toggle="event" data-action="product" data-master_id="'.$item['master_id'].'" class="option">明细</a>';
return $item;
});
return $items->toJson();
}
$header['buttons'] = [
app/Gdoo/Approach/Controllers/MarketController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/Approach/Controllers/ReviewController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/Article/Controllers/ArticleController.php
+7 -1
View File
@@ -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'] = [
app/Gdoo/Customer/Controllers/ComplaintController.php
+1 -3
View File
@@ -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'] = [
app/Gdoo/Customer/Controllers/ContactController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/Customer/Controllers/CustomerApplyController.php
+1 -3
View File
@@ -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'] = [
app/Gdoo/Customer/Controllers/CustomerController.php
+1 -3
View File
@@ -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'] = [
app/Gdoo/Customer/Controllers/DeliveryAddressController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/Customer/Controllers/PriceController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/Customer/Controllers/TaxController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/Customer/Controllers/TypeController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/CustomerCost/Controllers/AdjustController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/CustomerCost/Controllers/CategoryController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/CustomerCost/Controllers/CompenController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/CustomerCost/Controllers/CostController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/CustomerCost/Controllers/RebateController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/File/Controllers/CertificateController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/File/Controllers/InspectReportController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/Index/views/index/index.blade.php
+1
View File
@@ -38,6 +38,7 @@
</a>
<a href="{{url('/')}}" class="navbar-brand">
<img src="{{$asset_url}}/images/logo.svg" width="18" />
<!--
<i class="fa text-lg fa-buysellads"></i>
app/Gdoo/Model/Grid.php
+5 -4
View File
@@ -105,13 +105,14 @@ class Grid
$rows[] = static::dataFilter($item, $header, $callback);
}
$rows = collect($rows);
$ret = [];
if ($items instanceof AbstractPaginator) {
$items->setCollection($rows);
$ret = $items->setCollection(collect($rows))->toArray();
} else {
$items = $rows;
$ret = collect(['data' => $rows]);
}
return $items;
$ret['header'] = $header;
return $ret;
}
public static function dataFilter($item, $header, $callback = null)
app/Gdoo/Order/Controllers/LogisticsController.php
+1 -2
View File
@@ -52,8 +52,7 @@ class LogisticsController 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'] = [
app/Gdoo/Order/Controllers/OrderController.php
+3 -7
View File
@@ -254,8 +254,7 @@ class OrderController extends WorkflowController
}
$rows = $model->paginate($query['limit'])->appends($query);
$items = Grid::dataFilters($rows, $header);
return $items->toJson();
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
@@ -385,9 +384,7 @@ class OrderController extends WorkflowController
$model->addSelect($header['select']);
$rows = $model->paginate($query['limit'])->appends($query);
$items = Grid::dataFilters($rows, $header);
return $items->toJson();
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
@@ -582,8 +579,7 @@ class OrderController extends WorkflowController
}
$rows = $model->paginate($query['limit'])->appends($query);
$items = Grid::dataFilters($rows, $header);
return $items->toJson();
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
app/Gdoo/Order/Controllers/SampleApplyController.php
+2 -4
View File
@@ -94,8 +94,7 @@ class SampleApplyController extends WorkflowController
$model->addSelect(DB::raw('sad.*'));
$rows = $model->paginate($query['limit'])->appends($query);
$items = Grid::dataFilters($rows, $header);
return $items->toJson();
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
@@ -157,8 +156,7 @@ class SampleApplyController 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'] = [
app/Gdoo/Order/Controllers/TypeController.php
+1 -2
View File
@@ -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'] = [
app/Gdoo/Produce/Controllers/MaterialController.php
+1 -2
View File
@@ -54,8 +54,7 @@ class MaterialController 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'] = [
app/Gdoo/Produce/Controllers/PlanController.php
+1 -2
View File
@@ -54,8 +54,7 @@ class PlanController 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'] = [
app/Gdoo/Product/Controllers/ProductController.php
+1 -2
View File
@@ -69,8 +69,7 @@ class ProductController 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'] = [
app/Gdoo/Product/Controllers/UnitController.php
+1 -2
View File
@@ -48,8 +48,7 @@ class UnitController 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'] = [
app/Gdoo/Promotion/Controllers/MaterialController.php
+1 -2
View File
@@ -78,10 +78,9 @@ class MaterialController extends DefaultController
$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'] = [
app/Gdoo/Promotion/Controllers/PromotionController.php
+1 -3
View File
@@ -86,13 +86,11 @@ class PromotionController extends WorkflowController
$model->addSelect(DB::raw("case when promotion.type_id = 2 then promotion.undertake_money else 0 end as zp_money"));
$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'] = '<a href="javascript:;" data-toggle="event" data-action="fee_detail" data-master_id="'.$item['master_id'].'" class="option">'.$item['master_cash_amount'].'</a>';
$item['master_product'] = '<a href="javascript:;" data-toggle="event" data-action="product" data-master_id="'.$item['master_id'].'" class="option">明细</a>';
return $item;
});
return $items->toJson();
}
$header['buttons'] = [
app/Gdoo/Promotion/Controllers/ReviewController.php
+1 -2
View File
@@ -59,8 +59,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'] = [
app/Gdoo/Purchase/Controllers/OrderController.php
+1 -2
View File
@@ -51,8 +51,7 @@ class OrderController 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'] = [
app/Gdoo/Purchase/Controllers/SupplierController.php
+1 -2
View File
@@ -51,8 +51,7 @@ class SupplierController 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'] = [
app/Gdoo/Stock/Controllers/AllocationController.php
+1 -2
View File
@@ -52,8 +52,7 @@ class AllocationController 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'] = [
app/Gdoo/Stock/Controllers/CancelController.php
+1 -2
View File
@@ -50,8 +50,7 @@ class CancelController 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'] = [
app/Gdoo/Stock/Controllers/CategoryController.php
+1 -2
View File
@@ -50,8 +50,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'] = [
app/Gdoo/Stock/Controllers/DeliveryController.php
+2 -4
View File
@@ -92,8 +92,7 @@ class DeliveryController extends WorkflowController
$model->addSelect(DB::raw('sdd.total_quantity'));
$rows = $model->paginate($query['limit'])->appends($query);
$items = Grid::dataFilters($rows, $header);
return $items->toJson();
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
@@ -165,8 +164,7 @@ class DeliveryController 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'] = [
app/Gdoo/Stock/Controllers/DirectController.php
+1 -2
View File
@@ -50,8 +50,7 @@ class DirectController 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'] = [
app/Gdoo/Stock/Controllers/LocationController.php
+1 -2
View File
@@ -50,8 +50,7 @@ class LocationController 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'] = [
app/Gdoo/Stock/Controllers/Record01Controller.php
+1 -2
View File
@@ -50,8 +50,7 @@ class Record01Controller 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'] = [
app/Gdoo/Stock/Controllers/Record08Controller.php
+1 -2
View File
@@ -50,8 +50,7 @@ class Record08Controller 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'] = [
app/Gdoo/Stock/Controllers/Record09Controller.php
+1 -2
View File
@@ -50,8 +50,7 @@ class Record09Controller 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'] = [
app/Gdoo/Stock/Controllers/Record10Controller.php
+1 -2
View File
@@ -50,8 +50,7 @@ class Record10Controller 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'] = [
app/Gdoo/Stock/Controllers/Record11Controller.php
+1 -2
View File
@@ -50,8 +50,7 @@ class Record11Controller 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'] = [
app/Gdoo/Stock/Controllers/TypeController.php
+1 -2
View File
@@ -50,8 +50,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'] = [
app/Gdoo/Stock/Controllers/WarehouseController.php
+1 -2
View File
@@ -50,8 +50,7 @@ class WarehouseController 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'] = [
app/Gdoo/System/Controllers/RegionController.php
+1 -2
View File
@@ -53,8 +53,7 @@ class RegionController 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'] = [
app/Gdoo/User/Controllers/GroupController.php
+1 -2
View File
@@ -52,8 +52,7 @@ class GroupController 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'] = [
app/Gdoo/User/Controllers/MessageController.php
+1 -2
View File
@@ -62,8 +62,7 @@ class MessageController extends Controller
$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'] = [
app/Gdoo/User/Controllers/PositionController.php
+1 -2
View File
@@ -52,8 +52,7 @@ class PositionController 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'] = [
app/Gdoo/User/Controllers/RoleController.php
+1 -2
View File
@@ -80,8 +80,7 @@ class RoleController extends DefaultController
->addSelect(DB::raw('(select count(id) from [user] where role_id = role.id) as user_count'));
$rows = $model->paginate($query['limit'])->appends($query);
$items = Grid::dataFilters($rows, $header);
return $items->toJson();
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
app/Gdoo/User/Controllers/UserController.php
+1 -2
View File
@@ -71,8 +71,7 @@ class UserController 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'] = [