Merge branch 'master' of http://119.23.72.7/q578953158/php_frq_api

app/Model/InquiryItemsModel.php

@@ -298,7 +298,7 @@ class InquiryItemsModel extends Model
             if (@$b["pur_s"] != ""){
             if (@$b["pur_s"] != ""){
                 $purArr = json_decode($b["pur_s"],true); #指定采购
                 $purArr = json_decode($b["pur_s"],true); #指定采购
                 $assignInsert = []; #指定领取人
                 $assignInsert = []; #指定领取人
-                foreach ($purArr as $b=>$c){
+                foreach ($purArr as $f=>$c){
                     array_push($assignInsert,[
                     array_push($assignInsert,[
                         "inquiry_items_id"=>$inquiry_items_id,
                         "inquiry_items_id"=>$inquiry_items_id,
                         "assign_uid"=>$c["uid"],
                         "assign_uid"=>$c["uid"],
@@ -315,9 +315,10 @@ class InquiryItemsModel extends Model
             \App\Model\OpLogModel::log([
             \App\Model\OpLogModel::log([
                 'types'=>1,
                 'types'=>1,
                 'relation_id'=>$inquiry_items_id, #明细id
                 'relation_id'=>$inquiry_items_id, #明细id
-                'relation_sn'=>(new InquiryModel())->FindInquirySn($b["inquiry_id"]),
+                'relation_sn'=>0,
                 'content'=>'修改询价,型号:'.$updateArr["goods_name"]." 品牌名称：".$updateArr["brand_name"]
                 'content'=>'修改询价,型号:'.$updateArr["goods_name"]." 品牌名称：".$updateArr["brand_name"]
-                    ." 货期：".$updateArr["delivery_time"]." 询价数量：".$updateArr["inquiry_number"] ." 批次：".$updateArr["batch"],
+                    ." 货期：".$updateArr["delivery_time"]." 询价数量：".$updateArr["inquiry_number"] ." 批次：".$updateArr["batch"]
+                    ." 目标价：".$updateArr["target_price"],
                 'create_uid'=>$b['user_id'],
                 'create_uid'=>$b['user_id'],
                 'create_name'=>$b["user_name"],
                 'create_name'=>$b["user_name"],
             ]);
             ]);

app/Model/InquiryModel.php

@@ -141,15 +141,26 @@ class InquiryModel extends Model
 
 
             #查询所有报价
             #查询所有报价
             $v['quote_price'] = "--";
             $v['quote_price'] = "--";
-            $quote = $QuoteModel->select("currency","price_origin","price_rmb")
+            $quote = $QuoteModel->select("status","currency","price_origin","price_rmb")
                 ->where("inquiry_items_id", $v["id"])
                 ->where("inquiry_items_id", $v["id"])
                 ->whereIn("status", QuoteMap::$status_used)
                 ->whereIn("status", QuoteMap::$status_used)
+                ->orderby("status","desc")
                 ->get();
                 ->get();
             if ($quote){
             if ($quote){
                 $quoteArr = $quote->toArray();
                 $quoteArr = $quote->toArray();
                 $checkPrice = 0; //rmb 为准
                 $checkPrice = 0; //rmb 为准
                 $lowerPrice = "";
                 $lowerPrice = "";
                 foreach ($quoteArr as $a=>$b){
                 foreach ($quoteArr as $a=>$b){
+
+                    if ($b["status"] == 3){ #已确认
+                        $lowerPrice = $b["currency"] == 1 ? "￥".$b["price_rmb"]:"$".$b["price_origin"];
+                        break;
+                    }
+                    if ($b["status"] == 2){ #已选中
+                        $lowerPrice = $b["currency"] == 1 ? "￥".$b["price_rmb"]:"$".$b["price_origin"];
+                        break;
+                    }
+
                     $price = $b["currency"] == 1 ? $b["price_rmb"] : $b["price_origin"]*6.5;
                     $price = $b["currency"] == 1 ? $b["price_rmb"] : $b["price_origin"]*6.5;
                     if ($checkPrice == 0){
                     if ($checkPrice == 0){
                         $checkPrice = $price;
                         $checkPrice = $price;

app/Model/QuoteModel.php

@@ -43,8 +43,8 @@ class QuoteModel extends Model
             ->paginate(@$input['limit'] ? $input["limit"] : 10, ['*'], 'p', @$input['p'] ? $input["p"] : 1)->toArray();
             ->paginate(@$input['limit'] ? $input["limit"] : 10, ['*'], 'p', @$input['p'] ? $input["p"] : 1)->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"] == 2 ? "$".$v["price_origin"] : "";
-            $v["price_rmb"] = $v["currency"] == 1 ? "￥".$v["price_rmb"]:"";
+            $v["price_origin"] = $v["currency"] == 2 ? "$".$v["price_origin"] : "--";
+            $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"){
                 $v["create_name"] = "digikey(包装：".$v["raw_goods_packing"].")";
                 $v["create_name"] = "digikey(包装：".$v["raw_goods_packing"].")";