完全vue渲染列表的功能

去掉不必要的js函数定义
修改返回json的方式

app/Gdoo/Approach/Controllers/MarketController.php

@@ -151,9 +151,7 @@ class MarketController extends DefaultController
             $model->selectRaw($sql);
             $rows = $model->paginate();
 
-            $items = Grid::dataFilters($rows, $header);
+            return Grid::dataFilters($rows, $header);
-
-            return response()->json($items);
         }
     }
 }

app/Gdoo/Approach/views/approach/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         action.fee_detail = function(data) {
             viewDialog({
                 title: '兑现明细',

app/Gdoo/Approach/views/market/index.blade.php

@@ -13,13 +13,6 @@
         var action = config.action;
         var search = config.search;
 
-        //action.dialogType = 'layer';
-
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Approach/views/review/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Article/Controllers/ArticleController.php

@@ -51,7 +51,6 @@ class ArticleController extends DefaultController
         $header['cols'] = $cols;
         $header['tabs'] = Article::$tabs;
         $header['bys'] = Article::$bys;
-        $header['js'] = Grid::js($header);
 
         $search = $header['search_form'];
         $query = $search['query'];

app/Gdoo/Article/Controllers/WidgetController.php

@@ -34,7 +34,7 @@ class WidgetController extends DefaultController
             
             $json['total'] = sizeof($rows);
             $json['data'] = $rows;
-            return response()->json($json);
+            return $json;
         }
         return $this->render();
     }

app/Gdoo/Article/views/article/index.blade.php

@@ -1,39 +1,24 @@
-<div id="{{$header['master_table']}}-controller">
+<div class="vue-list-page" id="{{$header['master_table']}}-controller">
     <div class="panel no-border">
-        @include('headers')
+        <div class="panel-header">
+            @include('headers2')
+        </div>
         <div class='list-jqgrid'>
             <div id="{{$header['master_table']}}-grid" style="width:100%;" class="ag-theme-balham"></div>
         </div>
     </div>
 </div>
 
-{{$header["js"]}}
-
 <script>
-
+Vue.createApp({
-(function ($) {
+    setup(props, ctx) {
-    var header = {{json_encode($header, JSON_UNESCAPED_UNICODE)}};
-
         var table = '{{$header["master_table"]}}';
-    var config = gdoo.grids[table];
-    var action = config.action;
-    var search = config.search;
 
-    action.dialogType = 'layer';
+        var config = new gdoo.grid(table);
 
-    // 自定义搜索方法
+        var grid = config.grid;
-    search.searchInit = function (e) {
+        grid.remoteDataUrl = '{{url()}}';
-        var self = this;
+        grid.onRowDoubleClicked = function (params) {
-    }
-    
-    var options = new agGridOptions();
-    var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
-    gridDiv.style.height = getPanelHeight(48);
-
-    options.remoteDataUrl = '{{url()}}';
-    options.remoteParams = search.advanced.query;
-    options.columnDefs = config.cols;
-    options.onRowDoubleClicked = function (params) {
             if (params.node.rowPinned) {
                 return;
             }
@@ -45,22 +30,21 @@
             }
         };
 
-    new agGrid.Grid(gridDiv, options);
+        var action = config.action;
+        action.dialogType = 'layer';
 
-    // 读取数据
+        var setup = config.setup;
-    options.remoteData({page: 1});
 
-    // 绑定自定义事件
+        Vue.onMounted(function() {
-    var $gridDiv = $(gridDiv);
+            var gridDiv = document.querySelector("#" + table + "-grid");
-    $gridDiv.on('click', '[data-toggle="event"]', function () {
+            gridDiv.style.height = getPanelHeight(136);
-        var data = $(this).data();
+            new agGrid.Grid(gridDiv, grid);
-        if (data.master_id > 0) {
+            // 初始化数据
-            action[data.action](data);
+            grid.remoteData({page: 1}, function(res) {
-        }
+                config.init(res);
             });
-    config.grid = options;
+        });
-
+        return setup;
-})(jQuery);
+    }
+}).mount("#{{$header['master_table']}}-controller");
 </script>
-
-@include('footers')

app/Gdoo/Article/views/article/index2.blade.php

@@ -1,105 +0,0 @@
-<style>
-.vue-list-page .search-inline-form .form-group {
-    margin-left: 4px;
-}
-.vue-list-page .btn-group {
-    margin-left: 4px;
-}
-</style>
-
-<div class="vue-list-page" id="{{$header['master_table']}}-controller">
-    <div class="panel no-border">
-        @include('headers3')
-        <div class='list-jqgrid'>
-            <div id="{{$header['master_table']}}-grid" style="width:100%;" class="ag-theme-balham"></div>
-        </div>
-    </div>
-</div>
-
-{{$header["js"]}}
-
-<script>
-
-(function ($) {
-    var header = {{json_encode($header, JSON_UNESCAPED_UNICODE)}};
-
-    var table = '{{$header["master_table"]}}';
-    var config = gdoo.grids[table];
-    var action = config.action;
-    var search = config.search;
-
-    const vueData = {
-        data() {
-            return {
-                header: {},
-                tab_active: '',
-            }
-        },mounted() {
-            abc(this);
-        },
-        methods: {
-            url(url, query) {
-                var me = this;
-                let params = Vue.toRaw(me.header.search_form.params);
-                for (const key in query) {
-                    params[key] = query[key];
-                }
-                return app.url(url, params);
-            }
-        }
-    }
-    Vue.createApp(vueData).mount("#{{$header['master_table']}}-controller");
-
-    function abc(vue) {
-
-        action.dialogType = 'layer';
-
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
-        var options = new agGridOptions();
-        var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
-        gridDiv.style.height = getPanelHeight(48);
-
-        options.remoteDataUrl = '{{url()}}';
-        options.remoteParams = search.advanced.query;
-        options.columnDefs = config.cols;
-        options.onRowDoubleClicked = function (params) {
-            if (params.node.rowPinned) {
-                return;
-            }
-            if (params.data == undefined) {
-                return;
-            }
-            if (params.data.master_id > 0) {
-                action.show(params.data);
-            }
-        };
-
-        new agGrid.Grid(gridDiv, options);
-
-        // 读取数据
-        options.remoteData({page: 1});
-
-        options.remoteSuccessed = function(res) {
-            vue.header = res.header;
-            vue.tab_active = vue.header.search_form.params['tab'] ? vue.header.search_form.params['tab'] : vue.header.tabs.items[0].value;
-        };
-
-        // 绑定自定义事件
-        var $gridDiv = $(gridDiv);
-        $gridDiv.on('click', '[data-toggle="event"]', function () {
-            var data = $(this).data();
-            if (data.master_id > 0) {
-                action[data.action](data);
-            }
-        });
-        config.grid = options;
-    }
-
-})(jQuery);
-</script>
-
-@include('footers')

app/Gdoo/Calendar/Controllers/EventController.php

@@ -57,7 +57,7 @@ class EventController extends DefaultController
                 $events[] = $row;
             }
         }
-        return response()->json($events);
+        return $events;
     }
 
     // 客户端显示事件列表
