From b9a4a46c4574a5b9c18fb81629b63e351bb65744 Mon Sep 17 00:00:00 2001
From: Jing Li <lym125@gmail.com>
Date: Fri, 12 Apr 2024 19:30:54 +0800
Subject: [PATCH] Update

---
 .../Controllers/Finance/LedgerController.php  | 82 ++-----------------
 app/Admin/routes.php                          |  2 -
 2 files changed, 5 insertions(+), 79 deletions(-)

diff --git a/app/Admin/Controllers/Finance/LedgerController.php b/app/Admin/Controllers/Finance/LedgerController.php
index 7c250af..dfbd616 100644
--- a/app/Admin/Controllers/Finance/LedgerController.php
+++ b/app/Admin/Controllers/Finance/LedgerController.php
@@ -98,16 +98,14 @@ class LedgerController extends AdminController
                                 ->url(admin_url('api/workflow/apply'))
                                 ->method('post')
                                 ->data(['id' => '${workflow.id}'])
-                        ),
+                        )
+                        ->visibleOn('${actual_commission != null && actual_income != null}'),
                     $this->cancelAction(),
                     $this->rowEditLedgerAmountButton()
                         ->visible(Admin::user()->can('admin.finance.ledgers.update_ledger_amount')),
-                    $this->rowEditActualCommissionButton()
-                        ->visible(Admin::user()->can('admin.finance.ledgers.update_actual_commission'))
-                        ->visibleOn('${OR(workflow.check_status == '.CheckStatus::None->value.', workflow.check_status == '.CheckStatus::Cancel->value.', workflow.check_status == '.CheckStatus::Fail->value.')}'),
-                    $this->rowEditActualIncomeButton()
-                        ->visible(Admin::user()->can('admin.finance.ledgers.update_actual_income'))
-                        ->visibleOn('${OR(workflow.check_status == '.CheckStatus::None->value.', workflow.check_status == '.CheckStatus::Cancel->value.', workflow.check_status == '.CheckStatus::Fail->value.')}'),
+                    $this->rowEditTypeButton('drawer', 'lg')
+                        ->visible(Admin::user()->can('admin.finance.ledgers.update'))
+                        ->visibleOn('${ARRAYINCLUDES(['.CheckStatus::None->value.','.CheckStatus::Cancel->value.','.CheckStatus::Fail->value.'], workflow.check_status)}'),
                     $this->rowShowButton()
                         ->visible(Admin::user()->can('admin.finance.ledgers.view')),
                 ]),
@@ -197,26 +195,6 @@ class LedgerController extends AdminController
         return $this->response()->success(null, '保存成功');
     }
 
-    /**
-     * 修改实际佣金
-     */
-    public function updateActualCommission($id, Request $request)
-    {
-        $this->service->update($id, $request->only(['actual_commission']));
-
-        return $this->response()->success(null, '保存成功');
-    }
-
-    /**
-     * 修改实际收益
-     */
-    public function updateActualIncome($id, Request $request)
-    {
-        $this->service->update($id, $request->only(['actual_income']));
-
-        return $this->response()->success(null, '保存成功');
-    }
-
     /**
      * 编辑总账金额按钮
      */
@@ -241,54 +219,4 @@ class LedgerController extends AdminController
                 ])->size('lg')
             );
     }
-
-    /**
-     * 编辑实际佣金按钮
-     */
-    protected function rowEditActualCommissionButton(): DrawerAction
-    {
-        return amis()->DrawerAction()
-            ->icon('fa-regular fa-pen-to-square')
-            ->label(__('finance.ledger.actual_commission'))
-            ->level('link')
-            ->drawer(
-                amis()->Drawer()->title(__('finance.ledger.actual_commission'))->body([
-                    amis()->Form()->title('')
-                        ->api('post:'.admin_url('finance/ledgers/${id}/actual-commission'))
-                        ->body([
-                            amis()->NumberControl()
-                                ->name('actual_commission')
-                                ->label(__('finance.ledger.actual_commission'))
-                                ->precision(2)
-                                ->showSteps(false)
-                                ->required(),
-                        ]),
-                ])->size('lg')
-            );
-    }
-
-    /**
-     * 编辑实际收益按钮
-     */
-    protected function rowEditActualIncomeButton(): DrawerAction
-    {
-        return amis()->DrawerAction()
-            ->icon('fa-regular fa-pen-to-square')
-            ->label(__('finance.ledger.actual_income'))
-            ->level('link')
-            ->drawer(
-                amis()->Drawer()->title(__('finance.ledger.actual_income'))->body([
-                    amis()->Form()->title('')
-                        ->api('post:'.admin_url('finance/ledgers/${id}/actual-income'))
-                        ->body([
-                            amis()->NumberControl()
-                                ->name('actual_income')
-                                ->label(__('finance.ledger.actual_income'))
-                                ->precision(2)
-                                ->showSteps(false)
-                                ->required(),
-                        ]),
-                ])->size('lg')
-            );
-    }
 }
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index 5b7e1bb..7bafef6 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -128,8 +128,6 @@ Route::group([
         // 上报数据
         $router->resource('ledgers', LedgerController::class);
         $router->post('ledgers/{ledger}/ledger-amount', [LedgerController::class, 'updateLedgerAmount'])->name('ledgers.update_ledger_amount');
-        $router->post('ledgers/{ledger}/actual-commission', [LedgerController::class, 'updateActualCommission'])->name('ledgers.update_actual_commission');
-        $router->post('ledgers/{ledger}/actual-income', [LedgerController::class, 'updateActualIncome'])->name('ledgers.update_actual_income');
         // 佣金收入
         $router->get('commission-incomes', [CommissionIncomeController::class, 'index'])->name('commission_incomes.index');
         // 收支报销