diff --git a/frontend/app/pages/component/[id]/index.vue b/frontend/app/pages/component/[id]/index.vue
index c4fa04f..f8f7719 100644
--- a/frontend/app/pages/component/[id]/index.vue
+++ b/frontend/app/pages/component/[id]/index.vue
@@ -43,387 +43,415 @@
             @toggle-edit="isEditMode = !isEditMode"
           />
 
-          <!-- Catégorie (always shown) -->
-          <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Catégorie de composant</span>
-              </label>
-              <template v-if="isEditMode">
-                <div class="flex items-center gap-2">
-                  <select
-                    v-model="selectedTypeId"
-                    class="select select-bordered select-sm md:select-md flex-1"
-                    disabled
-                  >
-                    <option value="">Sélectionner une catégorie</option>
-                    <option
-                      v-for="type in componentTypeList"
-                      :key="type.id"
-                      :value="type.id"
-                    >
-                      {{ type.name }}
-                    </option>
-                  </select>
-                  <NuxtLink
-                    v-if="selectedTypeId"
-                    :to="`/component-category/${selectedTypeId}/edit`"
-                    class="btn btn-ghost btn-sm"
-                    title="Voir la catégorie"
-                  >
-                    <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" viewBox="0 0 20 20" fill="currentColor">
-                      <path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z" />
-                      <path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z" />
-                    </svg>
-                  </NuxtLink>
-                </div>
-                <p class="text-xs text-base-content/60 mt-1">
-                  La catégorie d'origine ne peut pas être modifiée depuis cette page.
-                </p>
-              </template>
-              <p v-else class="text-sm font-medium text-base-content py-1">
-                {{ selectedType?.name || '—' }}
-              </p>
-            </div>
-          </div>
-
-          <!-- Nom (always shown) -->
-          <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Nom du composant</span>
-              </label>
-              <input
-                v-if="isEditMode"
-                v-model="editionForm.name"
-                type="text"
-                class="input input-bordered input-sm md:input-md"
-                :disabled="!canEdit || saving"
-                placeholder="Nom affiché dans le catalogue"
-                required
-              >
-              <p v-else class="text-sm font-medium text-base-content py-1">
-                {{ component.name }}
-              </p>
-            </div>
-          </div>
-
-          <!-- Description (if value or edit mode) -->
-          <div v-if="isEditMode || component.description" class="form-control">
-            <label class="label">
-              <span class="label-text">Description</span>
-            </label>
-            <textarea
-              v-if="isEditMode"
-              v-model="editionForm.description"
-              class="textarea textarea-bordered textarea-sm md:textarea-md"
-              :disabled="!canEdit || saving"
-              placeholder="Description du composant (optionnel)"
-              rows="3"
-            />
-            <div v-else class="textarea textarea-bordered textarea-sm md:textarea-md bg-base-200">
-              {{ component.description }}
-            </div>
-          </div>
-
-          <!-- Référence + Fournisseurs (if value or edit mode) -->
-          <div
-            v-if="isEditMode || component.reference || constructeurLinks.length"
-            class="grid grid-cols-1 gap-4 md:grid-cols-2"
-          >
-            <div v-if="isEditMode || component.reference" class="form-control">
-              <label class="label">
-                <span class="label-text">Référence</span>
-              </label>
-              <input
-                v-if="isEditMode"
-                v-model="editionForm.reference"
-                type="text"
-                class="input input-bordered input-sm md:input-md"
-                :disabled="!canEdit || saving"
-                placeholder="Référence interne ou fournisseur"
-              >
-              <p v-else class="text-sm font-medium text-base-content py-1">
-                {{ component.reference }}
-              </p>
-            </div>
-
-            <div v-if="isEditMode || constructeurLinks.length" class="form-control">
-              <label class="label">
-                <span class="label-text">Fournisseur</span>
-              </label>
-              <ConstructeurSelect
-                v-if="isEditMode"
-                v-model="editionForm.constructeurIds"
-                class="w-full"
-                :disabled="!canEdit || saving"
-                placeholder="Rechercher un ou plusieurs fournisseurs..."
-                :initial-options="component?.constructeurs || []"
-              />
-            </div>
-          </div>
-
-          <!-- Constructeur links table -->
-          <ConstructeurLinksTable
-            v-if="isEditMode && constructeurLinks.length"
-            v-model="constructeurLinks"
-          />
-          <ConstructeurLinksTable
-            v-else-if="!isEditMode && constructeurLinks.length"
-            :model-value="constructeurLinks"
-            :readonly="true"
-          />
-
-          <!-- Prix (if value or edit mode) -->
-          <div v-if="isEditMode || component.prix" class="grid grid-cols-1 gap-4 md:grid-cols-2">
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text">Prix indicatif (€)</span>
-              </label>
-              <input
-                v-if="isEditMode"
-                v-model="editionForm.prix"
-                type="number"
-                step="0.01"
-                min="0"
-                class="input input-bordered input-sm md:input-md"
-                :disabled="!canEdit || saving"
-                placeholder="Valeur indicatrice"
-              >
-              <p v-else class="text-sm font-medium text-base-content py-1">
-                {{ component.prix }} €
-              </p>
-            </div>
-          </div>
-
-          <!-- Skeleton preview (edit mode only) -->
-          <StructureSkeletonPreview
-            v-if="isEditMode && selectedType"
-            :structure="selectedTypeStructure"
-            :description="selectedType.description || 'Ce squelette définit la structure et les contraintes du composant.'"
-            :preview-badge="formatStructurePreview(selectedTypeStructure)"
-            variant="component"
-            show-empty-state
-            :resolve-piece-label="resolvePieceLabel"
-            :resolve-product-label="resolveProductLabel"
-            :resolve-subcomponent-label="resolveSubcomponentLabel"
-          />
-
-          <!-- Skeleton slot selections -->
-          <div
-            v-if="pieceSlotEntries.length || productSlotEntries.length || subcomponentSlotEntries.length"
-            class="space-y-3 rounded-lg border border-base-200 bg-base-200/30 p-4"
-          >
-            <header class="space-y-1">
-              <h2 class="font-semibold text-base-content">{{ isEditMode ? 'Sélections du squelette' : 'Structure du composant' }}</h2>
-              <p class="text-xs text-base-content/70">
-                {{ isEditMode ? 'Choisissez les pièces, produits et sous-composants pour chaque emplacement requis par la catégorie.' : 'Pièces, produits et sous-composants associés à ce composant.' }}
-              </p>
-            </header>
-
-            <div v-if="pieceSlotEntries.length" class="space-y-2">
-              <h3 class="font-semibold text-sm text-base-content">Pièces</h3>
-              <div class="grid grid-cols-1 gap-3 md:grid-cols-2">
-                <div
-                  v-for="slot in pieceSlotEntries"
-                  :key="`piece-slot-${slot.slotId}`"
-                  class="form-control"
-                >
-                  <label class="label">
-                    <span class="label-text text-xs font-medium" :class="{ 'text-error font-semibold': slot.isEmpty }">{{ slot.label }}</span>
-                  </label>
-                  <template v-if="isEditMode">
-                    <div class="flex items-start gap-2">
-                      <div class="flex-1">
-                        <PieceSelect
-                          :model-value="slot.selectedPieceId"
-                          :disabled="!canEdit || saving"
-                          :type-piece-id="slot.typePieceId"
-                          @update:model-value="(value) => setPieceSlotSelection(slot.slotId, value)"
-                        />
-                      </div>
-                      <div class="w-20 shrink-0">
-                        <input
-                          type="number"
-                          :value="slot.quantity"
-                          min="1"
-                          class="input input-bordered input-sm w-full text-center"
-                          :disabled="!canEdit || saving"
-                          title="Quantité"
-                          @change="(e) => setSlotQuantity(slot.slotId, Number((e.target as HTMLInputElement).value))"
+          <EntityTabs v-model="activeTab" :tabs="entityTabs" aria-label="Sections composant">
+            <template #tab-general>
+              <div class="space-y-6">
+                <!-- Catégorie (always shown) -->
+                <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+                  <div class="form-control">
+                    <label class="label">
+                      <span class="label-text">Catégorie de composant</span>
+                    </label>
+                    <template v-if="isEditMode">
+                      <div class="flex items-center gap-2">
+                        <select
+                          v-model="selectedTypeId"
+                          class="select select-bordered select-sm md:select-md flex-1"
+                          disabled
                         >