@@ -120,7 +120,7 @@ class EventController extends DefaultController
             $repeat = CalendarObjectService::getEventRepeat($master, '1D', 'Y-n-j');
             $items = array_merge($items, $repeat);
         }
-        return response()->json($items);
+        return $items;
     }
 
     // 调整事件

app/Gdoo/Customer/Controllers/BusinessController.php

@@ -92,7 +92,7 @@ class BusinessController extends DefaultController
         $row['address'] = str_replace("\n", " ", $row['address']);
         $attachments = AttachmentService::show($row['attachment']);
         $row['attachments'] = $attachments['main'];
-        return response()->json($row);
+        return $row;
     }
 
     // 负责人列表

app/Gdoo/Customer/Controllers/ContactController.php

@@ -142,7 +142,7 @@ class ContactController extends DefaultController
                 $item['text'] = $item['name'];
                 return $item;
             });
-            return response()->json($items);
+            return $items;
         }
         $query['form_id'] = $query['jqgrid'] == '' ? $query['id'] : $query['jqgrid'];
         return $this->render([

app/Gdoo/Customer/Controllers/CustomerClassController.php

@@ -102,7 +102,7 @@ class CustomerClassController extends DefaultController
                 }
             }
             $rows = $model->get();
-            return response()->json(['data' => $rows]);
+            return ['data' => $rows];
         }
         return $this->render([
             'search' => $search

app/Gdoo/Customer/Controllers/CustomerController.php

@@ -278,20 +278,15 @@ class CustomerController extends DefaultController
 
             if ($query['suggest']) {
                 $rows = $model->limit(15)->get();
-                $data = Grid::dataFilters($rows, $header, function($item) {
-                    return $item;
-                });
-                $items['data'] = $data;
             } else {
                 $rows = $model->paginate($query['limit']);
-                $items = Grid::dataFilters($rows, $header, function($item) {
+            }
+            return Grid::dataFilters($rows, $header, function($item) {
                 $item['text'] = $item['name'];
                 $item['sid'] = 'u'.$item['user_id'];
                 return $item;
             });
         }
-            return response()->json($items);
-        }
         return $this->render([
             'search' => $search,
             'query' => $query,

app/Gdoo/Customer/Controllers/DeliveryAddressController.php

@@ -139,11 +139,7 @@ class DeliveryAddressController extends DefaultController
             $model->select($header['select']);
 
             $rows = $model->paginate($query['limit']);
-
+            return $rows;
-            if (isset($query['autocomplete'])) {
-                return response()->json($rows->items());
-            }
-            return response()->json($rows);
         }
         return $this->render([
             'search' => $search,

app/Gdoo/Customer/Controllers/RegionController.php

@@ -140,7 +140,7 @@ class RegionController extends DefaultController
             foreach($rows as $row) {
                 $json[] = $row;
             }
-            return response()->json(['data' => $json]);
+            return ['data' => $json];
         }
         return $this->render([
             'search' => $search

app/Gdoo/Customer/Controllers/TaxController.php

@@ -135,8 +135,7 @@ class TaxController extends AuditController
             }
 
             $model->select(['customer_tax.*','customer.code as customer_code', 'customer.name as customer_name']);
-            $rows = $model->paginate($query['limit']);
+            return $model->paginate($query['limit']);
-            return response()->json($rows);
         }
         return $this->render([
             'search' => $search,

app/Gdoo/Customer/Controllers/TypeController.php

@@ -97,7 +97,7 @@ class TypeController extends DefaultController
                 }
             }
             $rows = $model->get(['*', 'name as text']);
-            return response()->json(['data' => $rows]);
+            return ['data' => $rows];
         }
         return $this->render([
             'get' => Request::all()

app/Gdoo/Customer/Controllers/WidgetController.php

@@ -49,7 +49,7 @@ class WidgetController extends DefaultController
 
             $json['total'] = sizeof($rows);
             $json['data'] = $rows;
-            return response()->json($json);
+            return $json;
         }
         return $this->render();
     }

app/Gdoo/Customer/views/complaint/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Customer/views/contact/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Customer/views/customer/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         action.priceEdit = function() {
             var me = this;
             var grid = config.grid;

app/Gdoo/Customer/views/customerApply/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Customer/views/customerClass/index.blade.php

@@ -14,11 +14,6 @@
         var action = config.action;
         var search = config.search;
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         var grid = new agGridOptions();
 
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");

app/Gdoo/Customer/views/deliveryAddress/index.blade.php

@@ -15,11 +15,6 @@
 
         //action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Customer/views/price/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Customer/views/region/index.blade.php

@@ -12,14 +12,8 @@ var config = gdoo.grids[table];
 var action = config.action;
 var search = config.search;
 (function ($) {
-
     var options = new agGridOptions();
 
-    // 自定义搜索方法
-    search.searchInit = function (e) {
-        var self = this;
-    }
-
     config.cols[0]['hide'] = true;
     config.cols[1]['hide'] = true;
     config.cols[2]['hide'] = true;

app/Gdoo/Customer/views/regionTask/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Customer/views/task/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Customer/views/tax/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Customer/views/type/index.blade.php

@@ -13,11 +13,6 @@
         var action = config.action;
         var search = config.search;
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/CustomerCost/Controllers/CategoryController.php

@@ -95,7 +95,7 @@ class CategoryController extends DefaultController
                 }
             }
             $rows = $model->get(['*', 'name as text']);
-            return response()->json(['data' => $rows]);
+            return ['data' => $rows];
         }
         return $this->render([
             'get' => Request::all()

app/Gdoo/CustomerCost/Controllers/CostController.php

@@ -177,11 +177,10 @@ class CostController extends AuditController
             }
 
             $rows = $model->get();
-
             $rows->transform(function($row) {
                 return $row;
             });
-            return response()->json(['data' => $rows]);
+            return ['data' => $rows];
         }
 
         return $this->render([

app/Gdoo/CustomerCost/views/adjust/index.blade.php

@@ -14,11 +14,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/CustomerCost/views/category/index.blade.php

@@ -13,11 +13,6 @@
         var action = config.action;
         var search = config.search;
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/CustomerCost/views/compen/index.blade.php

@@ -14,11 +14,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/CustomerCost/views/cost/index.blade.php

@@ -40,11 +40,6 @@
             });
         }
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/CustomerCost/views/rebate/index.blade.php

@@ -14,11 +14,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/File/Controllers/AttachmentController.php

@@ -174,10 +174,10 @@ class AttachmentController extends DefaultController
 
                         $insert_id = DB::table($table)->insertGetId($data);
                         $data['id'] = $insert_id;
-                        return response()->json($data);
+                        return $data;
                     }
                 }
