1

app/Http/Controllers/ApiController.php

@@ -37,9 +37,9 @@ class ApiController extends Controller
     public function Entrance(Request $request, $id)
     public function Entrance(Request $request, $id)
     {
     {
         $loginInfo = (new LoginModel())->checkLogin($request);
         $loginInfo = (new LoginModel())->checkLogin($request);
-        $this->user_id   = $loginInfo["user_id"];
-        $this->user_name = $loginInfo["user_name"];
-        $this->email = $loginInfo["email"];
+        $this->user_id   = @$loginInfo["user_id"];
+        $this->user_name = @$loginInfo["user_name"];
+        $this->email = @$loginInfo["email"];
 
 
         $input = $_REQUEST;
         $input = $_REQUEST;
         $input["user_id"]   = $this->user_id; #用户id
         $input["user_id"]   = $this->user_id; #用户id

app/Model/InquiryItemsReportModel.php

@@ -32,9 +32,6 @@ class InquiryItemsReportModel extends Model
             $con = DB::connection('rfq');
             $con = DB::connection('rfq');
             $con->beginTransaction();
             $con->beginTransaction();
 
 
-            #先批量删除报价
-            $this->where("inquiry_id",$inquiry_id)->delete();
-
             #最后批量添加
             #最后批量添加
             foreach ($input["items"] as $k=>$inquiry_items_id){
             foreach ($input["items"] as $k=>$inquiry_items_id){
                $temp = [
                $temp = [
@@ -82,11 +79,7 @@ class InquiryItemsReportModel extends Model
         $data["company"] = $company_info_origin[$mainArr["delivery_place"]]; #公司信息
         $data["company"] = $company_info_origin[$mainArr["delivery_place"]]; #公司信息
 
 
         #客户信息
         #客户信息
-        $user = (new CommonModel())->getUserDetail($mainArr["com_id"],$mainArr["user_id"]);
-        if ($user === false){
-            $user = ["name"=>$mainArr["user_types"] == 1 ? $mainArr["user_name"]:$mainArr["com_name"] ];
-        }
-        $data["user"] = $user;
+        $data["user"] = ["name"=>$mainArr["user_name"]];
 
 
         #询价明细
         #询价明细
         $itemsArr  = $this->where("inquiry_id",$inquiry_id)->get()->toArray();
         $itemsArr  = $this->where("inquiry_id",$inquiry_id)->get()->toArray();

app/Model/InquiryModel.php

@@ -35,7 +35,11 @@ class InquiryModel extends Model
             ->join('inquiry_items as b', 'a.id', '=', 'b.inquiry_id')
             ->join('inquiry_items as b', 'a.id', '=', 'b.inquiry_id')
             ->select(DB::Raw("lie_a.inquiry_sn,lie_a.currency,lie_a.status as status_a,lie_a.com_name,lie_a.user_name,lie_a.create_name,lie_a.create_time as inquiry_ctime,lie_b.*"))
             ->select(DB::Raw("lie_a.inquiry_sn,lie_a.currency,lie_a.status as status_a,lie_a.com_name,lie_a.user_name,lie_a.create_name,lie_a.create_time as inquiry_ctime,lie_b.*"))
             ->where(function ($query) use ($input) {
             ->where(function ($query) use ($input) {
-                $query->whereIn('a.status', [-1,1]);
+                if (@$input["types"] == 5){
+                    $query->where('a.status', 0);
+                }else{
+                    $query->whereIn('a.status', [-1,1]);
+                }
                 foreach ($input as $k => $v) {
                 foreach ($input as $k => $v) {
                     $v = trim($v);
                     $v = trim($v);
                     if (empty($v)) {
                     if (empty($v)) {