diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
index f7f07a5b0..94adfe0ff 100644
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
import VnInput from 'components/common/VnInput.vue';
import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
import axios from 'axios';
@@ -207,7 +207,7 @@ const removeTag = (index, params, search) => {
- {
-
+
@@ -246,7 +246,7 @@ const removeTag = (index, params, search) => {
class="q-mt-md filter-value"
>
- {
/>
-
+import { reactive, ref, onMounted, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+const { t } = useI18n();
+const emit = defineEmits(['onDataSaved']);
+
+const genusInputRef = ref(null);
+const genusFormData = reactive({});
+
+const onDataSaved = (formData, requestResponse) => {
+ emit('onDataSaved', formData, requestResponse);
+};
+
+onMounted(async () => {
+ await nextTick();
+ genusInputRef.value.focus();
+});
+
+
+
+
+
+
+
+
+
+
+
+
+
+es:
+ New genus: Nuevo genus
+ Latin genus name: Nombre del genus en latín
+
diff --git a/src/pages/Item/Card/CreateSpecieForm.vue b/src/pages/Item/Card/CreateSpecieForm.vue
new file mode 100644
index 000000000..2731820ba
--- /dev/null
+++ b/src/pages/Item/Card/CreateSpecieForm.vue
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+es:
+ New species: Nueva especie
+ Latin species name: Nombre de la especie en latín
+
diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
index a2a39d9df..15492de9f 100644
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -1 +1,114 @@
-Item Botanical
+
+
+ (itemBotanicals = data)"
+ />
+ (itemGenusOptions = data)"
+ auto-load
+ />
+ (itemSpeciesOptions = data)"
+ auto-load
+ />
+
+
+
+
+
+
+ onGenusCreated(requestResponse, data)
+ "
+ />
+
+
+
+
+
+ onSpecieCreated(requestResponse, data)
+ "
+ />
+
+
+
+
+
+
+
+
+es:
+ Genus: Genus
+ Species: Especie
+
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 0dd7ca07d..2a753a3a5 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue';
import FetchedTags from 'components/ui/FetchedTags.vue';
import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
import VnInputDate from 'src/components/common/VnInputDate.vue';
import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
@@ -178,7 +178,7 @@ const columns = computed(() => [
name: 'warehouse',
...defaultColumnAttrs,
columnFilter: {
- component: VnSelectFilter,
+ component: VnSelect,
type: 'select',
filterValue: null,
event: getColumnInputEvents,
@@ -434,7 +434,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
- (stateStore.rightDrawer = false));
-
+
@@ -531,7 +531,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
-
-
- {
- {
- {
- {
-
+
@@ -261,7 +261,7 @@ const decrement = (paramsObj, key) => {
- import('src/pages/Item/Card/ItemTax.vue'),
},
- {
- path: 'botanical',
- name: 'ItemBotanical',
- meta: {
- title: 'botanical',
- icon: 'vn:botanical',
- },
- component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
- },
{
path: 'barcode',
name: 'ItemBarcode',
@@ -157,6 +148,15 @@ export default {
},
component: () => import('src/pages/Item/Card/ItemLog.vue'),
},
+ {
+ path: 'botanical',
+ name: 'ItemBotanical',
+ meta: {
+ title: 'botanical',
+ icon: 'vn:botanical',
+ },
+ component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
+ },
],
},
],