+                          <option value="">Sélectionner une catégorie</option>
+                          <option
+                            v-for="type in componentTypeList"
+                            :key="type.id"
+                            :value="type.id"
+                          >
+                            {{ type.name }}
+                          </option>
+                        </select>
+                        <NuxtLink
+                          v-if="selectedTypeId"
+                          :to="`/component-category/${selectedTypeId}/edit`"
+                          class="btn btn-ghost btn-sm"
+                          title="Voir la catégorie"
+                        >
+                          <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" viewBox="0 0 20 20" fill="currentColor">
+                            <path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z" />
+                            <path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z" />
+                          </svg>
+                        </NuxtLink>
+                      </div>
+                      <p class="text-xs text-base-content/60 mt-1">
+                        La catégorie d'origine ne peut pas être modifiée depuis cette page.
+                      </p>
+                    </template>
+                    <p v-else class="text-sm font-medium text-base-content py-1">
+                      {{ selectedType?.name || '—' }}
+                    </p>
+                  </div>
+                </div>
+
+                <!-- Nom (always shown) -->
+                <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+                  <div class="form-control">
+                    <label class="label">
+                      <span class="label-text">Nom du composant</span>
+                    </label>
+                    <input
+                      v-if="isEditMode"
+                      v-model="editionForm.name"
+                      type="text"
+                      class="input input-bordered input-sm md:input-md"
+                      :disabled="!canEdit || saving"
+                      placeholder="Nom affiché dans le catalogue"
+                      required
+                    >
+                    <p v-else class="text-sm font-medium text-base-content py-1">
+                      {{ component.name }}
+                    </p>
+                  </div>
+                </div>
+
+                <!-- Description (if value or edit mode) -->
+                <div v-if="isEditMode || component.description" class="form-control">
+                  <label class="label">
+                    <span class="label-text">Description</span>
+                  </label>
+                  <textarea
+                    v-if="isEditMode"
+                    v-model="editionForm.description"
+                    class="textarea textarea-bordered textarea-sm md:textarea-md"
+                    :disabled="!canEdit || saving"
+                    placeholder="Description du composant (optionnel)"
+                    rows="3"
+                  />
+                  <div v-else class="textarea textarea-bordered textarea-sm md:textarea-md bg-base-200">
+                    {{ component.description }}
+                  </div>
+                </div>
+
+                <!-- Référence + Fournisseurs (if value or edit mode) -->
+                <div
+                  v-if="isEditMode || component.reference || constructeurLinks.length"
+                  class="grid grid-cols-1 gap-4 md:grid-cols-2"
+                >
+                  <div v-if="isEditMode || component.reference" class="form-control">
+                    <label class="label">
+                      <span class="label-text">Référence</span>
+                    </label>
+                    <input
+                      v-if="isEditMode"
+                      v-model="editionForm.reference"
+                      type="text"
+                      class="input input-bordered input-sm md:input-md"
+                      :disabled="!canEdit || saving"
+                      placeholder="Référence interne ou fournisseur"
+                    >
+                    <p v-else class="text-sm font-medium text-base-content py-1">
+                      {{ component.reference }}
+                    </p>
+                  </div>
+
+                  <div v-if="isEditMode || constructeurLinks.length" class="form-control">
+                    <label class="label">
+                      <span class="label-text">Fournisseur</span>
+                    </label>
+                    <ConstructeurSelect
+                      v-if="isEditMode"
+                      v-model="editionForm.constructeurIds"
+                      class="w-full"
+                      :disabled="!canEdit || saving"
+                      placeholder="Rechercher un ou plusieurs fournisseurs..."
+                      :initial-options="component?.constructeurs || []"
+                    />
+                  </div>
+                </div>
+
+                <!-- Constructeur links table -->
+                <ConstructeurLinksTable
+                  v-if="isEditMode && constructeurLinks.length"
+                  v-model="constructeurLinks"
+                />
+                <ConstructeurLinksTable
+                  v-else-if="!isEditMode && constructeurLinks.length"
+                  :model-value="constructeurLinks"
+                  :readonly="true"
+                />
+
+                <!-- Prix (if value or edit mode) -->
+                <div v-if="isEditMode || component.prix" class="grid grid-cols-1 gap-4 md:grid-cols-2">
+                  <div class="form-control">
+                    <label class="label">
+                      <span class="label-text">Prix indicatif (€)</span>
+                    </label>
+                    <input
+                      v-if="isEditMode"
+                      v-model="editionForm.prix"
+                      type="number"
+                      step="0.01"
+                      min="0"
+                      class="input input-bordered input-sm md:input-md"
+                      :disabled="!canEdit || saving"
+                      placeholder="Valeur indicatrice"
+                    >
+                    <p v-else class="text-sm font-medium text-base-content py-1">
+                      {{ component.prix }} €
+                    </p>
+                  </div>
+                </div>
+              </div>
+            </template>
+
+            <template #tab-structure>
+              <div class="space-y-6">
+                <!-- Skeleton preview (edit mode only) -->
+                <StructureSkeletonPreview
+                  v-if="isEditMode && selectedType"
+                  :structure="selectedTypeStructure"
+                  :description="selectedType.description || 'Ce squelette définit la structure et les contraintes du composant.'"
+                  :preview-badge="formatStructurePreview(selectedTypeStructure)"
+                  variant="component"
+                  show-empty-state
+                  :resolve-piece-label="resolvePieceLabel"
+                  :resolve-product-label="resolveProductLabel"
+                  :resolve-subcomponent-label="resolveSubcomponentLabel"
+                />
+
+                <!-- Skeleton slot selections -->
+                <div
+                  v-if="pieceSlotEntries.length || productSlotEntries.length || subcomponentSlotEntries.length"
+                  class="space-y-3 rounded-lg border border-base-200 bg-base-200/30 p-4"
+                >
+                  <header class="space-y-1">
+                    <h2 class="font-semibold text-base-content">{{ isEditMode ? 'Sélections du squelette' : 'Structure du composant' }}</h2>
+                    <p class="text-xs text-base-content/70">
+                      {{ isEditMode ? 'Choisissez les pièces, produits et sous-composants pour chaque emplacement requis par la catégorie.' : 'Pièces, produits et sous-composants associés à ce composant.' }}
+                    </p>
+                  </header>
+
+                  <div v-if="pieceSlotEntries.length" class="space-y-2">
+                    <h3 class="font-semibold text-sm text-base-content">Pièces</h3>
+                    <div class="grid grid-cols-1 gap-3 md:grid-cols-2">
+                      <div
+                        v-for="slot in pieceSlotEntries"
+                        :key="`piece-slot-${slot.slotId}`"
+                        class="form-control"
+                      >
+                        <label class="label">
+                          <span class="label-text text-xs font-medium" :class="{ 'text-error font-semibold': slot.isEmpty }">{{ slot.label }}</span>
+                        </label>
+                        <template v-if="isEditMode">
+                          <div class="flex items-start gap-2">
+                            <div class="flex-1">
+                              <PieceSelect
+                                :model-value="slot.selectedPieceId"
+                                :disabled="!canEdit || saving"
+                                :type-piece-id="slot.typePieceId"
+                                @update:model-value="(value) => setPieceSlotSelection(slot.slotId, value)"
+                              />
+                            </div>
+                            <div class="w-20 shrink-0">
+                              <input
+                                type="number"
+                                :value="slot.quantity"
+                                min="1"
+                                class="input input-bordered input-sm w-full text-center"
+                                :disabled="!canEdit || saving"
+                                title="Quantité"
+                                @change="(e) => setSlotQuantity(slot.slotId, Number((e.target as HTMLInputElement).value))"
+                              >
+                            </div>
+                          </div>
+                        </template>
+                        <div v-else class="text-sm font-medium py-1 px-2 rounded" :class="slot.isEmpty ? 'border border-error bg-error/10 text-error font-semibold' : 'text-base-content'">
+                          <template v-if="slot.isEmpty">{{ slot.label }} — manquant</template>
+                          <template v-else>
+                            {{ slot.selectedPieceName }}
+                            <span v-if="slot.quantity > 1" class="badge badge-sm">x{{ slot.quantity }}</span>
+                          </template>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div v-if="productSlotEntries.length" class="space-y-2">
+                    <h3 class="font-semibold text-sm text-base-content">Produits</h3>
+                    <div class="grid grid-cols-1 gap-3 md:grid-cols-2">
+                      <div
+                        v-for="slot in productSlotEntries"
+                        :key="`product-slot-${slot.slotId}`"
+                        class="form-control"
+                      >
+                        <label class="label">
+                          <span class="label-text text-xs font-medium" :class="{ 'text-error font-semibold': slot.isEmpty }">{{ slot.label }}</span>
+                        </label>
+                        <template v-if="isEditMode">
+                          <ProductSelect
+                            :model-value="slot.selectedProductId"
+                            :disabled="!canEdit || saving"
+                            :type-product-id="slot.typeProductId"
+                            @update:model-value="(value) => setProductSlotSelection(slot.slotId, value)"
+                          />
+                        </template>
+                        <div v-else class="text-sm font-medium py-1 px-2 rounded" :class="slot.isEmpty ? 'border border-error bg-error/10 text-error font-semibold' : 'text-base-content'">
+                          <template v-if="slot.isEmpty">{{ slot.label }} — manquant</template>
+                          <template v-else>{{ slot.selectedProductName }}</template>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div v-if="subcomponentSlotEntries.length" class="space-y-2">
+                    <h3 class="font-semibold text-sm text-base-content">Sous-composants</h3>
+                    <div class="grid grid-cols-1 gap-3 md:grid-cols-2">
+                      <div
+                        v-for="slot in subcomponentSlotEntries"
+                        :key="`sub-slot-${slot.slotId}`"
+                        class="form-control"
+                      >
+                        <label class="label">
+                          <span class="label-text text-xs font-medium" :class="{ 'text-error font-semibold': slot.isEmpty }">{{ slot.label }}</span>
+                        </label>
+                        <template v-if="isEditMode">
+                          <ComposantSelect
+                            :model-value="slot.selectedComponentId"
+                            :disabled="!canEdit || saving"
+                            :type-composant-id="slot.typeComposantId"
+                            @update:model-value="(value) => setSubcomponentSlotSelection(slot.slotId, value)"
+                          />
+                        </template>
+                        <div v-else class="text-sm font-medium py-1 px-2 rounded" :class="slot.isEmpty ? 'border border-error bg-error/10 text-error font-semibold' : 'text-base-content'">
+                          <template v-if="slot.isEmpty">{{ slot.label }} — manquant</template>
+                          <template v-else>{{ slot.selectedComponentName }}</template>
+                        </div>
                       </div>
                     </div>
