ad

app/cxinv/controller/Payment.php

@@ -79,9 +79,9 @@ class Payment extends Base{
     }
     public function list(){
         $params = $this->request->param(['page'=>1,'size'=>20,'startTime'=>'',"endTime"=>"","supplierNo"=>"",
-        "supplierName"=>"","pay_status"=>"","inv_status"=>"","tag_id"=>"","status"=>"",'companyNo'=>'','pay_type'=>'',
+        "supplierName"=>"","pay_status"=>"","inv_status"=>"","tag_id"=>"","status"=>"",'companyNo'=>'','pay_type'=>1,
         'companyName'=>'','is_comon'=>'',"relaComNo"=>""],"post","trim");
-        $where=[['is_del','=',0],['pay_type','=',$params['pay_type']??1]];
+        $where=[['is_del','=',0],['pay_type','=',$params['pay_type']]];
         $check = RoleAction::checkRole($this->roleid, [77,117]);
         if ($check) $where[]=['apply_id','=',$this->uid];
        if ($params['startTime']!=="") $where[]=['addtime','>=',startTime($params['startTime'])];
@@ -112,7 +112,7 @@ class Payment extends Base{
        if($params['relaComNo']!=="") $where[]=['companyNo|supplierNo','=',$params['relaComNo']];
        $list = $this->model->where($where)->order("id desc")->paginate(["list_rows"=>$params['size'],"page"=>$params['page']]);
 
-       foreach ($list as $k=>&$v){
+       foreach ($list->items() as $k=>&$v){
             $v['orderNum'] = PayInfo::where([['payNo','=',$v['payNo']],['is_del','=',0],['status','=',1]])->count();
             $v['inv_tag_name']='';
             $v['pay_tag_name']='';

app/cxinv/controller/Stage.php

@@ -83,9 +83,9 @@ class Stage extends Base{
 
     public function list(){
        $params= $this->request->param(["startTime"=>"","endTime"=>"","payNo"=>"","supplierNo"=>"","supplierName"=>"",
-       "companyNo"=>"","apply_name"=>"","status"=>"","dzNo"=>"","relaComNo"=>"","is_comon"=>"",'pay_type'=>'',"page"=>1,
+       "companyNo"=>"","apply_name"=>"","status"=>"","dzNo"=>"","relaComNo"=>"","is_comon"=>"",'pay_type'=>'1',"page"=>1,
        "size"=>20],"post","trim");
-       $where=[['a.is_del','=',0],['pay_type','=',$params['pay_type']??1]];
+       $where=[['a.is_del','=',0],['pay_type','=',$params['pay_type']]];
        $check = RoleAction::checkRole($this->roleid, [77,117]);
        if ($check) $where[]=['apply_id','=',$this->uid];
        if ($params['startTime']!=='') $where[]=['a.addtime','>=',startTime($params['startTime'])];
@@ -102,33 +102,33 @@ class Stage extends Base{
        $list = $this->model->alias("a")
        ->leftJoin("pay b","`a`.`payNo` = `b`.`payNo` AND  b.is_del = 0 ")
        ->where($where)
-       ->field("`b`.`id` AS `id`,
-                           `a`.`payNo` AS `payNo`,
-                           `a`.`supplierNo`,
-                           `a`.`supplierName`,
-                           `a`.`apay_fee` ,
-                           `a`.`total_fee` AS `total_fee`,
-                           `b`.`apply_name`,
-                           `b`.`apply_id`,
-                           `a`.`is_comon`,
-                           `a`.`winv_fee` ,
-                           `a`.`ainv_fee` ,
-                           `a`.`wpay_fee` ,
-                           `a`.`pay_status` ,
-                           `a`.`inv_status` ,
-                           `b`.`pay_fee` AS `dpay_fee`,
-                           `b`.`return_img`,
-                           `b`.`return_time`,
-                           `b`.`status` AS `dstatus`,
-                           `a`.`status`,
-                           `a`.`remark` AS `remark`,
-                           `b`.`addtime` ,
-                           `a`.`companyNo` ,
-                           `a`.`companyName` ,
-                           `b`.`dzNo` AS `dzNo`")
-                           ->order("a.id DESC")
-                          ->paginate(['list_rows'=>$params['size'],'page'=>$params['page']]);
-        foreach ($list as $k=>&$v){
+       ->field("`a`.`id` AS `id`,
+                   `a`.`payNo` AS `payNo`,
+                   `b`.`supplierNo`,
+                   `b`.`supplierName`,
+                   `b`.`apay_fee` ,
+                   `b`.`total_fee` AS `total_fee`,
+                   `a`.`apply_name`,
+                   `a`.`apply_id`,
+                   `b`.`is_comon`,
+                   `b`.`winv_fee` ,
+                   `b`.`ainv_fee` ,
+                   `b`.`wpay_fee` ,
+                   `b`.`pay_status` ,
+                   `b`.`inv_status` ,
+                   `a`.`pay_fee` AS `dpay_fee`,
+                   `a`.`return_img`,
+                   `a`.`return_time`,
+                   `a`.`status` AS `dstatus`,
+                   `b`.`status`,
+                   `b`.`remark` AS `remark`,
+                   `a`.`addtime` ,
+                   `b`.`companyNo` ,
+                   `b`.`companyName` ,
+                   `a`.`dzNo` AS `dzNo`")
+                   ->order("b.id DESC")
+                  ->paginate(['list_rows'=>$params['size'],'page'=>$params['page']]);
+        foreach ($list->items() as $k=>&$v){
             $v['orderNum'] = PayInfo::where([['payNo','=',$v['payNo']],['is_del','=',0],['status','=',1]])->count();
             $v['has_account'] = AccountCompany::SupplierHasAcount($v['supplierNo']);
        }
@@ -265,8 +265,8 @@ class Stage extends Base{
 
     public function BackList(){
        $param =$this->request->only(['relaComNo'=>'','companyNo'=>'','supplierNo'=>'','start'=>'','end'=>'','returnCode'=>'','payNo'=>'',
-		'status'=>'','dzNo'=>'','pay_type'=>'','is_comon'=>'','page'=>1,'size'=>15],'post','trim');
-		$condition=[['a.is_del','=',0],['a.returnType','=',2],['pay_type','=',$param['pay_type']?:1]];
+		'status'=>'','dzNo'=>'','pay_type'=>1,'is_comon'=>'','page'=>1,'size'=>15],'post','trim');
+		$condition=[['a.is_del','=',0],['a.returnType','=',2],['pay_type','=',$param['pay_type']]];
 		$check = RoleAction::checkRole($this->roleid,[131,129]);
 		if($check) $condition[]=['a.apply_id','=',$this->uid];
 		if($param['relaComNo']!='') $condition[]=['b.companyNo|b.supplierNo','=',$param['relaComNo']];