整理对话框相关逻辑，封装部分js方法

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

@@ -68,64 +68,15 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     mGrid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, mGrid);
         if (ret === true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            mGrid.api.forEachNode(function(node) {
-                var key = node.data['id'];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = mGrid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row['id']);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    mGrid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = mGrid;
-
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
+
     mGrid.remoteData();
     $ref_approach = mGrid;
 
@@ -161,14 +112,12 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
     sGrid.remoteData();
     $ref_approach_data = sGrid;
 
     var data = JSON.parse('{{json_encode($search["forms"])}}');
     var search = $('#dialog-approach-search-form').searchForm({
-        data: data,
+        data: data
-        init:function(e) {}
     });
 
     search.find('#search-submit').on('click', function() {

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

@@ -26,7 +26,6 @@
     ];
 
     new agGrid.Grid(gridDiv, grid);
-    // 读取数据
     grid.remoteData();
 
 })(jQuery);

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

@@ -55,7 +55,6 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
     mGrid.remoteData();
     $ref_approach = mGrid;
 
@@ -94,7 +93,6 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
     sGrid.remoteData();
     $ref_approach_data = sGrid;
 

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

@@ -85,7 +85,6 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-right',field:'undertake_money', headerName: '支持费用', width: 100}
     ];
     new agGrid.Grid(tabDiv, grid);
-    // 读取数据
     grid.remoteData({type: 'promotion'});
 
     var tabDiv2 = document.querySelector("#ref_tab_b");
@@ -102,7 +101,6 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-right',field:'apply2_money', headerName: '支持费用', width: 140}
     ];
     new agGrid.Grid(tabDiv2, grid2);
-    // 读取数据
     grid2.remoteData({type: 'approach'});
 
     var tabDiv3 = document.querySelector("#ref_tab_c");
@@ -118,7 +116,6 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-right',field:'undertake_money', headerName: '支持费用', width: 140}
     ];
     new agGrid.Grid(tabDiv3, grid3);
-    // 读取数据
     grid3.remoteData({type: 'material'});
 })(jQuery);
 </script>

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

@@ -59,64 +59,14 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     mGrid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, mGrid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            mGrid.api.forEachNode(function(node) {
-                var key = node.data['id'];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = mGrid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row['id']);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    mGrid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = mGrid;
-
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
     mGrid.remoteData();
     $ref_approach = mGrid;
 
@@ -152,7 +102,6 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
     sGrid.remoteData();
     $ref_approach_data = sGrid;
 

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

@@ -55,7 +55,6 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
     mGrid.remoteData();
     $ref_approach = mGrid;
 
@@ -81,7 +80,6 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
     sGrid.remoteData();
     $ref_approach_data = sGrid;
 

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

@@ -26,7 +26,6 @@
     ];
 
     new agGrid.Grid(gridDiv, grid);
-    // 读取数据
     grid.remoteData();
 
 })(jQuery);

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

@@ -78,7 +78,6 @@
     new agGrid.Grid(gridDiv, grid);
     gridDiv.style.height = getPanelHeight(12);
 
