|
|
@@ -826,8 +826,8 @@ class SaleReport extends Base
|
|
|
|
|
|
$count = Db::name('consult_info')
|
|
|
->alias('ci')
|
|
|
- ->leftJoin('consult_bids cb', 'cb.bidNo=ci.zxNo')
|
|
|
- ->leftJoin('sale s', 's.zxNo=ci.zxNo AND s.is_del=0')
|
|
|
+ ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo')
|
|
|
+ ->leftJoin('sale s', 's.zxNo=cb.bidNo AND s.is_del=0')
|
|
|
->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
|
|
|
->leftJoin('company_item item', 'item.id=co.depart')
|
|
|
->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
|
|
|
@@ -840,8 +840,8 @@ class SaleReport extends Base
|
|
|
$data = Db::name('consult_info')
|
|
|
->alias('ci')
|
|
|
->field('ci.addtime,co.salesman,item.name,cb.infoNo,csi.companyName,ci.use_desc,ci.good_name,b.brand_name,ci.model,s.good_code,ci.cat_id,ci.budget_price,u.unit,ci.num,s.sale_price,ci.arrival_time,ci.is_addrs,ci.is_custom,ci.remark,ci.status,ci.bargain_code,csi.itemid,s.orderCode')
|
|
|
- ->leftJoin('consult_bids cb', 'cb.bidNo=ci.zxNo')
|
|
|
- ->leftJoin('sale s', 's.zxNo=ci.zxNo AND s.is_del=0')
|
|
|
+ ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo')
|
|
|
+ ->leftJoin('sale s', 's.zxNo=cb.bidNo AND s.is_del=0')
|
|
|
->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
|
|
|
->leftJoin('company_item item', 'item.id=co.depart')
|
|
|
->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
|
