Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Report.php

@@ -332,13 +332,13 @@ class Report extends Base
 
             switch ($value['status']) {
                 case 0:
-                    $data[$value['addtime']][$value['itemid']]['wait_confirm_total_fee'] += $value['total_fee'];
-                    $data[$value['addtime']][$value['itemid']]['wait_confirm_total_num'] += 1;
+                    $data[$value['addtime']][$value['itemid']]['wait_confirm_total_fee'] = bcadd($data[$value['addtime']][$value['itemid']]['wait_confirm_total_fee'], $value['total_fee'], 2);
+                    $data[$value['addtime']][$value['itemid']]['wait_confirm_total_num'] = bcadd($data[$value['addtime']][$value['itemid']]['wait_confirm_total_num'], '1');
                     break;
 
                 case 1:
-                    $data[$value['addtime']][$value['itemid']]['wait_in_total_fee'] += $value['total_fee'];
-                    $data[$value['addtime']][$value['itemid']]['wait_in_total_num'] += 1;
+                    $data[$value['addtime']][$value['itemid']]['wait_in_total_fee'] = bcadd($data[$value['addtime']][$value['itemid']]['wait_in_total_fee'], $value['total_fee'], 2);
+                    $data[$value['addtime']][$value['itemid']]['wait_in_total_num'] = bcadd($data[$value['addtime']][$value['itemid']]['wait_in_total_num'], 1);
                     break;
             }
 
@@ -373,7 +373,7 @@ class Report extends Base
             'end_date' => '',
             'page' => 1,
             'size' => 15,
-            'supplierNo' => ''
+            'supplier' => ''
         ], 'post', 'trim');
 
         $val_params = Validate::rule([
@@ -385,7 +385,13 @@ 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'] . '%'];
+        if ($param['supplier'] != '') {
+            $codes = Db::name('supplier')
+                ->where('is_del', 0)
+                ->whereLike('name', '%' . $param['supplier'] . '%')
+                ->column('code');
+            $where[] = ['cb.supplier', 'in', $codes];
+        }
 
         $count = Db::name('consult_bids')
             ->alias('cb')