|
|
@@ -1084,10 +1084,6 @@ class OrderInv extends BaseController{
|
|
|
if($inv_out!==""){
|
|
|
$condition[]=["a.inv_out","=",$inv_out];
|
|
|
}
|
|
|
-// $inv_in = isset($this->post['inv_in'])&&$this->post['inv_in']!=="" ? trim($this->post['inv_in']):"";
|
|
|
-// if($inv_in!==""){
|
|
|
-// $condition[]=["a.inv_in","=",$inv_in];
|
|
|
-// }
|
|
|
$invNo = isset($this->post['invNo'])&&$this->post['invNo']!=="" ? trim($this->post['invNo']):"";
|
|
|
if($invNo!==""){
|
|
|
$condition[]=["a.invNo","like","%$invNo%"];
|
|
|
@@ -1129,7 +1125,7 @@ class OrderInv extends BaseController{
|
|
|
$page= $page>$total ? intval($total):$page;
|
|
|
$list=Db::name("invoice_pool")->alias("a")
|
|
|
->leftJoin("invoice_pool_info b","a.invNo=b.invNo")
|
|
|
- ->leftJoin("invoice_ticket c","a.invNo=c.invNo and c.type=0")
|
|
|
+ ->leftJoin("invoice_ticket c","a.invNo=c.invNo and c.type=0 and c.is_del=0")
|
|
|
->where($condition)->field("b.*,a.*,c.inv_code,c.inv_number,c.open_date,c.type")
|
|
|
->page($page,$size)->order("a.addtime desc")->select()->toArray();
|
|
|
return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
|
