xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/inv' into develop

Browse Source 
# Conflicts:
#	app/controller/IndexController.php
#	composer.lock
#	config/route.php
This commit is contained in:
WIN-C27C5MSVTPO\16961
2026-02-05 09:51:21 +08:00
parent e4f0d107ec a8cab8c51c
commit c896bef9a6
63 changed files with 7197 additions and 1960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/route.php
+50
View File
@@ -518,6 +518,24 @@ Route::group('/admin', function () {
Route::any('/destroy', [app\admin\controller\UserDashboardRuleController::class, 'destroy']);
});
});
// 物品领用
Route::group('/inv', function () {
Route::any('/item/list', [app\admin\controller\InvItemController::class, 'index']);
Route::any('/item/store', [app\admin\controller\InvItemController::class, 'store']);
Route::any('/item/update', [app\admin\controller\InvItemController::class, 'update']);
Route::any('/item/show', [app\admin\controller\InvItemController::class, 'show']);
Route::any('/item/destroy', [app\admin\controller\InvItemController::class, 'destroy']);
Route::group('/requisition', function () {
Route::any('/list', [app\admin\controller\InvRequisitionController::class, 'index']);
Route::any('/show', [app\admin\controller\InvRequisitionController::class, 'show']);
Route::any('/approve', [app\admin\controller\InvRequisitionController::class, 'approve']);
});
// 物品归还
Route::any('/requisition/return', [app\admin\controller\InvRequisitionReturnController::class, 'store']);
// Route::any('/requisition/return', [app\admin\controller\InvRequisitionReturnController::class, 'returnConfirm']);
});
});
@@ -637,4 +655,36 @@ Route::group('/crm', function () {
Route::any('/update', [app\common\controller\VehModificationController::class, 'update']);
Route::any('/destroy', [app\common\controller\VehModificationController::class, 'destroy']);
});
});
// 移动端
Route::group('/mobile', function () {
// 物品领用
Route::group('/inv', function () {
//物品下拉
Route::any('/item/preset', [app\mobile\controller\InvItemController::class, 'preset']);
// 物品领用申请
// Route::any('/requisition/list', [app\mobile\controller\InvRequisitionController::class, 'index']);
// Route::any('/requisition/show', [app\mobile\controller\InvRequisitionController::class, 'show']);
Route::any('/requisition/apply', [app\mobile\controller\InvRequisitionController::class, 'apply']);
Route::any('/requisition/update', [app\mobile\controller\InvRequisitionController::class, 'update']);
Route::group('/requisition', function () {
Route::any('/list', [app\mobile\controller\InvRequisitionController::class, 'index']);
Route::any('/show', [app\mobile\controller\InvRequisitionController::class, 'show']);
// Route::any('/approve', [app\mobile\controller\InvRequisitionController::class, 'approve']);
});
// 物品归还
Route::group('/requisition/return', function () {
Route::any('/store', [app\mobile\controller\InvRequisitionItemReturnController::class, 'store']);
Route::any('/update', [app\mobile\controller\InvRequisitionItemReturnController::class, 'update']);
Route::any('/list', [app\mobile\controller\InvRequisitionItemReturnController::class, 'index']);
Route::any('/confirm', [app\mobile\controller\InvRequisitionItemReturnController::class, 'returnConfirm']);
});
});
});