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

app/admin/controller/SaleReport.php

@@ -780,7 +780,7 @@ class SaleReport extends Base
     {
         $param = $this->request->only(['token', 'start_date' => '', 'end_date' => '', 'use_desc' => '', 'page' => 1, 'size' => 15], 'post', 'trim');
 
-        $where = [['ci.is_del', '=', 0]];
+        $where = [['s.order_type', '=', 3], ['s.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 ($param['use_desc'] != '') $where[] = ['ci.use_desc', 'like', '%' . $param['use_desc'] . '%'];
 
@@ -845,7 +845,7 @@ class SaleReport extends Base
 
         $where = [['s.order_type', '=', 3], ['s.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 ($param['use_desc'] != '') $where[] = ['ci.use_desc', '=', $param['use_desc']];
+        if ($param['use_desc'] != '') $where[] = ['ci.use_desc', 'like', $param['use_desc']];
 
         $data = Db::name('sale')
             ->alias('s')