|
|
@@ -1613,8 +1613,12 @@ 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");
|
|
|
+ $info->tax_exam_remark = $params['remark']??"";
|
|
|
$save=$info->save();
|
|
|
+
|
|
|
if($save){
|
|
|
ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
|
|
|
'order_code' =>$params['bidNo'],//咨询单详情编号
|
|
|
@@ -1659,7 +1663,9 @@ class Consult extends Base
|
|
|
"out_tax_id"=>$bids[$v]['tax_id'],
|
|
|
"out_tax"=>$bids[$v]['tax'],
|
|
|
"tax_exam_uid"=>$this->uid,
|
|
|
- 'tax_exam_uname'=>$this->uname
|
|
|
+ 'tax_exam_uname'=>$this->uname,
|
|
|
+ "tax_exam_time"=>date('Y-m-d H:i:s'),
|
|
|
+ "tax_exam_remark"=>$v['remark']??"",
|
|
|
];
|
|
|
}
|
|
|
try{
|
|
|
@@ -2061,7 +2067,12 @@ class Consult extends Base
|
|
|
if($platform_id!=="") $where[]=['b.platform_code','=',$platform_id];
|
|
|
$skuOrName = isset($this->post['skuOrName'])&& $this->post['skuOrName']!=='' ? trim($this->post['skuOrName']):'';
|
|
|
if($skuOrName!=="") $where[]=['a.good_name|a.spuCode','like','%'.$skuOrName.'%'];
|
|
|
-
|
|
|
+ $tax_exam_time_start=isset($this->post['tax_exam_time_start'])&& $this->post['tax_exam_time_start']!=='' ? startTime($this->post['tax_exam_time_start']):'';
|
|
|
+ $tax_exam_time_end=isset($this->post['tax_exam_time_end'])&& $this->post['tax_exam_time_end']!=='' ? endTime($this->post['tax_exam_time_end']):'';
|
|
|
+
|
|
|
+ if($tax_exam_time_start !=="") $where[]=['a.tax_exam_time','>=',$tax_exam_time_start];
|
|
|
+ if($tax_exam_time_end !=="") $where[]=['a.tax_exam_time','<=',$tax_exam_time_end];
|
|
|
+
|
|
|
$count = Db::name('consult_bids')->alias("a")
|
|
|
->leftJoin('consult_info c','a.infoNo=c.infoNo')
|
|
|
->leftJoin("consult_order b","a.zxNo=b.zxNo")->where($where)->count();
|
