|
|
@@ -107,8 +107,30 @@ class search {
|
|
|
if (strtolower($model_name) == "booking_search" && (strtolower($v['value_name']) == "transport_mode")) {
|
|
|
//transport_mode todo
|
|
|
|
|
|
- } elseif (strtolower($model_name) == "ocean_search" && (strtolower($v['value_name']) == "transport_mode")){
|
|
|
+ } elseif (strtolower($model_name) == "ocean_search"
|
|
|
+ && (strtolower($v['value_name']) == "transport_mode"
|
|
|
+ || strtolower($v['value_name']) == "incoterms"
|
|
|
+ || strtolower($v['value_name']) == "service")){
|
|
|
//transport_mode todo
|
|
|
+ //incoterms 和 service特殊处理
|
|
|
+ if(!empty($_POST[$v['value_name']])){
|
|
|
+ //前台这个字段，All是字符串，其他值的提交过来的是数组
|
|
|
+ $value_arr = $_POST[$v['value_name']];
|
|
|
+ if(!is_array($value_arr)){
|
|
|
+ $value_arr = array($value_arr);
|
|
|
+ }
|
|
|
+ $value_sql = "1<>1";
|
|
|
+ foreach($value_arr as $val){
|
|
|
+ if(strtolower($val) == "all"){
|
|
|
+ continue;
|
|
|
+ }else{
|
|
|
+ $value_sql .= " or lower(".$v['value_name'].") = '".strtolower($val)."'";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if ($value_sql <> "1<>1"){
|
|
|
+ $result .= " and ($value_sql)";
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
} else {
|
|
|
if ($v['search_condition'] == '>=,<=') {
|
