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

app/admin/controller/Report.php

@@ -642,7 +642,7 @@ class Report extends Base
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
             ->where($where)
             ->page($param['page'], $param['size'])
-            ->order('po.addtime','desc')
+            ->order('po.addtime', 'desc')
             ->cursor();
 
         $list = [];
@@ -702,7 +702,7 @@ class Report extends Base
             ->leftJoin('business b', 'b.companyNo=po.companyNo AND b.is_del=0')
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
             ->where($where)
-            ->order('po.addtime','desc')
+            ->order('po.addtime', 'desc')
             ->cursor();
 
         $list = [];
@@ -768,6 +768,8 @@ class Report extends Base
             ->alias('or')
             ->leftJoin('order_num on', 'on.orderCode=or.orderCode')
             ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo AND po.is_del=0')
+            ->leftJoin('order_out oo', 'oo.outCode=or.outCode AND oo.status=3')
+            ->leftJoin('result_info ri', 'ri.result_code=or.error_code')
             ->where($where)
             ->count('or.id');
 
@@ -1408,15 +1410,19 @@ class Report extends Base
 
             $before_info = json_decode($value['修改前的内容'], true);
             $after_info = json_decode($value['修改后的内容'], true);
-            $field_change = json_decode($after_info['field_change'], true);
 
-            $value['修改前的内容'] = [];
-            foreach ($field_change as $v) {
-                $value['修改前的内容'][$v] = $before_info[$v];
+            if (isset($after_info['field_change'])) {
+                $field_change = json_decode($after_info['field_change'], true);
+
+                $value['修改前的内容'] = [];
+                foreach ($field_change as $v) {
+                    $value['修改前的内容'][$v] = $before_info[$v];
+                }
+                unset($after_info['field_change']);
+                $value['修改前的内容'] = json_encode($value['修改前的内容'], JSON_UNESCAPED_UNICODE);
+                $value['修改后的内容'] = json_encode($after_info, JSON_UNESCAPED_UNICODE);
+
             }
-            unset($after_info['field_change']);
-            $value['修改前的内容'] = json_encode($value['修改前的内容'], JSON_UNESCAPED_UNICODE);
-            $value['修改后的内容'] = json_encode($after_info, JSON_UNESCAPED_UNICODE);
 
             $list[] = $value;