ShuanghongS преди 1 година
родител
ревизия
b5c4e677c8
променени са 3 файла, в които са добавени 3 реда и са изтрити 16 реда
  1. 1 8
      service/ocean_booking.class.php
  2. 1 7
      service/ocean_order.class.php
  3. 1 1
      utils/utils.class.php

+ 1 - 8
service/ocean_booking.class.php

@@ -443,14 +443,7 @@ class ocean_booking {
         if(!empty($sql)){
             $rss = common::excuteListSql($sql);
         }
-
-        $allBookingColumns = array();
-        if(strtolower($_POST['is_all_colums']) == "yes"){
-            //现在下载交给前端,后台最后只返回全部字段的列,
-            $allColumn = column::getInstance()->getDisplayColumnAll('Booking_Search');
-            $allBookingColumns = column::getInstance()->tableColumns('Booking_Search',$allColumn);
-        }
-        common::echo_json_encode(200,array("msg"=>"success","allColums" => $allBookingColumns,"Data" => $rss));
+        common::echo_json_encode(200,array("msg"=>"success","Data" => $rss));
         exit;
     }
 

+ 1 - 7
service/ocean_order.class.php

@@ -868,13 +868,7 @@ class ocean_order {
         if(!empty($sql)){
             $rss = common::excuteListSql($sql);
         }
-        $allBookingColumns = array();
-        if(strtolower($_POST['is_all_colums']) == "yes"){
-            //现在下载交给前端,后台最后只返回全部字段的列,
-            $allColumn = column::getInstance()->getDisplayColumnAll('Ocean_Search');
-            $allBookingColumns = column::getInstance()->tableColumns('Ocean_Search',$allColumn);
-        }
-        common::echo_json_encode(200,array("msg"=>"success","allColums" => $allBookingColumns,"Data" => $rss));
+        common::echo_json_encode(200,array("msg"=>"success","Data" => $rss));
         exit;
     }
     

+ 1 - 1
utils/utils.class.php

@@ -500,7 +500,7 @@ class utils {
             $detail = "AMS/ISF";  
         }
         if(($action == "ocean_booking" || $action == "ocean_order") && $operate == "excel"){
-            $detail = "Filter_condition:" . $_REQUEST['excel_filter_condition']." Selected Fields:". $_REQUEST['selected fields'];
+            $detail = "Filter_condition:" . $_REQUEST['excel_filter_condition']." Selected Fields:". $_REQUEST['selected_fields'];
         }
         return $detail;