feat:문서양식 기본정보 + 결재라인 기능 개선

- 회사명: 생성 시 테넌트 company_name 자동입력
- 분류: select 변경 (수입검사/중간검사/품질검사 + 커스텀)
- 수입검사 → 품목 다중선택 (RM, SM 필터)
- 품질검사 → 공정 선택
- 결재라인 단계명: text → select (작성/검토/승인/참조)
- 작성 단계: (작성자) 표시, user_id=null
- 검토/승인/참조: 테넌트 사용자 검색/선택, user_id 저장
- 공정 검색 API, 테넌트 사용자 검색 API 신규 추가
- ItemApiController에 item_type, ids 파라미터 지원 추가

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
2026-02-03 10:33:48 +09:00
parent 5653d2f88e
commit 430e59b241
10 changed files with 691 additions and 25 deletions

View File

@@ -30,6 +30,12 @@ public function index(Request $request): View
$query->where('tenant_id', $tenantId);
}
// 슈퍼관리자 휴지통 조회
$showTrashed = $request->filled('trashed') && auth()->user()?->is_super_admin;
if ($showTrashed) {
$query->onlyTrashed();
}
// 검색
if ($search = $request->input('search')) {
$query->where(function ($q) use ($search) {
@@ -45,14 +51,14 @@ public function index(Request $request): View
}
// 활성 상태 필터
if ($request->filled('is_active')) {
if ($request->filled('is_active') && !$showTrashed) {
$query->where('is_active', $request->boolean('is_active'));
}
$templates = $query->orderBy('updated_at', 'desc')
->paginate($request->input('per_page', 10));
return view('document-templates.partials.table', compact('templates'));
return view('document-templates.partials.table', compact('templates', 'showTrashed'));
}
/**
@@ -89,6 +95,9 @@ public function store(Request $request): JsonResponse
'footer_judgement_label' => 'nullable|string|max:50',
'footer_judgement_options' => 'nullable|array',
'is_active' => 'boolean',
'linked_item_ids' => 'nullable|array',
'linked_item_ids.*' => 'integer',
'linked_process_id' => 'nullable|integer',
// 관계 데이터
'approval_lines' => 'nullable|array',
'basic_fields' => 'nullable|array',
@@ -111,6 +120,8 @@ public function store(Request $request): JsonResponse
'footer_judgement_label' => $validated['footer_judgement_label'] ?? '종합판정',
'footer_judgement_options' => $validated['footer_judgement_options'] ?? ['적합', '부적합'],
'is_active' => $validated['is_active'] ?? true,
'linked_item_ids' => $validated['linked_item_ids'] ?? null,
'linked_process_id' => $validated['linked_process_id'] ?? null,
]);
// 관계 데이터 저장
@@ -151,6 +162,9 @@ public function update(Request $request, int $id): JsonResponse
'footer_judgement_label' => 'nullable|string|max:50',
'footer_judgement_options' => 'nullable|array',
'is_active' => 'boolean',
'linked_item_ids' => 'nullable|array',
'linked_item_ids.*' => 'integer',
'linked_process_id' => 'nullable|integer',
// 관계 데이터
'approval_lines' => 'nullable|array',
'basic_fields' => 'nullable|array',
@@ -172,6 +186,8 @@ public function update(Request $request, int $id): JsonResponse
'footer_judgement_label' => $validated['footer_judgement_label'] ?? '종합판정',
'footer_judgement_options' => $validated['footer_judgement_options'] ?? ['적합', '부적합'],
'is_active' => $validated['is_active'] ?? true,
'linked_item_ids' => $validated['linked_item_ids'] ?? null,
'linked_process_id' => $validated['linked_process_id'] ?? null,
]);
// 관계 데이터 저장 (기존 데이터 삭제 후 재생성)
@@ -195,11 +211,12 @@ public function update(Request $request, int $id): JsonResponse
}
/**
* 삭제
* 삭제 (소프트 삭제)
*/
public function destroy(int $id): JsonResponse
{
$template = DocumentTemplate::findOrFail($id);
$template->update(['deleted_by' => auth()->id()]);
$template->delete();
return response()->json([
@@ -208,6 +225,77 @@ public function destroy(int $id): JsonResponse
]);
}
/**
* 영구삭제 (슈퍼관리자 전용)
*/
public function forceDestroy(int $id): JsonResponse
{
if (!auth()->user()?->is_super_admin) {
return response()->json([
'success' => false,
'message' => '슈퍼관리자만 영구 삭제할 수 있습니다.',
], 403);
}
$tenantId = session('selected_tenant_id');
$template = DocumentTemplate::withTrashed()
->where('tenant_id', $tenantId)
->findOrFail($id);
// 이 양식을 참조하는 문서가 있는지 확인 (소프트삭제 포함)
$documentCount = \App\Models\Documents\Document::withTrashed()
->where('template_id', $template->id)
->count();
if ($documentCount > 0) {
return response()->json([
'success' => false,
'message' => "이 양식을 사용한 문서가 {$documentCount}건 있어 영구 삭제할 수 없습니다. 문서를 먼저 삭제해주세요.",
], 422);
}
// 관련 데이터도 영구삭제
$template->approvalLines()->delete();
$template->basicFields()->delete();
$template->sections()->each(function ($section) {
$section->items()->delete();
$section->delete();
});
$template->columns()->delete();
$template->forceDelete();
return response()->json([
'success' => true,
'message' => '문서양식이 영구 삭제되었습니다.',
]);
}
/**
* 삭제된 문서양식 복원 (슈퍼관리자 전용)
*/
public function restore(int $id): JsonResponse
{
if (!auth()->user()?->is_super_admin) {
return response()->json([
'success' => false,
'message' => '슈퍼관리자만 복원할 수 있습니다.',
], 403);
}
$tenantId = session('selected_tenant_id');
$template = DocumentTemplate::onlyTrashed()
->where('tenant_id', $tenantId)
->findOrFail($id);
$template->update(['deleted_by' => null]);
$template->restore();
return response()->json([
'success' => true,
'message' => '문서양식이 복원되었습니다.',
]);
}
/**
* 활성 상태 토글
*/
@@ -252,6 +340,8 @@ public function duplicate(Request $request, int $id): JsonResponse
'footer_judgement_label' => $source->footer_judgement_label,
'footer_judgement_options' => $source->footer_judgement_options,
'is_active' => false,
'linked_item_ids' => $source->linked_item_ids,
'linked_process_id' => $source->linked_process_id,
]);
foreach ($source->approvalLines as $line) {
@@ -260,6 +350,7 @@ public function duplicate(Request $request, int $id): JsonResponse
'name' => $line->name,
'dept' => $line->dept,
'role' => $line->role,
'user_id' => $line->user_id,
'sort_order' => $line->sort_order,
]);
}
@@ -395,6 +486,7 @@ private function saveRelations(DocumentTemplate $template, array $data, bool $de
'name' => $line['name'] ?? '',
'dept' => $line['dept'] ?? '',
'role' => $line['role'] ?? '',
'user_id' => $line['user_id'] ?? null,
'sort_order' => $index,
]);
}