-    // 读取数据
     grid.remoteData();
 
     var search_advanced = $('#' + table + '-search-form-advanced').searchForm({

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

@@ -12,15 +12,18 @@
 (function ($) {
     var search = JSON.parse('{{json_encode($search)}}');
     var params = search.query;
-var sid = params.prefix == 1 ? 'sid' : 'id';
+
-var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
+    var option = gdoo.formKey(params);
+    var event = gdoo.event.get(option.key);
+    event.trigger('query', params);
+
     var grid = new agGridOptions();
-var selectedData = {};
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
-grid.remoteParams = {};
+    grid.remoteParams = params;
-//grid.rowMultiSelectWithClick = multiple;
+    grid.suppressRowClickSelection = true;
     grid.rowSelection = multiple ? 'multiple' : 'single';
+
     grid.columnDefs = [
         {suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: multiple, suppressSizeToFit: true, sortable: false, width: 40},
         {suppressMenu: true, cellClass:'text-center', sortable: false, field: 'name', headerName: '姓名', minWidth: 160},
@@ -28,75 +31,26 @@ grid.columnDefs = [
         {suppressMenu: true, cellClass:'text-center', field: 'id', headerName: 'ID', width: 80}
     ];
 
-grid.onRowClicked1 = function(row) {
+    grid.onRowClicked = function(row) {
-    var id = row.data[sid];
+        var selected = row.node.isSelected();
-    if (selectedData[id]) {
+        if (selected === false) {
-        delete selectedData[id];
+            row.node.setSelected(true, true);
-        row.node.setSelected(false);
-    } else {
-        if (multiple == false) {
-            selectedData = {};
         }
-        selectedData[id] = row.data.name;
-    }
-    writeSelected();
-};
-
-grid.onSelectionChanged = function() {
-    var rows = grid.api.getSelectedRows();
-    selectedData = {};
-    for (let i = 0; i < rows.length; i++) {
-        var row = rows[i];
-        selectedData[row.id] = row.name;
-    }
-    writeSelected();
     };
 
     grid.onRowDoubleClicked = function (row) {
-    grid.onRowClicked(row);
+        var ret = gdoo.writeSelected(event, params, option, grid);
+        if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
+        }
     };
 
-function initSelected() {
+    gdoo.dialogs[option.id] = grid;
-    selectedData = {};
-    var id = $('#'+params.id).val();
-    var text = $('#'+params.id+'_text').val();
-    if (id && text) {
-        id = id.split(',');
-        text = text.split(',');
-        for (var i = 0; i < id.length; i++) {
-            selectedData[id[i]] = text[i];
-        }
-    }
-}
-
-function writeSelected() {
-    var id = [];
-    var text = [];
-    $.each(selectedData, function(k, v) {
-        id.push(k);
-        text.push(v);
-    });
-    $('#'+params.id).val(id.join(','));
-    $('#'+params.id+'_text').val(text.join(','));
-}
-
     new agGrid.Grid(gridDiv, grid);
 
-// 读取数据
     grid.remoteData({page: 1});
-
+    grid.remoteAfterSuccess = function() {
-// 数据载入成功
+        gdoo.initSelected(params, option, grid);
-grid.remoteSuccessed = function() {
-    initSelected();
-    grid.api.forEachNode(function(node) {
-        // 默认选中
-        $.each(selectedData, function(k, v) {
-            if (node.data[sid] == k) {
-                node.setSelected(true);
-            }
-        });
-    });
     }
 
     var data = search.forms;

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

@@ -16,7 +16,6 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var grid = new agGridOptions();
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
@@ -48,88 +47,20 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-
-            /*
-            if (params.iframe_id) {
-                var iframe = window.frames['iframe_' + params.iframe_id];
-                if (iframe) {
-                    var $option_id = $('#' + option.id, doc);
-                    var $option_text = $('#'+option.id + '_text', doc);
-                }
-            } else {
-                var $option = $('#' + option.id);
-                var $option_text = $('#'+option.id + '_text');
-            }
-            */
-
-            var $option = $('#' + option.id);
-            var $option_text = $('#'+option.id + '_text');
-
-            $option_id.val(id.join(','));
-            $option_text.val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
-    gdoo.dialogs[option.id] = grid;
-
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
 
     // 数据载入成功
-    grid.remoteSuccessed = function() {
+    grid.remoteAfterSuccess = function() {
-        initSelected();
+        gdoo.initSelected(params, option, grid);
     }
 
     var data = search.forms;

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

@@ -15,10 +15,8 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
@@ -39,70 +37,20 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
     
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData();
 
     // 数据载入成功
-    grid.remoteSuccessed = function() {
+    grid.remoteAfterSuccess = function() {
-        initSelected();
+        gdoo.initSelected(params, option, grid);
     }
 
     var data = search.forms;

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

@@ -12,15 +12,18 @@
 (function ($) {
     var search = JSON.parse('{{json_encode($search)}}');
     var params = search.query;
-var sid = params.prefix == 1 ? 'sid' : 'id';
+
-var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
+    var option = gdoo.formKey(params);
+    var event = gdoo.event.get(option.key);
+    event.trigger('query', params);
+
     var grid = new agGridOptions();
-var selectedData = {};
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
-grid.remoteParams = {};
+    grid.remoteParams = params;
-//grid.rowMultiSelectWithClick = multiple;
+    grid.suppressRowClickSelection = true;
     grid.rowSelection = multiple ? 'multiple' : 'single';
+
     grid.columnDefs = [
         {suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: multiple, suppressSizeToFit: true, sortable: false, width: 40},
         {suppressMenu: true, cellClass:'text-center', sortable: false, field: 'name', headerName: '姓名', minWidth: 160},
@@ -28,75 +31,28 @@ grid.columnDefs = [
         {suppressMenu: true, cellClass:'text-center', field: 'id', headerName: 'ID', width: 80}
     ];
 
-grid.onRowClicked1 = function(row) {
+    grid.onRowClicked = function(row) {
-    var id = row.data[sid];
+        var selected = row.node.isSelected();
-    if (selectedData[id]) {
+        if (selected === false) {
-        delete selectedData[id];
+            row.node.setSelected(true, true);
-        row.node.setSelected(false);
-    } else {
-        if (multiple == false) {
-            selectedData = {};
         }
-        selectedData[id] = row.data.name;
-    }
-    writeSelected();
-};
-
-grid.onSelectionChanged = function() {
-    var rows = grid.api.getSelectedRows();
-    selectedData = {};
-    for (let i = 0; i < rows.length; i++) {
-        var row = rows[i];
-        selectedData[row.id] = row.name;
-    }
-    writeSelected();
     };
 
     grid.onRowDoubleClicked = function (row) {
-    grid.onRowClicked(row);
+        var ret = gdoo.writeSelected(event, params, option, grid);
+        if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
+        }
     };
 
-function initSelected() {
+    gdoo.dialogs[option.id] = grid;
-    selectedData = {};
-    var id = $('#'+params.id).val();
-    var text = $('#'+params.id+'_text').val();
-    if (id && text) {
-        id = id.split(',');
-        text = text.split(',');
-        for (var i = 0; i < id.length; i++) {
-            selectedData[id[i]] = text[i];
-        }
-    }
-}
-
-function writeSelected() {
-    var id = [];
-    var text = [];
-    $.each(selectedData, function(k, v) {
-        id.push(k);
-        text.push(v);
-    });
-    $('#'+params.id).val(id.join(','));
-    $('#'+params.id+'_text').val(text.join(','));
-}
-
     new agGrid.Grid(gridDiv, grid);
 
-// 读取数据
     grid.remoteData({page: 1});
 
     // 数据载入成功
-grid.remoteSuccessed = function() {
+    grid.remoteAfterSuccess = function() {
-    initSelected();
+        gdoo.initSelected(params, option, grid);
-    grid.api.forEachNode(function(node) {
-        // 默认选中
-        $.each(selectedData, function(k, v) {
-            if (node.data[sid] == k) {
-                node.setSelected(true);
-            }
-        });
-    });
     }
 
     var data = search.forms;

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

@@ -15,10 +15,8 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
@@ -44,17 +42,15 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#aike-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
     
-    // 读取数据
     grid.remoteData();
 
     var data = search.forms;

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

@@ -15,10 +15,8 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
@@ -51,70 +49,20 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
     
-    // 读取数据
     grid.remoteData();
 
     // 数据载入成功
-    grid.remoteSuccessed = function() {
+    grid.remoteAfterSuccess = function() {
-        initSelected();
+        gdoo.initSelected(params, option, grid);
     }
 
     var data = search.forms;

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

@@ -64,7 +64,6 @@
     new agGrid.Grid(gridDiv, grid);
     gridDiv.style.height = getPanelHeight(12);
 
-    // 读取数据
     grid.remoteData();
 
     var search_advanced = $('#' + table + '-search-form-advanced').searchForm({

app/Gdoo/Customer/views/report/accountStatement.blade.php

@@ -74,7 +74,6 @@
         grid.rowSelection = 'single';
         new agGrid.Grid(gridDiv, grid);
 
-        // 读取数据
         grid.remoteData({page: 1});
 
         // 绑定自定义事件

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

@@ -79,7 +79,6 @@
     new agGrid.Grid(gridDiv, grid);
     gridDiv.style.height = getPanelHeight(12);
 
-    // 读取数据
     grid.remoteData();
 
     var search_advanced = $('#' + table + '-search-form-advanced').searchForm({

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

@@ -16,7 +16,6 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var grid = new agGridOptions();
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
@@ -50,72 +49,19 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            console.log('#'+option.id);
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

app/Gdoo/Customer/views/widget/birthday.blade.php

@@ -22,7 +22,6 @@
 
     grid.columnDefs = columnDefs;
     new agGrid.Grid(gridDiv, grid);
-    // 读取数据
     grid.remoteData({page: 1});
 
     gdoo.widgets['customer_widget_birthday'] = grid;

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

@@ -1,113 +0,0 @@
-<div class="wrapper">
-    <table id="position-dialog">
-        <thead>
-            <tr>
-                <th data-field="state" data-checkbox="true"></th>
-                <th data-field="text" data-align="left">名称</th>
-                <th data-field="id" data-width="60" data-align="center">ID</th>
-            </tr>
-        </thead>
-    </table>
-</div>
-
-<script>
-(function($) {
-    var $table = $('#position-dialog');
-    var params = {{json_encode($get)}};
-    var sid = params.prefix == 1 ? 'sid' : 'id';
-
-    var selected = {};
-
-    function getSelected()
-    {
-        selected = {};
-        var id = $('#'+params.id).val();
-        var text = $('#'+params.id+'_text').val();
-
-        if(id == '') {
-            return;
-        }
-
-        id = id.split(',');
-        text = text.split(',');
-        for (var i = 0; i < id.length; i++) {
-            selected[id[i]] = text[i];
-        }
-    }
-
-    function setSelected() {
-        var id = [], text = [];
-        $.each(selected, function(k, v) {
-            id.push(k);
-            text.push(v);
-        });
-        $('#'+params.id).val(id.join(','));
-        $('#'+params.id+'_text').val(text.join(','));
-    }
-
-    function setRow(row)
-    {
-        if (params.multi == 0) {
-            selected = {};
-        }
-        selected[row[sid]] = row.text;
-        setSelected();
-    }
-
-    function unsetRow(row) {
-        $.each(selected, function(id) {
-            if (id == row[sid]) {
-                delete selected[id];
-            }
-        });
-        setSelected();
-    }
-
-    $table.bootstrapTable({
-        iconSize:'sm',
-        singleSelect: params.multi == 1 ? 0 : 1,
-        showColumns: false,
-        clickToSelect: true,
-        method: 'post',
-        url: '{{url()}}',
-        height: 350,
-        onLoadSuccess: function(res) {
-
-            getSelected();
-
-            $.each(selected, function(j) {
-                for (var i = 0; i < res.data.length; i++) {
-                    if (res.data[i][sid] == j) {
-                        $table.bootstrapTable('check', i);
-                   }
-                }
-            });
-        },
-        onDblClickRow: function(row) {
-            setRow(row);
-            if (sid == 'sid') {
-                $('#modal-dialog-search').dialog('close');
-            } else {
-                $('#modal-dialog-user').dialog('close');
-            }
-        },
-        onCheck: function(row) {
-            setRow(row);
-        },
-        onUncheck: function(row) {
-            unsetRow(row);
-        },
-        onCheckAll: function(rows) {
-            for (var i = 0; i < rows.length; i++) {
-                setRow(rows[i]);
-            }
-        },
-        onUncheckAll: function(rows) {
-            for (var i = 0; i < rows.length; i++) {
-                unsetRow(rows[i]);
-            }
-        }
-    });
-})(jQuery);
-
-</script>

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

@@ -33,8 +33,6 @@ var params = JSON.parse('{{json_encode($query)}}');
 
     var gridDiv = document.querySelector("#ref_customer_cost");
     new agGrid.Grid(gridDiv, grid);
-
-    // 读取数据
     grid.remoteData();
 
     $ref_customer_cost = grid;

app/Gdoo/CustomerCost/views/report/saleOrderDetail.blade.php

@@ -51,8 +51,6 @@
     var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
     new agGrid.Grid(gridDiv, grid);
     gridDiv.style.height = getPanelHeight(12);
-
-    // 读取数据
     grid.remoteData();
 
     var search_advanced = $('#' + table + '-search-form-advanced').searchForm({

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

@@ -72,8 +72,6 @@
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);
         new agGrid.Grid(gridDiv, grid);
-
-        // 读取数据
         grid.remoteData({page: 1});
 
         // 绑定自定义事件

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

@@ -72,8 +72,6 @@
         var gridDiv = document.querySelector("#{{$header['table']}}-grid");
         gridDiv.style.height = getPanelHeight(48);
         new agGrid.Grid(gridDiv, grid);
-
-        // 读取数据
         grid.remoteData({page: 1});
 
         // 绑定自定义事件

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

@@ -68,8 +68,6 @@
         };
 
         new agGrid.Grid(gridDiv, options);
-
-        // 读取数据
         options.remoteData({page: 1});
 
         // 绑定自定义事件

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

@@ -76,8 +76,6 @@
         };
 
         new agGrid.Grid(gridDiv, options);
-
-        // 读取数据
         options.remoteData({page: 1});
 
         // 绑定自定义事件

app/Gdoo/Model/views/todo/widget.blade.php

@@ -70,8 +70,6 @@
     new agGrid.Grid(gridDiv, options);
 
     window.todoGrid = options;
-
-    // 读取数据
     options.remoteData();
 
     gdoo.widgets['model_todo_widget'] = options;

app/Gdoo/Order/Hooks/OrderHook.php

@@ -10,7 +10,7 @@ class OrderHook
         $permission = $params['permission'];
         $data = $permission['customer_order_data'];
 
-        // 是客户不能编辑产品类型
+        // 以下角色类型无法修改子表字段
         $role_ids = [2, 83, 84, 85];
         if (in_array(auth()->user()->role_id, $role_ids)) {
             // 不能编辑类型
@@ -44,33 +44,15 @@ class OrderHook
         // 只限制内销和直营
         if (in_array($master['type_id'], [1, 3])) {
             // 客户和区域经理和业务员限制下单数和倍数
-            $role_ids = [2, 83, 84];
+            $role_ids = [2, 83, 84, 85];
-
-            // 成品数量
-            $product_quantity = $product_money = 0;
 
             if (in_array(auth()->user()->role_id, $role_ids)) {
-
-                $_product_ids = DB::table('product')
-                ->whereRaw('product_type = 1')
-                ->pluck('id', 'id')->toArray();
-
-                $quantitys = [];
                 $product_ids = [];
                 foreach($params['datas'] as $i => $datas) {
                     if ($datas['table'] == 'customer_order_data') {
                         foreach($datas['data'] as $j => $row) {
                             $quantitys[$row['product_id']][] = $row['quantity'];
                             $product_ids[] = $row['product_id'];
-
-                            // 获取产成品数量
-                            if (isset($_product_ids[$row['product_id']])) {
-                                if ($row['type_id'] == 1) {
-                                    $product_quantity += $row['quantity'];
-                                    $product_money += $row['money'];
-                                }
-                            }
-
                         }
                     }
                 }
@@ -101,11 +83,6 @@ class OrderHook
             }
         }
 
-        $params['master'] = $master;
-
-        $fee = 0;
-        $amount = 0;
-
         foreach($params['datas'] as $i => $datas) {
             if ($datas['table'] == 'customer_order_data') {
 
@@ -116,9 +93,10 @@ class OrderHook
                         if (empty($row['promotion_sn'])) {
                             abort_error('赠品必须有编号。');
                         }
+
                         // 赠品修改客户促销开票单位
                         if ($row['fee_src_id'] > 0) {
-                            // 检查赠品是否在其他订单里已经使用过了
+                            // 促销费用首次使用回写开票单位到促销申请
                             $count = DB::table('customer_order_data')
                             ->where('order_id', '<>', $row['order_id'])
                             ->where('fee_src_id', $row['fee_src_id'])
@@ -139,28 +117,12 @@ class OrderHook
                         }
                     }
 
-                    // 判断费用比例
-                    $money = floatval($row['money']);
-                    if ($row['product_code'] == '99001') {
-                        $fee += $money;
-                    } else {
-                        $amount += $money;
-                    }
-
                     $datas['data'][$j] = $row;
                 }
                 $params['datas'][$i] = $datas;
             }
         }
         
-        // 费用不能大于20%
-        /*
-        $feeAmount = $amount * 0.2;
-        if (abs($fee) > $feeAmount) {
-            abort_error('费用金额不能大于'.$feeAmount);
-        }
-        */
-        
         return $params;
     }
 

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

@@ -50,7 +50,6 @@
     var gridDiv = document.querySelector("#dialog-delivery_plan");
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData();
 
     $('#plan_delivery_submit').on('click', function() {

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

@@ -15,7 +15,6 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var multiple = params.multi == 0 ? false : true;
     var grid = new agGridOptions();
 
@@ -41,71 +40,19 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

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

@@ -53,9 +53,10 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
+
     mGrid.remoteData();
     $ref_customer_order = mGrid;
+
     params['master'] = 0;
     var sGridDiv = document.querySelector("#ref_customer_order_data");
     var sGrid = new agGridOptions();
@@ -95,7 +96,6 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
     sGrid.remoteData();
     $ref_customer_order_data = sGrid;
 

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

@@ -53,9 +53,9 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
     mGrid.remoteData();
     $ref_customer_order = mGrid;
+
     params['master'] = 0;
     var sGridDiv = document.querySelector("#ref_cancel_order_data");
     var sGrid = new agGridOptions();
@@ -92,7 +92,6 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
     sGrid.remoteData();
     $ref_customer_order_data = sGrid;
 

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

@@ -55,9 +55,9 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
     mGrid.remoteData();
     $ref_customer_order = mGrid;
+
     params['master'] = 0;
     var sGridDiv = document.querySelector("#ref_customer_order_data");
     var sGrid = new agGridOptions();
@@ -101,7 +101,6 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
     sGrid.remoteData();
     $ref_customer_order_data = sGrid;
 

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

@@ -53,9 +53,9 @@
             sGrid.remoteData(params);
         };
         new agGrid.Grid(mGridDiv, mGrid);
-        // 读取数据
         mGrid.remoteData();
         $ref_customer_order = mGrid;
+
         params['master'] = 0;
         var sGridDiv = document.querySelector("#ref_customer_order_data");
         var sGrid = new agGridOptions();
@@ -90,7 +90,6 @@
         };
     
         new agGrid.Grid(sGridDiv, sGrid);
-        // 读取数据
         sGrid.remoteData();
         $ref_customer_order_data = sGrid;
     

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

@@ -22,7 +22,6 @@ var $promotion_customer_order_data = null;
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var multiple = params.multi == 0 ? false : true;
     var mGrid = new agGridOptions();
 
@@ -56,69 +55,19 @@ var $promotion_customer_order_data = null;
     };
 
     mGrid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, mGrid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            mGrid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = mGrid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    mGrid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = mGrid;
-
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     new agGrid.Grid(gridDiv, mGrid);
-    // 读取数据
+    
     mGrid.remoteData();
-    // 数据载入成功
+    mGrid.remoteAfterSuccess = function() {
-    mGrid.remoteSuccessed = function() {
+        gdoo.initSelected(params, option, mGrid);
-        initSelected();
     }
 
     params['master'] = 0;
@@ -148,7 +97,6 @@ var $promotion_customer_order_data = null;
         {cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
     sGrid.remoteData();
     $promotion_customer_order_data = sGrid;
 

app/Gdoo/Order/views/plan/export_sale.blade.php

@@ -47,7 +47,6 @@
     new agGrid.Grid(gridDiv, grid);
     gridDiv.style.height = getPanelHeight(12);
 
-    // 读取数据
     grid.remoteData();
 
     var search = $('#' + table + '-search-form-advanced').searchForm({

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

@@ -54,7 +54,6 @@
     new agGrid.Grid(gridDiv, grid);
     gridDiv.style.height = getPanelHeight(12);
 
-    // 读取数据
     grid.remoteData();
 
     var search_advanced = $('#' + table + '-search-form-advanced').searchForm({

app/Gdoo/Order/views/plan/produce.blade.php

@@ -74,7 +74,6 @@
         grid.api.setColumnDefs(columnDefs);
     }
 
-    // 读取数据
     grid.remoteData(null, function(res) {
         setColumns(res);
     });

app/Gdoo/Order/views/plan/producePlan.blade.php

@@ -37,7 +37,6 @@
     var gridDiv = document.querySelector("#dialog-delivery_plan");
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData();
 
 })(jQuery);

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

@@ -55,7 +55,6 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
     mGrid.remoteData();
     $ref_sample_apply = mGrid;
 
@@ -89,7 +88,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
+    
     sGrid.remoteData();
     $ref_sample_apply_data = sGrid;
 

app/Gdoo/Order/views/widget/goods.blade.php

@@ -31,7 +31,6 @@
         }
     };
     new agGrid.Grid(gridDiv, options);
-    // 读取数据
     options.remoteData({page: 1});
     gdoo.widgets['order_widget_goods'] = options;
 })(jQuery);

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

@@ -24,7 +24,7 @@
     }];
     options.columnDefs = columnDefs;
     new agGrid.Grid(gridDiv, options);
-    // 读取数据
+
     options.remoteData({page: 1});
     gdoo.widgets['order_widget_index'] = options;
 })(jQuery);

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

@@ -74,7 +74,6 @@ html {
         }
     });
     
-    // 读取数据
     grid.remoteData();
 
     $('#product_formula_delete').on('click', function() {

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

@@ -92,7 +92,6 @@
 
         new agGrid.Grid(gridDiv, grid);
 
-        // 读取数据
         grid.remoteData({page: 1});
 
         // 绑定自定义事件

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

@@ -65,7 +65,6 @@
         }
     });
     
-    // 读取数据
     grid.remoteData();
 
     $('#product_formula_delete').on('click', function() {

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

@@ -54,7 +54,6 @@
         grid.rowSelection = 'single';
         new agGrid.Grid(gridDiv, grid);
 
-        // 读取数据
         grid.remoteData({page: 1});
 
         // 绑定自定义事件

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

@@ -15,10 +15,8 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
@@ -52,70 +50,18 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-        * 初始化选择
-        */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-        * 写入选中
-        */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData();
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

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

@@ -73,7 +73,7 @@
     treeOptions.remoteDataUrl = "{{url('category')}}?type=1";
 
     new agGrid.Grid(gridDiv, treeOptions);
-    // 读取数据
+
     treeOptions.remoteData();
 
     var search = JSON.parse('{{json_encode($search)}}');
@@ -83,7 +83,6 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
     var multiple = params.multi == 0 ? false : true;
@@ -108,70 +107,18 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-    * 初始化选择
-    */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-    */
-    function writeSelected() {
-        var rows = grid.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

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

@@ -73,7 +73,6 @@
     treeOptions.remoteDataUrl = "{{url('category')}}";
 
     new agGrid.Grid(gridDiv, treeOptions);
-    // 读取数据
     treeOptions.remoteData();
 
     var search = JSON.parse('{{json_encode($search)}}');
@@ -83,7 +82,6 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
     var multiple = params.multi == 0 ? false : true;
@@ -111,71 +109,18 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-    * 初始化选择
-    */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-    * 写入选中
-    */
-    function writeSelected() {
-        var rows = grid.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
     
-    // 读取数据
     grid.remoteData({page: 1});
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

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

@@ -15,7 +15,6 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
     
@@ -38,70 +37,18 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-        * 初始化选择
-        */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-        * 写入选中
-        */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData();
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

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

@@ -118,7 +118,6 @@ function durationRenderer(params) {
     gridDiv.style.height = getPanelHeight(12);
 
     new agGrid.Grid(gridDiv, grid);
-    // 读取数据
     grid.remoteData();
 
     var search = $('#search-task-form').searchForm({

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

@@ -64,65 +64,15 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     mGrid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, mGrid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            mGrid.api.forEachNode(function(node) {
-                var key = node.data['id'];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = mGrid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row['id']);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    mGrid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = mGrid;
-
     new agGrid.Grid(mGridDiv, mGrid);
 
-    // 读取数据
     mGrid.remoteData();
     $ref_promotion = mGrid;
 
@@ -159,7 +109,6 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
     sGrid.remoteData();
     $ref_promotion_data = sGrid;
 

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

@@ -26,7 +26,6 @@
     ];
 
     new agGrid.Grid(gridDiv, grid);
-    // 读取数据
     grid.remoteData();
 
 })(jQuery);

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

@@ -55,7 +55,6 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
     mGrid.remoteData();
     $ref_promotion = mGrid;
 
@@ -94,7 +93,6 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
     sGrid.remoteData();
     $ref_promotion_data = sGrid;
 

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

@@ -27,7 +27,6 @@
     ];
 
     new agGrid.Grid(gridDiv, grid);
-    // 读取数据
     grid.remoteData();
 
 })(jQuery);

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

@@ -52,7 +52,6 @@
             sGrid.remoteData(params);
         };
         new agGrid.Grid(mGridDiv, mGrid);
-        // 读取数据
         mGrid.remoteData();
         $ref_purchase_order = mGrid;
         params['master'] = 0;
@@ -97,7 +96,6 @@
         };
     
         new agGrid.Grid(sGridDiv, sGrid);
-        // 读取数据
         sGrid.remoteData();
         $ref_purchase_order_data = sGrid;
     

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

@@ -15,13 +15,13 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var grid = new agGridOptions();
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
     grid.suppressRowClickSelection = true;
     grid.rowSelection = multiple ? 'multiple' : 'single';
+    
     grid.columnDefs = [
         {suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: multiple, suppressSizeToFit: true, sortable: false, width: 40},
         {suppressMenu: true, cellClass:'text-left', sortable: false, field: 'name', headerName: '名称', minWidth: 160},
@@ -47,71 +47,21 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
 
     // 数据载入成功
-    grid.remoteSuccessed = function() {
+    grid.remoteAfterSuccess = function() {
-        initSelected();
+        gdoo.initSelected(params, option, grid);
     }
 
     var data = search.forms;

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

@@ -55,7 +55,6 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
     mGrid.remoteData();
     $ref_promotion = mGrid;
 
@@ -82,7 +81,6 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
     sGrid.remoteData();
     $ref_promotion_data = sGrid;
 

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

@@ -61,7 +61,6 @@ var $ref_stock_select = null;
 
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
 
     var data = search.forms;

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

@@ -55,7 +55,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
+
     mGrid.remoteData();
     $ref_promotion = mGrid;
 
@@ -82,7 +82,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
+
     sGrid.remoteData();
     $ref_promotion_data = sGrid;
 

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

@@ -12,7 +12,7 @@
 (function ($) {
     var search = JSON.parse('{{json_encode($search)}}');
     var params = search.query;
-    var sid = params.prefix == 1 ? 'sid' : 'id';
+
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
 
@@ -25,6 +25,7 @@
     grid.remoteParams = params;
     grid.rowSelection = multiple ? 'multiple' : 'single';
     grid.suppressRowClickSelection = true;
+    
     grid.columnDefs = [
         {suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: multiple, suppressSizeToFit: true, sortable: false, width: 40},
         {suppressMenu: true, cellClass:'text-center', sortable: false, field: 'code', headerName: '编码', width: 100},
@@ -40,70 +41,18 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

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

@@ -15,15 +15,14 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = false;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
     grid.suppressRowClickSelection = true;
     grid.rowSelection = multiple ? 'multiple' : 'single';
+    
     grid.columnDefs = [
         {suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: multiple, suppressSizeToFit: true, sortable: false, width: 40},
         {suppressMenu: true, cellClass:'text-center', sortable: false, field: 'sn', type:'sn', suppressSizeToFit: true, headerName: '', width: 40},
@@ -48,70 +47,18 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-    
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

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

@@ -55,7 +55,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
+
     mGrid.remoteData();
     $ref_promotion = mGrid;
 
@@ -82,7 +82,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
+
     sGrid.remoteData();
     $ref_promotion_data = sGrid;
 

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

@@ -55,7 +55,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
+
     mGrid.remoteData();
     $ref_promotion = mGrid;
 
@@ -82,7 +82,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
+
     sGrid.remoteData();
     $ref_promotion_data = sGrid;
 

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

@@ -15,15 +15,14 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = false;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
     grid.suppressRowClickSelection = true;
     grid.rowSelection = multiple ? 'multiple' : 'single';
+    
     grid.columnDefs = [
         {suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: multiple, suppressSizeToFit: true, sortable: false, width: 40},
         {suppressMenu: true, cellClass:'text-center', sortable: false, field: 'code', headerName: '编码', width: 60},
@@ -39,70 +38,18 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-    
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

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

@@ -15,15 +15,14 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = false;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
     grid.suppressRowClickSelection = true;
     grid.rowSelection = multiple ? 'multiple' : 'single';
+    
     grid.columnDefs = [
         {suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: multiple, suppressSizeToFit: true, sortable: false, width: 40},
         {suppressMenu: true, cellClass:'text-center', sortable: false, field: 'code', headerName: '编码', width: 60},
@@ -39,70 +38,18 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-    
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

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

@@ -55,7 +55,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
+
     mGrid.remoteData();
     $ref_promotion = mGrid;
 
@@ -82,7 +82,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
+    
     sGrid.remoteData();
     $ref_promotion_data = sGrid;
 

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

@@ -55,7 +55,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
+
     mGrid.remoteData();
     $ref_promotion = mGrid;
 
@@ -82,7 +82,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
+
     sGrid.remoteData();
     $ref_promotion_data = sGrid;
 

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

@@ -55,7 +55,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
+
     mGrid.remoteData();
     $ref_promotion = mGrid;
 
@@ -82,7 +82,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
+
     sGrid.remoteData();
     $ref_promotion_data = sGrid;
 

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

@@ -55,7 +55,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         sGrid.remoteData(params);
     };
     new agGrid.Grid(mGridDiv, mGrid);
-    // 读取数据
+
     mGrid.remoteData();
     $ref_promotion = mGrid;
 
@@ -82,7 +82,7 @@ var params = JSON.parse('{{json_encode($query)}}');
         {cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
     new agGrid.Grid(sGridDiv, sGrid);
-    // 读取数据
+
     sGrid.remoteData();
     $ref_promotion_data = sGrid;
 

app/Gdoo/Stock/views/report/stockDetail.blade.php

@@ -62,7 +62,6 @@
         grid.rowSelection = 'single';
         new agGrid.Grid(gridDiv, grid);
 
-        // 读取数据
         grid.remoteData({page: 1});
 
         // 绑定自定义事件

app/Gdoo/Stock/views/report/stockInOut.blade.php

@@ -72,7 +72,6 @@
         grid.autoColumnsToFit = false;
         new agGrid.Grid(gridDiv, grid);
 
-        // 读取数据
         grid.remoteData({page: 1});
 
         // 绑定自定义事件

app/Gdoo/Stock/views/report/stockTotal.blade.php

@@ -69,7 +69,6 @@
         grid.rowSelection = 'single';
         new agGrid.Grid(gridDiv, grid);
 
-        // 读取数据
         grid.remoteData({page: 1});
 
         // 绑定自定义事件

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

@@ -17,13 +17,13 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
     grid.rowSelection = multiple ? 'multiple' : 'single';
+    
     grid.columnDefs = [
         {suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: multiple, suppressSizeToFit: true, sortable: false, width: 40},
         {suppressMenu: true, cellClass:'text-center', sortable: false, field: 'code', headerName: '编码', width: 100},
@@ -39,70 +39,20 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
 
     // 数据载入成功
-    grid.remoteSuccessed = function() {
+    grid.remoteAfterSuccess = function() {
-        initSelected();
+        gdoo.initSelected(params, option, grid);
     }
 
     var data = search.forms;

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

@@ -15,15 +15,14 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = false;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
     grid.suppressRowClickSelection = true;
     grid.rowSelection = multiple ? 'multiple' : 'single';
+    
     grid.columnDefs = [
         {suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: multiple, suppressSizeToFit: true, sortable: false, width: 40},
         {suppressMenu: true, cellClass:'text-center', sortable: false, field: 'code', headerName: '编码', width: 60},
@@ -39,70 +38,20 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-    
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
 
     // 数据载入成功
-    grid.remoteSuccessed = function() {
+    grid.remoteAfterSuccess = function() {
-        initSelected();
+        gdoo.initSelected(params, option, grid);
     }
 
     var data = search.forms;

app/Gdoo/System/views/region/dialog.blade.php

@@ -15,10 +15,8 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
@@ -51,70 +49,20 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData();
 
     // 数据载入成功
-    grid.remoteSuccessed = function() {
+    grid.remoteAfterSuccess = function() {
-        initSelected();
+        gdoo.initSelected(params, option, grid);
     }
 
     var data = search.forms;

app/Gdoo/User/views/department/dialog.blade.php

@@ -15,10 +15,8 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
@@ -50,70 +48,20 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData();
 
     // 数据载入成功
-    grid.remoteSuccessed = function() {
+    grid.remoteAfterSuccess = function() {
-        initSelected();
+        gdoo.initSelected(params, option, grid);
     }
 
     var data = search.forms;

app/Gdoo/User/views/department/index.blade.php

@@ -42,7 +42,6 @@
         grid.columnDefs = config.cols;
         new agGrid.Grid(gridDiv, grid);
 
-        // 读取数据
         grid.remoteData();
 
         // 绑定自定义事件

app/Gdoo/User/views/group/index.blade.php

@@ -34,7 +34,6 @@
 
         new agGrid.Grid(gridDiv, grid);
 
-        // 读取数据
         grid.remoteData({page: 1});
 
         // 绑定自定义事件

app/Gdoo/User/views/message/index.blade.php

@@ -62,7 +62,6 @@
     gridDiv.style.height = getPanelHeight(48);
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
 
     // 绑定自定义事件

app/Gdoo/User/views/position/dialog.blade.php

@@ -17,10 +17,8 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
@@ -40,70 +38,18 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-    * 初始化选择
-    */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-    * 写入选中
-    */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData();
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

app/Gdoo/User/views/position/index.blade.php

@@ -34,7 +34,6 @@
 
         new agGrid.Grid(gridDiv, grid);
 
-        // 读取数据
         grid.remoteData({page: 1});
 
         // 绑定自定义事件

app/Gdoo/User/views/role/dialog.blade.php

@@ -15,10 +15,8 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
@@ -50,70 +48,18 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            var rows = {};
-            var id = $('#'+option.id).val();
-            if (id) {
-                var ids = id.split(',');
-                for (var i = 0; i < ids.length; i++) {
-                    rows[ids[i]] = ids[i];
-                }
-            }
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (rows[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(rows, function(k, row) {
-                id.push(row[sid]);
-                text.push(row.name);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData();
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

app/Gdoo/User/views/role/index.blade.php

@@ -25,7 +25,6 @@
 
         new agGrid.Grid(gridDiv, grid);
 
-        // 读取数据
         grid.remoteData({page: 1});
 
         // 绑定自定义事件

app/Gdoo/User/views/user/dialog.blade.php

@@ -25,10 +25,8 @@
     var event = gdoo.event.get(option.key);
     event.trigger('query', params);
 
-    var sid = params.prefix == 1 ? 'sid' : 'id';
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var selectedData = {};
     var multiple = params.multi == 0 ? false : true;
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
@@ -42,18 +40,6 @@
         {suppressMenu: true, cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
 
-    var selecteds = {};
-
-    var id = $('#'+option.id).val();
-    var text = $('#'+option.id+'_text').val();
-    if (id) {
-        var ids = id.split(',');
-        var texts = text.split(',');
-        for (var i = 0; i < ids.length; i++) {
-            selecteds[ids[i]] = texts[i];
-        }
-    }
-
     function statusRenderer(row) {
         if (row.value == 0) {
             return '<span style="color:red">禁用</span>';
@@ -63,15 +49,6 @@
         }
     }
 
-    grid.onCustomRowSelected = function(event) {
-        var data = event.node.data;
-        if (event.node.isSelected()) {
-            selecteds[data[sid]] = data.name;
-        } else {
-            delete selecteds[data[sid]];
-        }
-    }
-
     grid.onRowClicked = function(row) {
         var selected = row.node.isSelected();
         if (selected === false) {
@@ -80,62 +57,18 @@
     };
 
     grid.onRowDoubleClicked = function (row) {
-        var ret = writeSelected();
+        var ret = gdoo.writeSelected(event, params, option, grid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
     };
 
-    /**
-     * 初始化选择
-     */
-    function initSelected() {
-        if (params.is_grid) {
-        } else {
-            grid.api.forEachNode(function(node) {
-                var key = node.data[sid];
-                if (selecteds[key] != undefined) {
-                    node.setSelected(true);
-                }
-            });
-        }
-    }
-
-    /**
-     * 写入选中
-     */
-    function writeSelected() {
-        var rows = grid.api.getSelectedRows();
-        if (params.is_grid) {
-            var list = gdoo.forms[params.form_id];
-            list.api.dialogSelected(params);
-        } else {
-            var id = [];
-            var text = [];
-            $.each(selecteds, function(k, v) {
-                id.push(k);
-                text.push(v);
-            });
-            $('#'+option.id).val(id.join(','));
-            $('#'+option.id+'_text').val(text.join(','));
-
-            if (event.exist('onSelect')) {
-                return event.trigger('onSelect', multiple ? rows : rows[0]);
-            }
-        }
-        return true;
-    }
-    grid.writeSelected = writeSelected;
     gdoo.dialogs[option.id] = grid;
-    
     new agGrid.Grid(gridDiv, grid);
 
-    // 读取数据
     grid.remoteData({page: 1});
-
+    grid.remoteAfterSuccess = function() {
-    // 数据载入成功
+        gdoo.initSelected(params, option, grid);
-    grid.remoteSuccessed = function() {
-        initSelected();
     }
 
     var data = search.forms;

app/Gdoo/User/views/user/index.blade.php

@@ -106,7 +106,6 @@
         gridDiv.style.height = getPanelHeight(48);
         new agGrid.Grid(gridDiv, grid);
 
-        // 读取数据
         grid.remoteData({page: 1});
 
         // 绑定自定义事件

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

@@ -72,7 +72,6 @@
 
         new agGrid.Grid(gridDiv, options);
 
-        // 读取数据
         options.remoteData({page: 1});
 
         // 绑定自定义事件

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

@@ -36,7 +36,6 @@
 
         new agGrid.Grid(gridDiv, options);
 
-        // 读取数据
         options.remoteData({page: 1});
 
         // 绑定自定义事件

app/Gdoo/Workflow/views/widget/index.blade.php

@@ -43,7 +43,6 @@
     };
     new agGrid.Grid(gridDiv, options);
 
-    // 读取数据
     options.remoteData({page: 1});
 
     gdoo.widgets['workflow_widget_index'] = options;

public/assets/js/aggrid.js

@@ -295,15 +295,9 @@ function getPanelHeight(v) {
             rowSelection: 'multiple',
             localeText: localeText,
             suppressAnimationFrame: true,
-            // suppressAutoSize: true,
             suppressContextMenu: true,
             // 关闭参数检查
             suppressPropertyNamesCheck: true,
-            // pagination: true,
-            // rowModelType: 'infinite',
-            // paginationPageSize: 25,
-            // cacheBlockSize: 25,
-            // suppressPaginationPanel: true,
             suppressCellSelection: true,
             enableCellTextSelection: true,
             // 自定义后端数据地址
@@ -324,10 +318,11 @@ function getPanelHeight(v) {
             onCellEditingStarted(params) {
                 this.lastEditCell = params;
             },
-            remoteSuccessed() {},
+            remoteBeforeSuccess() {},
-            onGridSizeChanged(params) {
+            remoteAfterSuccess() {},
+            onGridSizeChanged() {
             },
-            onGridReady(params) {
+            onGridReady() {
             },
             onFirstDataRendered(params) {
                 var me = this;
@@ -370,20 +365,7 @@ function getPanelHeight(v) {
                         }
                     }
                 }
-                if (typeof me.onCustomRowSelected == "function") {
-                    me.onCustomRowSelected.call(me, params);
-                }
             },
-            onRowDoubleClicked(params) {
-                console.log('onRowDoubleClicked');
-            },
-            /*
-            getRowNodeId_bak(data) {
-                if (data.id) {
-                    return data.id;
-                }
-            },
-            */
             columnTypes: {
                 number: {
                     cellClass: 'ag-cell-number',
@@ -504,10 +486,11 @@ function getPanelHeight(v) {
             gridOptions.api.showLoadingOverlay();
             $.post(gridOptions.remoteDataUrl, remoteParams, function (res) {
 
+                gridOptions.remoteBeforeSuccess.call(gridOptions, res);
+
                 if (typeof success === 'function') {
                     success(res);
                 }
-                gridOptions.remoteSuccessed.call(gridOptions, res);
 
                 if (res.per_page) {
                     if (me.pagerDom === null) {
@@ -536,6 +519,7 @@ function getPanelHeight(v) {
                 gridOptions.api.setRowData(res.data);
                 gridOptions.generatePinnedBottomData();
 
+                gridOptions.remoteAfterSuccess.call(gridOptions, res);
             }, 'json');
         }
 
@@ -548,15 +532,18 @@ function getPanelHeight(v) {
             gridOptions.api.showLoadingOverlay();
             $.post(gridOptions.remoteDataUrl, remoteParams, function (res) {
 
+                gridOptions.remoteBeforeSuccess.call(gridOptions, res);
+
                 if (typeof success === 'function') {
                     success(res);
                 }
-                gridOptions.remoteSuccessed.call(gridOptions, res);
 
                 gridOptions.api.hideOverlay();
                 gridOptions.api.setRowData(res.data);
                 gridOptions.generatePinnedBottomData();
 
+                gridOptions.remoteAfterSuccess.call(gridOptions, res);
+            
             }, 'json');
         }
         return gridOptions;

public/assets/js/aggrid/celleditor/suggest.js

@@ -58,7 +58,6 @@
     function refreshDropMenu($input, data, options) {
         showDropMenu($input, options);
         grid.remoteParams.q = $input.val();
-        // 读取数据
         grid.remoteData();
         return $input;
     }

public/assets/js/gdoo.dialog.input.js

@@ -62,7 +62,6 @@
         grid.remoteDataUrl = app.url(params.url);
         grid.remoteParams = params;
 
-        // 读取数据
         grid.remoteData();
         return $input;
     }

public/assets/js/gdoo.js

@@ -47,6 +47,80 @@
         }
     };
 
+    /**
+     * 对话框字段写入选中
+     */
+    gdoo.writeSelected = function(event, params, option, grid) {
+        var rows = grid.api.getSelectedRows();
+        if (params.is_grid) {
+            var list = gdoo.forms[params.form_id];
+            list.api.dialogSelected(params);
+        } else {
+            var sid = params.prefix == 1 ? 'sid' : 'id';
+            var multiple = params.multi == 0 ? false : true;
+
+            var id = [];
+            var text = [];
+            $.each(rows, function(k, row) {
+                id.push(row[sid]);
+                text.push(row.name);
+            });
+
+            var doc = getIframeDocument(params.iframe_id);
+            if (doc) {
+                var $option_id = $('#' + option.id, doc);
+                var $option_text = $('#'+option.id + '_text', doc);
+            } else {
+                var $option_id = $('#' + option.id);
+                var $option_text = $('#' + option.id + '_text');
+            }
+
+            $option_id.val(id.join(','));
+            $option_text.val(text.join(','));
+
+            if (event.exist('onSelect')) {
+                return event.trigger('onSelect', multiple ? rows : rows[0]);
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * 初始化选择
+     */
+    gdoo.initSelected = function(params, option, grid) {
+        if (params.is_grid) {
+        } else {
+            var doc = getIframeDocument(params.iframe_id);
+            if (doc) {
+                var $option_id = $('#' + option.id, doc);
+            } else {
+                var $option_id = $('#' + option.id);
+            }
+
+            var sid = params.prefix == 1 ? 'sid' : 'id';
+            var id = $option_id.val();
+            var rows = {};
+            if (id) {
+                var ids = id.split(',');
+                for (var i = 0; i < ids.length; i++) {
+                    rows[ids[i]] = ids[i];
+                }
+            }
+
+            grid.api.forEachNode(function(node) {
+                var key = node.data[sid];
+                if (rows[key] != undefined) {
+                    node.setSelected(true);
+                }
+            });
+        }
+    }
+
+    /**
+     * grid列表显示构建
+     * @param {*} table
+     */
     gdoo.grid = function(table) {
         var root = this;
         this.table = table;

public/assets/js/support.js

@@ -130,10 +130,9 @@ $(function() {
                 text: "确定",
                 'class': "btn-default",
                 click: function() {
-                    var me = this;
+                    var list = gdoo.dialogs[option.id];
-                    var list = gdoo.dialogs[option.id] || {};
+                    if (list) {
-                    if (typeof list.writeSelected == 'function') {
+                        var ret = gdoo.writeSelected(event, params, option, list);
-                        var ret = list.writeSelected();
                         if (ret === true) {
                             $(this).dialog("close");
                         }
@@ -875,11 +874,32 @@ function ajaxSubmit(table, callback) {
     });
 }
 
+/**
+ * 获取框架的name
+ * @returns
+ */
 function getIframeName() {
     var name = window.name;
     return name ? name.replace('iframe_', '') : '';
 }
 
+/**
+ * 获取框架的document
+ * @param {*} iframe_id 
+ * @returns 
+ */
+function getIframeDocument(iframe_id) {
+    if (iframe_id) {
+        var iframe = window.frames['iframe_' + iframe_id];
+        if (iframe) {
+            return iframe.document;
+        } else {
+            //toastrError('iframe_id参数无效。');
+        }
+    }
+    return null;
+}
+
 /**
  * 格式化文件大小
  * @param {*} fileSize 

public/mix-manifest.json

@@ -1,7 +1,7 @@
 {
     "/assets/dist/bundle.min.js": "/assets/dist/bundle.min.js?id=b46cb4305a863944f84c",
     "/assets/dist/vendor.min.js": "/assets/dist/vendor.min.js?id=29c59d13160c6607b4af",
-    "/assets/dist/gdoo.min.js": "/assets/dist/gdoo.min.js?id=b40a40adf287e5ea02aa",
+    "/assets/dist/gdoo.min.js": "/assets/dist/gdoo.min.js?id=a3923df9d79f567f2cf9",
     "/assets/dist/index.min.js": "/assets/dist/index.min.js?id=9f7be548e55d993be518",
     "/assets/dist/vendor.min.css": "/assets/dist/vendor.min.css?id=99a58728a17257718260",
     "/assets/dist/gdoo.min.css": "/assets/dist/gdoo.min.css?id=3817f9870ed3748aba46",