-                  </template>
-                  <div v-else class="text-sm font-medium py-1 px-2 rounded" :class="slot.isEmpty ? 'border border-error bg-error/10 text-error font-semibold' : 'text-base-content'">
-                    <template v-if="slot.isEmpty">{{ slot.label }} — manquant</template>
-                    <template v-else>
-                      {{ slot.selectedPieceName }}
-                      <span v-if="slot.quantity > 1" class="badge badge-sm">x{{ slot.quantity }}</span>
-                    </template>
                   </div>
                 </div>
               </div>
-            </div>
-
-            <div v-if="productSlotEntries.length" class="space-y-2">
-              <h3 class="font-semibold text-sm text-base-content">Produits</h3>
-              <div class="grid grid-cols-1 gap-3 md:grid-cols-2">
-                <div
-                  v-for="slot in productSlotEntries"
-                  :key="`product-slot-${slot.slotId}`"
-                  class="form-control"
-                >
-                  <label class="label">
-                    <span class="label-text text-xs font-medium" :class="{ 'text-error font-semibold': slot.isEmpty }">{{ slot.label }}</span>
-                  </label>
-                  <template v-if="isEditMode">
-                    <ProductSelect
-                      :model-value="slot.selectedProductId"
-                      :disabled="!canEdit || saving"
-                      :type-product-id="slot.typeProductId"
-                      @update:model-value="(value) => setProductSlotSelection(slot.slotId, value)"
-                    />
-                  </template>
-                  <div v-else class="text-sm font-medium py-1 px-2 rounded" :class="slot.isEmpty ? 'border border-error bg-error/10 text-error font-semibold' : 'text-base-content'">
-                    <template v-if="slot.isEmpty">{{ slot.label }} — manquant</template>
-                    <template v-else>{{ slot.selectedProductName }}</template>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <div v-if="subcomponentSlotEntries.length" class="space-y-2">
-              <h3 class="font-semibold text-sm text-base-content">Sous-composants</h3>
-              <div class="grid grid-cols-1 gap-3 md:grid-cols-2">
-                <div
-                  v-for="slot in subcomponentSlotEntries"
-                  :key="`sub-slot-${slot.slotId}`"
-                  class="form-control"
-                >
-                  <label class="label">
-                    <span class="label-text text-xs font-medium" :class="{ 'text-error font-semibold': slot.isEmpty }">{{ slot.label }}</span>
-                  </label>
-                  <template v-if="isEditMode">
-                    <ComposantSelect
-                      :model-value="slot.selectedComponentId"
-                      :disabled="!canEdit || saving"
-                      :type-composant-id="slot.typeComposantId"
-                      @update:model-value="(value) => setSubcomponentSlotSelection(slot.slotId, value)"
-                    />
-                  </template>
-                  <div v-else class="text-sm font-medium py-1 px-2 rounded" :class="slot.isEmpty ? 'border border-error bg-error/10 text-error font-semibold' : 'text-base-content'">
-                    <template v-if="slot.isEmpty">{{ slot.label }} — manquant</template>
-                    <template v-else>{{ slot.selectedComponentName }}</template>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <!-- Custom fields -->
-          <div v-if="visibleCustomFields.length" class="space-y-4 rounded-lg border border-base-200 bg-base-200/40 p-4">
-            <header class="space-y-1">
-              <h2 class="font-semibold text-base-content">Champs personnalisés</h2>
-              <p v-if="isEditMode" class="text-xs text-base-content/70">
-                Mettez à jour les valeurs propres à ce composant.
-              </p>
-            </header>
-            <template v-if="isEditMode">
-              <CustomFieldInputGrid :fields="customFieldInputs" :disabled="!canEdit || saving" />
             </template>
