|
|
@@ -1018,6 +1018,32 @@ class Payment extends Base
|
|
|
$value['goodNum'] =$value['goodNum']- $value['thNum'];
|
|
|
$value['sendNum'] =$value['sendNum']- $value['thNum'];
|
|
|
$value['has_account'] = (int)isset($supp_account['data'][$value['supplierNo']]);
|
|
|
+ $value['inv_tag_name']='';
|
|
|
+ $value['pay_tag_name']='';
|
|
|
+ $value['pay_tag_img']='';
|
|
|
+ $value['inv_tag_id']='0';
|
|
|
+ $value['pay_tag_id']='0';
|
|
|
+ $value['pay_tag_remark']='';
|
|
|
+ $value['inv_tag_img']='';
|
|
|
+ $value['inv_tag_remark']='';
|
|
|
+ if($value['pay_tag']==1 || $value['inv_tag']==1){
|
|
|
+ $tag =Db::name('tag_log')->alias('a')->leftJoin('order_tag b','a.tag_id=b.id')->where
|
|
|
+ (['code'=>$value['payNo'],'a.status'=>[5,6]])->order('a.id desc')->column('a.id,b.tag_name,a.tag_img,a
|
|
|
+ .tag_remark','b.type');
|
|
|
+ if($value['inv_tag']==1){
|
|
|
+ $value['inv_tag_name']=$tag[6]['tag_name']??'';
|
|
|
+ $value['inv_tag_id']=$tag[6]['id']??'0';
|
|
|
+ $value['inv_tag_img']=$tag[6]['tag_img']??'';
|
|
|
+ $value['inv_tag_remark']=$tag[6]['tag_remark']??'';
|
|
|
+ }
|
|
|
+
|
|
|
+ if($value['pay_tag']==1){
|
|
|
+ $value['pay_tag_id']=$tag[5]['id']??'0';
|
|
|
+ $value['pay_tag_name']=$tag[5]['tag_name']??'';
|
|
|
+ $value['pay_tag_img']=$tag[5]['tag_img']??'';
|
|
|
+ $value['pay_tag_remark']=$tag[5]['tag_remark']??'';
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
return app_show(0,"获取成功",["list"=>$list->items(),"count"=>$list->total()]);
|
|
|
@@ -1082,6 +1108,32 @@ class Payment extends Base
|
|
|
$value['pay_type']=$payArr[$value['supplierNo']]??'';
|
|
|
$value['goodNum'] =$value['goodNum']- $value['thNum'];
|
|
|
$value['sendNum'] =$value['sendNum']- $value['thNum'];
|
|
|
+ $value['inv_tag_name']='';
|
|
|
+ $value['pay_tag_name']='';
|
|
|
+ $value['pay_tag_img']='';
|
|
|
+ $value['inv_tag_id']='0';
|
|
|
+ $value['pay_tag_id']='0';
|
|
|
+ $value['pay_tag_remark']='';
|
|
|
+ $value['inv_tag_img']='';
|
|
|
+ $value['inv_tag_remark']='';
|
|
|
+ if($value['pay_tag']==1 || $value['inv_tag']==1){
|
|
|
+ $tag =Db::name('tag_log')->alias('a')->leftJoin('order_tag b','a.tag_id=b.id')->where
|
|
|
+ (['code'=>$value['payNo'],'a.status'=>[5,6]])->order('a.id desc')->column('a.id,b.tag_name,a.tag_img,a
|
|
|
+ .tag_remark','b.type');
|
|
|
+ if($value['inv_tag']==1){
|
|
|
+ $value['inv_tag_name']=$tag[6]['tag_name']??'';
|
|
|
+ $value['inv_tag_id']=$tag[6]['id']??'0';
|
|
|
+ $value['inv_tag_img']=$tag[6]['tag_img']??'';
|
|
|
+ $value['inv_tag_remark']=$tag[6]['tag_remark']??'';
|
|
|
+ }
|
|
|
+
|
|
|
+ if($value['pay_tag']==1){
|
|
|
+ $value['pay_tag_id']=$tag[5]['id']??'0';
|
|
|
+ $value['pay_tag_name']=$tag[5]['tag_name']??'';
|
|
|
+ $value['pay_tag_img']=$tag[5]['tag_img']??'';
|
|
|
+ $value['pay_tag_remark']=$tag[5]['tag_remark']??'';
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
return app_show(0,"获取成功",$list);
|
|
|
}
|
