Merge branch 'master' of ssh://119.23.72.7:22611/q578953158/php_frq_api

app/Model/OpLogModel.php

@@ -17,7 +17,7 @@ class OpLogModel extends Model
     //列表
     public function getList()
     {
-        $input = Request::all();
+        $input = Request::all();        
         $list = $this->where(function ($query) use ($input) {
             foreach ($input as $k => $v){
                 $v = trim($v);
@@ -25,6 +25,7 @@ class OpLogModel extends Model
                     continue;
                 }
                 switch ($k){
+                    case "relation_id":
                     case "relation_sn":
                     case "types":
                         $query->where($k,$v);

app/Model/QuoteModel.php

@@ -93,14 +93,14 @@ class QuoteModel extends Model
         $limit = $input['limit'];
         $type  = $input['type'];  // 1-我的报价，2-所有报价 
 
-        $map['inquiry_sn'] = isset($input['inquiry_sn']) ? $input['inquiry_sn'] : ''; // 询价单号
-        $map['goods_name'] = isset($input['goods_name']) ? $input['goods_name'] : ''; // 型号
-        $map['brand_name'] = isset($input['brand_name']) ? $input['brand_name'] : ''; // 品牌
-        $map['quote_sn']   = isset($input['quote_sn']) ? $input['quote_sn'] : ''; // 报价单号
+        $map['inquiry_sn'] = isset($input['inquiry_sn']) ? trim($input['inquiry_sn']) : ''; // 询价单号
+        $map['goods_name'] = isset($input['goods_name']) ? trim($input['goods_name']) : ''; // 型号
+        $map['brand_name'] = isset($input['brand_name']) ? trim($input['brand_name']) : ''; // 品牌
+        $map['quote_sn']   = isset($input['quote_sn']) ? trim($input['quote_sn']) : ''; // 报价单号
         $map['status']     = isset($input['status']) ? $input['status'] : ''; // 报价状态
         $map['create_uid'] = isset($input['create_uid']) ? $input['create_uid'] : ''; // 报价制单人
-        $map['start_time'] = isset($input['start_time']) ? strtotime($input['start_time']) : '';
-        $map['end_time']   = isset($input['end_time']) ? strtotime($input['end_time']) + 86399 : '';
+        $map['start_time'] = !empty($input['start_time']) ? strtotime($input['start_time']) : '';
+        $map['end_time']   = !empty($input['end_time']) ? strtotime($input['end_time']) + 86399 : '';
 
         $field = ['q.id', 'q.inquiry_id', 'q.inquiry_sn', 'q.inquiry_items_id', 'q.quote_sn', 'q.source', 'q.price_origin', 'q.price_rmb', 'q.price_other', 'q.currency', 'q.goods_name as quote_goods_name', 'q.brand_name as quote_brand_name', 'q.supplier_id', 'q.supplier_name', 'q.quote_number', 'q.status', 'q.create_uid', 'q.create_name', 'q.delivery_time', 'q.batch', 'q.create_time', 'it.goods_name', 'it.brand_name', 'it.inquiry_number'];
 
@@ -475,12 +475,12 @@ class QuoteModel extends Model
                     return;
                 }
 
-                if ($val['price_rmb'] <= 0) {
+                if ($val['currency'] == 'RMB' && $val['price_rmb'] <= 0) {
                     $err[] = '第'.($key+1).'行，含税价格等于或小于0';
                     return;
                 }
 
-                if (!preg_match('/^\d{0,9}(\.\d{0,6})?$/', $val['price_rmb'])) {
+                if ($val['currency'] == 'RMB' && !preg_match('/^\d{0,9}(\.\d{0,6})?$/', $val['price_rmb'])) {
                     $err[] = '第'.($key+1).'行，含税价格格式错误';
                     return;
                 }