-            <template v-else>
-              <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-                <div
-                  v-for="field in visibleCustomFields"
-                  :key="field.customFieldValueId || field.customFieldId || field.name"
-                  class="form-control"
-                >
-                  <label class="label">
-                    <span class="label-text text-sm">{{ field.name }}</span>
-                  </label>
-                  <p class="text-sm font-medium text-base-content py-1">
-                    {{ field.value }}
+
+            <template #tab-documents>
+              <!-- Documents -->
+              <div
+                v-if="isEditMode || componentDocuments.length > 0"
+                class="space-y-4 rounded-lg border border-base-200 bg-base-200/40 p-4"
+              >
+                <header class="flex flex-col gap-1 md:flex-row md:items-center md:justify-between">
+                  <div>
+                    <h2 class="font-semibold text-base-content">Documents</h2>
+                    <p class="text-xs text-base-content/70">
+                      {{ isEditMode ? 'Gérez les documents associés à ce composant.' : 'Documents associés à ce composant.' }}
+                    </p>
+                  </div>
+                  <span v-if="isEditMode && selectedFiles.length" class="badge badge-outline">
+                    {{ selectedFiles.length }} document{{ selectedFiles.length > 1 ? 's' : '' }} prêt{{ selectedFiles.length > 1 ? 's' : '' }} à être ajouté{{ selectedFiles.length > 1 ? 's' : '' }}
+                  </span>
+                </header>
+                <template v-if="isEditMode">
+                  <div :class="{ 'pointer-events-none opacity-60': !canEdit || saving || uploadingDocuments }">
+                    <DocumentUpload
+                      v-model="selectedFiles"
+                      title="Déposer vos fichiers"
+                      subtitle="Formats acceptés : PDF, images, documents…"
+                      @files-added="handleFilesAdded"
+                    />
+                  </div>
+                  <p v-if="uploadingDocuments" class="text-xs text-base-content/70">
+                    Téléversement des documents en cours…
                   </p>
