|
|
@@ -302,7 +302,7 @@ class Report extends Base
|
|
|
$list = Db::name('purchease_order')
|
|
|
->alias('po')
|
|
|
->field('po.id,DATE_FORMAT(po.addtime,"%Y%m%d") addtime,po.cgder_id,IF(ISNULL(`du`.`itemid`),0,`du`.`itemid`) itemid,IF(ISNULL(`ci`.`name`),"供应商端",`ci`.`name`) name,po.total_fee,po.good_num,po.status')
|
|
|
- ->leftJoin('depart_user du', 'du.uid=po.cgder_id AND du.is_del=0')
|
|
|
+ ->leftJoin('depart_user du', 'du.uid=po.cgder_id AND du.is_del=0 AND du.nickname = po.cgder')
|
|
|
->leftJoin('company_item ci', 'ci.id=du.itemid')
|
|
|
->where($where)
|
|
|
->order(['addtime' => 'desc', 'itemid' => 'asc'])
|
|
|
@@ -318,7 +318,7 @@ class Report extends Base
|
|
|
'name' => $value['name'],
|
|
|
'total_fee' => '0',
|
|
|
'total_num' => '0',
|
|
|
- 'good_num'=>'0',
|
|
|
+ 'good_num' => '0',
|
|
|
'wait_confirm_total_fee' => '0',//待与供应商确认-总金额
|
|
|
'wait_confirm_total_num' => '0',//待与供应商确认-总单数
|
|
|
'wait_in_total_fee' => '0',//待入库-总金额
|
|
|
@@ -373,6 +373,7 @@ class Report extends Base
|
|
|
'end_date' => '',
|
|
|
'page' => 1,
|
|
|
'size' => 15,
|
|
|
+ 'supplierNo' => ''
|
|
|
], 'post', 'trim');
|
|
|
|
|
|
$val_params = Validate::rule([
|
|
|
@@ -384,6 +385,7 @@ class Report extends Base
|
|
|
|
|
|
$where = [['cb.is_del', '=', 0]];
|
|
|
if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['cb.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
|
|
|
+ if ($param['supplierNo'] != '') $where[] = ['cb.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
|
|
|
|
|
|
$count = Db::name('consult_bids')
|
|
|
->alias('cb')
|
