@@ -246,8 +258,7 @@ class InquiryModel extends Model
->join('inquiry_items_urge as u','b.id','=','u.inquiry_items_id')
->where('c.assign_uid',$user_id);
}
$list=$list->select(DB::Raw("lie_a.inquiry_sn,lie_a.currency,lie_a.status as status_a,lie_a.user_name,lie_a.com_name,lie_a.create_name,lie_a.create_time as inquiry_ctime, lie_b.*, lie_c.id as c_id, lie_c.assign_type as c_assign_type"))
$list=$list->select(DB::Raw("lie_a.inquiry_sn,lie_a.currency,lie_a.status as status_a,lie_a.user_name,lie_a.com_name,lie_a.create_name,lie_a.create_time as inquiry_ctime, lie_a.remark as inquiry_remark, lie_b.*, lie_c.id as c_id, lie_c.assign_type as c_assign_type"))
$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'];
// $map = array_filter($map) ? $map : [];
$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'
];
if($map){
$list=$this->commonQuery($map,$input);
}else{
$list=$this->from('quote as q')
->join('inquiry_items as it','q.inquiry_items_id','=','it.id')