diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 50f5aeae8..21f0beada 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -7,6 +7,8 @@ import VnInput from 'src/components/common/VnInput.vue';
import VnRow from 'components/ui/VnRow.vue';
import FetchData from 'components/FetchData.vue';
import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
+import FilterItemForm from 'src/components/FilterItemForm.vue';
import { useStateStore } from 'stores/useStateStore';
import axios from 'axios';
@@ -27,6 +29,7 @@ const importData = ref({
ref: null,
});
+const inputFileRef = ref(null);
const lastItemBuysOptions = ref([]);
const packagingsOptions = ref([]);
@@ -197,14 +200,20 @@ const redirectToBuysView = () => {
-
+
{{ t('Select a file') }}
@@ -237,13 +246,19 @@ const redirectToBuysView = () => {
>
-
+
+
+
@@ -254,7 +269,7 @@ const redirectToBuysView = () => {
-
+
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index f6399cc0b..fe4d73f99 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -16,6 +16,7 @@ const stateStore = useStateStore();
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index b1658ccd3..32421f9bc 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -111,26 +111,19 @@ const showEntryReport = () => {
{{ t('Show entry report') }}
-
-
-
- {{ t('Go to module index') }}
-
-
-
diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
index c78d6c842..f56e59253 100644
--- a/src/pages/Entry/Card/EntryNotes.vue
+++ b/src/pages/Entry/Card/EntryNotes.vue
@@ -15,6 +15,12 @@ const { t } = useI18n();
const entryObservationsRef = ref(null);
const entryObservationsOptions = ref([]);
+const sortEntryObservationOptions = (data) => {
+ entryObservationsOptions.value = [...data].sort((a, b) =>
+ a.description.localeCompare(b.description)
+ );
+};
+
onMounted(() => {
if (entryObservationsRef.value) entryObservationsRef.value.reload();
});
@@ -22,7 +28,7 @@ onMounted(() => {
(entryObservationsOptions = data)"
+ @on-fetch="(data) => sortEntryObservationOptions(data)"
auto-load
/>
{
:default-remove="false"
:data-required="{ entryFk: route.params.id }"
>
-
+
{
:label="t('entry.notes.observationType')"
v-model="row.observationTypeFk"
:options="entryObservationsOptions"
+ :disable="!!row.id"
option-label="description"
option-value="id"
hide-selected
@@ -58,6 +65,7 @@ onMounted(() => {
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index d4eb8a3ef..d0a2f7df1 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -1,28 +1,38 @@
@@ -48,79 +58,99 @@ const companiesOptions = ref([]);
@on-fetch="(data) => (companiesOptions = data)"
auto-load
/>
-
-
-
+
+
+
+
+
-
+
-
-
-
-
- {{ scope.opt?.nickname }}
-
- #{{ scope.opt?.id }}
-
-
-
-
-
+
+
+
+
+
+ {{ scope.opt?.nickname }}
+
+ #{{ scope.opt?.id }}
+
+
+
+
+
+
-
-
-
-
- {{ scope.opt?.agencyModeName }} -
- {{ scope.opt?.warehouseInName }} ({{
- toDate(scope.opt?.shipped)
- }}) → {{ scope.opt?.warehouseOutName }} ({{
- toDate(scope.opt?.landed)
- }})
-
-
-
-
+
+
+
+
+
+ {{ scope.opt?.agencyModeName }} -
+ {{ scope.opt?.warehouseInName }} ({{
+ toDate(scope.opt?.shipped)
+ }}) →
+ {{ scope.opt?.warehouseOutName }} ({{
+ toDate(scope.opt?.landed)
+ }})
+
+
+
+
+
-
+
+
+
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index f137b05e8..22ddf0bbf 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -53,7 +53,7 @@ const suppliersOptions = ref([]);
{{ formatFn(tag.value) }}