diff --git a/app/AdminAgent/Controllers/DemandController.php b/app/AdminAgent/Controllers/DemandController.php index 1a778c0..cca7f80 100755 --- a/app/AdminAgent/Controllers/DemandController.php +++ b/app/AdminAgent/Controllers/DemandController.php @@ -46,7 +46,7 @@ class DemandController extends AdminController }); $grid->column('images','图片')->display(function ($image) { return json_decode($image,true); - })->image(); + })->image('', 60, 60); $grid->column('deadline'); $grid->column('publisher.name','发布人'); $grid->column('publisher_type')->using(DemandTraits::$polymorphic); @@ -143,7 +143,7 @@ class DemandController extends AdminController $form->disableViewCheck(); $form->display('id'); $form->text('title'); - $form->text('comment'); + $form->textarea('comment'); $form->multipleImage('images','图片')->limit(5)->saving(function ($path) { return json_encode($path); }); diff --git a/app/AdminGuide/Controllers/DemandController.php b/app/AdminGuide/Controllers/DemandController.php index db43f05..428edaa 100755 --- a/app/AdminGuide/Controllers/DemandController.php +++ b/app/AdminGuide/Controllers/DemandController.php @@ -45,7 +45,7 @@ class DemandController extends AdminController }); $grid->column('images','图片')->display(function ($image) { return json_decode($image,true); - })->image(); + })->image('', 60, 60); $grid->column('deadline'); $grid->column('publisher.name','发布人'); $grid->column('publisher_type')->using(DemandTraits::$polymorphic); @@ -142,7 +142,7 @@ class DemandController extends AdminController $form->disableViewCheck(); $form->display('id'); $form->text('title'); - $form->text('comment'); + $form->textarea('comment'); $form->multipleImage('images','图片')->limit(5)->saving(function ($path) { return json_encode($path); }); diff --git a/app/AdminSupplier/Controllers/DemandBiddingController.php b/app/AdminSupplier/Controllers/DemandBiddingController.php index 19e6e41..fe695a5 100755 --- a/app/AdminSupplier/Controllers/DemandBiddingController.php +++ b/app/AdminSupplier/Controllers/DemandBiddingController.php @@ -35,7 +35,12 @@ class DemandBiddingController extends AdminController $grid->column('price'); $grid->column('comment'); $grid->column('demand.title','竞拍标题'); - $grid->column('demand.comment','竞拍内容'); + $grid->column('demand.comment','竞拍内容') + ->display('查看') + ->modal('详情',function ($modal) { + $modal->xl(); + return $this->demand->comment; + }); $grid->column('state','状态')->using(DemandTraits::$biddingState)->dot( [ 'yellow', diff --git a/app/AdminSupplier/Controllers/DemandController.php b/app/AdminSupplier/Controllers/DemandController.php index 4a3a52c..c97a57d 100755 --- a/app/AdminSupplier/Controllers/DemandController.php +++ b/app/AdminSupplier/Controllers/DemandController.php @@ -45,7 +45,7 @@ class DemandController extends AdminController }); $grid->column('images','图片')->display(function ($image) { return json_decode($image,true); - })->image(); + })->image('', 60, 60); $grid->column('deadline'); $grid->column('publisher.name','发布人'); $grid->column('publisher_type')->using(DemandTraits::$polymorphic); @@ -136,7 +136,7 @@ class DemandController extends AdminController $form->disableViewCheck(); $form->display('id'); $form->text('title'); - $form->text('comment'); + $form->textarea('comment'); $form->multipleImage('images','图片')->limit(5)->saving(function ($path) { return json_encode($path); }); @@ -151,7 +151,7 @@ class DemandController extends AdminController '代理商' ]) ->default(0); - $form->decimal('price'); + $form->decimal('price')->required(); $form->number('stock'); $form->hidden('publisher_type'); $form->hidden('publisher_id'); diff --git a/app/AdminSupplier/Extensions/Grid/ChooseDemand.php b/app/AdminSupplier/Extensions/Grid/ChooseDemand.php index 72cdbd2..6834bf5 100644 --- a/app/AdminSupplier/Extensions/Grid/ChooseDemand.php +++ b/app/AdminSupplier/Extensions/Grid/ChooseDemand.php @@ -23,7 +23,7 @@ class ChooseDemand extends RowAction public function __construct($biddingId = '') { - parent::__construct('选中竞标'); + parent::__construct('参与竞标'); $this->id = $biddingId; $this->title = '选中竞标'; }