diff --git a/app/Admin/Controllers/LiveInController.php b/app/Admin/Controllers/LiveInController.php index eacc2a6..bf9c454 100644 --- a/app/Admin/Controllers/LiveInController.php +++ b/app/Admin/Controllers/LiveInController.php @@ -177,16 +177,16 @@ class LiveInController extends AdminController ), ]), - // amisMake()->FieldSetControl()->className('mt-10')->title('附加项')->collapsable(true)->body([ - // amisMake()->ComboControl('add_extends','收费项')->multiple(true)->items([ - // amisMake()->TextControl('name', '名称'), - // Components::make()->decimalControl('fee', '金额') - // ]), - // amisMake()->ComboControl('del_extends','抵扣项')->multiple(true)->items([ - // amisMake()->TextControl('name', '名称'), - // Components::make()->decimalControl('fee', '金额') - // ]), - // ]), + amisMake()->FieldSetControl()->className('mt-10')->title('附加项')->collapsable(true)->body([ + amisMake()->ComboControl('add_extends','收费项')->multiple(true)->items([ + amisMake()->TextControl('name', '名称'), + Components::make()->decimalControl('fee', '金额') + ]), + amisMake()->ComboControl('del_extends','抵扣项')->multiple(true)->items([ + amisMake()->TextControl('name', '名称'), + Components::make()->decimalControl('fee', '金额') + ]), + ]), ]) ->actions([ amis('button')->label("生成清单")->level('primary') @@ -256,12 +256,14 @@ class LiveInController extends AdminController $liveFee = $request->input('live_fee', []); $bondsFee = $request->input('bonds_fee', []); - // $addFee = $request->input('add_extends', []); - // $delFee = $request->input('del_extends', []); + $addFee = $request->input('add_extends', []); + $delFee = $request->input('del_extends', []); $res = $this->service->do($oldManId, $startDay, $endDay, [ 'live_fee' => $liveFee, 'bonds_fee' => $bondsFee, + 'add_fee' => $addFee, + 'del_fee' => $delFee, ]); return $this->autoResponse($res, '入住');