前端报表，供应商负责人采购订单情况报表优化逻辑，toC和toB的逻辑保持与'供应商采购订单情况'报表一致

app/admin/controller/SaleReport.php

@@ -2183,12 +2183,14 @@ class SaleReport extends Base
 
         $data = Db::name('purchease_order')
             ->alias('a')
-            ->field('a.id,s.personid,s.person,a.order_type,a.order_source,c.use_type')
-            ->leftJoin("good_platform b", "b.skuCode=a.skuCode AND b.is_del=0")
-            ->leftJoin("platform c", "c.id=b.platform_code AND c.is_del=0")
-            ->leftJoin("supplier s", "s.code=a.supplierNo AND s.is_del=0")
+            ->field('a.id,a.supplierNo,a.supplier_name,a.order_type,a.order_source,p.use_type,c.personid,c.person')
+            ->leftJoin("order_num b", "b.cgdNo=a.cgdNo")
+            ->leftJoin("sale s", "s.orderCode=b.orderCode AND s.is_del=0")
+            ->leftJoin("platform p", "p.id=s.platform_id AND p.is_del=0")
+            ->leftJoin("supplier c", "c.code=a.supplierNo AND c.is_del=0")
             ->where($where)
             ->cursor();
+
         $list = [];
         $total = ['person' => '总计', 'total_cgd' => 0, 'tag_1' => 0, 'tag_2' => 0, 'tag_c' => 0, 'tag_b' => 0, 'tag_zx' => 0];
         foreach ($data as $val) {
@@ -2221,8 +2223,10 @@ class SaleReport extends Base
 
                 case 3:
                     //咨询采反
-                    $list[$val['personid']]['tag_zx']++;
-                    $total['tag_zx']++;
+                    if ($val['order_source'] == 2) {
+                        $list[$val['personid']]['tag_zx']++;
+                        $total['tag_zx']++;
+                    }
                     break;
             }
 
@@ -2275,10 +2279,11 @@ class SaleReport extends Base
 
         $data = Db::name('purchease_order')
             ->alias('a')
-            ->field('a.id,s.personid,s.person,a.order_type,a.order_source,c.use_type')
-            ->leftJoin("good_platform b", "b.skuCode=a.skuCode AND b.is_del=0")
-            ->leftJoin("platform c", "c.id=b.platform_code AND c.is_del=0")
-            ->leftJoin("supplier s", "s.code=a.supplierNo AND s.is_del=0")
+            ->field('a.id,a.supplierNo,a.supplier_name,a.order_type,a.order_source,p.use_type,c.personid,c.person')
+            ->leftJoin("order_num b", "b.cgdNo=a.cgdNo")
+            ->leftJoin("sale s", "s.orderCode=b.orderCode AND s.is_del=0")
+            ->leftJoin("platform p", "p.id=s.platform_id AND p.is_del=0")
+            ->leftJoin("supplier c", "c.code=a.supplierNo AND c.is_del=0")
             ->where($where)
             ->cursor();
         $list = [];
@@ -2315,8 +2320,11 @@ class SaleReport extends Base
 
                 case 3:
                     //咨询采反
-                    $list[$val['personid']]['反馈单数合计']++;
-                    $total['反馈单数合计']++;
+                    if ($val['order_source'] == 2) {
+                        $list[$val['personid']]['反馈单数合计']++;
+                        $total['反馈单数合计']++;
+                    }
+
                     break;
             }