ad

app/admin/controller/InterOrder.php

@@ -120,6 +120,7 @@ class InterOrder extends Base
       		"good_name"=>'',
       		"status"=>'',
       		"use_type"=>'',
+      		"platform_id"=>'',
       		"page"=>1,
       		"size"=>10,
       		],"post","trim");
@@ -130,17 +131,18 @@ class InterOrder extends Base
 		if($param['company']!=='')$condition[]=["companyNo|companyName","like","%{$param['company']}%"];
 		if($param['good_name']!=='')$condition[]=["good_name","like","%{$param['good_name']}%"];
 		if($param['status']!=='')$condition[]=["a.status","=",$param['status']];
+		if($param['platform_id']!=='')$condition[]=["a.platform_id","=",$param['platform_id']];
 		if($param['use_type']!=='')$condition[]=["b.use_type","=",$param['use_type']];
 		$count=Db::name("inter_order")
 		->alias("a")
-		->leftJoin("platform","a.platform_id =b.id")
+		->leftJoin("platform b","a.platform_id =b.id")
 		->where($condition)
 		->count();
 		$total=ceil($count/$param['size']);
 		$page=$param['page']>=$total ? $total:$param['page'];
 		$list = Db::name("inter_order")->where($condition)
 		->alias("a")
-		->leftJoin("platform","a.platform_id =b.id")
+		->leftJoin("platform b","a.platform_id =b.id")
 		->field("a.*,cat_id as cat_info,b.platform_name,b.use_type")
 		->page(intval($page),intval($param['size']))
 		->withAttr("cat_info",function ($v){return made($v);})

app/admin/controller/Sale.php

@@ -2108,6 +2108,8 @@ class Sale extends Base
 
         $use_type = $this->post['use_type']??'';
         if($use_type!=='') $where[]=['e.use_type','=',$use_type];
+         $platform_id = $this->post['platform_id']??'';
+        if($platform_id!=='') $where[]=['s.platform_id','=',$platform_id];
 //        $role = $this->checkRole();
 //        if (!empty($role['write'])) {
 //            $where[] = ["s.apply_id", "in", $role['write']];
@@ -2143,7 +2145,7 @@ class Sale extends Base
         $page = $page >= $total ? $total : $page;
         $list = Db::name('sale')
             ->alias('s')
-            ->field('s.*,b.cgdNo,c.order_use useage,d.status cgd_status,e.use_type')
+            ->field('s.*,b.cgdNo,c.order_use useage,d.status cgd_status,e.use_type,e.platform_name')
             ->leftJoin('order_num b','b.orderCode=s.orderCode')
             ->leftJoin('order_use c','c.id=s.use_order')
             ->leftJoin('purchease_order d','d.cgdNo=b.cgdNo')