code

service/ajax.class.php

@@ -71,7 +71,7 @@ class ajax {
         
         $term = trim($term);
         if (strtolower($type) == "apex" || strtolower($type) == "contanct" || strtolower($type) == "sales"
-            || strtolower($type) == "vessel") {
+            || strtolower($type) == "vessel" || strtolower($type) == "voyage") {
             if($search_mode == "tracking"){
                 $sqlWhere = $this->getTrackingSearchWhere();
             }elseif($search_mode == "booking"){

service/ocean_booking.class.php

@@ -124,7 +124,7 @@ class ocean_booking {
         $cp = common::check_input($_POST ['cp']); //current_page
         $ps = common::check_input($_POST ['ps']); //ps
         if (empty($ps)){
-            $ps = 50;
+            $ps = 100;
         }
         $sqlWhere = ' where ' . common::searchExtendHandNew("booking", $_SESSION["ONLINE_USER"]);
         $sqlWhere .= search::getInstance()->getSearchSQL("Booking_Search");

service/ocean_order.class.php

@@ -264,7 +264,7 @@ class ocean_order {
         $cp = common::check_input($_POST ['cp']); //current_page
         $ps = common::check_input($_POST ['ps']); //ps
         if (empty($ps))
-            $ps = 50;
+            $ps = 100;
         if (empty($cp))
             $cp = 1;
 
@@ -442,6 +442,26 @@ class ocean_order {
             //移除filterTag
             $sqlWhere_bk = $sqlWhere_befrom_filterTag;
 
+            //后端带入Incoterms/Service
+            $incoterms_sql = "select DISTINCT incoterms from online_ocean" . $sqlWhere_bk; 
+            $incoterms = common::excuteListSql($incoterms_sql);
+            $IncotermsList = array();
+            foreach($incoterms as $terms){
+                if(!empty($terms['incoterms'])){
+                    $IncotermsList[] = array("name"=>$terms['incoterms'],"checked"=>false);
+                }
+            }
+
+            $service_sql = "select DISTINCT service from online_ocean" . $sqlWhere_bk; 
+            $service = common::excuteListSql($service_sql);
+            $ServiceList = array();
+            foreach($service as $_service){
+                if(!empty($_service['service'])){
+                    $ServiceList[] = array("name"=>$_service['service'],"checked"=>false);
+                }
+            }
+
+
             $sql = $this->getOcanOrderSearchSql("All",$sqlWhere_bk);    
             $rc = common::excuteOneSql($sql);
             error_log("online_ocean_count_ALL_SQL:".$sql);
@@ -556,6 +576,8 @@ class ocean_order {
                'tagsList' => $tagsList,
                'TransportList' => $TransportList,
                'allColums' => $allBookingColumns,
+               'IncotermsList' =>$IncotermsList,
+               'ServiceList' =>$ServiceList,
                'canEdiVgm' => _canEdiVgm(),
                'rc' => $search_rc,
                'ps' => $ps,
@@ -567,6 +589,8 @@ class ocean_order {
             $arrTmp = array('searchData' => array(), 
                 'tagsList' => $tagsList,
                 'TransportList' => $TransportList,
+                'IncotermsList' =>$IncotermsList,
+                'ServiceList' =>$ServiceList,
                 'allColums' => $allBookingColumns,
                 'canEdiVgm' => _canEdiVgm(),
                 'rc' => $rc,

utils/utils.class.php

@@ -359,7 +359,7 @@ class utils {
         $operateInfo = utils::getPageByAction($_REQUEST["action"],$_REQUEST["operate"]);
         $page = $operateInfo["page"];
         $operation = $operateInfo["operate"];
-        $operation_detail = utils::jsonFiltration("null", "\"\"", json_encode($_REQUEST));
+        $operation_detail = common::check_input(utils::jsonFiltration("null", "\"\"", json_encode($_REQUEST)));
         $sql = "INSERT INTO public.customer_service_operation_log(user_type, user_name, page, operation, operation_detail, 
             operation_time) 
             VALUES ('$user_type', '$user_name', '$page', '$operation', '$operation_detail', now())";