ad

app/admin/controller/CompanyCgd.php

@@ -70,10 +70,14 @@ class CompanyCgd extends Base
     }
     
     public function loglist(){
-    	$param = $this->request->only(['companyNo'=>'','code'=>'','page'=>1,'size'=>10],'post');
+    	$param = $this->request->only(['companyNo'=>'','code'=>'','good_code'=>'',"start"=>'',"end"=>"",'page'=>1,
+    	'size'=>10],'post');
         $where=[["a.source","=",2]];
         $param['companyNo']==''?:$where[]=['b.companyNo','=',$param['companyNo']];
         $param['code']==''?:$where[]=['a.code','=',$param['code']];
+        $param['good_code']==''?:$where[]=['b.spuCode','=',$param['good_code']];
+       $param['start']==""||$param['end']==""?:$where[]=['a.addtime','between',[startTime($param['start']),endTime
+        ($param['end'])]];
         $model =new \app\admin\model\DataChange();
         $list =$model->alias("a")
         ->leftJoin("purchease_order b","a.code=b.cgdNo")

app/common.php

@@ -1627,6 +1627,14 @@ if (!function_exists('get_headquarters_code_and_name')) {
     }
 }
 
+
+function startTime($time){
+	return date("Y-m-d 00:00:00",strtotime($time));
+}
+
+function endTime($time){
+	return date('Y-m-d 23:59:59',strtotime($time));
+}
 //获取毛利率
 if (function_exists('get_budget') == false) {
     function get_budget(int $cat_id = 0, string $relaComNo = '', int $platform_id = 0,bool $is_show_more=false)