发布2.3测试版

app/Gdoo/Order/Controllers/SampleApplyController.php

@@ -204,7 +204,7 @@ class SampleApplyController extends WorkflowController
     public function print()
     {
         $this->layout = 'layouts.print_html';
-        print_prince($this->create('print'));
+        return $this->create('print');
     }
 
     // 关闭

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

@@ -98,7 +98,7 @@ var form_action = '{{$action}}';
         query(params) {
         },
         onSelect(row) {
-            if (row.id) {
+            if (row) {
                 $('#customer_order_type_id').val(row.type_id);
                 $('#customer_order_type_id_select').val(row.type_id);
                 $('#customer_region_region_id').val(row.region_id);
@@ -148,7 +148,7 @@ var form_action = '{{$action}}';
             query.customer_id = get_customer_id();
         },
         onSelect(row) {
-            if (row.id) {
+            if (row) {
                 if (row.id.indexOf('draft_') == 0) {
                     return true;
                 }
@@ -193,10 +193,11 @@ var form_action = '{{$action}}';
         editable: {
             product_name(params) {
                 var data = params.data;
-                // 费用不能编辑产品
+                // 费用不能编辑
                 if (data.product_code == '99001') {
                     return false;
                 }
+
                 var customer_id = get_customer_id();
                 if (customer_id.trim() == '') {
                     toastrError('请先选择客户');
@@ -249,7 +250,6 @@ var form_action = '{{$action}}';
             toastrError('请先选择客户');
             return;
         }
-
         var buttons = [{
             text: "取消",
             'class': "btn-default",
@@ -284,7 +284,6 @@ var form_action = '{{$action}}';
                 }
             });
         }
-
         $.dialog({
             title: '促销列表',
             url: '{{url("promotion/promotion/serviceSaleOrder")}}?customer_id=' + customer_id,

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

@@ -11,19 +11,14 @@
     var search = JSON.parse('{{json_encode($search)}}');
     var params = search.query;
 
-    var option = gdoo.formKey(params);
-    var event = gdoo.event.get(option.key);
-    event.trigger('query', params);
-
-    var multiple = params.multi == 0 ? false : true;
     var grid = new agGridOptions();
+    var option = gdoo.dialogInit(params, grid);
 
     grid.remoteDataUrl = '{{url()}}';
     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', checkboxSelection: true, headerCheckboxSelection: grid.multiple, suppressSizeToFit: true, sortable: false, width: 40},
         {suppressMenu: true, cellClass:'text-center', field: 'sn', headerName: '单据编号', minWidth: 160},
         {suppressMenu: true, cellClass:'text-center', sortable: false, field: 'created_at', headerName: '单据日期', width: 140},
         {suppressMenu: true, cellClass:'text-center', field: 'customer_code', headerName: '客户编号', width: 120},
@@ -32,28 +27,10 @@
         {suppressMenu: true, cellClass:'text-center', field: 'id', headerName: 'ID', width: 80}
     ];
 
-    grid.onRowClicked = function(row) {
-        var selected = row.node.isSelected();
-        if (selected === false) {
-            row.node.setSelected(true, true);
-        }
-    };
-
-    grid.onRowDoubleClicked = function (row) {
-        var ret = gdoo.writeSelected(event, params, option, grid);
-        if (ret == true) {
-            $('#gdoo-dialog-' + params.dialog_index).dialog('close');
-        }
-    };
-
-    gdoo.dialogs[option.id] = grid;
     var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     new agGrid.Grid(gridDiv, grid);
 
     grid.remoteData({page: 1});
-    grid.remoteAfterSuccess = function() {
-        gdoo.initSelected(params, option, grid);
-    }
 
     var data = search.forms;
     var search = $("#dialog-{{$search['query']['id']}}-search-form").searchForm({

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

@@ -55,7 +55,7 @@ var $promotion_customer_order_data = null;
     };
 
     mGrid.onRowDoubleClicked = function (row) {
-        var ret = gdoo.writeSelected(event, params, option, mGrid);
+        var ret = gdoo.dialogSelected(event, params, option, mGrid);
         if (ret == true) {
             $('#gdoo-dialog-' + params.dialog_index).dialog('close');
         }
@@ -67,7 +67,7 @@ var $promotion_customer_order_data = null;
     
     mGrid.remoteData();
     mGrid.remoteAfterSuccess = function() {
-        gdoo.initSelected(params, option, mGrid);
+        gdoo.dialogInitSelected(params, option, mGrid);
     }
 
     params['master'] = 0;