diff --git a/app/api/controller/operation/OpurchaseGoodsOfferController.php b/app/api/controller/operation/OpurchaseGoodsOfferController.php index 471289a..19dc216 100644 --- a/app/api/controller/operation/OpurchaseGoodsOfferController.php +++ b/app/api/controller/operation/OpurchaseGoodsOfferController.php @@ -14,7 +14,7 @@ } public function offer(){ -// if(!$this->request->userInfo['supplier']) return $this->fail('非供应商用户不能报价'); + if(!$this->request->userInfo['supplier']) return $this->fail('非供应商用户不能报价'); $params = (new OpurchaseGoodsOfferValidate())->post()->goCheck('offer'); $result = OpurchaseGoodsOfferLogic::offer($params); if (true === $result) { diff --git a/app/api/lists/operation/OpurchaseGoodsOfferList.php b/app/api/lists/operation/OpurchaseGoodsOfferList.php index a7a6d46..990c0cb 100644 --- a/app/api/lists/operation/OpurchaseGoodsOfferList.php +++ b/app/api/lists/operation/OpurchaseGoodsOfferList.php @@ -5,6 +5,7 @@ namespace app\api\lists\operation; use app\admin\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; +use app\common\model\goods\Unit; use app\common\model\opurchase\OpurchaseGoodsOffer; /** @@ -52,6 +53,8 @@ class OpurchaseGoodsOfferList extends BaseAdminDataLists implements ListsSearchI ->order(['id' => 'desc']) ->select()->each(function($data){ $data['is_adopt_text'] = $data->is_adopt_text; + $unit = Unit::where('id',$data['goods']['unit'])->findOrEmpty(); + $data['goods']['unit_name'] = !$unit->isEmpty() ? $unit->name : ''; }) ->toArray(); }