ad

app/admin/controller/Good.php

@@ -16,13 +16,14 @@ class Good extends Base
 	* @throws \think\exception\DbException
 	 */
     public function list(){
-    	$param=$this->request->param(["spuCode"=>"","status"=>"","good_name"=>"",'companyNo'=>'','supplierNo'=>'','cgd_supplierNo'=>'',
-    	'creater'=>'','isZx'=>'','isCombind'=>'','isChange'=>'',"cat_diff"=>"","tax_diff"=>"","is_diff"=>"",
-    	"start"=>"",'end'=>'','page'=>'1','size'=>'15'],"post","trim");
+    	$param=$this->request->param(["spuCode"=>"","status"=>"","good_name"=>"",'companyNo'=>'','relaComNo'=>'',
+    	'supplierNo'=>'','cgd_supplierNo'=>'','creater'=>'','isZx'=>'','isCombind'=>'','isChange'=>'',"cat_diff"=>"",
+    	"tax_diff"=>"","is_diff"=>"","start"=>"",'end'=>'','page'=>'1','size'=>'15'],"post","trim");
     	$where=[];
     	$param["spuCode"]==""?: $where[]=['spuCode','like',"%{$param['spuCode']}%"];
     	$param["good_name"]==""?: $where[]=['good_name','like',"%{$param['good_name']}%"];
     	$param["companyNo"]==""?: $where[]=['companyNo','like',"%{$param['companyNo']}%"];
+    	$param["relaComNo"]==""?: $where[]=['companyNo|supplierNo','like',"%{$param['relaComNo']}%"];
     	$param["supplierNo"]==""?: $where[]=['supplierNo|cgd_supplierNo','like',"%{$param['supplierNo']}%"];
     	$param['cgd_supplierNo']==''?: $where[]=['cgd_supplierNo','like',"%{$param['cgd_supplierNo']}%"];
     	$param["creater"]==""?: $where[]=['creater','like',"%{$param['creater']}%"];
@@ -39,14 +40,6 @@ class Good extends Base
     	->where($where)
     	->order("id desc")
     	->paginate(["page"=>$param['page'],"list_rows"=>$param["size"]]);
-//    	foreach ($list->items() as &$item){
-//    		$item->combind=[];
-//    		if($item->isCombind==1){
-//    			$good = GoodCombind::with(['child'])->where(["spuCode"=>$item->spuCode,"is_del"=>0])->select();
-//    		    $item->combind = $good->isEmpty()?[]:$good->toArray();
-//    		}
-//    	}
-    	
     	$this->success("获取成功",["list"=>$list->items(),"count"=>$list->total()]);
     }
     //批量更新数据状态审核
@@ -131,14 +124,16 @@ class Good extends Base
     }
     //导出列表
     public function exportDiff(){
-    	$param=$this->request->param(['spuCode'=>'','status'=>'','good_name'=>'','companyNo'=>'','supplierNo'=>'','cgd_supplierNo'=>'',
-    	'creater'=>'','isZx'=>'','cat_diff'=>'','tax_diff'=>'',"start"=>"",'end'=>'','is_diff'=>''],'post','trim');
+    	$param=$this->request->param(['spuCode'=>'','status'=>'','good_name'=>'','companyNo'=>'','supplierNo'=>'','relaComNo'=>'',
+    	'cgd_supplierNo'=>'','creater'=>'','isZx'=>'','cat_diff'=>'','tax_diff'=>'',"start"=>"",'end'=>'','is_diff'=>''],
+    	'post','trim');
     	ini_set('memory_limit' , '-1');
     	$where=[];
     	$param['spuCode']==''?: $where[]=['spuCode','like',"%{$param['spuCode']}%"];
     	$param['good_name']==''?: $where[]=['good_name','like',"%{$param['good_name']}%"];
     	$param['companyNo']==''?: $where[]=['companyNo','like',"%{$param['companyNo']}%"];
     	$param['supplierNo']==''?: $where[]=['supplierNo|cgd_supplierNo','like',"%{$param['supplierNo']}%"];
+    	$param['relaComNo']==''?: $where[]=['companyNo|supplierNo','like',"%{$param['relaComNo']}%"];
     	$param['cgd_supplierNo']==''?: $where[]=['cgd_supplierNo','like',"%{$param['cgd_supplierNo']}%"];
     	$param['creater']==''?: $where[]=['creater','like',"%{$param['creater']}%"];
     	$param['status']===''?: $where[]=['status','=',$param['status']];
@@ -159,14 +154,15 @@ class Good extends Base
     
     public function export(){
 		ini_set('memory_limit' , '-1');
-		$param=$this->request->param(['spuCode'=>'','status'=>'','good_name'=>'','companyNo'=>'','supplierNo'=>'','cgd_supplierNo'=>'',
-    	'creater'=>'','isZx'=>'','isChange'=>'','cat_diff'=>'','tax_diff'=>'','is_diff'=>'','start'=>'','end'=>''
-    	],'post','trim');
+		$param=$this->request->param(['spuCode'=>'','status'=>'','good_name'=>'','companyNo'=>'','supplierNo'=>'',
+		'cgd_supplierNo'=>'','relaComNo'=>'','creater'=>'','isZx'=>'','isChange'=>'','cat_diff'=>'','tax_diff'=>'',
+		'is_diff'=>'','start'=>'','end'=>''],'post','trim');
     	$where=[];
     	$param['spuCode']==''?: $where[]=['spuCode','like',"%{$param['spuCode']}%"];
     	$param['good_name']==''?: $where[]=['good_name','like',"%{$param['good_name']}%"];
     	$param['companyNo']==''?: $where[]=['companyNo','like',"%{$param['companyNo']}%"];
     	$param['supplierNo']==''?: $where[]=['supplierNo|cgd_supplierNo','like',"%{$param['supplierNo']}%"];
+    	$param['relaComNo']==''?: $where[]=['companyNo|supplierNo','like',"%{$param['relaComNo']}%"];
     	$param['cgd_supplierNo']==''?: $where[]=['cgd_supplierNo','like',"%{$param['cgd_supplierNo']}%"];
     	$param['creater']==''?: $where[]=['creater','like',"%{$param['creater']}%"];
     	$param['status']===''?: $where[]=['status','=',$param['status']];