Merge branch 'develop' into feature/mzl_dev

# Conflicts:
#	config/route.php
This commit is contained in:
mzl
2025-10-30 14:39:10 +08:00
parent a7d623656d
commit 8c3a445a39
32 changed files with 2004 additions and 7 deletions
+38 -1
View File
@@ -389,7 +389,6 @@ Route::group('/admin', function () {
});
});
Route::group('/purchase/order', function () {
Route::any('/predata', [app\common\controller\PurchaseOrdersController::class, 'preQueryData']);
Route::any('/list', [app\common\controller\PurchaseOrdersController::class, 'index']);
@@ -423,6 +422,44 @@ Route::group('/admin', function () {
Route::any('/destroy', [app\common\controller\SysUpdateLogController::class, 'destroy']);
});
// 收款记录
Route::group('/receipt', function () {
Route::any('/list', [app\common\controller\FinReceiptController::class, 'index']);
Route::any('/show', [app\common\controller\FinReceiptController::class, 'show']);
Route::any('/store', [app\common\controller\FinReceiptController::class, 'store']);
Route::any('/update', [app\common\controller\FinReceiptController::class, 'update']);
Route::any('/payment', [app\common\controller\FinReceiptController::class, 'payment']);
Route::any('/destroy', [app\common\controller\FinReceiptController::class, 'destroy']);
Route::any('/credit', [app\common\controller\FinReceiptController::class, 'credit']);
});
// 收款记录历史
Route::group('/receipt/his', function () {
Route::any('/list', [app\common\controller\FinReceiptHisController::class, 'index']);
Route::any('/show', [app\common\controller\FinReceiptHisController::class, 'show']);
});
Route::group('/fin', function () {
Route::any('/statistics', [app\admin\controller\dashboard\FinStatisticsController::class, 'statistics']);
});
// 付款申请
Route::group('/payment', function () {
Route::any('/list', [app\common\controller\FinPaymentApplyController::class, 'index']);
Route::any('/show', [app\common\controller\FinPaymentApplyController::class, 'show']);
Route::any('/store', [app\common\controller\FinPaymentApplyController::class, 'store']);
Route::any('/update', [app\common\controller\FinPaymentApplyController::class, 'update']);
Route::any('/destroy', [app\common\controller\FinPaymentApplyController::class, 'destroy']);
});
// 系统配置
Route::group('/config', function () {
Route::any('/list', [app\admin\controller\SysConfigController::class, 'index']);
Route::any('/show', [app\admin\controller\SysConfigController::class, 'show']);
Route::any('/store', [app\admin\controller\SysConfigController::class, 'store']);
Route::any('/update', [app\admin\controller\SysConfigController::class, 'update']);
Route::any('/destroy', [app\admin\controller\SysConfigController::class, 'destroy']);
});
// 仪表盘
Route::group('/dashboard', function () {
// 内勤