upload result v3

mikhailprivalov · Jul 3, 2024 · ec45efb · ec45efb
1 parent 0ab79f8
commit ec45efb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/l2-frontend/src/components/UploadFile.vue b/l2-frontend/src/components/UploadFile.vue
@@ -144,6 +144,8 @@ const changeType = () => {
   currentFileForms.value = getForms(String(selectedType.value), props.formsFile, props.uploadResult);
   if (currentFileForms.value.length > 0) {
     selectedForm.value = currentFileForms.value[0].id;
+  } else {
+    selectedForm.value = null;
   }
 };
 

diff --git a/l2-frontend/src/components/types-and-forms-file.ts b/l2-frontend/src/components/types-and-forms-file.ts
@@ -43,7 +43,7 @@ export default function typesAndForms() {
   });
   // todo - режим UploadResult - получать по расширению файла - только функции связанные с сохранением результата (анализаторы)
   // todo - UploadResult + forms - получать только выбранные isResult функции
-  const getForms = (type: string, forms: string[] = [], onlyResult = false): formsFile[] => {
+  const getForms = (type: string, forms: string[] = null, onlyResult = false): formsFile[] => {
     let result: formsFile[] = [];
     if (forms && forms.length > 0) {
       for (const form of forms) {

diff --git a/l2-frontend/src/ui-cards/LaboratoryHeader.vue b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
@@ -36,7 +36,15 @@
     <ul class="nav navbar-nav">
       <LoadFile />
     </ul>
-    <UploadFileModal title="Прикрепить результат" :types-file="['PDF']" :upload-result="true" />
+    <ul class="nav navbar-nav">
+      <li>
+        <UploadFileModal
+          title="Прикрепить результат"
+          :types-file="['PDF', 'XLSX']"
+          :upload-result="true"
+        />
+      </li>
+    </ul>
   </div>
 </template>
 
@@ -46,7 +54,7 @@ import LaboratorySelector from '@/ui-cards/LaboratorySelector.vue';
 import ExecutionList from '@/ui-cards/ExecutionList.vue';
 import LaboratoryJournal from '@/ui-cards/LaboratoryJournal.vue';
 import LaboratoryPrintResults from '@/ui-cards/LaboratoryPrintResults.vue';
-import UploadFileModal from "@/modals/UploadFileModal.vue";
+import UploadFileModal from '@/modals/UploadFileModal.vue';
 
 export default {
   name: 'LaboratoryHeader',