diff --git a/app/Admin/Controllers/IndustryProductController.php b/app/Admin/Controllers/IndustryProductController.php index 1fa7dcd..c4f01f6 100644 --- a/app/Admin/Controllers/IndustryProductController.php +++ b/app/Admin/Controllers/IndustryProductController.php @@ -55,7 +55,7 @@ class IndustryProductController extends AdminController ProductStatus::REFUSE => 'danger', ProductStatus::SOLD_OUT => 'warning', ], 'primary'); - $grid->column('single_deposit'); + $grid->column('single_deposit')->editable(); $grid->column('min_sale'); $grid->column('created_at'); @@ -111,13 +111,8 @@ class IndustryProductController extends AdminController $form->disableDeleteButton(); $form->display('id'); - $form->select('status')->options(ProductStatus::array()); - })->saving(function (Form $form) { - if (!is_null($form->status) && array_key_exists($form->status, ProductStatus::array())) { - $form->model()->update(['status' => $form->status]); - return $form->response()->success('操作成功!')->script('history.go(-1)'); - } - return $form->response()->error('操作禁止!')->refresh(); //禁止编辑,如果非要编辑的话,记录冻结和解决交易金 + $form->select('status')->options(ProductStatus::array())->required(); + $form->number('single_deposit')->min(0)->required(); })->deleting(function (Form $form) { return $form->response()->error('操作禁止!')->refresh(); }); diff --git a/app/Admin/Extensions/Grid/AuditIndustryProduct.php b/app/Admin/Extensions/Grid/AuditIndustryProduct.php index 3d49cfb..704861a 100644 --- a/app/Admin/Extensions/Grid/AuditIndustryProduct.php +++ b/app/Admin/Extensions/Grid/AuditIndustryProduct.php @@ -36,11 +36,15 @@ class AuditIndustryProduct extends RowAction public function handle(Request $request) { - return $this->response()->warning('测试'); + $status = $request->action == 1 ? ProductStatus::ON_SALE : ProductStatus::REFUSE; try { //修改产品状态 $industry = IndustryProduct::find($this->getKey()); - $industry->status = $request->action == 1 ? ProductStatus::ON_SALE : ProductStatus::REFUSE; + if ($status == ProductStatus::ON_SALE && $industry->single_deposit <= 0) { + throw new \Exception('请先设置交易金单价!'); + } + + $industry->status = $status; $industry->single_deposit = 0; //TODO 交易金单价由前台审核时输入,代理商购买时还要存入行业产品订单表 $industry->save(); diff --git a/app/AdminAgent/Controllers/IndustryOrderController.php b/app/AdminAgent/Controllers/IndustryOrderController.php index 04e2908..89696ae 100644 --- a/app/AdminAgent/Controllers/IndustryOrderController.php +++ b/app/AdminAgent/Controllers/IndustryOrderController.php @@ -151,7 +151,6 @@ class IndustryOrderController extends AdminController $form->text('', '购买产品')->default($industry->title)->disable(); $form->text('', '单价')->default($industry->price)->disable(); $form->text('', '库存')->default($industry->stock)->disable(); - $form->text('', '单库存服务用户数')->default($industry->service_persons)->disable(); $form->text('', '起购数量')->default($industry->min_sale)->disable(); $form->image('picture', '产品图')->default($industry->pictures)->disable(); })->saving(function (Form $form) use ($industry) { diff --git a/app/AdminSupplier/Controllers/IndustryOrderController.php b/app/AdminSupplier/Controllers/IndustryOrderController.php index 3b5e45f..98e4308 100644 --- a/app/AdminSupplier/Controllers/IndustryOrderController.php +++ b/app/AdminSupplier/Controllers/IndustryOrderController.php @@ -35,7 +35,7 @@ class IndustryOrderController extends AdminController $grid->column('name'); $grid->column('mobile'); $grid->column('industry_product_id', '产品ID'); - $grid->column('title'); + $grid->column('title')->limit(15); $grid->column('picture')->image('', 60, 60); $grid->column('status') ->using(OrderStatus::array())