+                  <p v-else-if="loadingDocuments" class="text-xs text-base-content/70">
+                    Chargement des documents en cours…
+                  </p>
+                  <DocumentListInline
+                    v-else
+                    :documents="componentDocuments"
+                    :can-delete="canEdit"
+                    :can-edit="true"
+                    :delete-disabled="uploadingDocuments"
+                    empty-text="Aucun document n'est associé à ce composant pour le moment."
+                    @preview="openPreview"
+                    @edit="openEditModal"
+                    @delete="removeDocument"
+                  />
+                </template>
+                <template v-else>
+                  <p v-if="loadingDocuments" class="text-xs text-base-content/70">
+                    Chargement des documents en cours…
+                  </p>
+                  <DocumentListInline
+                    v-else
+                    :documents="componentDocuments"
+                    :can-delete="false"
+                    :can-edit="false"
+                    empty-text="Aucun document n'est associé à ce composant pour le moment."
+                    @preview="openPreview"
+                  />
+                </template>
+              </div>
+            </template>
+
+            <template #tab-custom-fields>
+              <!-- Custom fields -->
+              <div v-if="visibleCustomFields.length" class="space-y-4 rounded-lg border border-base-200 bg-base-200/40 p-4">
+                <header class="space-y-1">
+                  <h2 class="font-semibold text-base-content">Champs personnalisés</h2>
+                  <p v-if="isEditMode" class="text-xs text-base-content/70">
+                    Mettez à jour les valeurs propres à ce composant.
+                  </p>
+                </header>
+                <template v-if="isEditMode">
+                  <CustomFieldInputGrid :fields="customFieldInputs" :disabled="!canEdit || saving" />
+                </template>
+                <template v-else>
+                  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+                    <div
+                      v-for="field in visibleCustomFields"
+                      :key="field.customFieldValueId || field.customFieldId || field.name"
+                      class="form-control"
+                    >
+                      <label class="label">
+                        <span class="label-text text-sm">{{ field.name }}</span>
+                      </label>
+                      <p class="text-sm font-medium text-base-content py-1">
+                        {{ field.value }}
+                      </p>
+                    </div>
+                  </div>
+                </template>
+              </div>
+            </template>
+
+            <template #tab-history>
+              <div class="space-y-6">
+                <EntityHistorySection
+                  :entries="history"
+                  :loading="historyLoading"
+                  :error="historyError"
+                  :field-labels="historyFieldLabels"
+                />
+
+                <EntityVersionList
+                  entity-type="composant"
+                  :entity-id="String(route.params.id)"
+                  :field-labels="historyFieldLabels"
+                  :refresh-key="versionRefreshKey"
+                  @restored="fetchComponent()"
+                />
+
+                <!-- Comments -->
+                <div class="mt-4">
+                  <CommentSection
+                    entity-type="composant"
+                    :entity-id="String(route.params.id)"
+                    :entity-name="component?.name"
+                    show-resolved
+                  />
                 </div>
               </div>
             </template>