View File

@@ -0,0 +1,44 @@
<?php
namespace App\Http\Controllers\Api\Admin;
use App\Http\Controllers\Controller;
use App\Models\Items\Item;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class ItemApiController extends Controller
{
/**
* 품목 검색 (datalist 자동완성용)
*/
public function search(Request $request): JsonResponse
{
$tenantId = session('selected_tenant_id');
$query = $request->input('q', '');
$items = Item::query()
->where('tenant_id', $tenantId)
->where('is_active', true)
->when($query, function ($q) use ($query) {
$q->where(function ($sub) use ($query) {
$sub->where('name', 'like', "%{$query}%")
->orWhere('code', 'like', "%{$query}%");
});
})
->when($request->input('item_type'), function ($q, $types) {
$q->whereIn('item_type', explode(',', $types));
})
->when($request->input('ids'), function ($q, $ids) {
$q->whereIn('id', explode(',', $ids));
})
->orderBy('name')
->limit(30)
->get(['id', 'code', 'name', 'item_type', 'unit']);
return response()->json([
'success' => true,
'data' => $items,
]);
}
}

View File

@@ -0,0 +1,38 @@
<?php
namespace App\Http\Controllers\Api\Admin;
use App\Http\Controllers\Controller;
use App\Models\Process;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class ProcessApiController extends Controller
{
/**
* 공정 검색 (문서양식 품질검사 연결용)
*/
public function search(Request $request): JsonResponse
{
$tenantId = session('selected_tenant_id');
$query = $request->input('q', '');
$processes = Process::query()
->where('tenant_id', $tenantId)
->where('is_active', true)
->when($query, function ($q) use ($query) {
$q->where(function ($sub) use ($query) {
$sub->where('process_name', 'like', "%{$query}%")
->orWhere('process_code', 'like', "%{$query}%");
});
})
->orderBy('process_name')
->limit(30)
->get(['id', 'process_code', 'process_name']);
return response()->json([
'success' => true,
'data' => $processes,
]);
}
}

View File

@@ -0,0 +1,54 @@
<?php
namespace App\Http\Controllers\Api\Admin;
use App\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class TenantUserApiController extends Controller
{
/**
* 테넌트 사용자 검색 (결재라인 담당자 선택용)
*/
public function search(Request $request): JsonResponse
{
$tenantId = session('selected_tenant_id');
$query = $request->input('q', '');
$users = DB::table('users')
->join('user_tenants', function ($join) use ($tenantId) {
$join->on('users.id', '=', 'user_tenants.user_id')
->where('user_tenants.tenant_id', $tenantId)
->where('user_tenants.is_active', true);
})
->leftJoin('departments', function ($join) use ($tenantId) {
$join->on('departments.id', '=', DB::raw('(
SELECT du.department_id FROM department_user du
WHERE du.user_id = users.id AND du.is_primary = 1
LIMIT 1
)'));
})
->whereNull('users.deleted_at')
->when($query, function ($q) use ($query) {
$q->where(function ($sub) use ($query) {
$sub->where('users.name', 'like', "%{$query}%")
->orWhere('users.email', 'like', "%{$query}%");
});
})
->orderBy('users.name')
->limit(30)
->select([
'users.id',
'users.name',
'departments.name as department_name',
])
->get();
return response()->json([
'success' => true,
'data' => $users,
]);
}
}

View File

@@ -4,6 +4,7 @@
use App\Models\DocumentTemplate;
use App\Models\Tenants\Tenant;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\View\View;
@@ -103,12 +104,21 @@ private function prepareTemplateData(DocumentTemplate $template): array
'footer_judgement_label' => $template->footer_judgement_label,
'footer_judgement_options' => $template->footer_judgement_options,
'is_active' => $template->is_active,
'linked_item_ids' => $template->linked_item_ids,
'linked_process_id' => $template->linked_process_id,
'approval_lines' => $template->approvalLines->map(function ($l) {
$userName = null;
if ($l->user_id) {
$userName = User::where('id', $l->user_id)->value('name');
}
return [
'id' => $l->id,
'name' => $l->name,
'dept' => $l->dept,
'role' => $l->role,
'user_id' => $l->user_id,
'user_name' => $userName,
];
})->toArray(),
'basic_fields' => $template->basicFields->map(function ($f) {