mkm/erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-05-11 18:47:04 +08:00
parent dd0ab2d890
commit 0795325a9e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/logic/operation/OpurchaseclassLogic.php
View File

@ -200,7 +200,7 @@ class OpurchaseclassLogic extends BaseLogic
self::setError('报价未设置'); self::setError('报价未设置');
return false; return false;
} }
$find->is_adopt=1; $find->is_adopt=2;
}else{ }else{
$find->is_storage=1; $find->is_storage=1;
$find->notes=$notes; $find->notes=$notes;

6
app/api/lists/operation/OpurchaseGoodsOfferList.php
View File

@ -42,12 +42,14 @@ class OpurchaseGoodsOfferList extends BaseAdminDataLists implements ListsSearchI
$supplier_id=$this->request->userInfo['supplier']['id'] ?? 0; $supplier_id=$this->request->userInfo['supplier']['id'] ?? 0;
$params = $this->request->get(); $params = $this->request->get();
if(isset($params['type']) && $params['type'] == 2){ if(isset($params['type']) && $params['type'] == 2){
$where[] = ['price','<>','']; $where[] = ['price','<>',0];
$where[] = ['is_adopt','<>',0];
}else{ }else{
$where[] = ['price','=','']; $where[] = ['price','=',''];
$where[] = ['is_adopt',0];
} }
if(!$supplier_id) return []; 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') ->with('goods')
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])