-          </div>
+          </EntityTabs>
 
-          <!-- Documents -->
-          <div
-            v-if="isEditMode || componentDocuments.length > 0"
-            class="space-y-4 rounded-lg border border-base-200 bg-base-200/40 p-4"
-          >
-            <header class="flex flex-col gap-1 md:flex-row md:items-center md:justify-between">
-              <div>
-                <h2 class="font-semibold text-base-content">Documents</h2>
-                <p class="text-xs text-base-content/70">
-                  {{ isEditMode ? 'Gérez les documents associés à ce composant.' : 'Documents associés à ce composant.' }}
-                </p>
-              </div>
-              <span v-if="isEditMode && selectedFiles.length" class="badge badge-outline">
-                {{ selectedFiles.length }} document{{ selectedFiles.length > 1 ? 's' : '' }} prêt{{ selectedFiles.length > 1 ? 's' : '' }} à être ajouté{{ selectedFiles.length > 1 ? 's' : '' }}
-              </span>
-            </header>
-            <template v-if="isEditMode">
-              <div :class="{ 'pointer-events-none opacity-60': !canEdit || saving || uploadingDocuments }">
-                <DocumentUpload
-                  v-model="selectedFiles"
-                  title="Déposer vos fichiers"
-                  subtitle="Formats acceptés : PDF, images, documents…"
-                  @files-added="handleFilesAdded"
-                />
-              </div>
-              <p v-if="uploadingDocuments" class="text-xs text-base-content/70">
-                Téléversement des documents en cours…
-              </p>
-              <p v-else-if="loadingDocuments" class="text-xs text-base-content/70">
-                Chargement des documents en cours…
-              </p>
-              <DocumentListInline
-                v-else
-                :documents="componentDocuments"
-                :can-delete="canEdit"
-                :can-edit="true"
-                :delete-disabled="uploadingDocuments"
-                empty-text="Aucun document n'est associé à ce composant pour le moment."
-                @preview="openPreview"
-                @edit="openEditModal"
-                @delete="removeDocument"
-              />
-            </template>
-            <template v-else>
-              <p v-if="loadingDocuments" class="text-xs text-base-content/70">
-                Chargement des documents en cours…
-              </p>
-              <DocumentListInline
-                v-else
-                :documents="componentDocuments"
-                :can-delete="false"
-                :can-edit="false"
-                empty-text="Aucun document n'est associé à ce composant pour le moment."
-                @preview="openPreview"
-              />
-            </template>
-          </div>
-
-          <EntityHistorySection
-            :entries="history"
-            :loading="historyLoading"
-            :error="historyError"
-            :field-labels="historyFieldLabels"
-          />
-
-          <EntityVersionList
-            entity-type="composant"
-            :entity-id="String(route.params.id)"
-            :field-labels="historyFieldLabels"
-            :refresh-key="versionRefreshKey"
-            @restored="fetchComponent()"
-          />
-
-          <!-- Save buttons (edit mode only) -->
+          <!-- Save/Cancel buttons (outside tabs) -->
           <div v-if="isEditMode" class="flex flex-col gap-3 md:flex-row md:justify-end">
             <button type="button" class="btn btn-ghost" :class="{ 'btn-disabled': saving }" @click="isEditMode = false">
               Annuler
