1

app/Model/InquiryItemsReportModel.php

@@ -172,7 +172,7 @@ class InquiryItemsReportModel extends Model
             return [1007,"请先撤销已确认的报价"];
             return [1007,"请先撤销已确认的报价"];
         }
         }
 
 
-        $price_rmb = $price_origin =  "";
+        $price_rmb = $price_origin =  $sale_price;
         if ($mainCurrency == 1 && $currency != $mainCurrency ){ #询价币种人民币
         if ($mainCurrency == 1 && $currency != $mainCurrency ){ #询价币种人民币
             $rate1 = $CommonModel->getRate($currency); #获取汇率
             $rate1 = $CommonModel->getRate($currency); #获取汇率
             $price_rmb = round($sale_price*$rate1,6);
             $price_rmb = round($sale_price*$rate1,6);

app/Model/QuoteModel.php

@@ -48,7 +48,7 @@ class QuoteModel extends Model
             ->toArray();
             ->toArray();
         if (!$list) return [20001, '没有数据'];
         if (!$list) return [20001, '没有数据'];
         foreach ($list['data'] as $k=>&$v){
         foreach ($list['data'] as $k=>&$v){
-            $v["price_origin"] = $v["currency"] >1  ? "$".$v["price_origin"] : "--";
+            $v["price_origin"] = $v["currency"] >1  ? InquiryMap::$currency_sign[$v["currency"]].$v["price_origin"] : "--";
             $v["price_rmb"] = $v["currency"] == 1 ? "￥".$v["price_rmb"]:"--";
             $v["price_rmb"] = $v["currency"] == 1 ? "￥".$v["price_rmb"]:"--";
             $v['status'] = QuoteMap::$status[$v["status"]];
             $v['status'] = QuoteMap::$status[$v["status"]];
             if ($v["create_name"] == "digikey"){
             if ($v["create_name"] == "digikey"){
@@ -200,6 +200,9 @@ class QuoteModel extends Model
                         case "brand_name":
                         case "brand_name":
                             $query->where('it.brand_name', 'like',$b.'%');
                             $query->where('it.brand_name', 'like',$b.'%');
                             break;
                             break;
+                        case "inquiry_items_id":
+                            $query->where('it.id', '<>',$b);
+                            break;
                     }
                     }
                 }
                 }
                  $query->whereIn('q.status', [1,2,3]);
                  $query->whereIn('q.status', [1,2,3]);