diff --git a/app/Cells/Equipment/ServerCell.php b/app/Cells/Equipment/ServerCell.php index a90564b..b8a79f8 100644 --- a/app/Cells/Equipment/ServerCell.php +++ b/app/Cells/Equipment/ServerCell.php @@ -63,7 +63,6 @@ class ServerCell extends EquipmentCell if (!array_key_exists('serviceEntity', $params)) { return static::class . '->' . __FUNCTION__ . "에서 오류발생: 서비스 정보가 정의되지 않았습니다."; } - $serviceEntity = $params['serviceEntity']; $entities = $this->getService()->getEntities(['serviceinfo_uid' => $params['serviceEntity']->getPK()]); $template = array_key_exists('template', $params) ? $params['template'] : __FUNCTION__; return view('cells/server/' . $template, [ @@ -72,7 +71,7 @@ class ServerCell extends EquipmentCell 'formOptions' => $this->getService()->getActionForm()->getFormOptions(), 'helper' => $this->getService()->getHelper(), 'entities' => $entities, - 'serviceEntity' => $serviceEntity, + 'serviceEntity' => $params['serviceEntity'], 'serverPartHelper' => new ServerPartHelper(), ] ]); diff --git a/app/Forms/Equipment/ServerForm.php b/app/Forms/Equipment/ServerForm.php index d9dac62..78786fb 100644 --- a/app/Forms/Equipment/ServerForm.php +++ b/app/Forms/Equipment/ServerForm.php @@ -11,6 +11,8 @@ class ServerForm extends EquipmentForm public function action_init_process(string $action, array &$formDatas = []): void { $fields = [ + "clientinfo_uid", + "serviceinfo_uid", "code", "type", "chassisinfo_uid", @@ -25,6 +27,7 @@ class ServerForm extends EquipmentForm ]; $filters = [ "clientinfo_uid", + "serviceinfo_uid", 'type', "chassisinfo_uid", 'switchinfo_uid', diff --git a/app/Services/Equipment/ServerService.php b/app/Services/Equipment/ServerService.php index b79f3cc..aebb520 100644 --- a/app/Services/Equipment/ServerService.php +++ b/app/Services/Equipment/ServerService.php @@ -151,7 +151,8 @@ class ServerService extends EquipmentService } $oldEntity = clone $entity; - + echo var_dump($formDatas); + dd($entity); $entity = parent::modify_process($entity, $formDatas); if (!$entity instanceof ServerEntity) { throw new RuntimeException(static::class . '->' . __FUNCTION__ . "에서 오류발생:Return Type은 ServerEntity만 가능"); diff --git a/app/Views/cells/server/detail.php b/app/Views/cells/server/detail.php index f573be4..373ea89 100644 --- a/app/Views/cells/server/detail.php +++ b/app/Views/cells/server/detail.php @@ -1,35 +1,35 @@
| - = $serverCellDatas['serviceEntity']->getServerInfoUid() == $entity->getPK() ? "📌" : "getPK()}?serverinfo_uid={$entity->getPK()}\">✔️" ?> - = $serverCellDatas['serverPartHelper']->getFieldView('SERVER', "", ['serverEntity' => $entity]) ?> - = "getPK()}?serverinfo_uid={$entity->getPK()}\">❌" ?> - | -파트정보 | -
|---|---|
| + + + | |
| + = $serverCellDatas['serviceEntity']->getServerInfoUid() == $entity->getPK() ? "📌" : "getPK()}?serverinfo_uid={$entity->getPK()}\">✔️" ?> + = $serverCellDatas['serverPartHelper']->getFieldView('SERVER', "", ['serverEntity' => $entity]) ?> + = "getPK()}?serverinfo_uid={$entity->getPK()}\">❌" ?> + | +파트정보 | +
|
+
+ = $serverCellDatas['helper']->getFieldView('switchinfo_uid', $entity->getSwitchInfoUid(), $serverCellDatas) ?>
+
+ = $entity->getTitle() ?>
+ = $entity->getIP() ?>
+ = $entity->getOS() ?>
+ 금액 : = number_format($entity->getPrice()) ?>원
+ getViewer()): ?>
- = $serverCellDatas['helper']->getFieldView('switchinfo_uid', $entity->getSwitchInfoUid(), $serverCellDatas) ?>
+ = $serverCellDatas['helper']->getListButton('console', "", $serverCellDatas) ?>
- = $entity->getTitle() ?>
- = $entity->getIP() ?>
- = $entity->getOS() ?>
- 금액 : = number_format($entity->getPrice()) ?>원
- getViewer()): ?>
-
- = $serverCellDatas['helper']->getListButton('console', "", $serverCellDatas) ?>
-
-
- |
- - = view_cell("\App\Cells\Equipment\ServerPartCell::parttable", [ - 'serverinfo_uid' => $entity->getPK(), - 'types' => SERVERPART['ALL_PARTTYPES'] - ]) ?> - | -+ = view_cell("\App\Cells\Equipment\ServerPartCell::parttable", [ + 'serverinfo_uid' => $entity->getPK(), + 'types' => SERVERPART['ALL_PARTTYPES'] + ]) ?> + | + +
| 서비스정보 | -서버 | +서버파트정보 | 서비스 비고 | 결제관련사항 | + = view_cell("\App\Cells\Equipment\ServerCell::detail", ['serviceEntity' => $entity]) ?> | -= view_cell("\App\Cells\Equipment\ServerCell::detail", ['serviceEntity' => $entity]) ?> | = form_open("/admin/customer/service/history/{$entity->getPK()}?return_url=" . urlencode(current_url()), ['method' => "post"]) ?> = $serviceCellDatas['helper']->getFieldForm('history', $entity->getHistory(), $serviceCellDatas) ?> |
|---|