发布2.3测试版

app/Gdoo/Approach/Controllers/ApproachController.php

@@ -129,7 +129,7 @@ class ApproachController extends WorkflowController
     public function print()
     {
         $this->layout = 'layouts.print_html';
-        print_prince($this->create('print'));
+        return $this->create('print');
     }
 
     // 关闭操作
@@ -205,8 +205,8 @@ class ApproachController extends WorkflowController
                 ');
                 $rows = $model->get();
                 $rows = Grid::dataFilters($rows, $header);
+                return $rows;
             } else {
-
                 $model = DB::table('approach_data')
                 ->leftJoin('product', 'product.id', '=', 'approach_data.product_id')
                 ->leftJoin('approach', 'approach.id', '=', 'approach_data.approach_id')
@@ -234,8 +234,8 @@ class ApproachController extends WorkflowController
                     product.weight
                 ");
                 $rows = $model->get();
+                return ['data' => $rows];
             }
-            return $this->json($rows, true);
         }
 
         return $this->render([

app/Gdoo/Approach/Controllers/ReviewController.php

@@ -120,7 +120,7 @@ class ReviewController extends WorkflowController
     public function print()
     {
         $this->layout = 'layouts.print_html';
-        print_prince($this->create('print'));
+        return $this->create('print');
     }
 
     // 批量编辑

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

@@ -135,7 +135,7 @@ gdoo.event.set('approach_data.product_id', {
 // 选择客户事件
 gdoo.event.set('approach.customer_id', {
     onSelect(row) {
-        if (row.id) {
+        if (row) {
             $('#customer_region_region_id').val(row.region_id);
             $('#customer_region_region_id_text').val(row.region_id_name || '');
             $('#approach_phone').val(row.tel);
@@ -157,7 +157,7 @@ gdoo.event.set('approach.market_name', {
         query.customer_id = customer_id;
     },
     onSelect(row) {
-        if (row.id) {
+        if (row) {
             $('#approach_market_fax').val(row.fax);
             $('#approach_market_totol').val(row.market_count);
             $('#approach_single_cast').val(row.single_cast);

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

@@ -68,7 +68,7 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     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');
         }

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

@@ -18,7 +18,7 @@ var $ref_approach_data = null;
 var params = JSON.parse('{{json_encode($query)}}');
 (function($) {
     params['master'] = 1;
-    var mGridDiv = document.querySelector("#ref_approach");
+
     var mGrid = new agGridOptions();
     mGrid.remoteDataUrl = '{{url()}}';
 
@@ -59,16 +59,19 @@ var params = JSON.parse('{{json_encode($query)}}');
     };
 
     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');
         }
     };
 
-    gdoo.dialogs[option.id] = mGrid;
-    new agGrid.Grid(mGridDiv, mGrid);
-    mGrid.remoteData();
     $ref_approach = mGrid;
+    gdoo.dialogs[option.id] = mGrid;
+
+    var mGridDiv = document.querySelector("#ref_approach");
+    new agGrid.Grid(mGridDiv, mGrid);
+
+    mGrid.remoteData();
 
     params['master'] = 0;
     var sGridDiv = document.querySelector("#ref_approach_data");
@@ -101,9 +104,10 @@ var params = JSON.parse('{{json_encode($query)}}');
         }
     };
 
-    new agGrid.Grid(sGridDiv, sGrid);
-    sGrid.remoteData();
     $ref_approach_data = sGrid;
+    new agGrid.Grid(sGridDiv, sGrid);
+
+    sGrid.remoteData();
 
     var data = JSON.parse('{{json_encode($search["forms"])}}');
     var search = $('#dialog-approach-search-form').searchForm({