diff --git a/app/Gdoo/Approach/views/approach/dialog.blade.php b/app/Gdoo/Approach/views/approach/dialog.blade.php index aa82c9f1..fb79e5bb 100644 --- a/app/Gdoo/Approach/views/approach/dialog.blade.php +++ b/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, - init:function(e) {} + data: data }); search.find('#search-submit').on('click', function() { diff --git a/app/Gdoo/Approach/views/approach/product.blade.php b/app/Gdoo/Approach/views/approach/product.blade.php index abffa7d7..bd716a1a 100644 --- a/app/Gdoo/Approach/views/approach/product.blade.php +++ b/app/Gdoo/Approach/views/approach/product.blade.php @@ -26,7 +26,6 @@ ]; new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData(); })(jQuery); diff --git a/app/Gdoo/Approach/views/approach/reference.blade.php b/app/Gdoo/Approach/views/approach/reference.blade.php index 60c034a1..8fb12fb2 100644 --- a/app/Gdoo/Approach/views/approach/reference.blade.php +++ b/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; diff --git a/app/Gdoo/Approach/views/approach/serviceCostDetail.blade.php b/app/Gdoo/Approach/views/approach/serviceCostDetail.blade.php index 15a541a2..3c1d9eed 100644 --- a/app/Gdoo/Approach/views/approach/serviceCostDetail.blade.php +++ b/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); \ No newline at end of file diff --git a/app/Gdoo/Approach/views/approach/serviceReview.blade.php b/app/Gdoo/Approach/views/approach/serviceReview.blade.php index c3a8379e..ff304db0 100644 --- a/app/Gdoo/Approach/views/approach/serviceReview.blade.php +++ b/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; diff --git a/app/Gdoo/Approach/views/market/dialog.blade.php b/app/Gdoo/Approach/views/market/dialog.blade.php index b34695eb..d19b8db3 100644 --- a/app/Gdoo/Approach/views/market/dialog.blade.php +++ b/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; diff --git a/app/Gdoo/Approach/views/review/feeDetail.blade.php b/app/Gdoo/Approach/views/review/feeDetail.blade.php index e6356834..6d97f7b9 100644 --- a/app/Gdoo/Approach/views/review/feeDetail.blade.php +++ b/app/Gdoo/Approach/views/review/feeDetail.blade.php @@ -26,7 +26,6 @@ ]; new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData(); })(jQuery); diff --git a/app/Gdoo/Customer/views/complaint/progress.blade.php b/app/Gdoo/Customer/views/complaint/progress.blade.php index f06c17cd..b8ec4e7a 100644 --- a/app/Gdoo/Customer/views/complaint/progress.blade.php +++ b/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({ diff --git a/app/Gdoo/Customer/views/contact/dialog.blade.php b/app/Gdoo/Customer/views/contact/dialog.blade.php index 15127bc9..71718bd0 100644 --- a/app/Gdoo/Customer/views/contact/dialog.blade.php +++ b/app/Gdoo/Customer/views/contact/dialog.blade.php @@ -10,107 +10,61 @@ \ No newline at end of file diff --git a/app/Gdoo/Customer/views/customer/dialog.blade.php b/app/Gdoo/Customer/views/customer/dialog.blade.php index a62ca614..754db4c6 100644 --- a/app/Gdoo/Customer/views/customer/dialog.blade.php +++ b/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() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Customer/views/customerClass/dialog.blade.php b/app/Gdoo/Customer/views/customerClass/dialog.blade.php index 1db92e72..0933fa72 100644 --- a/app/Gdoo/Customer/views/customerClass/dialog.blade.php +++ b/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() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Customer/views/deliveryAddress/dialog.blade.php b/app/Gdoo/Customer/views/deliveryAddress/dialog.blade.php index 15127bc9..00801085 100644 --- a/app/Gdoo/Customer/views/deliveryAddress/dialog.blade.php +++ b/app/Gdoo/Customer/views/deliveryAddress/dialog.blade.php @@ -10,107 +10,63 @@ \ No newline at end of file diff --git a/app/Gdoo/Customer/views/price/referCustomer.blade.php b/app/Gdoo/Customer/views/price/referCustomer.blade.php index d2dfaa12..44494e12 100644 --- a/app/Gdoo/Customer/views/price/referCustomer.blade.php +++ b/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; diff --git a/app/Gdoo/Customer/views/region/dialog.blade.php b/app/Gdoo/Customer/views/region/dialog.blade.php index 88e69f40..e67bd078 100644 --- a/app/Gdoo/Customer/views/region/dialog.blade.php +++ b/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() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Customer/views/regionTask/progress.blade.php b/app/Gdoo/Customer/views/regionTask/progress.blade.php index 91f4d7d0..4b7556e1 100644 --- a/app/Gdoo/Customer/views/regionTask/progress.blade.php +++ b/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({ diff --git a/app/Gdoo/Customer/views/report/accountStatement.blade.php b/app/Gdoo/Customer/views/report/accountStatement.blade.php index dc043a44..ad51ee65 100644 --- a/app/Gdoo/Customer/views/report/accountStatement.blade.php +++ b/app/Gdoo/Customer/views/report/accountStatement.blade.php @@ -74,7 +74,6 @@ grid.rowSelection = 'single'; new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/Customer/views/task/progress.blade.php b/app/Gdoo/Customer/views/task/progress.blade.php index a64555ba..d1fc1c0e 100644 --- a/app/Gdoo/Customer/views/task/progress.blade.php +++ b/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({ diff --git a/app/Gdoo/Customer/views/tax/dialog.blade.php b/app/Gdoo/Customer/views/tax/dialog.blade.php index cb43d971..fba5da18 100644 --- a/app/Gdoo/Customer/views/tax/dialog.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Customer/views/widget/birthday.blade.php b/app/Gdoo/Customer/views/widget/birthday.blade.php index 9d20bafc..7218ea4e 100644 --- a/app/Gdoo/Customer/views/widget/birthday.blade.php +++ b/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; diff --git a/app/Gdoo/CustomerCost/views/category/dialog.blade.php b/app/Gdoo/CustomerCost/views/category/dialog.blade.php deleted file mode 100644 index a6181bd3..00000000 --- a/app/Gdoo/CustomerCost/views/category/dialog.blade.php +++ /dev/null @@ -1,113 +0,0 @@ -
- - - - - - - - -
名称ID
-
- - \ No newline at end of file diff --git a/app/Gdoo/CustomerCost/views/cost/serviceSaleOrder.blade.php b/app/Gdoo/CustomerCost/views/cost/serviceSaleOrder.blade.php index 4e0d662c..a634b47b 100644 --- a/app/Gdoo/CustomerCost/views/cost/serviceSaleOrder.blade.php +++ b/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; diff --git a/app/Gdoo/CustomerCost/views/report/saleOrderDetail.blade.php b/app/Gdoo/CustomerCost/views/report/saleOrderDetail.blade.php index 0324e23c..b35fb2b2 100644 --- a/app/Gdoo/CustomerCost/views/report/saleOrderDetail.blade.php +++ b/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({ diff --git a/app/Gdoo/File/views/certificate/index.blade.php b/app/Gdoo/File/views/certificate/index.blade.php index 09a5d431..bedf9dc8 100644 --- a/app/Gdoo/File/views/certificate/index.blade.php +++ b/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}); // 绑定自定义事件 diff --git a/app/Gdoo/File/views/inspectReport/index.blade.php b/app/Gdoo/File/views/inspectReport/index.blade.php index 747e2f19..26889d95 100644 --- a/app/Gdoo/File/views/inspectReport/index.blade.php +++ b/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}); // 绑定自定义事件 diff --git a/app/Gdoo/Model/views/model/index.blade.php b/app/Gdoo/Model/views/model/index.blade.php index aad5a6e0..41c00384 100644 --- a/app/Gdoo/Model/views/model/index.blade.php +++ b/app/Gdoo/Model/views/model/index.blade.php @@ -68,8 +68,6 @@ }; new agGrid.Grid(gridDiv, options); - - // 读取数据 options.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/Model/views/module/index.blade.php b/app/Gdoo/Model/views/module/index.blade.php index b520cb77..b725c1b1 100644 --- a/app/Gdoo/Model/views/module/index.blade.php +++ b/app/Gdoo/Model/views/module/index.blade.php @@ -76,8 +76,6 @@ }; new agGrid.Grid(gridDiv, options); - - // 读取数据 options.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/Model/views/todo/widget.blade.php b/app/Gdoo/Model/views/todo/widget.blade.php index 982ce393..442a8845 100644 --- a/app/Gdoo/Model/views/todo/widget.blade.php +++ b/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; diff --git a/app/Gdoo/Order/Hooks/OrderHook.php b/app/Gdoo/Order/Hooks/OrderHook.php index 5cd2ff26..29e494cf 100644 --- a/app/Gdoo/Order/Hooks/OrderHook.php +++ b/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]; - - // 成品数量 - $product_quantity = $product_money = 0; + $role_ids = [2, 83, 84, 85]; 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,27 +117,11 @@ 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; } diff --git a/app/Gdoo/Order/views/order/deliveryPlan.blade.php b/app/Gdoo/Order/views/order/deliveryPlan.blade.php index 61369ce3..ecbe1117 100644 --- a/app/Gdoo/Order/views/order/deliveryPlan.blade.php +++ b/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() { diff --git a/app/Gdoo/Order/views/order/dialog.blade.php b/app/Gdoo/Order/views/order/dialog.blade.php index 21c4855f..aee3a017 100644 --- a/app/Gdoo/Order/views/order/dialog.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Order/views/order/reference.blade.php b/app/Gdoo/Order/views/order/reference.blade.php index 2d81a877..329e1a98 100644 --- a/app/Gdoo/Order/views/order/reference.blade.php +++ b/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; diff --git a/app/Gdoo/Order/views/order/serviceCancelOrder.blade.php b/app/Gdoo/Order/views/order/serviceCancelOrder.blade.php index 87dde57e..6e5fbbb9 100644 --- a/app/Gdoo/Order/views/order/serviceCancelOrder.blade.php +++ b/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; diff --git a/app/Gdoo/Order/views/order/serviceDelivery.blade.php b/app/Gdoo/Order/views/order/serviceDelivery.blade.php index fdbf8903..7042855a 100644 --- a/app/Gdoo/Order/views/order/serviceDelivery.blade.php +++ b/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; diff --git a/app/Gdoo/Order/views/order/serviceNotDelivery.blade.php b/app/Gdoo/Order/views/order/serviceNotDelivery.blade.php index e8641d4d..384592e8 100644 --- a/app/Gdoo/Order/views/order/serviceNotDelivery.blade.php +++ b/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; diff --git a/app/Gdoo/Order/views/order/servicePromotion.blade.php b/app/Gdoo/Order/views/order/servicePromotion.blade.php index 672700a5..16359d71 100644 --- a/app/Gdoo/Order/views/order/servicePromotion.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + mGrid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, mGrid); } 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; diff --git a/app/Gdoo/Order/views/plan/export_sale.blade.php b/app/Gdoo/Order/views/plan/export_sale.blade.php index 8d8e526a..a749ec30 100644 --- a/app/Gdoo/Order/views/plan/export_sale.blade.php +++ b/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({ diff --git a/app/Gdoo/Order/views/plan/index.blade.php b/app/Gdoo/Order/views/plan/index.blade.php index f768cd9d..97d0bfc0 100644 --- a/app/Gdoo/Order/views/plan/index.blade.php +++ b/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({ diff --git a/app/Gdoo/Order/views/plan/produce.blade.php b/app/Gdoo/Order/views/plan/produce.blade.php index c03b2925..76299057 100644 --- a/app/Gdoo/Order/views/plan/produce.blade.php +++ b/app/Gdoo/Order/views/plan/produce.blade.php @@ -74,7 +74,6 @@ grid.api.setColumnDefs(columnDefs); } - // 读取数据 grid.remoteData(null, function(res) { setColumns(res); }); diff --git a/app/Gdoo/Order/views/plan/producePlan.blade.php b/app/Gdoo/Order/views/plan/producePlan.blade.php index 449499d7..5bab8162 100644 --- a/app/Gdoo/Order/views/plan/producePlan.blade.php +++ b/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); diff --git a/app/Gdoo/Order/views/sampleApply/serviceDelivery.blade.php b/app/Gdoo/Order/views/sampleApply/serviceDelivery.blade.php index 88a8041a..e047e5b4 100644 --- a/app/Gdoo/Order/views/sampleApply/serviceDelivery.blade.php +++ b/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; diff --git a/app/Gdoo/Order/views/widget/goods.blade.php b/app/Gdoo/Order/views/widget/goods.blade.php index 18e66e7c..7bb0e458 100644 --- a/app/Gdoo/Order/views/widget/goods.blade.php +++ b/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); diff --git a/app/Gdoo/Order/views/widget/index.blade.php b/app/Gdoo/Order/views/widget/index.blade.php index 9a6d3f6e..86efe0ed 100644 --- a/app/Gdoo/Order/views/widget/index.blade.php +++ b/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); diff --git a/app/Gdoo/Produce/views/material/config.blade.php b/app/Gdoo/Produce/views/material/config.blade.php index ef217111..f7c1e983 100644 --- a/app/Gdoo/Produce/views/material/config.blade.php +++ b/app/Gdoo/Produce/views/material/config.blade.php @@ -74,7 +74,6 @@ html { } }); - // 读取数据 grid.remoteData(); $('#product_formula_delete').on('click', function() { diff --git a/app/Gdoo/Produce/views/material/plan.blade.php b/app/Gdoo/Produce/views/material/plan.blade.php index 3f8c349c..a0ed2f36 100644 --- a/app/Gdoo/Produce/views/material/plan.blade.php +++ b/app/Gdoo/Produce/views/material/plan.blade.php @@ -92,7 +92,6 @@ new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/Produce/views/plan/config.blade.php b/app/Gdoo/Produce/views/plan/config.blade.php index 6551591d..9c576245 100644 --- a/app/Gdoo/Produce/views/plan/config.blade.php +++ b/app/Gdoo/Produce/views/plan/config.blade.php @@ -65,7 +65,6 @@ } }); - // 读取数据 grid.remoteData(); $('#product_formula_delete').on('click', function() { diff --git a/app/Gdoo/Produce/views/plan/planExport.blade.php b/app/Gdoo/Produce/views/plan/planExport.blade.php index fe914de5..3cbfd6ed 100644 --- a/app/Gdoo/Produce/views/plan/planExport.blade.php +++ b/app/Gdoo/Produce/views/plan/planExport.blade.php @@ -54,7 +54,6 @@ grid.rowSelection = 'single'; new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/Product/views/category/dialog.blade.php b/app/Gdoo/Product/views/category/dialog.blade.php index 16474744..32a68860 100644 --- a/app/Gdoo/Product/views/category/dialog.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Product/views/product/dialog.blade.php b/app/Gdoo/Product/views/product/dialog.blade.php index 74fa67ce..c258a093 100644 --- a/app/Gdoo/Product/views/product/dialog.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Product/views/product/serviceCustomer.blade.php b/app/Gdoo/Product/views/product/serviceCustomer.blade.php index ff5ec49f..6893b6ec 100644 --- a/app/Gdoo/Product/views/product/serviceCustomer.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Product/views/unit/dialog.blade.php b/app/Gdoo/Product/views/unit/dialog.blade.php index cd521f14..91037f0c 100644 --- a/app/Gdoo/Product/views/unit/dialog.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Project/views/task/index/index.blade.php b/app/Gdoo/Project/views/task/index/index.blade.php index 209cdaf8..19873ef6 100644 --- a/app/Gdoo/Project/views/task/index/index.blade.php +++ b/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({ diff --git a/app/Gdoo/Promotion/views/promotion/dialog.blade.php b/app/Gdoo/Promotion/views/promotion/dialog.blade.php index a6da4eb2..cb27ebc6 100644 --- a/app/Gdoo/Promotion/views/promotion/dialog.blade.php +++ b/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; diff --git a/app/Gdoo/Promotion/views/promotion/product.blade.php b/app/Gdoo/Promotion/views/promotion/product.blade.php index abffa7d7..bd716a1a 100644 --- a/app/Gdoo/Promotion/views/promotion/product.blade.php +++ b/app/Gdoo/Promotion/views/promotion/product.blade.php @@ -26,7 +26,6 @@ ]; new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData(); })(jQuery); diff --git a/app/Gdoo/Promotion/views/promotion/serviceSaleOrder.blade.php b/app/Gdoo/Promotion/views/promotion/serviceSaleOrder.blade.php index 812deac8..8364aba0 100644 --- a/app/Gdoo/Promotion/views/promotion/serviceSaleOrder.blade.php +++ b/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; diff --git a/app/Gdoo/Promotion/views/review/feeDetail.blade.php b/app/Gdoo/Promotion/views/review/feeDetail.blade.php index c977add1..83bd37aa 100644 --- a/app/Gdoo/Promotion/views/review/feeDetail.blade.php +++ b/app/Gdoo/Promotion/views/review/feeDetail.blade.php @@ -27,7 +27,6 @@ ]; new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData(); })(jQuery); diff --git a/app/Gdoo/Purchase/views/order/serviceRecord01.blade.php b/app/Gdoo/Purchase/views/order/serviceRecord01.blade.php index 3a9b0a53..4dfcd859 100644 --- a/app/Gdoo/Purchase/views/order/serviceRecord01.blade.php +++ b/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; diff --git a/app/Gdoo/Purchase/views/supplier/dialog.blade.php b/app/Gdoo/Purchase/views/supplier/dialog.blade.php index 23106ddf..d82a48cd 100644 --- a/app/Gdoo/Purchase/views/supplier/dialog.blade.php +++ b/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() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Stock/views/allocation/reference.blade.php b/app/Gdoo/Stock/views/allocation/reference.blade.php index 564b172a..7fe698e4 100644 --- a/app/Gdoo/Stock/views/allocation/reference.blade.php +++ b/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; diff --git a/app/Gdoo/Stock/views/allocation/stockSelect.blade.php b/app/Gdoo/Stock/views/allocation/stockSelect.blade.php index ef409c85..9494e8ac 100644 --- a/app/Gdoo/Stock/views/allocation/stockSelect.blade.php +++ b/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; diff --git a/app/Gdoo/Stock/views/cancel/reference.blade.php b/app/Gdoo/Stock/views/cancel/reference.blade.php index 5703aa61..f4cd40b3 100644 --- a/app/Gdoo/Stock/views/cancel/reference.blade.php +++ b/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; diff --git a/app/Gdoo/Stock/views/category/dialog.blade.php b/app/Gdoo/Stock/views/category/dialog.blade.php index 4ed8c29a..e1ca5577 100644 --- a/app/Gdoo/Stock/views/category/dialog.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Stock/views/delivery/getBatchSelect.blade.php b/app/Gdoo/Stock/views/delivery/getBatchSelect.blade.php index 244b4d61..95e7cd7b 100644 --- a/app/Gdoo/Stock/views/delivery/getBatchSelect.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Stock/views/delivery/reference.blade.php b/app/Gdoo/Stock/views/delivery/reference.blade.php index 564b172a..8d541183 100644 --- a/app/Gdoo/Stock/views/delivery/reference.blade.php +++ b/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; diff --git a/app/Gdoo/Stock/views/direct/reference.blade.php b/app/Gdoo/Stock/views/direct/reference.blade.php index 5703aa61..f4cd40b3 100644 --- a/app/Gdoo/Stock/views/direct/reference.blade.php +++ b/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; diff --git a/app/Gdoo/Stock/views/location/dialog.blade.php b/app/Gdoo/Stock/views/location/dialog.blade.php index 40aa50e3..2663c3a4 100644 --- a/app/Gdoo/Stock/views/location/dialog.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Stock/views/location/dialog2.blade.php b/app/Gdoo/Stock/views/location/dialog2.blade.php index fe97f72b..21da791a 100644 --- a/app/Gdoo/Stock/views/location/dialog2.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Stock/views/record08/reference.blade.php b/app/Gdoo/Stock/views/record08/reference.blade.php index 564b172a..668af2ec 100644 --- a/app/Gdoo/Stock/views/record08/reference.blade.php +++ b/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; diff --git a/app/Gdoo/Stock/views/record09/reference.blade.php b/app/Gdoo/Stock/views/record09/reference.blade.php index 564b172a..8d541183 100644 --- a/app/Gdoo/Stock/views/record09/reference.blade.php +++ b/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; diff --git a/app/Gdoo/Stock/views/record10/reference.blade.php b/app/Gdoo/Stock/views/record10/reference.blade.php index 564b172a..8d541183 100644 --- a/app/Gdoo/Stock/views/record10/reference.blade.php +++ b/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; diff --git a/app/Gdoo/Stock/views/record11/reference.blade.php b/app/Gdoo/Stock/views/record11/reference.blade.php index 564b172a..8d541183 100644 --- a/app/Gdoo/Stock/views/record11/reference.blade.php +++ b/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; diff --git a/app/Gdoo/Stock/views/report/stockDetail.blade.php b/app/Gdoo/Stock/views/report/stockDetail.blade.php index f5d907c3..1d834a43 100644 --- a/app/Gdoo/Stock/views/report/stockDetail.blade.php +++ b/app/Gdoo/Stock/views/report/stockDetail.blade.php @@ -62,7 +62,6 @@ grid.rowSelection = 'single'; new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/Stock/views/report/stockInOut.blade.php b/app/Gdoo/Stock/views/report/stockInOut.blade.php index 8b7765f7..ce0767ef 100644 --- a/app/Gdoo/Stock/views/report/stockInOut.blade.php +++ b/app/Gdoo/Stock/views/report/stockInOut.blade.php @@ -72,7 +72,6 @@ grid.autoColumnsToFit = false; new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/Stock/views/report/stockTotal.blade.php b/app/Gdoo/Stock/views/report/stockTotal.blade.php index 6befe31b..7d14ed2f 100644 --- a/app/Gdoo/Stock/views/report/stockTotal.blade.php +++ b/app/Gdoo/Stock/views/report/stockTotal.blade.php @@ -69,7 +69,6 @@ grid.rowSelection = 'single'; new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/Stock/views/type/dialog.blade.php b/app/Gdoo/Stock/views/type/dialog.blade.php index 7de72639..34804a22 100644 --- a/app/Gdoo/Stock/views/type/dialog.blade.php +++ b/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() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/Stock/views/warehouse/dialog.blade.php b/app/Gdoo/Stock/views/warehouse/dialog.blade.php index 40aa50e3..0df450e5 100644 --- a/app/Gdoo/Stock/views/warehouse/dialog.blade.php +++ b/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() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/System/views/region/dialog.blade.php b/app/Gdoo/System/views/region/dialog.blade.php index bf5dd28a..36352d65 100644 --- a/app/Gdoo/System/views/region/dialog.blade.php +++ b/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() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/User/views/department/dialog.blade.php b/app/Gdoo/User/views/department/dialog.blade.php index 054f8fe9..cc46b0c4 100644 --- a/app/Gdoo/User/views/department/dialog.blade.php +++ b/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() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/User/views/department/index.blade.php b/app/Gdoo/User/views/department/index.blade.php index 61f5d670..69116698 100644 --- a/app/Gdoo/User/views/department/index.blade.php +++ b/app/Gdoo/User/views/department/index.blade.php @@ -42,7 +42,6 @@ grid.columnDefs = config.cols; new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData(); // 绑定自定义事件 diff --git a/app/Gdoo/User/views/group/index.blade.php b/app/Gdoo/User/views/group/index.blade.php index 5c31c2b0..a049d479 100644 --- a/app/Gdoo/User/views/group/index.blade.php +++ b/app/Gdoo/User/views/group/index.blade.php @@ -34,7 +34,6 @@ new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/User/views/message/index.blade.php b/app/Gdoo/User/views/message/index.blade.php index 27a0b131..9ccceadf 100644 --- a/app/Gdoo/User/views/message/index.blade.php +++ b/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}); // 绑定自定义事件 diff --git a/app/Gdoo/User/views/position/dialog.blade.php b/app/Gdoo/User/views/position/dialog.blade.php index 294a96b0..bc3331ca 100644 --- a/app/Gdoo/User/views/position/dialog.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/User/views/position/index.blade.php b/app/Gdoo/User/views/position/index.blade.php index 5c31c2b0..a049d479 100644 --- a/app/Gdoo/User/views/position/index.blade.php +++ b/app/Gdoo/User/views/position/index.blade.php @@ -34,7 +34,6 @@ new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/User/views/role/dialog.blade.php b/app/Gdoo/User/views/role/dialog.blade.php index 054f8fe9..c7c7c7d5 100644 --- a/app/Gdoo/User/views/role/dialog.blade.php +++ b/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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/User/views/role/index.blade.php b/app/Gdoo/User/views/role/index.blade.php index 975f1862..240772fc 100644 --- a/app/Gdoo/User/views/role/index.blade.php +++ b/app/Gdoo/User/views/role/index.blade.php @@ -25,7 +25,6 @@ new agGrid.Grid(gridDiv, grid); - // 读取数据 grid.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/User/views/user/dialog.blade.php b/app/Gdoo/User/views/user/dialog.blade.php index f1b6fc04..0f58edbd 100644 --- a/app/Gdoo/User/views/user/dialog.blade.php +++ b/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 '禁用'; @@ -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.remoteSuccessed = function() { - initSelected(); + grid.remoteAfterSuccess = function() { + gdoo.initSelected(params, option, grid); } var data = search.forms; diff --git a/app/Gdoo/User/views/user/index.blade.php b/app/Gdoo/User/views/user/index.blade.php index 1add12cc..7fb2d8ca 100644 --- a/app/Gdoo/User/views/user/index.blade.php +++ b/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}); // 绑定自定义事件 diff --git a/app/Gdoo/Workflow/views/bill/index.blade.php b/app/Gdoo/Workflow/views/bill/index.blade.php index 035b9676..0e59d625 100644 --- a/app/Gdoo/Workflow/views/bill/index.blade.php +++ b/app/Gdoo/Workflow/views/bill/index.blade.php @@ -72,7 +72,6 @@ new agGrid.Grid(gridDiv, options); - // 读取数据 options.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/Workflow/views/category/index.blade.php b/app/Gdoo/Workflow/views/category/index.blade.php index d695c281..809b438c 100644 --- a/app/Gdoo/Workflow/views/category/index.blade.php +++ b/app/Gdoo/Workflow/views/category/index.blade.php @@ -36,7 +36,6 @@ new agGrid.Grid(gridDiv, options); - // 读取数据 options.remoteData({page: 1}); // 绑定自定义事件 diff --git a/app/Gdoo/Workflow/views/widget/index.blade.php b/app/Gdoo/Workflow/views/widget/index.blade.php index c0774f7c..940be9fe 100644 --- a/app/Gdoo/Workflow/views/widget/index.blade.php +++ b/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; diff --git a/public/assets/dist/gdoo.min.js b/public/assets/dist/gdoo.min.js index b837e6ab..2ea7b17d 100644 --- a/public/assets/dist/gdoo.min.js +++ b/public/assets/dist/gdoo.min.js @@ -1 +1 @@ -function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}!function(e,t){var a="agDropdownCellEditor",i="ag.dropdown.celleditor",o={maxHeight:200},n=27,r=9,l=37,s=38,d=39,c=40,u=13,p=16,f=function(t,i){this.grid=i.grid,this.config=i.config,this.items=i.data.items,this.selected=i.data.selected,this.hook=i.hook,this.arrow=i.arrow||"icon-search",this.name=i.name,this.onSelect=i.select||function(){},this.$input=e(t),this.settings=e.extend({},o,i),this.init(),e.fn[a].instances.push(this)};e.extend(f.prototype,{init:function(){this._construct(),this._events()},_construct:function(){this.$container=e('
'),this.$arrow=e('
'),this.$dropdown=e('
')},i.prototype.getGui=function(){return this.eGui},o.prototype.init=function(e){this.eGui=document.createElement("span"),this.eGui.innerHTML=e.value||""},o.prototype.getGui=function(){return this.eGui},n.prototype.init=function(e){var t=e.api.gridCore.gridOptions;if(!e.node.rowPinned&&null!=e.data){var a=e.data,i="";a.master_id>0&&e.colDef.options.forEach((function(e){if(e.display){var o=''+e.name+"";i+=t.actionCellBeforeRender(o,e,a)||""}})),this.eGui=document.createElement("span"),this.eGui.innerHTML=i}},n.prototype.getGui=function(){return this.eGui},r.prototype.init=function(e){this.grid=e,this.selectedKey=null,this.items=e.colDef.cellEditorParams.values,this.eInput=document.createElement("input"),this.eInput.value=e.value||"",this.eInput.className="ag-cell-edit-input form-control"},r.prototype.getGui=function(e){return this.eInput},r.prototype.afterGuiAttached=function(){var e=this,a=e.grid,i=e.eInput.value;t(e.eInput).agDropdownCellEditor({grid:e,arrow:"fa-caret-down",data:{items:e.items,selected:a.data[a.select_key]},select:function(t){t?(a.data[a.select_key]=t.id,e.eInput.value=t.name,e.selectedKey=t.id):e.eInput.value=i,a.stopEditing()}}),e.eInput.focus(),e.eInput.select()},r.prototype.getValue=function(){return this.eInput.value},r.prototype.destroy=function(){t("body").find(".combo-select").remove()},l.prototype.init=function(e){var t=e.value,a=e.colDef.cellEditorParams.values;this.eGui=document.createElement("div"),this.eGui.innerHTML=a[t]||a[0]},l.prototype.getGui=function(){return this.eGui},s.prototype.init=function(e){var t=e.value;this.eInput=document.createElement("input"),this.eInput.type="checkbox",this.eInput.checked=t,this.eInput.value=t},s.prototype.getGui=function(e){return this.eInput},s.prototype.afterGuiAttached=function(){this.eInput.focus(),this.eInput.select()},s.prototype.getValue=function(){return this.eInput.checked?1:0},s.prototype.destroy=function(){},d.prototype.init=function(e){this.params=e,this.eInput=document.createElement("div"),this.eInput.tabIndex="-1";var a=e.colDef.field+"_"+e.data.id,i=e.query;i.multi=1,i.is_grid=1,i.url=e.url,i.grid_id=e.data.id,i.title=e.title;var o="";t.each(i,(function(e,t){o+=" data-"+e+'="'+t+'"'})),this.query=i,this.eInput.innerHTML='',this.eInput.className="ag-input-wrapper ag-input-dialog-wrapper"},d.prototype.getGui=function(e){return this.eInput},d.prototype.afterGuiAttached=function(){var e=this;t(e.eInput).find("input").gdooSuggest({item:e.params.data,query:e.query}).on("onSelect",(function(t,a){e.params.data[e.query.name]=a[e.query.name],e.eInput.querySelector("input").value=a[e.query.name]})),e.eInput.querySelector("input").select()},d.prototype.getValue=function(){return this.params.data[this.params.query.name]},d.prototype.destroy=function(){t(this.eInput).find("input").off()},d.prototype.isPopup=function(){return!1},c.prototype.init=function(e){this.params=e.colDef.cellEditorParams,this.eInput=document.createElement("div"),this.eInput.innerHTML='',this.eInput.className="ag-input-wrapper ag-input-date-wrapper"},c.prototype.getGui=function(e){return this.eInput},c.prototype.afterGuiAttached=function(){this.eInput.querySelector("input").click()},c.prototype.getValue=function(){return this.eInput.querySelector("input").value},c.prototype.destroy=function(){},e.agGridOptions=function(){var e={defaultColDef:{minWidth:100,enableRowGroup:!0,enablePivot:!0,enableValue:!0,sortable:!0,resizable:!0,filter:!0,comparator:function(e,t){return"htmlCellRenderer"==this.cellRenderer?(e=delHtmlTag(e),t=delHtmlTag(t),e.localeCompare(t)):"string"==typeof e?e.localeCompare(t):e>t?1:e数据加载中...',overlayNoRowsTemplate:'
暂无数据
暂无数据
',generatePinnedBottomData:function(){var t=this,a={},i=!1;e.columnApi.getAllGridColumns().forEach((function(e){e.colDef.calcFooter&&(i=!0,a[e.colId]=t.calculatePinnedBottomData(e))})),i&&t.api.setPinnedBottomRowData([a])},calculatePinnedBottomData:function(t){var a=0;return e.api.forEachNode((function(e){a+=toNumber(e.data[t.colId])})),0==a?"":a},actionCellBeforeRender:function(e,t,a){return e},remoteData:function(a,i){var o=this,n=e.remoteParams;for(var r in a)n[r]=a[r];e.api.showLoadingOverlay(),t.post(e.remoteDataUrl,n,(function(a){if("function"==typeof i&&i(a),e.remoteSuccessed.call(e,a),a.per_page)if(null===o.pagerDom){var n=o.api.gridCore.eGridDiv,r=n.id+"-pager";t(n).after('
'),o.pagerDom=t("#"+r).Paging({pagesize:a.per_page,count:a.total,current:a.current_page,pageSizeList:[50,100,500,1e3,2e3,5e3,1e4,2e4,5e4],callback:function(e,t,a){o.remoteData2({page:e,limit:t})}})}else o.pagerDom[0].render({pagesize:a.per_page,count:a.total,current:a.current_page});e.api.hideOverlay(),e.api.setRowData(a.data),e.generatePinnedBottomData()}),"json")},remoteData2:function(a,i){var o=e.remoteParams;for(var n in a)o[n]=a[n];e.api.showLoadingOverlay(),t.post(e.remoteDataUrl,o,(function(t){"function"==typeof i&&i(t),e.remoteSuccessed.call(e,t),e.api.hideOverlay(),e.api.setRowData(t.data),e.generatePinnedBottomData()}),"json")}};return e}}(window,jQuery),function(e){var t=function(e){var t=this;t.args=e,t.trigger=function(e){if("function"==typeof t.args[e]){for(var a=[],i=1;i0&&i.action.rowDoubleClick&&i.action.rowDoubleClick(e.data)},this.div=function(t){var a=document.querySelector("#"+this.table+"-grid");return a.style.height=this.getPanelHeight(t),new agGrid.Grid(a,this.grid),e(a).on("click",'[data-toggle="event"]',(function(){var t=e(this).data();t.master_id>0&&i.action[t.action](t)})),a},this.getPanelHeight=function(t){return"calc(100vh - "+(e(".gdoo-list-grid").position().top+t+"px")+")"},this.init=function(a){var i=this;if(0==i.header.init){var o=a.header;i.header.init=!0,i.header.create_btn=o.create_btn,i.header.trash_btn=o.trash_btn,i.header.name=o.name,i.header.table=t;var n=o.search_form;n.simple_search=o.simple_search_form,i.header.search_form=n,i.search.forms=n.forms,i.action.table=t,i.action.name=o.master_name,i.action.bill_url=o.bill_uri,o.access&&(i.header.access=o.access),o.right_buttons&&(i.header.right_buttons=o.right_buttons),o.left_buttons&&(i.header.left_buttons=o.left_buttons),o.buttons&&(i.header.center_buttons=o.buttons),o.bys&&(i.header.bys=o.bys),o.tabs&&(i.header.tabs=o.tabs,i.header.tabs.active=n.params.tab?n.params.tab:o.tabs.items[0].value),i.grid.api.setColumnDefs(o.columns),i.grid.columnDefs=o.columns,i.grid.remoteParams=n.query,e("#"+t+"-page").show(),setTimeout((function(){i.searchForm()}),1)}},this.searchForm=function(){var t=this;t.search.advanced.el=e("#"+t.table+"-search-form-advanced").searchForm({data:t.search.forms,advanced:!0}),t.search.simple.el=e("#"+t.table+"-search-form").searchForm({data:t.search.forms}),t.search.simple.el.find("#search-submit").on("click",(function(){var a=t.search.simple.el.serializeArray(),i={};return t.search.queryType="simple",e.map(a,(function(e){i[e.name]=e.value})),i.page=1,t.grid.remoteData(i),!1}))},this.setup={header:this.header,action:this.action,grid:this.grid},a.grids[t]={grid:this.grid,search:this.search}}};window.gdoo=a}(jQuery);var select2List={};!function(e){e.fn.select2Field=function(t){$this=e(this);var a=$this.attr("key"),i=gdoo.event.get(a),o={width:"100%",placeholder:" - ",allowClear:!0,minimumInputLength:0,resultCache:!0,ajax:{type:"POST",url:"",dataType:"json",delay:250,cache:!1,data:function(e){var a=t.ajaxParams||{};return a.q=e.term||"",a.page=e.page||1,a.resultCache=!0,i.trigger("query",a),a},processResults:function(e,t){return{results:e.data,pagination:{more:e.current_page