diff --git a/components/MainNav.vue b/components/MainNav.vue index 85b6680..38d5cae 100644 --- a/components/MainNav.vue +++ b/components/MainNav.vue @@ -40,7 +40,8 @@ const links = computed(() => { id: 'historyitems', label: "Logbuch", to: "/historyitems", - icon: "i-heroicons-book-open" + icon: "i-heroicons-book-open", + disabled: true }, { label: "Organisation", @@ -52,7 +53,7 @@ const links = computed(() => { to: "/standardEntity/tasks", icon: "i-heroicons-rectangle-stack" }] : [], - ... true ? [{ + /*... true ? [{ label: "Plantafel", to: "/calendar/timeline", icon: "i-heroicons-calendar-days" @@ -66,7 +67,7 @@ const links = computed(() => { label: "Termine", to: "/standardEntity/events", icon: "i-heroicons-calendar-days" - }] : [], + }] : [],*/ /*{ label: "Dateien", to: "/files", @@ -83,10 +84,16 @@ const links = computed(() => { label: "Dateien", to: "/files", icon: "i-heroicons-document" + },{ + label: "Anschreiben", + to: "/createdletters", + icon: "i-heroicons-document", + disabled: true },{ label: "Boxen", to: "/standardEntity/documentboxes", - icon: "i-heroicons-archive-box" + icon: "i-heroicons-archive-box", + disabled: true }, ] }, @@ -98,12 +105,14 @@ const links = computed(() => { { label: "Helpdesk", to: "/helpdesk", - icon: "i-heroicons-chat-bubble-left-right" + icon: "i-heroicons-chat-bubble-left-right", + disabled: true }, { label: "E-Mail", to: "/email/new", - icon: "i-heroicons-envelope" + icon: "i-heroicons-envelope", + disabled: true }/*, { label: "Logbücher", to: "/communication/historyItems", @@ -145,7 +154,8 @@ const links = computed(() => { ... true ? [{ label: "Anwesenheiten", to: "/staff/time", - icon: "i-heroicons-clock" + icon: "i-heroicons-clock", + disabled: true }] : [], /*... has("absencerequests") ? [{ label: "Abwesenheiten", @@ -175,7 +185,8 @@ const links = computed(() => { },{ label: "Eingangsbelege", to: "/incomingInvoices", - icon: "i-heroicons-document-text" + icon: "i-heroicons-document-text", + disabled: true },{ label: "Kostenstellen", to: "/standardEntity/costcentres", @@ -183,7 +194,8 @@ const links = computed(() => { },{ label: "Buchungskonten", to: "/accounts", - icon: "i-heroicons-document-text" + icon: "i-heroicons-document-text", + disabled: true },{ label: "zusätzliche Buchungskonten", to: "/standardEntity/ownaccounts", @@ -192,7 +204,8 @@ const links = computed(() => { { label: "Bank", to: "/banking", - icon: "i-heroicons-document-text" + icon: "i-heroicons-document-text", + disabled: true }, ] }], @@ -285,11 +298,11 @@ const links = computed(() => { to: "/standardEntity/plants", icon: "i-heroicons-clipboard-document" },] : [], - ... has("checks") ? [{ + /*... has("checks") ? [{ label: "Überprüfungen", to: "/standardEntity/checks", icon: "i-heroicons-magnifying-glass" - },] : [], + },] : [],*/ { label: "Einstellungen", defaultOpen: false, @@ -298,7 +311,8 @@ const links = computed(() => { { label: "Nummernkreise", to: "/settings/numberRanges", - icon: "i-heroicons-clipboard-document-list" + icon: "i-heroicons-clipboard-document-list", + disabled: true },/*{ label: "Rollen", to: "/roles", @@ -306,15 +320,18 @@ const links = computed(() => { },*/{ label: "E-Mail Konten", to: "/settings/emailaccounts", - icon: "i-heroicons-envelope" + icon: "i-heroicons-envelope", + disabled: true },{ label: "Bankkonten", to: "/settings/banking", - icon: "i-heroicons-currency-euro" + icon: "i-heroicons-currency-euro", + disabled: true },{ label: "Textvorlagen", to: "/settings/texttemplates", - icon: "i-heroicons-clipboard-document-list" + icon: "i-heroicons-clipboard-document-list", + disabled: true },/*{ label: "Eigene Felder", to: "/settings/ownfields", @@ -322,15 +339,18 @@ const links = computed(() => { },*/{ label: "Firmeneinstellungen", to: "/settings/tenant", - icon: "i-heroicons-building-office" + icon: "i-heroicons-building-office", + disabled: true },{ label: "Projekttypen", to: "/projecttypes", - icon: "i-heroicons-clipboard-document-list" + icon: "i-heroicons-clipboard-document-list", + disabled: true },{ label: "Export", to: "/export", - icon: "i-heroicons-clipboard-document-list" + icon: "i-heroicons-clipboard-document-list", + disabled: true } ] } diff --git a/pages/createDocument/index.vue b/pages/createDocument/index.vue index a68944c..e16d2d7 100644 --- a/pages/createDocument/index.vue +++ b/pages/createDocument/index.vue @@ -83,7 +83,9 @@ > diff --git a/stores/data.js b/stores/data.js index f492d97..adb5f5e 100644 --- a/stores/data.js +++ b/stores/data.js @@ -950,7 +950,7 @@ export const useDataStore = defineStore('data', () => { selectSearchAttributes: ['name'], }, { - key: "purchasePrice", + key: "purchase_price", label: "Einkaufspreis", component: purchasePrice, inputType: "number", @@ -963,7 +963,7 @@ export const useDataStore = defineStore('data', () => { } } },{ - key: "markupPercentage", + key: "markup_percentage", label: "Aufschlag", inputType: "number", inputTrailing: "%", @@ -977,7 +977,7 @@ export const useDataStore = defineStore('data', () => { } } },{ - key: "sellingPrice", + key: "selling_price", label: "Verkaufpreispreis", required: true, component: sellingPrice, @@ -991,7 +991,7 @@ export const useDataStore = defineStore('data', () => { } } },{ - key: "taxPercentage", + key: "tax_percentage", label: "Umsatzsteuer", inputType: "select", selectOptionAttribute: "label", @@ -1194,7 +1194,7 @@ export const useDataStore = defineStore('data', () => { inputType: "bool", sortable: true },{ - key: 'licensePlate', + key: 'license_plate', label: "Kennzeichen", required: true, inputType: "text", @@ -1219,18 +1219,18 @@ export const useDataStore = defineStore('data', () => { component: driver },*/ { - key: "tankSize", + key: "tank_size", label: "Tankvolumen", unit: "L", inputType: "number" }, { - key: "buildYear", + key: "build_year", label: "Baujahr", inputType: "number" }, { - key: "towingCapacity", + key: "towing_capacity", label: "Anhängelast", unit: "Kg", inputType: "number", @@ -1242,7 +1242,7 @@ export const useDataStore = defineStore('data', () => { inputType: "text" }, { - key: "powerInKW", + key: "power_in_kw", label: "Leistung", unit: "kW", inputType: "number", @@ -1459,7 +1459,7 @@ export const useDataStore = defineStore('data', () => { sortable: true }, { - key: 'spaceNumber', + key: 'space_number', label: "Lagerplatznr.", inputType: "text", inputIsNumberRange: true, @@ -1483,7 +1483,7 @@ export const useDataStore = defineStore('data', () => { sortable: true }, { - key: "parentSpace", + key: "parent_space", label: "Übergeordneter Lagerplatz", inputType: "select", selectDataType: "spaces", @@ -1492,21 +1492,21 @@ export const useDataStore = defineStore('data', () => { inputColumn: "Allgemeines" }, { - key: "infoData.streetNumber", + key: "info_data.streetNumber", label: "Straße + Hausnummer", inputType: "text", disabledInTable: true, inputColumn: "Ort" }, { - key: "infoData.special", + key: "info_data.special", label: "Adresszusatz", inputType: "text", disabledInTable: true, inputColumn: "Ort" }, { - key: "infoData.zip", + key: "info_data.zip", label: "Postleitzahl", inputType: "number", disabledInTable: true, @@ -1518,14 +1518,14 @@ export const useDataStore = defineStore('data', () => { }, }, { - key: "infoData.city", + key: "info_data.city", label: "Stadt", inputType: "text", disabledInTable: true, inputColumn: "Ort" }, { - key: "infoData.country", + key: "info_data.country", label: "Land", inputType: "select", selectDataType: "countrys", @@ -1574,6 +1574,12 @@ export const useDataStore = defineStore('data', () => { } } } + ], + templateColumns: [ + { + key: "customer", + distinct: true + } ] }, tickets: { @@ -2192,8 +2198,8 @@ export const useDataStore = defineStore('data', () => { label: "Fahrzeuge", inputType: "select", selectDataType: "vehicles", - selectOptionAttribute: "licensePlate", - selectSearchAttributes: ['licensePlate'], + selectOptionAttribute: "license_plate", + selectSearchAttributes: ['license_plate'], selectMultiple: true, component: vehiclesWithLoad, },{