diff --git a/app/admin/logic/operation/OpurchaseclassLogic.php b/app/admin/logic/operation/OpurchaseclassLogic.php index 25a8072..4e355f2 100644 --- a/app/admin/logic/operation/OpurchaseclassLogic.php +++ b/app/admin/logic/operation/OpurchaseclassLogic.php @@ -200,7 +200,7 @@ class OpurchaseclassLogic extends BaseLogic self::setError('报价未设置'); return false; } - $find->is_adopt=1; + $find->is_adopt=2; }else{ $find->is_storage=1; $find->notes=$notes; diff --git a/app/api/lists/operation/OpurchaseGoodsOfferList.php b/app/api/lists/operation/OpurchaseGoodsOfferList.php index a3ffd7c..b4c2663 100644 --- a/app/api/lists/operation/OpurchaseGoodsOfferList.php +++ b/app/api/lists/operation/OpurchaseGoodsOfferList.php @@ -42,12 +42,14 @@ class OpurchaseGoodsOfferList extends BaseAdminDataLists implements ListsSearchI $supplier_id=$this->request->userInfo['supplier']['id'] ?? 0; $params = $this->request->get(); if(isset($params['type']) && $params['type'] == 2){ - $where[] = ['price','<>','']; + $where[] = ['price','<>',0]; + $where[] = ['is_adopt','<>',0]; }else{ $where[] = ['price','=','']; + $where[] = ['is_adopt',0]; } if(!$supplier_id) return []; - return OpurchaseGoodsOffer::where($this->searchWhere)->where('supplier_id',$supplier_id)->where($where)->where('is_adopt',0) + return OpurchaseGoodsOffer::where($this->searchWhere)->where('supplier_id',$supplier_id)->where($where) ->with('goods') ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc'])