1

app/Model/ExportModel.php

@@ -8,13 +8,13 @@ use DB;
 //通用导出模型
 class ExportModel
 {
-   private  $frqUrl ; //询报价网址
+   private  $frqApiUrl ; //询报价网址
    private  $ExportUrl ; //导出网址
    const  IS_DEBUG = 0; //是否调试
    public function __construct()
    {
       $this->ExportUrl = config("website.export_domain");
-      $this->frqUrl = config("website.frqapi_domain");
+      $this->frqApiUrl = config("website.frqapi_domain");
    }
 
    public function push($data){
@@ -51,12 +51,12 @@ class ExportModel
         }
         $data = [
             "type"=> 2,  # 类型 1:模板调用 2: api回调
-            "source_items_id"=>config("website.frq_export_inquiry"), #来源明细id，必填
+            "source_items_id"=>config("website.export_source_items_id"), #来源明细id，必填
             "file_name"=> $file_name,
             "excel_suf" => "csv", #导出文件格式 csv,xls
             "header"=> $header,
             "query_param"=>$input, #查询参数
-            "callbackurl"=>  $this->frqUrl."/server/InquiryExport", #rpc回调网址
+            "callbackurl"=>  $this->frqApiUrl."/server/InquiryExport", #rpc回调网址
             "callbackfuc"=>"InquiryServer", #rpc回调函数
             "create_uid"=> $create_uid, #创建人id
         ];

app/Model/InquiryItemsModel.php

@@ -171,11 +171,13 @@ class InquiryItemsModel extends Model
             $indata = ["inquiry_items_id"=>$inquiry_items_id,"remark"=>$input["remark"],"create_uid"=>$input["user_id"],"create_name"=>$input["user_name"],"create_time"=>time(),"update_time"=>time()];
             (new InquiryItemsUrgeModel())->insert($indata);
         }
+        #更新自动报价标志
+        (new InquiryItemsModel())->where("id",$inquiry_items_id)->update(["flag"=>0]);
         return [0,"催价成功"];
     }
 
     /*
-     * 创建单个批量创建明细
+     * 创建单个创建明细
      * @param $data 批量
      */
     public function addItems($b){
@@ -205,7 +207,7 @@ class InquiryItemsModel extends Model
                 "target_price"=>@$b["target_price"] ? $b["target_price"] : 0,
                 "delivery_time"=>@$b["delivery_time"] ? $b["delivery_time"] : "",
                 "batch"=>@$b["batch"] ? $b["batch"] : "" ,
-                "assign_type"=>@$b["assign_type"] ? $b["assign_type"] : 2,
+                "assign_type"=>@$b["assign_type"] ? $b["assign_type"] : 0,
                 "remark"=>@$b["remark"] ? $b["remark"] : "",
                 "create_time"=>time() ,
                 "update_time"=>time() ,

app/Model/InquiryModel.php

@@ -35,6 +35,7 @@ class InquiryModel extends Model
             ->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.*"))
             ->where(function ($query) use ($input) {
+                $query->whereIn('a.status', [-1,1]);
                 foreach ($input as $k => $v) {
                     $v = trim($v);
                     if (empty($v)) {
@@ -50,7 +51,7 @@ class InquiryModel extends Model
                         case "goods_name":
                         case "brand_name":
                         case "customer_name":
-                            $query->whereRaw('(lie_b.com_name like "' . $v . '%"  or lie_b.user_name like "' . $v . '%" )');
+                            $query->whereRaw('lie_a.user_name like "' . $v . '%" ');
                             break;
                         case "status":
                             $query->where('b.status', '=', $v);
@@ -95,7 +96,9 @@ class InquiryModel extends Model
         }
 
         $page = isset($input['p']) ? $input['p'] : $input['page'];
-        $list = $list->orderBy('id', 'desc')->paginate(@$input['limit'] ? $input["limit"] : 10, ['*'], 'p', @$page ? $page : 1)->toArray();
+        $list = $list->orderBy('create_time', 'desc')
+            ->orderBy('b.status', 'desc')
+            ->paginate(@$input['limit'] ? $input["limit"] : 10, ['*'], 'p', @$page ? $page : 1)->toArray();
 
         if (!$list) return [20001, '没有数据'];
 
@@ -309,7 +312,7 @@ class InquiryModel extends Model
 
         $result = $this->where('status', '=', 0)->where('create_uid', '=', $user_id)->select('id', 'create_time')->first();
         if (!$result) {
-            $Add['inquiry_sn'] = generateSnWithPreStringShort("X");
+            $Add['inquiry_sn'] = createSn((new InquiryModel()),"X");
             $Add['create_uid'] = $user_id;
             $Add['create_name'] = $user_name;
             $Add['create_time'] = time();

app/Model/OpLogModel.php

@@ -37,7 +37,7 @@ class OpLogModel extends Model
                         break;
                 }
             }
-        })->orderBy('id','desc')->paginate($input['limit'], ['*'], 'page', $input['page'])->toArray();
+        })->orderBy('id','desc')->paginate(@$input['limit']  ? $input["limit"]:10, ['*'], 'page', @$input['p'] ? $input["p"]:1 )->toArray();
         if (!$list) return [20001, '没有数据'];
         foreach ($list['data'] as $k=>&$v){
             $v['types_val'] = $v['types'] == 1 ? '询价' : '报价';

app/Model/QuoteModel.php

@@ -660,7 +660,7 @@ class QuoteModel extends Model
             $data['relation_sn'] = $quote_info['quote_sn'];
             $data['content']     = '询价操作报价：'.QuoteMap::$status[$status];
             $data['create_uid']  = $input['user_id'];
-            $data['create_name'] = $UserModel->FinduserInfoName($input['user_id']);
+            $data['create_name'] = $input["user_name"];
 
             OpLogModel::log($data);
         } catch (Exception $e) {

config/website.php

@@ -9,9 +9,16 @@ return [
         'search'=> 'http://' . env('LOGIN_DOMAIN', '') . '/api/search',
         'dashboard'=>'http://'.env('LOGIN_DOMAIN', '') . '/dashboard',
     ],
+    ////////////////232配置////////////////////
+//    'export_domain'=>'http://export.liexin.net', //通用导入导出网址
+//    'frqapi_domain' => "http://frqapi.liexin.net", //接口网址
+//    'export_source_items_id' => "23", //导出来源明细id
 
+    ////////////////本地配置////////////////////
     'export_domain'=>'http://export.liexin.net', //通用导入导出网址
-    'frqapi_domain' => "http://frqapi.liexin.net", //接口网址
+    'frqapi_domain' => "http://frq_api.liexin.com", //接口网址
+    'export_source_items_id' => "23", //导出来源明细id
+
 
     'company_info_origin'=>[  #原始公司信息
         '1'=>[ #内地