diff --git a/package.json b/package.json
index eff551a..80bf202 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Item",
-	"version": "2.4.9",
+	"version": "2.4.10-SNAPSHOT",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
diff --git a/src/components/Dialog/DialogLancerTraitement.vue b/src/components/Dialog/DialogLancerTraitement.vue
index 53ac46b..89dc07e 100644
--- a/src/components/Dialog/DialogLancerTraitement.vue
+++ b/src/components/Dialog/DialogLancerTraitement.vue
@@ -15,7 +15,7 @@
         <v-card-actions class="justify-space-between">
           <v-btn v-if="!isFinished" color="primary" @click="dialog = false" aria-label="Annuler">Annuler</v-btn>
           <v-spacer v-else></v-spacer>
-          <v-btn v-if="!isFinished" color="primary" @click="confirm()" aria-label="Valider">Valider</v-btn>
+          <v-btn v-if="!isFinished && !isSuppDemande" color="primary" @click="confirm()" aria-label="Valider">Valider</v-btn>
           <v-btn v-else color="primary" @click="router.push(route)" aria-label="OK">OK</v-btn>
         </v-card-actions>
       </v-card>
@@ -36,6 +36,10 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
+  rubrique: {
+    required: true,
+    type: String,
+  },
   route: {
     required: true,
     type: String,
@@ -47,7 +51,7 @@ const isFinished = ref(false);
 function confirm() {
   emits('launch');
   title.value = "Traitement validé";
-  body.value = "Votre demande est en cours de traitement.<br/>Un mail vous sera envoyé quand celui-ci sera terminé.<br/>Vous pouvez retrouver l'ensemble de vos demandes sur votre tableau de bord ITEM. Rubrique \"Gérer mes créations\".";
+  body.value = `Votre demande est en cours de traitement.<br/>Un mail vous sera envoyé quand celui-ci sera terminé.<br/>Vous pouvez retrouver l'ensemble de vos demandes sur votre tableau de bord ITEM. Rubrique ${props.rubrique}.`;
   isFinished.value = true;
 }
 </script>
diff --git a/src/components/MenuDownloadFile.vue b/src/components/MenuDownloadFile.vue
index bb974c2..ec59e1e 100644
--- a/src/components/MenuDownloadFile.vue
+++ b/src/components/MenuDownloadFile.vue
@@ -5,10 +5,10 @@
     <v-menu bottom left activator="parent">
       <!-- FICHIERS MODIF -->
       <v-list>
-        <v-list-item @click="downloadFile('fichier_initial', '.txt')" v-if="demande.type === 'MODIF' && idEtatCurrentDemande >= 3">
+        <v-list-item @click="downloadFile('fichier_initial', '.txt')" v-if="(demande.type === 'MODIF' && idEtatCurrentDemande >= 3) || (demande.type === 'SUPP' && idEtatCurrentDemande >= 3)">
           <v-list-item-title>Télécharger le fichier initial des PPN</v-list-item-title>
         </v-list-item>
-        <v-list-item @click="downloadFile('fichier_prepare', '.csv')" v-if="demande.type === 'MODIF' && idEtatCurrentDemande >= 3">
+        <v-list-item @click="downloadFile('fichier_prepare', '.csv')" v-if="(demande.type === 'MODIF' && idEtatCurrentDemande >= 3) || (demande.type === 'SUPP' && idEtatCurrentDemande >= 3)">
           <v-list-item-title>Télécharger le fichier de correspondance PPN/EPN</v-list-item-title>
         </v-list-item>
         <v-list-item @click="downloadFile('fichier_enrichi', '.csv')" v-if="demande.type === 'MODIF' && idEtatCurrentDemande >= 4">
@@ -16,7 +16,7 @@
         </v-list-item>
 
         <v-list-item @click="downloadFile('fichier_enrichi', '.csv')"
-                     v-if="(demande.type === 'RECOUV' && idEtatCurrentDemande >= 3) || (demande.type === 'EXEMP' && idEtatCurrentDemande >= 3)">
+                     v-if="(demande.type === 'RECOUV' && idEtatCurrentDemande >= 3) || (demande.type === 'EXEMP' && idEtatCurrentDemande >= 3) ||(demande.type === 'SUPP' && idEtatCurrentDemande >= 5)">
           <v-list-item-title>Télécharger le fichier déposé</v-list-item-title>
         </v-list-item>
 
diff --git a/src/components/SelectFile.vue b/src/components/SelectFile.vue
index 00e43cc..609ebaf 100644
--- a/src/components/SelectFile.vue
+++ b/src/components/SelectFile.vue
@@ -18,20 +18,29 @@
         aria-label="Dépôt du fichier"
         v-model="fileCharged"
         ref="fileInput"
-        label="Cliquez pour charger votre fichier complété (format .txt ou .csv obligatoire)"
+        :label="label"
       >
       </v-file-input>
     </v-card-text>
   </v-card>
 </template>
 <script setup>
-import { ref } from 'vue';
+import {computed, ref} from 'vue'
 
 const fileCharged = defineModel();
-const props = defineProps(  {isLoading: { type: Boolean}})
+const props = defineProps(  {isLoading: { type: Boolean}, typeFile: { type: String}})
 const emits = defineEmits(['deleted']);
 
 const isValidFile = ref(false)
+const label = computed(() => {
+  if (props.typeFile === 'PPN'){
+    return 'Cliquez pour charger votre liste de PPN (Fichier PPN sur une colonne, format .txt ou .csv obligatoire)';
+  } else if (props.typeFile === 'EPN'){
+    return 'Cliquez pour charger votre liste d’EPN (Fichier EPN sur une colonne, format .txt ou .csv obligatoire)';
+  } else {
+    return 'Cliquez pour charger votre fichier complété (format .txt ou .csv obligatoire)';
+  }
+})
 const rules = ref([
   value => {
     if(!value[0]) {
diff --git a/src/components/Supp/TypeFile.vue b/src/components/Supp/TypeFile.vue
index 064acee..22cb036 100644
--- a/src/components/Supp/TypeFile.vue
+++ b/src/components/Supp/TypeFile.vue
@@ -11,7 +11,9 @@
             <v-col cols="12" sm="3" class="d-flex justify-center">
               <v-icon size="x-large" dark color="primary"> mdi-file-document-outline  </v-icon>
             </v-col>
-            <v-col cols="12" sm="9" class="d-flex justify-start"><span class="group">Fichier {{ type }}</span></v-col>
+            <v-col cols="12" sm="9" class="d-flex justify-start">
+              <span class="group large-text">Fichier {{ type }}</span>
+            </v-col>
           </v-row>
         </div>
       </v-hover>
@@ -20,17 +22,26 @@
 </template>
 <script setup>
 
+const emits = defineEmits(['clicked'])
 const props = defineProps({
   isLoading: {
     type: Boolean,
     default: false
   }
 })
-const typeFile = defineModel();
-const types = ['PPN','EPN']
+const model = defineModel();
+const types = ['PPN','EPN'];
 
 function onClick(type) {
-  typeFile.value = type;
+  model.value = type;
+  emits('clicked')
 }
 
 </script>
+
+<style scoped>
+.large-text {
+  font-size: 1.1rem;
+  font-weight: bold;
+}
+</style>
diff --git a/src/service/DemandesService.js b/src/service/DemandesService.js
index 7f5f16d..1ddcbb8 100644
--- a/src/service/DemandesService.js
+++ b/src/service/DemandesService.js
@@ -100,6 +100,13 @@ export class DemandesService {
   modifierCommentaireDemande(id, commentaire, typeDemande){
     return this.client.patch(`demandes/${typeDemande}/${id}?commentaire=${commentaire}`);
   }
+  modifierTypeFileDemande(id, typeFileDemande){
+    return this.client.patch(`demandes/SUPP/${id}?typeSupp=${typeFileDemande}`);
+  }
+
+  modifierTypeSuppression(id, typeSuppression){
+    return this.client.patch(`demandes/SUPP/${id}?typeSuppression=${typeSuppression}`);
+  }
 
   uploadDemande(id, file, typeDemande){
     const config = { headers: {
diff --git a/src/views/Exemplarisation/ExempSteps.vue b/src/views/Exemplarisation/ExempSteps.vue
index 33f30d2..ebb50fc 100644
--- a/src/views/Exemplarisation/ExempSteps.vue
+++ b/src/views/Exemplarisation/ExempSteps.vue
@@ -97,7 +97,7 @@
       </v-col>
     </v-row>
   </v-container>
-  <dialog-lancer-traitement v-model="dialog" :is-loading="isLoading" route="/exemplarisation-tableau" @launch="launchDemande()"></dialog-lancer-traitement>
+  <dialog-lancer-traitement v-model="dialog" :is-loading="isLoading" rubrique="Gérer mes créations" route="/exemplarisation-tableau" @launch="launchDemande()"></dialog-lancer-traitement>
   <dialog-suppression  v-model="suppDialog" :demande="demande" return-to-accueil></dialog-suppression>
 </template>
 
diff --git a/src/views/Exemplarisation/ExempTable.vue b/src/views/Exemplarisation/ExempTable.vue
index b765285..f576cf4 100644
--- a/src/views/Exemplarisation/ExempTable.vue
+++ b/src/views/Exemplarisation/ExempTable.vue
@@ -1,24 +1,18 @@
 <template>
 
   <v-container fluid>
-    <v-chip v-if="!archiveFalseActiveTrue" style="margin-right: 10px"
-            @click="switchArchiveActiveDisplay(!archiveFalseActiveTrue)">Créations d'exemplaires
+    <v-chip :variant="isActiveDemandesDisplayed ? 'plain' : 'tonal'" style="margin-right: 10px"
+            @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">Créations d'exemplaires
     </v-chip>
-    <v-chip v-if="archiveFalseActiveTrue" variant="plain" style="margin-right: 10px"
-            @click="switchArchiveActiveDisplay(!archiveFalseActiveTrue)">Créations d'exemplaires
-    </v-chip>
-    <v-chip v-if="archiveFalseActiveTrue" @click="switchArchiveActiveDisplay(!archiveFalseActiveTrue)">Créations
+    <v-chip :variant="!isActiveDemandesDisplayed ? 'plain' : 'tonal'" @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">Créations
       d'exemplaires archivées
     </v-chip>
-    <v-chip v-if="!archiveFalseActiveTrue" variant="plain" @click="switchArchiveActiveDisplay(!archiveFalseActiveTrue)">
-      Créations d'exemplaires archivées
-    </v-chip>
     <v-chip variant="text">
       <v-tooltip activator="parent" location="bottom">
         <template v-slot:activator="{ props }">
           <label>
             <input type="checkbox" v-model="extendedAllILN" style="margin-right: 5px"
-                   @change="loadItems('EXEMP', archiveFalseActiveTrue)">
+                   @change="loadItems('EXEMP', isActiveDemandesDisplayed)">
             <span v-bind="props">Affichage étendu sur tous les ILN</span>
           </label>
         </template>
@@ -127,7 +121,7 @@
     </template>
   </v-data-table>
   <dialog-suppression v-model="suppDialog" :demande="suppDemande"
-                      @supp="loadItems('EXEMP', archiveFalseActiveTrue)"></dialog-suppression>
+                      @supp="loadItems('EXEMP', isActiveDemandesDisplayed)"></dialog-suppression>
 </template>
 
 <script setup>
@@ -254,11 +248,11 @@ const isDialogOpen = computed(() => {
   return !!contentsDemandesFrontFiltered.value.find(item => item.expanded === true)
 });
 //Actives or archives demands displayed
-const archiveFalseActiveTrue = ref(false);
+const isActiveDemandesDisplayed = ref(false);
 
 //Data initialisation
 onMounted(() => {
-  loadItems('EXEMP', archiveFalseActiveTrue.value);
+  loadItems('EXEMP', isActiveDemandesDisplayed.value);
   contentsDemandesFromServer.value = [...contentsDemandesFromServer.value];
   demandesService.getTypeExemp()
     .then(response => {
@@ -270,7 +264,7 @@ onMounted(() => {
     });
   polling = setInterval(() => {
     if(!isDialogOpen.value) {
-      loadItems('EXEMP', archiveFalseActiveTrue.value)
+      loadItems('EXEMP', isActiveDemandesDisplayed.value)
         .then(() => {
           filterItems();
         });
@@ -282,8 +276,8 @@ onBeforeUnmount(() => {
   clearInterval(polling);
 })
 function switchArchiveActiveDisplay(value) {
-  archiveFalseActiveTrue.value = value;
-  loadItems('EXEMP', archiveFalseActiveTrue.value);
+  isActiveDemandesDisplayed.value = value;
+  loadItems('EXEMP', isActiveDemandesDisplayed.value);
 }
 
 async function loadItems(type, archive) {
@@ -358,7 +352,7 @@ function onRowClick(item) {
 }
 
 function saveComment(){
-  loadItems('EXEMP',archiveFalseActiveTrue.value).then(()=>{
+  loadItems('EXEMP',isActiveDemandesDisplayed.value).then(()=>{
     filterItems();
   })
 }
diff --git a/src/views/Modification/ModifSteps.vue b/src/views/Modification/ModifSteps.vue
index decabff..3bb2028 100644
--- a/src/views/Modification/ModifSteps.vue
+++ b/src/views/Modification/ModifSteps.vue
@@ -146,7 +146,7 @@
       </v-col>
     </v-row>
   </v-container>
-  <dialog-lancer-traitement v-model="dialog" :is-loading="isLoading" route="/modification-tableau" @launch="launchDemande()"></dialog-lancer-traitement>
+  <dialog-lancer-traitement v-model="dialog" :is-loading="isLoading" rubrique="Gérer mes modifications" route="/modification-tableau" @launch="launchDemande()"></dialog-lancer-traitement>
   <dialog-suppression v-model="suppDialog" :demande="demande" return-to-accueil></dialog-suppression>
 </template>
 
diff --git a/src/views/Modification/ModifTable.vue b/src/views/Modification/ModifTable.vue
index e909fe8..a837b4d 100644
--- a/src/views/Modification/ModifTable.vue
+++ b/src/views/Modification/ModifTable.vue
@@ -1,23 +1,18 @@
 <template>
   <v-container fluid>
-    <v-chip v-if="!archiveFalseActiveTrue" style="margin-right: 10px"
-            @click="switchArchiveActiveDisplay(!archiveFalseActiveTrue)">Modification d'exemplaires
+    <!--:variant="isActiveDemandesDisplayed ? 'plain' : 'tonal'" -->
+    <v-chip :variant="isActiveDemandesDisplayed ? 'plain' : 'tonal'" style="margin-right: 10px"
+            @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">Modification d'exemplaires
     </v-chip>
-    <v-chip v-if="archiveFalseActiveTrue" variant="plain" style="margin-right: 10px"
-            @click="switchArchiveActiveDisplay(!archiveFalseActiveTrue)">Modification d'exemplaires
-    </v-chip>
-    <v-chip v-if="archiveFalseActiveTrue" @click="switchArchiveActiveDisplay(!archiveFalseActiveTrue)">Modification
+    <v-chip :variant="!isActiveDemandesDisplayed ? 'plain' : 'tonal'" @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">Modification
       d'exemplaires archivées
     </v-chip>
-    <v-chip v-if="!archiveFalseActiveTrue" variant="plain" @click="switchArchiveActiveDisplay(!archiveFalseActiveTrue)">
-      Modification d'exemplaires archivées
-    </v-chip>
     <v-chip variant="text">
       <v-tooltip activator="parent" location="bottom">
         <template v-slot:activator="{ props }">
           <label>
             <input type="checkbox" v-model="extendedAllILN" style="margin-right: 5px"
-                   @change="loadItems('MODIF', archiveFalseActiveTrue)">
+                   @change="loadItems('MODIF', isActiveDemandesDisplayed)">
             <span v-bind="props">Affichage étendu sur tous les ILN</span>
           </label>
         </template>
@@ -124,7 +119,7 @@
     </template>
   </v-data-table>
   <dialog-suppression v-model="suppDialog" :demande="suppDemande"
-                      @supp="loadItems('MODIF', archiveFalseActiveTrue)"></dialog-suppression>
+                      @supp="loadItems('MODIF', isActiveDemandesDisplayed)"></dialog-suppression>
 </template>
 
 <script setup>
@@ -260,11 +255,11 @@ const isDialogOpen = computed(() => {
 });
 
 //Actives or archives demands displayed
-const archiveFalseActiveTrue = ref(false);
+const isActiveDemandesDisplayed = ref(false);
 
 //Data initialisation
 onMounted(() => {
-  loadItems('MODIF', archiveFalseActiveTrue.value);
+  loadItems('MODIF', isActiveDemandesDisplayed.value);
   contentsDemandesFromServer.value = [...contentsDemandesFromServer.value];
   demandesService.getTypeTraitement()
     .then(response => {
@@ -276,7 +271,7 @@ onMounted(() => {
     });
   polling = setInterval(() => {
     if (!isDialogOpen.value) {
-      loadItems('MODIF', archiveFalseActiveTrue.value)
+      loadItems('MODIF', isActiveDemandesDisplayed.value)
         .then(() => {
           filterItems();
         });
@@ -289,8 +284,8 @@ onBeforeUnmount(() => {
 });
 
 function switchArchiveActiveDisplay(value) {
-  archiveFalseActiveTrue.value = value;
-  loadItems('MODIF', archiveFalseActiveTrue.value);
+  isActiveDemandesDisplayed.value = value;
+  loadItems('MODIF', isActiveDemandesDisplayed.value);
 }
 
 async function loadItems(type, archive) {
@@ -375,7 +370,7 @@ function onRowClick(item) {
 }
 
 function saveComment() {
-  loadItems('MODIF', archiveFalseActiveTrue.value)
+  loadItems('MODIF', isActiveDemandesDisplayed.value)
     .then(() => {
       filterItems();
     });
diff --git a/src/views/Recouvrement/RecouvSteps.vue b/src/views/Recouvrement/RecouvSteps.vue
index ec3813c..5bf0716 100644
--- a/src/views/Recouvrement/RecouvSteps.vue
+++ b/src/views/Recouvrement/RecouvSteps.vue
@@ -75,7 +75,7 @@
             <v-divider></v-divider>
             <v-card-actions>
               <v-spacer></v-spacer>
-              <v-btn color="primary" @click="router.replace('recouvrement-tableau')" aria-label="OK">OK</v-btn>
+              <v-btn color="primary" @click="router.push('recouvrement-tableau')" aria-label="OK">OK</v-btn>
             </v-card-actions>
           </v-card>
         </v-dialog>
diff --git a/src/views/Recouvrement/RecouvTable.vue b/src/views/Recouvrement/RecouvTable.vue
index f970477..2398f6a 100644
--- a/src/views/Recouvrement/RecouvTable.vue
+++ b/src/views/Recouvrement/RecouvTable.vue
@@ -1,23 +1,17 @@
 <template>
   <v-container fluid>
-    <v-chip v-if="!archiveFalseActiveTrue" style="margin-right: 10px"
-            @click="switchArchiveActiveDisplay(!archiveFalseActiveTrue)">Calculs de taux de recouvrement
+    <v-chip :variant="isActiveDemandesDisplayed ? 'plain' : 'tonal'" style="margin-right: 10px"
+            @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">Calculs de taux de recouvrement
     </v-chip>
-    <v-chip v-if="archiveFalseActiveTrue" variant="plain" style="margin-right: 10px"
-            @click="switchArchiveActiveDisplay(!archiveFalseActiveTrue)">Calculs de taux de recouvrement
-    </v-chip>
-    <v-chip v-if="archiveFalseActiveTrue" @click="switchArchiveActiveDisplay(!archiveFalseActiveTrue)">Calculs de taux
+    <v-chip :variant="!isActiveDemandesDisplayed ? 'plain' : 'tonal'" @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">Calculs de taux
       de recouvrement archivés
     </v-chip>
-    <v-chip v-if="!archiveFalseActiveTrue" variant="plain" @click="switchArchiveActiveDisplay(!archiveFalseActiveTrue)">
-      Calculs de taux de recouvrement archivés
-    </v-chip>
     <v-chip variant="text">
       <v-tooltip activator="parent" location="bottom">
         <template v-slot:activator="{ props }">
           <label>
             <input type="checkbox" v-model="extendedAllILN" style="margin-right: 5px"
-                   @change="loadItems('RECOUV', archiveFalseActiveTrue)">
+                   @change="loadItems('RECOUV', isActiveDemandesDisplayed)">
             <span v-bind="props">Affichage étendu sur tous les ILN</span>
           </label>
         </template>
@@ -119,7 +113,7 @@
     </template>
   </v-data-table>
   <dialog-suppression v-model="suppDialog" :demande="suppDemande"
-                      @supp="loadItems('RECOUV', archiveFalseActiveTrue)"></dialog-suppression>
+                      @supp="loadItems('RECOUV', isActiveDemandesDisplayed)"></dialog-suppression>
 </template>
 
 <script setup>
@@ -242,15 +236,15 @@ const isDialogOpen = computed(() => {
 });
 
 //Actives or archives demands displayed
-const archiveFalseActiveTrue = ref(false);
+const isActiveDemandesDisplayed = ref(false);
 
 //Data initialisation
 onMounted(() => {
-  loadItems('RECOUV', archiveFalseActiveTrue.value);
+  loadItems('RECOUV', isActiveDemandesDisplayed.value);
   contentsDemandesFromServer.value = [...contentsDemandesFromServer.value];
   polling = setInterval(() => {
     if(!isDialogOpen.value) {
-      loadItems('RECOUV', archiveFalseActiveTrue.value)
+      loadItems('RECOUV', isActiveDemandesDisplayed.value)
         .then(() => {
           filterItems();
         });
@@ -263,8 +257,8 @@ onBeforeUnmount(() => {
 })
 
 function switchArchiveActiveDisplay(value) {
-  archiveFalseActiveTrue.value = value;
-  loadItems('RECOUV', archiveFalseActiveTrue.value);
+  isActiveDemandesDisplayed.value = value;
+  loadItems('RECOUV', isActiveDemandesDisplayed.value);
 }
 
 async function loadItems(type, archive) {
@@ -342,7 +336,7 @@ function saveAction() {
 }
 
 function saveComment(){
-  loadItems('RECOUV',archiveFalseActiveTrue.value).then(()=>{
+  loadItems('RECOUV',isActiveDemandesDisplayed.value).then(()=>{
     filterItems();
   })
 }
diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue
index d728b00..769223d 100644
--- a/src/views/Suppression/SuppSteps.vue
+++ b/src/views/Suppression/SuppSteps.vue
@@ -7,7 +7,7 @@
             <v-stepper-item
               :color="currentStep >= 0 ? '#295494' : ''"
               :complete="currentStep > 0"
-              editable
+              :editable="currentStep > 0"
               icon="mdi-numeric-1"
               title="Séléction du RCR"
               :subtitle="demande ? 'Demande n°'+demande.id : 'Demande'"
@@ -17,7 +17,7 @@
             <v-stepper-item
               :color="currentStep >= 1 ? '#295494' : ''"
               :complete="currentStep > 1"
-              editable
+              :editable="currentStep > 1"
               icon="mdi-numeric-2"
               title="PPN/RCR/EPN"
               :subtitle="typeFileSelected ? 'Fichier '+ typeFileSelected : 'fichier envoyé'"
@@ -25,21 +25,14 @@
             </v-stepper-item>
             <v-divider></v-divider>
             <v-stepper-item
-              :color="currentStep >= 3 ? '#295494' : ''"
-              :complete="currentStep > 3"
-              editable
-              icon="mdi-numeric-4"
+              :color="currentStep >= 2 ? '#295494' : ''"
+              :complete="currentStep > 2"
+              :editable="currentStep > 2"
+              icon="mdi-numeric-3"
               title="Envoi"
               subtitle="du fichier"
             >
             </v-stepper-item>
-            <v-divider></v-divider>
-            <v-stepper-item
-              :color="currentStep >= 4 ? '#295494' : ''"
-              icon="mdi-numeric-5"
-              title="Simulation"
-            >
-            </v-stepper-item>
           </v-stepper-header>
 
           <v-stepper-window>
@@ -49,6 +42,7 @@
                 <v-spacer></v-spacer>
                 <v-btn
                   :disabled="!rcrSelected"
+                  :loading="isLoading"
                   @click="createDemande"
                 >
                   Valider
@@ -56,8 +50,8 @@
               </v-container>
             </v-stepper-window-item>
             <v-stepper-window-item>
-              <type-file v-if="!typeFileSelected" v-model="typeFileSelected"></type-file>
-              <select-file v-else-if="!isLoaded" v-model="fileSelected">Selection du fichier {{typeFileSelected}}</select-file>
+              <type-file v-if="!typeFileSelected" v-model="typeFileSelected" @clicked="setTypeSelected()"></type-file>
+              <select-file v-else-if="!isLoaded" :is-loading="isLoading" v-model="fileSelected" :typeFile="typeFileSelected">Selection du fichier {{typeFileSelected}}</select-file>
               <download-file v-if="isLoaded" :file-link="fileLink" :file-name="fileName" @clicked="isDownloaded = true">Téléchargement du fichier PPN/RCR/EPN</download-file>
               <v-alert
                 v-if="alertMessage"
@@ -78,6 +72,7 @@
                 <v-btn
                   v-if="typeFileSelected && !isLoaded"
                   :disabled="!fileSelected"
+                  :loading="isLoading"
                   @click="uploadFile()"
                 >
                   Envoyer
@@ -92,12 +87,48 @@
               </v-container>
             </v-stepper-window-item>
             <v-stepper-window-item>
-            </v-stepper-window-item>
-            <v-stepper-window-item>
-
+              <select-file v-model="fileFinalSelected" :is-loading="isLoading" @deleted="deleteDemande()">Charger le
+                fichier des exemplaires à supprimer
+              </select-file>
+              <v-alert
+                v-if="alertMessage"
+                :type="alertType"
+              >
+                <span v-html="alertMessage"></span>
+              </v-alert>
+              <v-container class="d-flex justify-space-between">
+                <v-btn @click="prev">
+                  précédent
+                </v-btn>
+                <v-btn
+                  :disabled="!fileFinalSelected"
+                  @click="uploadFileFinal()"
+                  :loading="isLoading"
+                >
+                  Lancer le traitement en production
+                </v-btn>
+              </v-container>
             </v-stepper-window-item>
           </v-stepper-window>
         </v-stepper>
+        <v-dialog
+          v-model="dialog"
+          width="500"
+        >
+          <v-card>
+            <v-card-title class="headline" primary-title>Traitement validé</v-card-title>
+            <v-card-text>Votre demande est en cours de traitement.<br/>Un mail vous sera envoyé quand celui-ci sera
+              terminé.
+              <br>Vous pouvez retrouver l'ensemble de vos demandes sur votre tableau de bord ITEM. Rubrique "Gérer mes
+              suppressions".
+            </v-card-text>
+            <v-divider></v-divider>
+            <v-card-actions>
+              <v-spacer></v-spacer>
+              <v-btn color="primary" @click="router.push('suppression-tableau')" aria-label="OK">OK</v-btn>
+            </v-card-actions>
+          </v-card>
+        </v-dialog>
       </v-col>
     </v-row>
   </v-container>
@@ -108,11 +139,9 @@ import { onMounted, ref } from 'vue';
 import TypeFile from '@/components/Supp/TypeFile.vue';
 import SelectFile from '@/components/SelectFile.vue';
 import demandesService from '@/service/DemandesService';
-import {tr} from "vuetify/locale";
 import DownloadFile from "@/components/Modif/DownloadFile.vue";
-
-
-
+import router from '@/router'
+import Rcr from '@/components/Rcr.vue';
 
 const currentStep = ref(0);
 const demande = ref();
@@ -120,8 +149,9 @@ const demande = ref();
 const emits = defineEmits(['backendError']);
 const props = defineProps({id: {type: String}});
 
-const rcrSelected = ref();
-const typeFileSelected = ref();
+const rcrSelected = ref('');
+const typeFileSelected = ref('');
+const fileFinalSelected = ref();
 const fileSelected = ref();
 const fileLink = ref('');
 const fileName = ref('');
@@ -130,6 +160,37 @@ const isDownloaded = ref(false);
 const isLoading = ref(false);
 const alertMessage = ref('');
 const alertType = ref('success');
+const dialog = ref(false);
+
+onMounted(()=>{
+  if (props.id) {
+    demandesService.getDemande(props.id, "SUPP")
+      .then(response => {
+        demande.value = response.data;
+        switch (demande.value.etatDemande) {
+          case 'En préparation':
+            currentStep.value = 1;
+            rcrSelected.value = demande.value.rcr;
+            if (demande.value.typeSuppression){
+              typeFileSelected.value = demande.value.typeSuppression;
+            }
+            break;
+          case 'Préparée':
+            rcrSelected.value = demande.value.rcr;
+            typeFileSelected.value = demande.value.typeSuppression;
+            currentStep.value = 1;
+            break;
+          case 'A compléter':
+            rcrSelected.value = demande.value.rcr;
+            typeFileSelected.value = demande.value.typeSuppression;
+            currentStep.value = 2;
+            break;
+        }
+      }).catch(() => {
+      router.replace("/suppression");
+    })
+  }
+})
 
 
 function createDemande() {
@@ -183,11 +244,51 @@ function uploadFile() {
       isLoading.value = false;
     });
 }
+function setTypeSelected(){
+  demandesService.modifierTypeFileDemande(demande.value.id, typeFileSelected.value)
+}
+
+function changeEtape() {
+  if (((currentStep.value + 1) === 1) || ((currentStep.value + 1) === 2 && !typeFileSelected.value)) {
+    demandesService.choixEtape(demande.value.id, 1, 'SUPP')
+      .then(response => {
+        demande.value = response.data;
+      });
+    typeFileSelected.value = null;
+  }
+  if ((currentStep.value + 1) === 2 && typeFileSelected.value) { //Changement d'etat pour le chargement du fichier car le back est perdu sinon
+    demandesService.choixEtape(demande.value.id, 2, 'SUPP')
+        .then(response => {
+          demande.value = response.data;
+        });
+  }
+}
+
+function uploadFileFinal() {
+  alertMessage.value = '';
+  alertType.value = 'success';
+  isLoading.value = true;
+  demandesService.uploadDemande(demande.value.id, fileFinalSelected.value, 'SUPP')
+    .then(() => {
+      alertMessage.value = "Fichier envoyé";
+      dialog.value = true;
+    })
+    .catch(err => {
+      alertMessage.value = err.response.data.message;
+      alertType.value = 'error';
+    })
+    .finally(() => {
+      isLoading.value = false;
+    });
+}
+
 function prevSelectTypeFile(){
   typeFileSelected.value = null;
+  changeEtape()
   raz();
 }
 function prevSelectFile(){
+  changeEtape()
   raz();
 }
 function next() {
@@ -197,6 +298,7 @@ function next() {
 
 function prev() {
   currentStep.value--;
+  changeEtape()
   raz();
 }
 
diff --git a/src/views/Suppression/SuppTable.vue b/src/views/Suppression/SuppTable.vue
index 9f8876b..f4a8b42 100644
--- a/src/views/Suppression/SuppTable.vue
+++ b/src/views/Suppression/SuppTable.vue
@@ -1,8 +1,360 @@
 <template>
+  <v-container fluid>
+    <v-chip :variant="isActiveDemandesDisplayed ? 'plain' : 'tonal'"  style="margin-right: 10px" @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">
+      Suppression d'exemplaires
+    </v-chip>
+    <v-chip :variant="!isActiveDemandesDisplayed ? 'plain' : 'tonal'" @click="switchArchiveActiveDisplay(!isActiveDemandesDisplayed)">
+      Suppression d'exemplaires archivées
+    </v-chip>
+    <v-chip variant="text">
+      <v-tooltip activator="parent" location="bottom">
+        <template v-slot:activator="{ props }">
+          <label>
+            <input type="checkbox" v-model="extendedAllILN" style="margin-right: 5px"
+                   @change="loadItems('SUPP', isActiveDemandesDisplayed)">
+            <span v-bind="props">Affichage étendu sur tous les ILN</span>
+          </label>
+        </template>
+        <span>
+          Permet en tant qu'administrateur de voir les demandes
+          <br>
+          En saisie | En attente | En cours de traitement | Terminé | En erreur
+          <br>
+          Sur tous les ILN
+        </span>
+      </v-tooltip>
+    </v-chip>
+  </v-container>
+  <v-data-table :headers="headingsDemandes" :items="contentsDemandesFrontFiltered" :items-length="totalItemsFound"
+                :loading="!isDataLoaded" show-expand :sort-by="sortBy"
+                item-key="id">
+    <template v-slot:body.prepend>
+      <tr>
+        <td></td>
+        <td>
+          <v-text-field v-model="numDemandeSearchField" hide-details @input="filterItems"
+                        variant="underlined" append-inner-icon="mdi-magnify"></v-text-field>
+        </td>
+        <td>
+          <v-text-field v-model="dateCreationSearchField" hide-details @input="filterItems"
+                        variant="underlined" append-inner-icon="mdi-magnify"></v-text-field>
+        </td>
+        <td>
+          <v-text-field v-model="dateModificationSearchField" hide-details @input="filterItems"
+                        variant="underlined" append-inner-icon="mdi-magnify"></v-text-field>
+        </td>
+        <td>
+          <v-text-field v-model="ilnSearchField" hide-details @input="filterItems" variant="underlined"
+                        append-inner-icon="mdi-magnify"></v-text-field>
+        </td>
+        <td>
+          <v-text-field v-model="rcrSearchField" hide-details @input="filterItems" variant="underlined"
+                        append-inner-icon="mdi-magnify"></v-text-field>
+        </td>
+        <td>
+          <v-select :items="listStatut" variant="underlined" hide-details @update:menu="filterItems"
+                    @click:clear="filterItems" aria-label="Recherche par statut" clearable clear-icon="mdi-close"
+                    no-data-text="Aucun statut trouvé." v-model="statutSearchField"></v-select>
+        </td>
+      </tr>
+    </template>
+
+    <template v-slot:item="{ item, expand }">
+      <tr :class="{ 'highlighted-row': item.highlighted }" style="cursor: pointer;">
+        <td>
+          <v-btn flat @click="item.expanded = !item.expanded" variant="text">
+            <v-icon size="x-large" :color="item.commentaire ? 'red' : ''">mdi-comment-text-outline</v-icon>
+            <dialog-commentaire :demande="item" @save="saveComment()"></dialog-commentaire>
+          </v-btn>
+        </td>
+        <td @click="onRowClick(item)" class="text-center">{{ item.id }}</td>
+        <td @click="onRowClick(item)" class="text-center">{{ item.dateCreation }}</td>
+        <td @click="onRowClick(item)" class="text-center">{{ item.dateModification }}</td>
+        <td @click="onRowClick(item)" class="text-center">{{ item.iln }}</td>
+        <td @click="onRowClick(item)" class="text-center">{{ item.rcr }}</td>
+        <td @click="onRowClick(item)" class="text-center">
+          <v-chip color="grey" variant="flat"
+                  v-if="item.etatDemande === 'En simulation' || item.etatDemande === 'En préparation' || item.etatDemande === 'Préparée' || item.etatDemande === 'A compléter'">
+            En saisie
+          </v-chip>
+          <v-chip color="orange" variant="flat" v-else-if="item.etatDemande === 'En attente'">En attente</v-chip>
+          <v-chip color="grey" variant="flat" v-else-if="item.etatDemande === 'En cours de traitement'">En cours de
+            traitement
+          </v-chip>
+          <v-chip color="green" variant="flat" v-else-if="item.etatDemande === 'Terminé'">Terminé</v-chip>
+          <v-chip color="brown" variant="flat" v-else-if="item.etatDemande === 'Archivé'">Archivé</v-chip>
+          <v-chip color="red" variant="flat" v-else-if="item.etatDemande === 'En erreur'">En erreur</v-chip>
+          <v-chip color="blue" variant="flat" v-else>{{item.etatDemande}}</v-chip> <!-- Cas : ne correspont à aucun cas -->
+        </td>
+        <td @click="onRowClick(item)" class="text-center">
+          <v-progress-linear v-model="item.pourcentageProgressionTraitement" height="18"
+                             color="grey-lighten-1" style="border: 1px solid grey; font-weight: bolder">
+            {{ item.pourcentageProgressionTraitement }} %
+          </v-progress-linear>
+        </td>
+        <td class="text-center">
+          <menu-download-file :demande="item"></menu-download-file>
+        </td>
+        <td class="text-center">
+          <!-- Colonne Action -->
+          <v-btn v-if="canArchive(item)" variant="plain" icon="mdi-archive" @click="archiverDemande(item)"></v-btn>
+          <v-btn v-else-if="canCancel(item)" variant="plain" icon="mdi-delete" @click="supprimerDemande(item)"></v-btn>
+        </td>
+      </tr>
+    </template>
+  </v-data-table>
+  <dialog-suppression v-model="suppDialog" :demande="suppDemande"
+                      @supp="loadItems('SUPP', isActiveDemandesDisplayed)"></dialog-suppression>
 </template>
 
 <script setup>
+import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
+import router from '@/router';
+import demandesService from '@/service/DemandesService';
+import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
+import DialogCommentaire from '@/components/Dialog/DialogCommentaire.vue';
+import MenuDownloadFile from '@/components/MenuDownloadFile.vue';
+import moment from 'moment/moment';
+
+//Emit
+const emit = defineEmits(['backendError', 'backendSuccess']);
+
+//Data
+const extendedAllILN = ref(true); // todo Pour les tests il faut laisser à true/ pour la prod faudra mettre à false
+const headingsDemandes = ref([
+  {
+    title: '',
+    key: 'data-table-expand',
+    align: 'center'
+  },
+  {
+    title: 'Demande',
+    key: 'id',
+    align: 'center'
+  },
+  {
+    title: 'Crée le',
+    key: 'dateCreation',
+    align: 'center',
+    sort: (d1, d2) => {
+      const date1 = moment(d1, 'DD/MM/yyyy HH:mm')
+        .valueOf();
+      const date2 = moment(d2, 'DD/MM/yyyy HH:mm')
+        .valueOf();
+      if (date1 > date2) return -1;
+      if (date1 < date2) return 1;
+      return 0;
+    }
+  },
+  {
+    title: 'Mise à jour',
+    key: 'dateModification',
+    align: 'center',
+    sort: (d1, d2) => {
+      const date1 = moment(d1, 'DD/MM/yyyy HH:mm')
+        .valueOf();
+      const date2 = moment(d2, 'DD/MM/yyyy HH:mm')
+        .valueOf();
+      if (date1 > date2) return -1;
+      if (date1 < date2) return 1;
+      return 0;
+    }
+  },
+  {
+    title: 'ILN',
+    key: 'iln',
+    align: 'center'
+  },
+  {
+    title: 'RCR',
+    key: 'rcr',
+    align: 'center'
+  },
+  {
+    title: 'Statut',
+    key: 'etatDemande',
+    align: 'center'
+  },
+  {
+    title: 'Progression',
+    key: 'pourcentageProgressionTraitement',
+    value: 'pourcentageProgressionTraitement',
+    align: 'center'
+  },
+  {
+    title: 'Fichiers',
+    key: 'filesToDownload',
+    value: 'filesToDownload',
+    align: 'center'
+  },
+  {
+    title: 'Action',
+    key: 'archiveOrCancel',
+    value: 'archiveOrCancel',
+    align: 'center'
+  }
+]);
+const listStatut = [
+  'En saisie',
+  'En attente',
+  'En cours de traitement',
+  'Terminé',
+  'En erreur'
+];
+const listTypeTraitement = ref([]);
+const contentsDemandesFromServer = ref([]);
+const contentsDemandesFrontFiltered = ref([]);
+const totalItemsFound = ref(0);
+const suppDialog = ref(false);
+const suppDemande = ref({});
+const sortBy = ref([{
+  key: 'dateModification',
+  order: 'desc'
+}]);
+
+//Progress bar displayed while fetching data
+const isDataLoaded = ref(false);
+
+//Search fields columns
+const numDemandeSearchField = ref('');
+const dateCreationSearchField = ref('');
+const dateModificationSearchField = ref('');
+const ilnSearchField = ref('');
+const rcrSearchField = ref('');
+const zoneSearchField = ref('');
+const traitementSearchField = ref();
+const statutSearchField = ref();
+let polling;
+const isDialogOpen = computed(() => {
+  return !!contentsDemandesFrontFiltered.value.find(item => item.expanded === true);
+});
+
+//Actives or archives demands displayed
+const isActiveDemandesDisplayed = ref(false);
+
+//Data initialisation
+onMounted(() => {
+  loadItems('SUPP', isActiveDemandesDisplayed.value);
+  contentsDemandesFromServer.value = [...contentsDemandesFromServer.value];
+  demandesService.getTypeTraitement()
+    .then(response => {
+      response.data.forEach(type => {
+        listTypeTraitement.value.push(type.libelle);
+      });
+      listTypeTraitement.value.sort();
+      listTypeTraitement.value.push('Non défini');
+    });
+  polling = setInterval(() => {
+    if (!isDialogOpen.value) {
+      loadItems('SUPP', isActiveDemandesDisplayed.value)
+        .then(() => {
+          filterItems();
+        });
+    }
+  }, 10000);
+});
+
+onBeforeUnmount(() => {
+  clearInterval(polling);
+});
+
+function switchArchiveActiveDisplay(value) {
+  isActiveDemandesDisplayed.value = value;
+  loadItems('SUPP', isActiveDemandesDisplayed.value);
+}
+
+async function loadItems(type, archive) {
+  try {
+    const response = await demandesService.fetchDemandes(type, archive, extendedAllILN.value);
+    contentsDemandesFromServer.value = response.data;
+    contentsDemandesFrontFiltered.value = response.data.map((item) => ({
+      ...item,
+      expanded: false,
+
+    }));
+
+    isDataLoaded.value = true;
+    emit('backendSuccess');
+  } catch (error) {
+    console.error(error);
+    emit('backendError', error);
+  }
+}
+
+function filterItems() {
+  contentsDemandesFrontFiltered.value = contentsDemandesFromServer.value.filter(demande => {
+    const matchesNumDemande = numDemandeSearchField.value === '' || demande.id.toString()
+      .includes(numDemandeSearchField.value);
+    const matchesDateCreation = dateCreationSearchField.value === '' || demande.dateCreation.toString()
+      .includes(dateCreationSearchField.value);
+    const matchesDateModification = dateModificationSearchField.value === '' || demande.dateModification.toString()
+      .includes(dateModificationSearchField.value);
+    const matchesRCR = rcrSearchField.value === '' || demande.rcr.toString()
+      .includes(rcrSearchField.value);
+    const matchesILN = ilnSearchField.value === '' || demande.iln.toString()
+      .includes(ilnSearchField.value);
+    const matchesZone = zoneSearchField.value === '' || demande.zone && demande.zone.includes(zoneSearchField.value);
+    const matchesTraitement = traitementSearchField.value === undefined || traitementSearchField.value === null || traitementSearchField.value === '' || (demande.traitement && demande.traitement.includes(traitementSearchField.value)) || (!demande.traitement && traitementSearchField.value === 'Non défini');
+    const matchesEtatDemande = statutSearchField.value === undefined || statutSearchField.value === null || statutSearchField.value === '' || demande.etatDemande.toString()
+      .includes(statutSearchField.value) || ((statutSearchField.value === 'En saisie') && (demande.etatDemande === 'En simulation' || demande.etatDemande === 'En préparation' || demande.etatDemande === 'Préparée' || demande.etatDemande === 'A compléter'));
+    return matchesNumDemande && matchesDateCreation && matchesDateModification && matchesRCR && matchesILN && matchesZone && matchesTraitement && matchesEtatDemande;
+  });
+}
+
+function isAvailableFile(demandeNumber, filename) {
+  return demandesService.headFile(filename, demandeNumber, 'csv', 'SUPP')
+    .then((response) => response.status !== 500)
+    .catch((error) => {
+      console.error(error);
+      return false;
+    });
+}
+
+//Action d'archivage ou suppression selon état de la demande dans le TDB
+function canArchive(item) {
+  return item.etatDemande === 'Terminé';
+}
+
+function canCancel(item) {
+  return item.etatDemande !== 'Terminé' && item.etatDemande !== 'En cours de traitement' && item.etatDemande !== 'En attente';
+}
+
+//Suppression d'une demande
+function supprimerDemande(item) {
+  suppDialog.value = true;
+  suppDemande.value = item;
+}
+
+//Archivage d'une demande
+async function archiverDemande(item) {
+  try {
+    await demandesService.archiverDemande('SUPP', item.id);
+    // Mettre à jour les données après l'archivage réussi
+    await loadItems('SUPP');
+    emit('backendSuccess');
+  } catch (error) {
+    console.error(error);
+    emit('backendError', error);
+  }
+}
+
+function onRowClick(item) {
+  if (item.etatDemande === 'En préparation' || item.etatDemande === 'Préparée' || item.etatDemande === 'A compléter' || item.etatDemande === 'En simulation') {
+    router.push('/suppression/' + item.id);
+  }
+}
+
+function saveComment() {
+  loadItems('SUPP', isActiveDemandesDisplayed.value)
+    .then(() => {
+      filterItems();
+    });
+}
+
 </script>
 
 <style scoped>
+.highlighted-row {
+  background-color: #f5f5f5;
+}
 </style>
diff --git a/src/views/Utilisateur/Login.vue b/src/views/Utilisateur/Login.vue
index 0e2059c..1d9ecb5 100644
--- a/src/views/Utilisateur/Login.vue
+++ b/src/views/Utilisateur/Login.vue
@@ -27,7 +27,7 @@
 					<div>
 						<v-img class="mx-auto my-6" max-width="228" src=""></v-img>
 
-						<v-card class="mx-auto pa-12 pb-8" max-width="448" variant="flat">
+						<v-card class="mx-auto pa-12 pb-8" max-width="448" variant="flat" :loading="isLoading">
 							<div class="text-subtitle-1 text-medium-emphasis" v-if="false">Nom utilisateur</div>
 
 							<v-text-field density="compact" placeholder="Utilisateur" prepend-inner-icon="mdi-account-outline" variant="outlined" v-model="userLogin"></v-text-field>
@@ -45,11 +45,12 @@
 								placeholder="Mot de passe"
 								prepend-inner-icon="mdi-key-outline"
 								variant="outlined"
+                @keydown.enter="login()"
 								@click:append-inner="visible = !visible"
                 v-model="userPassword"
 							></v-text-field>
 
-							<v-btn class="mb-8" color="blue" size="large" variant="tonal" block @click="login()">Se connecter</v-btn>
+							<v-btn class="mb-8" color="blue" size="large" variant="tonal" :loading="isLoading" block @click="login()">Se connecter</v-btn>
 						</v-card>
 					</div>
 				</v-col>
@@ -73,8 +74,10 @@ const incident = ref(false)
 const userLogin = ref('')
 const userPassword = ref('')
 const visible = ref(false)
+const isLoading = ref(false)
 
 async function login() {
+  isLoading.value = true;
   try {
     const utilisateur = await service.login(userLogin.value, userPassword.value)
     authStore.login(utilisateur, utilisateur.token)
@@ -88,6 +91,8 @@ async function login() {
   } catch (error) {
     console.error('Login error:', error)
     emit('backendError', error)
+  } finally {
+    isLoading.value = false;
   }
 }
 </script>