-                return response()->json([]);
+                return [];
             }
         }
         $query = Request::all();

app/Gdoo/File/views/certificate/index.blade.php

@@ -14,11 +14,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         action.create = function(data) {
             var me = this;
             var grid = config.grid;

app/Gdoo/File/views/inspectReport/index.blade.php

@@ -14,11 +14,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         action.create = function(data) {
             var me = this;
             var grid = config.grid;

app/Gdoo/Index/Controllers/ApiController.php

@@ -108,7 +108,7 @@ class ApiController extends Controller
     {
         $key = Request::get('key');
         $rows = option($key);
-        return response()->json($rows)->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        return $rows;
     }
 
     /**
@@ -118,7 +118,7 @@ class ApiController extends Controller
     {
         $key = Request::get('key');
         $rows = option($key);
-        return response()->json($rows)->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        return $rows;
     }
 
     /**
@@ -156,6 +156,6 @@ class ApiController extends Controller
         ->get()->toArray();
 
         $rows = array_merge($title, $rows);
-        return response()->json($rows);
+        return $rows;
     }
 }

app/Gdoo/Index/Controllers/AttachmentController.php

@@ -131,7 +131,7 @@ class AttachmentController extends DefaultController
     {
         $id = Request::get('id');
         $rows = AttachmentService::get($id);
-        return response()->json($rows);
+        return $rows;
     }
 
     /**
@@ -141,7 +141,7 @@ class AttachmentController extends DefaultController
     {
         $key = Request::get('key');
         $rows = AttachmentService::draft($key);
-        return response()->json($rows);
+        return $rows;
     }
     
     /**

app/Gdoo/Index/Controllers/IndexController.php

@@ -50,10 +50,10 @@ class IndexController extends DefaultController
         if ($key) {
             $badge = ModuleService::badges($key);
             if ($badge) {
-                return response()->json($badge());
+                return $badge();
             }
         }
-        return response()->json(['total' => 0, 'data' => []]);
+        return ['total' => 0, 'data' => []];
     }
 
     // 获取全部待办数量
@@ -64,6 +64,6 @@ class IndexController extends DefaultController
         foreach($badges as $key => $badge) {
             $json[$key] = $badge();
         }
-        return response()->json($json);
+        return $json;
     }
 }

app/Gdoo/Model/Controllers/FieldController.php

@@ -419,7 +419,7 @@ class FieldController extends DefaultController
     public function getEnumsAction()
     {
         $enums = Option::where('parent_id', 0)->orderBy('sort', 'asc')->orderBy('id', 'asc')->get();
-        return response()->json($enums);
+        return $enums;
     }
 
     public function deleteAction()

app/Gdoo/Model/Form.php

@@ -2002,7 +2002,6 @@ class Form
             if ($row['w'] == 1) {
                 $_field_data = Hook::fire($table.'.onFieldFilter', ['table' => $table, 'master' => $master, 'field' => $field, 'values' => $values]);
                 extract($_field_data);
-            }
 
                 if ($field['data_format']) {
                     switch ($field['data_format']) {
@@ -2052,6 +2051,8 @@ class Form
                 }
                 $values[$key] = $value;
             }
+        }
+
         return $values;
     }
 

app/Gdoo/Model/Grid.php

@@ -20,6 +20,7 @@ use Gdoo\Model\Models\Step;
 use Gdoo\Model\Models\StepLog;
 use Gdoo\Model\Services\ModelService;
 use Gdoo\Model\Services\ModuleService;
+use Gdoo\User\Services\UserAssetService;
 
 class Grid
 {
@@ -99,6 +100,7 @@ class Grid
 
         $_header = $header;
         unset($_header['columns']);
+        unset($_header['cols']);
         unset($_header['dialogs']);
         unset($_header['join']);
         unset($_header['js']);
@@ -106,6 +108,19 @@ class Grid
         unset($_header['search']);
         unset($_header['select']);
 
+        // 重新组合字段给前端
+        $columns = [];
+        foreach ($header['cols'] as $field => $col) {
+            if ($field == 'action' && empty($col['events'])) {
+                continue;
+            }
+            if ($col['field'] == 'created_by') {
+                $col['formatter'] = 'created_by';
+            }
+            $columns[] = $col;
+        }
+        $_header['columns'] = $columns;
+
         $header['runs'] = $runs;
         $header['dialogs'] = $dialogs;
         $header['regions'] = $regions;
@@ -886,6 +901,7 @@ class Grid
         $res['form_type'] = $bill['form_type'];
 
         $res['bill_id'] = $bill['id'];
+        $res['bill_uri'] = $bill['uri'];
         $res['name'] = $master['name'];
         $res['model_id'] = $master['id'];
         $res['is_sort'] = $master['is_sort'];
@@ -893,6 +909,9 @@ class Grid
         $res['sort'] = $sort;
         $res['order'] = $order;
 
+        // 获取当前权限
+        $res['access'] = UserAssetService::getNowRoleAssets();
+
         // 是否开启简单搜索框
         $res['simple_search_form'] = 1;
         $res['exist_sub_table'] = $exist_sub_table;

app/Gdoo/Model/views/bill/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'dialog';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         action.view = function(data) {
             var me = this;
             var grid = config.grid;

app/Gdoo/Model/views/model/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'dialog';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         action.field = function(data) {
             var me = this;
             var grid = config.grid;

app/Gdoo/Model/views/module/index.blade.php

@@ -56,11 +56,6 @@
             }
         }
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Order/Controllers/LogisticsController.php

@@ -135,7 +135,7 @@ class LogisticsController extends DefaultController
                 $rows['total'] = $model->count();
                 $rows['data'] = $model->get();
             }
-            return response()->json($rows);
+            return $rows;
         }
 
         return $this->render([

app/Gdoo/Order/Controllers/OrderController.php

@@ -828,7 +828,7 @@ class OrderController extends WorkflowController
                 $item['text'] = $item['name'];
                 return $item;
             });
-            return response()->json($items);
+            return $items;
         }
         return $this->render([
             'search' => $search,
@@ -918,7 +918,7 @@ class OrderController extends WorkflowController
                 ");
                 $rows = $model->get();
             }
-            return response()->json(['data' => $rows]);
+            return ['data' => $rows];
         }
         return $this->render([
             'search' => $search,

app/Gdoo/Order/Controllers/PlanController.php

@@ -70,7 +70,7 @@ class PlanController extends DefaultController
             }
             $rows = ProduceService::getPlanDetail($sdate, $edate, $query['warehouse_id'], $query['category_id'], $query['type']);
             $json = ['data' => $rows, 'status' => true];
-            return response()->json($json);
+            return $json;
         }
 
         $header = [
@@ -205,7 +205,7 @@ class PlanController extends DefaultController
                 });
             }
             $json = ['data' => $rows, 'status' => true];
-            return response()->json($json);
+            return $json;
         }
 
         $search['table'] = 'produce_plan';
@@ -298,7 +298,7 @@ class PlanController extends DefaultController
             }
             $rows = ProduceService::getPlanDetail($sdate, $edate, 0, $query['category_id'], $query['type']);
             $json = ['columns' => $columns, 'data' => $rows, 'status' => true];
-            return response()->json($json);
+            return $json;
         }
 
         $header = [

app/Gdoo/Order/Controllers/TypeController.php

@@ -111,7 +111,7 @@ class TypeController extends DefaultController
                 $item['text'] = $item['name'];
                 return $item;
             });
-            return response()->json($items);
+            return $items;
         }
         $query['form_id'] = $query['jqgrid'] == '' ? $query['id'] : $query['jqgrid'];
         return $this->render([

app/Gdoo/Order/Controllers/WidgetController.php

@@ -198,7 +198,7 @@ class WidgetController extends DefaultController
 
             $json['total'] = sizeof($rows);
             $json['data'] = $rows;
-            return response()->json($json);
+            return $json;
         }
         return $this->render();
     }
@@ -225,7 +225,7 @@ class WidgetController extends DefaultController
             ->get();
             $json['total'] = $rows->count();
             $json['data'] = $rows;
-            return response()->json($json);
+            return $json;
         }
         return $this->render();
     }

app/Gdoo/Order/views/logistics/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Order/views/order/delivery.blade.php

@@ -108,11 +108,6 @@
             }
         }
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Order/views/order/detail.blade.php

@@ -17,11 +17,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Order/views/order/index.blade.php

@@ -16,11 +16,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Order/views/sampleApply/detail.blade.php

@@ -35,11 +35,6 @@
             }
         }
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Order/views/sampleApply/index.blade.php

@@ -35,11 +35,6 @@
             }
         }
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Order/views/type/index.blade.php

@@ -13,11 +13,6 @@
         var action = config.action;
         var search = config.search;
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Produce/Controllers/MaterialController.php

@@ -315,7 +315,7 @@ class MaterialController extends DefaultController
                 $rows['total'] = $model->count();
                 $rows['data']  = $model->get();
             }
-            return response()->json($rows);
+            return $rows;
         }
 
         return $this->render([

app/Gdoo/Produce/views/material/index.blade.php

@@ -43,11 +43,6 @@
             }
         }
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Produce/views/plan/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Product/Controllers/CategoryController.php

@@ -99,7 +99,6 @@ class CategoryController extends DefaultController
             ['text','product_category.id','ID'],
         ]);
         $query = $search['query'];
-
         $type = Request::get('type', 1);
         if (Request::method() == 'POST') {
             $model = ProductCategory::orderBy('lft', 'asc');
@@ -110,7 +109,7 @@ class CategoryController extends DefaultController
                 $data[] = $row;
             }
             $json = ['data' => $data];
-            return response()->json($json);
+            return $json;
         }
 
         return $this->render(array(

app/Gdoo/Product/Controllers/ProductController.php

@@ -163,17 +163,10 @@ class ProductController extends DefaultController
 
             if ($query['suggest']) {
                 $rows = $model->limit(15)->get();
-                $data = Grid::dataFilters($rows, $header, function($item) {
-                    return $item;
-                });
-                $items['data'] = $data;
             } else {
                 $rows = $model->paginate($query['limit']);
-                $items = Grid::dataFilters($rows, $header, function($item) {
-                    return $item;
-                });
             }
-            return response()->json($items);
+            return Grid::dataFilters($rows, $header);
         }
         return $this->render([
             'search' => $search,
@@ -246,17 +239,10 @@ class ProductController extends DefaultController
 
             if ($query['suggest']) {
                 $rows = $model->limit(15)->get();
-                $data = Grid::dataFilters($rows, $header, function($item) {
-                    return $item;
-                });
-                $items['data'] = $data;
             } else {
                 $rows = $model->paginate($query['limit']);
-                $items = Grid::dataFilters($rows, $header, function($item) {
-                    return $item;
-                });
             }
-            return response()->json($items);
+            return Grid::dataFilters($rows, $header);
         }
         return $this->render([
             'search' => $search,
@@ -270,7 +256,7 @@ class ProductController extends DefaultController
             $rows = $model->get(['*', 'name as text'])->toArray();
             $rows = array_nest($rows);
             $rows = array_merge($rows);
-            return response()->json(['data' => $rows]);
+            return ['data' => $rows];
         }
     }
     

app/Gdoo/Product/Controllers/UnitController.php

@@ -94,7 +94,7 @@ class UnitController extends DefaultController
                 }
             }
             $rows = $model->get(['*', 'name as text']);
-            return response()->json(['data' => $rows]);
+            return ['data' => $rows];
         }
         return $this->render([
             'search' => $search,

app/Gdoo/Product/views/category/index.blade.php

@@ -14,11 +14,6 @@
         var action = config.action;
         var search = config.search;
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         var grid = new agGridOptions;
 
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");

app/Gdoo/Product/views/product/index.blade.php

@@ -83,11 +83,6 @@
 
     action.dialogType = 'layer';
 
-    // 自定义搜索方法
-    search.searchInit = function (e) {
-        var self = this;
-    }
-
     var height = getPanelHeight(140);
     var treeOptions = new agGridOptions();
     treeOptions.rowSelection = 'single';

app/Gdoo/Product/views/unit/index.blade.php

@@ -13,11 +13,6 @@
         var action = config.action;
         var search = config.search;
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Project/Controllers/TaskController.php

@@ -45,12 +45,12 @@ class TaskController extends DefaultController
                 $rows[] = $_task;
             }
             $json['data'] = $rows;
-            return response()->json($json);
+            return $json;
         }
 
         if ($request->ajax()) {
             $tasks = TaskService::data($search);
-            return response()->json(['data' => $tasks]);
+            return ['data' => $tasks];
         }
         
         $project = Project::find($query['project_id']);

app/Gdoo/Promotion/Controllers/MaterialController.php

@@ -208,7 +208,7 @@ class MaterialController extends DefaultController
         $row['upload_url'] = URL::to('/uploads');
 
         if (Request::wantsJson()) {
-            return response()->json($row);
+            return $row;
         }
 
         return $this->render([

app/Gdoo/Promotion/views/material/index.blade.php

@@ -37,11 +37,6 @@
             });
         }
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Promotion/views/promotion/index.blade.php

@@ -37,11 +37,6 @@
             });
         }
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Promotion/views/review/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Purchase/Controllers/SupplierController.php

@@ -121,8 +121,7 @@ class SupplierController extends DefaultController
             }
 
             $model->select($header['select']);
-            $rows = $model->paginate($query['limit']);
+            return $model->paginate($query['limit']);
-            return response()->json($rows);
         }
         return $this->render([
             'search' => $search,

app/Gdoo/Purchase/views/order/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Purchase/views/supplier/index.blade.php

@@ -13,13 +13,6 @@
         var action = config.action;
         var search = config.search;
 
-        //action.dialogType = 'layer';
-
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/Controllers/CategoryController.php

@@ -106,10 +106,7 @@ class CategoryController extends DefaultController
             $model->select($header['select']);
 
             $rows = $model->paginate($query['limit']);
-            $items = Grid::dataFilters($rows, $header, function($item) {
+            return Grid::dataFilters($rows, $header);
-                return $item;
-            });
-            return response()->json($items);
         }
 
         return $this->render([

app/Gdoo/Stock/Controllers/LocationController.php

@@ -106,10 +106,7 @@ class LocationController extends DefaultController
             $model->select($header['select']);
 
             $rows = $model->paginate($query['limit']);
-            $items = Grid::dataFilters($rows, $header, function($item) {
+            return Grid::dataFilters($rows, $header);
-                return $item;
-            });
-            return response()->json($items);
         }
 
         return $this->render([
@@ -145,10 +142,7 @@ class LocationController extends DefaultController
             $model->select($header['select']);
 
             $rows = $model->paginate($query['limit']);
-            $items = Grid::dataFilters($rows, $header, function($item) {
+            return Grid::dataFilters($rows, $header);
-                return $item;
-            });
-            return response()->json($items);
         }
 
         return $this->render([
@@ -167,7 +161,7 @@ class LocationController extends DefaultController
             ->where('warehouse_location.warehouse_id', $warehouse_id)
             ->where('warehouse_location.status', 1)
             ->orderBy('warehouse_location.sort', 'asc');
-            return response()->json($model->get());
+            return $model->get();
         }
     }
     

app/Gdoo/Stock/Controllers/TypeController.php

@@ -106,10 +106,7 @@ class TypeController extends DefaultController
             $model->select($header['select']);
 
             $rows = $model->paginate($query['limit']);
-            $items = Grid::dataFilters($rows, $header, function($item) {
+            return Grid::dataFilters($rows, $header);
-                return $item;
-            });
-            return response()->json($items);
         }
 
         return $this->render([

app/Gdoo/Stock/Controllers/WarehouseController.php

@@ -113,11 +113,10 @@ class WarehouseController extends DefaultController
                 $locations[$_location['warehouse_id']][] = $_location;
             }
 
-            $items = Grid::dataFilters($rows, $header, function($item) use($locations) {
+            return Grid::dataFilters($rows, $header, function($item) use($locations) {
                 $item['pos'] = (array)$locations[$item['id']];
                 return $item;
             });
-            return response()->json($items);
         }
 
         return $this->render([

app/Gdoo/Stock/views/allocation/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/cancel/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/category/index.blade.php

@@ -13,11 +13,6 @@
         var action = config.action;
         var search = config.search;
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/delivery/detail.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/delivery/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/direct/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/location/index.blade.php

@@ -13,11 +13,6 @@
         var action = config.action;
         var search = config.search;
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/record01/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/record08/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/record09/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/record10/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/record11/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'layer';
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/type/index.blade.php

@@ -13,11 +13,6 @@
         var action = config.action;
         var search = config.search;
         
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/Stock/views/warehouse/index.blade.php

@@ -13,11 +13,6 @@
         var action = config.action;
         var search = config.search;
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/System/Controllers/OptionController.php

@@ -202,7 +202,7 @@ class OptionController extends DefaultController
         if (Request::method() == 'POST') {
             $rows = Option::where('parent_id', 0)->orderBy('sort', 'asc')->orderBy('id', 'asc')->get();
             $rows->prepend(['name' => '全部类别', 'id' => 0, 'parent_id' => 0]);
-            return response()->json(['data' => $rows]);
+            return ['data' => $rows];
         }
     }
 

app/Gdoo/System/Controllers/RegionController.php

@@ -108,7 +108,7 @@ class RegionController extends DefaultController
                 $row['text'] = $row['layer_space'].$row['name'];
                 $json[] = $row;
             }
-            return response()->json(['data' => $json]);
+            return ['data' => $json];
         }
         return $this->render([
             'search' => $search,
@@ -122,7 +122,7 @@ class RegionController extends DefaultController
             $model = Region::orderBy('id', 'asc');
             $rows = $model->get(['*', 'name as text']);
             array_nest($rows);
-            return response()->json(['data' => $rows]);
+            return ['data' => $rows];
         }
     }
 

app/Gdoo/System/views/log/index.blade.php

@@ -15,11 +15,6 @@
 
         action.dialogType = 'dialog';
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);

app/Gdoo/System/views/mail/index.blade.php

@@ -39,11 +39,6 @@
             }
         }
 
-        // 自定义搜索方法
-        search.searchInit = function (e) {
-            var self = this;
-        }
-        
         var options = new agGridOptions();
         var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);