|
|
@@ -466,7 +466,7 @@ class Report extends Base
|
|
|
{
|
|
|
$param = $this->request->only([
|
|
|
'token',
|
|
|
- 'infoNo' => [],
|
|
|
+ 'zxNo' => [],
|
|
|
'start_date' => '',
|
|
|
'end_date' => '',
|
|
|
'page' => 1,
|
|
|
@@ -483,7 +483,7 @@ class Report extends Base
|
|
|
$where = [['cb.is_del', '=', 0]];
|
|
|
|
|
|
if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['ci.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
|
|
|
- if (!empty($param['infoNo'])) $where[] = ['cb.infoNo', 'in', $param['infoNo']];
|
|
|
+ if (!empty($param['zxNo'])) $where[] = ['cb.infoNo', 'in', $param['zxNo']];
|
|
|
|
|
|
|
|
|
$count = Db::name('consult_bids')
|
|
|
@@ -497,7 +497,7 @@ class Report extends Base
|
|
|
|
|
|
$data = Db::name('consult_bids')
|
|
|
->alias('cb')
|
|
|
- ->field('cb.id,ci.addtime,cb.bidNo,cb.infoNo,cb.addtime cbaddtime,cb.good_name,s.name supplier,cb.total_fee,cb.delivery_day,cb.work_day,cb.expire_day,cb.creater,cb.createrid,"" name,ci.num,ci.arrival_time,co.saleid,co.salesman,"" salesman_name,csi.companyName')
|
|
|
+ ->field('cb.id,ci.addtime,cb.bidNo,cb.infoNo zxNo,cb.addtime cbaddtime,cb.good_name,s.name supplier,cb.total_fee,cb.delivery_day,cb.work_day,cb.expire_day,cb.creater,cb.createrid,"" name,ci.num,ci.arrival_time,co.saleid,co.salesman,"" salesman_name,csi.companyName')
|
|
|
->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo')
|
|
|
->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
|
|
|
->leftJoin('supplier s', 's.code=cb.supplierNo')
|
|
|
@@ -519,7 +519,7 @@ class Report extends Base
|
|
|
'id' => 0,
|
|
|
'addtime' => '汇总',
|
|
|
'bidNo' => '',
|
|
|
- 'infoNo' => '',
|
|
|
+ 'zxNo' => '',
|
|
|
'cbaddtime' => '',
|
|
|
'good_name' => '',
|
|
|
'supplier' => '',
|
|
|
@@ -543,7 +543,7 @@ class Report extends Base
|
|
|
{
|
|
|
$param = $this->request->only([
|
|
|
'token',
|
|
|
- 'infoNo' => [],
|
|
|
+ 'zxNo' => [],
|
|
|
'start_date' => '',
|
|
|
'end_date' => '',
|
|
|
'page' => 1,
|
|
|
@@ -562,7 +562,7 @@ class Report extends Base
|
|
|
->where('cb.is_del', 0);
|
|
|
|
|
|
if ($param['start_date'] != '' && $param['end_date'] != '') $rs->whereBetween('ci.addtime', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']);
|
|
|
- if (!empty($param['infoNo'])) $rs->whereIn('cb.infoNo', $param['infoNo']);
|
|
|
+ if (!empty($param['zxNo'])) $rs->whereIn('cb.infoNo', $param['zxNo']);
|
|
|
|
|
|
|
|
|
$data = $rs
|
|
|
@@ -632,7 +632,7 @@ class Report extends Base
|
|
|
|
|
|
$data = Db::name('consult_info')
|
|
|
->alias('ci')
|
|
|
- ->field('ci.infoNo,ci.good_name,ci.num,csi.companyName,ci.addtime,ci.arrival_time endtime,ci.updatetime,ci.status')
|
|
|
+ ->field('ci.infoNo zxNo,ci.good_name,ci.num,csi.companyName,ci.addtime,ci.arrival_time endtime,ci.updatetime,ci.status')
|
|
|
->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo')
|
|
|
->leftJoin('consult_order co', 'co.zxNo=ci.zxNo')
|
|
|
->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
|
