Update

app/Admin/Controllers/Finance/StoreMasterCommissionController.php

@@ -62,7 +62,6 @@ class StoreMasterCommissionController extends AdminController
                                 ->method('post')
                                 ->data(['id' => '${workflow.id}'])
                         ),
-                    $this->approveAction(),
                     $this->cancelAction(),
                     $this->rowEditTypeButton('drawer', 'lg')
                         ->visible(Admin::user()->can('admin.finance.store_master_commissions.update'))

app/Admin/Controllers/System/WorkflowController.php

@@ -7,11 +7,8 @@ use App\Admin\Services\WorkFlowService;
 use App\Enums\CheckType;
 use App\Models\Keyword;
 use App\Models\{Employee, WorkflowLog, WorkflowCheck};
-use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
 use Slowlyo\OwlAdmin\Admin;
 use Slowlyo\OwlAdmin\Renderers\Form;
 use Slowlyo\OwlAdmin\Renderers\Page;
@@ -123,34 +120,6 @@ class WorkflowController extends AdminController
         }
     }
 
-    /**
-     * 审批
-     */
-    public function approve(Request $request)
-    {
-        $validator = Validator::make(
-            data: $request->input(),
-            rules: [
-                'approval_results' => ['bail', 'required', Rule::in([1, 2])],
-                'remarks' => ['bail', 'required_if:approval_results,2', 'string'],
-            ],
-            attributes: [
-                'approval_results' => '审核结果',
-                'remarks' => '拒绝原因',
-            ],
-        );
-
-        if ($validator->fails()) {
-            admin_abort($validator->errors()->first());
-        }
-
-        if ($request->input('approval_results') == 1) {
-            return $this->success($request);
-        }
-
-        return $this->fail($request);
-    }
-
     public function cancel(Request $request)
     {
         $model = WorkflowCheck::findOrFail($request->input('id'));

app/Admin/routes.php

@@ -193,7 +193,6 @@ Route::group([
         $router->get('keywords/tree-list', [KeywordController::class, 'getTreeList'])->name('api.keywords.tree-list');
 
         $router->post('workflow/apply', [WorkflowController::class, 'apply']);
-        $router->post('workflow/approve', [WorkflowController::class, 'approve']);
         $router->post('workflow/cancel', [WorkflowController::class, 'cancel']);
         $router->post('workflow/success', [WorkflowController::class, 'success']);
         $router->post('workflow/fail', [WorkflowController::class, 'fail']);

app/Traits/HasCheckActions.php

@@ -3,7 +3,6 @@
 namespace App\Traits;
 
 use App\Enums\CheckStatus;
-use Slowlyo\OwlAdmin\Renderers\DrawerAction;
 
 trait HasCheckActions
 {
@@ -21,33 +20,6 @@ trait HasCheckActions
             ->visibleOn('${OR(workflow.check_status == '.CheckStatus::None->value.', workflow.check_status == '.CheckStatus::Cancel->value.', workflow.check_status == '.CheckStatus::Fail->value.')}');
     }
 
-    /**
-     * 审批操作
-     */
-    public function approveAction(): DrawerAction
-    {
-        return amis()->DrawerAction()->icon('fa fa-check-square')->label('审核')->level('link')->drawer(
-            amis()->Drawer()->title('审核')->body([
-                amis()->Form()->title('')
-                    ->api('post:'.admin_url('api/workflow/approve'))
-                    ->body([
-                        amis()->HiddenControl()->name('id')->value('${workflow.id}'),
-                        amis()->RadiosControl('approval_results', '审核结果')
-                            ->options([
-                                ['label' => '通过', 'value' => 1],
-                                ['label' => '拒绝', 'value' => 2],
-                            ])
-                            ->selectFirst()
-                            ->required(),
-                        amis()->TextareaControl('remarks', '拒绝原因')
-                            ->visibleOn('${approval_results == 2}')
-                            ->required()
-                            ->minRows(15),
-                    ]),
-            ])->size('lg')
-        )->visibleOn('${workflow.check_status == '.CheckStatus::Processing->value.'}');
-    }
-
     public function cancelAction()
     {
         return amisMake()
@@ -67,7 +39,7 @@ trait HasCheckActions
             ->AjaxAction()
             ->label('审核通过')
             ->level('link')
-            ->api('post:' . admin_url('api/workflow/success?id=${workflow.id}'))
+            ->api('post:' . admin_url('api/workflow/success?id=${id}'))
             ->confirmText(__('admin.confirm'))
             ->visibleOn('${workflow.check_status == '.CheckStatus::Processing->value.'}');
     }
@@ -80,7 +52,7 @@ trait HasCheckActions
             ->level('link')
             ->dialog(amisMake()->Dialog()->title('审核不通过')->body(
                 amisMake()->Form()->title('')->api('post:'.admin_url('api/workflow/fail'))->body([
-                    amisMake()->HiddenControl()->name('id')->value('${workflow.id}'),
+                    amisMake()->HiddenControl()->name('id')->value('${id}'),
                     amisMake()->TextControl()->name('remarks')->label(__('workflow_log.remarks'))->required(),
                 ])
             ))