|
|
@@ -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['zxNo'])) $where[] = ['cb.zxNo', 'in', $param['zxNo']];
|
|
|
+ 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.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')
|
|
|
+ ->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')
|
|
|
@@ -562,11 +562,11 @@ 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['zxNo'])) $rs->whereIn('cb.zxNo', $param['zxNo']);
|
|
|
+ if (!empty($param['zxNo'])) $rs->whereIn('cb.infoNo', $param['zxNo']);
|
|
|
|
|
|
|
|
|
$data = $rs
|
|
|
- ->field('ci.addtime as 咨询时间,cb.bidNo as 采购单反馈单号,cb.zxNo as 咨询订单号,cb.addtime as 回复时间,cb.good_name as 产品名称,s.name as 供应商名称,cb.total_fee 成本合计,cb.delivery_day 物流时间,cb.work_day 产品工期,cb.expire_day 信息有效期,cb.creater 采购员,"" 采购员所属部门,ci.num 需求数量,ci.arrival_time 要求到货日期,co.salesman 业务人员,"" 业务人员所属部门,csi.companyName 客户名称,cb.createrid,co.saleid')
|
|
|
+ ->field('ci.addtime as 咨询时间,cb.bidNo as 采购单反馈单号,cb.infoNo as 咨询订单号,cb.addtime as 回复时间,cb.good_name as 产品名称,s.name as 供应商名称,cb.total_fee 成本合计,cb.delivery_day 物流时间,cb.work_day 产品工期,cb.expire_day 信息有效期,cb.creater 采购员,"" 采购员所属部门,ci.num 需求数量,ci.arrival_time 要求到货日期,co.salesman 业务人员,"" 业务人员所属部门,csi.companyName 客户名称,cb.createrid,co.saleid')
|
|
|
->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo')
|
|
|
->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
|
|
|
->leftJoin('supplier s', 's.code=cb.supplierNo')
|
|
|
@@ -632,7 +632,7 @@ class Report extends Base
|
|
|
|
|
|
$data = Db::name('consult_info')
|
|
|
->alias('ci')
|
|
|
- ->field('ci.zxNo,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')
|
|
|
@@ -682,7 +682,7 @@ class Report extends Base
|
|
|
|
|
|
$data = Db::name('consult_info')
|
|
|
->alias('ci')
|
|
|
- ->field('ci.zxNo 咨询订单号,ci.good_name 产品名称,ci.num 需求数量,csi.companyName 客户名称,ci.addtime 咨询时间,ci.arrival_time 截止时间,ci.status 状态')
|
|
|
+ ->field('ci.infoNo 咨询订单号,ci.good_name 产品名称,ci.num 需求数量,csi.companyName 客户名称,ci.addtime 咨询时间,ci.arrival_time 截止时间,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')
|