@@ -433,16 +461,6 @@
               Enregistrer les modifications
             </button>
           </div>
-
-          <!-- Comments -->
-          <div class="mt-4">
-            <CommentSection
-              entity-type="composant"
-              :entity-id="String(route.params.id)"
-              :entity-name="component?.name"
-              show-resolved
-            />
-          </div>
         </div>
       </section>
     </main>
@@ -466,6 +484,11 @@ const { updateDocument } = useDocuments()
 const isEditMode = ref(false)
 const versionRefreshKey = ref(0)
 
+const activeTab = ref((route.query.tab as string) || 'general')
+watch(activeTab, (val) => {
+  navigateTo({ query: { ...route.query, tab: val } }, { replace: true })
+})
+
 const {
   component,
   loading,
@@ -547,6 +570,14 @@ const visibleCustomFields = computed(() => {
   )
 })
 
+const entityTabs = computed(() => [
+  { key: 'general', label: 'Général' },
+  { key: 'structure', label: 'Structure', count: pieceSlotEntries.value.length + productSlotEntries.value.length + subcomponentSlotEntries.value.length },
+  { key: 'documents', label: 'Documents', count: componentDocuments.value.length },
+  { key: 'custom-fields', label: 'Champs perso', count: visibleCustomFields.value.length },
+  { key: 'history', label: 'Historique' },
+])
+
 const openEditModal = (doc: any) => {
   editingDocument.value = doc
   editModalVisible.value = true