|
@@ -1613,6 +1613,7 @@ class Consult extends Base
|
|
|
$info->tax_status=$params['status'];
|
|
|
$info->out_tax_id=$params['out_tax_id'];
|
|
|
$info->out_tax=$params['out_tax'];
|
|
|
+ $info->remark = $params['remark']??"";
|
|
|
$info->tax_exam_uid = $this->uid;
|
|
|
$info->tax_exam_uname = $this->uname;
|
|
|
$info->tax_exam_time=date("Y-m-d H:i:s");
|
|
@@ -1647,7 +1648,7 @@ class Consult extends Base
|
|
|
return error_show(1004,$valid->getError());
|
|
|
}
|
|
|
$temp=[];
|
|
|
- $bids = ConsultBids::whereIn('bidNo',$list['list'])->column("id,infoNo,bidNo,status,tax_status,tax,tax_id,is_combind","bidNo");
|
|
|
+ $bids = ConsultBids::whereIn('bidNo',$list['list'])->column("id,infoNo,bidNo,status,remark,tax_status,tax,tax_id,is_combind","bidNo");
|
|
|
foreach ($list['list'] as $k=>$v){
|
|
|
if (!isset($bids[$v])) return error_show(1004,"{$v}的反馈单不存在");
|
|
|
if($bids[$v]['tax_status']!=0) return error_show(1004,"{$v}的反馈单状态不正确");
|
|
@@ -1665,7 +1666,7 @@ class Consult extends Base
|
|
|
"tax_exam_uid"=>$this->uid,
|
|
|
'tax_exam_uname'=>$this->uname,
|
|
|
"tax_exam_time"=>date('Y-m-d H:i:s'),
|
|
|
- "tax_exam_remark"=>$v['remark']??"",
|
|
|
+ "tax_exam_remark"=>$v['remark']??""
|
|
|
];
|
|
|
}
|
|
|
try{
|