diff --git a/.gitignore b/.gitignore index 58275e2..fc3a99f 100644 Binary files a/.gitignore and b/.gitignore differ diff --git a/frontend/ops_vue_js/.gitignore b/frontend/ops_vue_js/.gitignore index a3f7a51..32258b0 100644 --- a/frontend/ops_vue_js/.gitignore +++ b/frontend/ops_vue_js/.gitignore @@ -34,3 +34,5 @@ coverage # Vitest __screenshots__/ + +.workbuddy diff --git a/frontend/ops_vue_js/src/components/AppHeader.vue b/frontend/ops_vue_js/src/components/AppHeader.vue index 746a951..65e7175 100644 --- a/frontend/ops_vue_js/src/components/AppHeader.vue +++ b/frontend/ops_vue_js/src/components/AppHeader.vue @@ -49,7 +49,7 @@ const normalClass = "rounded-md px-3 py-2 text-sm font-medium text-gray-600 tran const navItems = computed(() => [ { label: t("appname.home"), to: "/" }, { label: t("appname.schedule"), to: "/schedule" }, - // { label: t("appname.purchase"), to: "/purchase" }, + { label: t("appname.purchase"), to: "/purchase" }, // { label: t("appname.warehouse"), to: "/warehouse" }, ]); diff --git a/frontend/ops_vue_js/src/components/useDropzone.vue b/frontend/ops_vue_js/src/components/useDropzone.vue index 601715f..0ba35b8 100644 --- a/frontend/ops_vue_js/src/components/useDropzone.vue +++ b/frontend/ops_vue_js/src/components/useDropzone.vue @@ -3,7 +3,7 @@ import { ref, onMounted, onUnmounted, defineProps, reactive } from "vue"; import { useI18n } from "vue-i18n"; const { t, locale } = useI18n(); import Dropzone from "dropzone"; -import "dropzone/dist/dropzone.css"; +//import "dropzone/dist/dropzone.css"; import { useUserStore } from "@/stores/user"; import "fslightbox"; const userStore = useUserStore(); @@ -32,7 +32,7 @@ const initDropzone = () => { maxFilesize: prop.maxFilesize, maxFiles: prop.maxFiles, acceptedFiles: prop.acceptedFiles, - dictDefaultMessage: t("dropzone.upload_drop_or_click"), + dictDefaultMessage: "", dictFallbackMessage: t("dropzone.upload_browser_not_supported"), dictFileTooBig: t("dropzone.upload_file_too_big") + "({{filesize}}MB). " + t("dropzone.upload_max_file_size") + "{{maxFilesize}}MB.", dictInvalidFileType: t("dropzone.upload_invalid_file_type"), @@ -65,17 +65,19 @@ defineExpose({ getFiles: () => files, getDropzone: () => dropzoneInstance }); @@ -84,3 +86,26 @@ defineExpose({ getFiles: () => files, getDropzone: () => dropzoneInstance }); .dropzone { min-height: 150px; } .dz-progress .dz-upload { transition: width 0.3s ease; } + + diff --git a/frontend/ops_vue_js/src/views/purchase/addorder.vue b/frontend/ops_vue_js/src/views/purchase/addorder.vue index de97d51..7ea6705 100644 --- a/frontend/ops_vue_js/src/views/purchase/addorder.vue +++ b/frontend/ops_vue_js/src/views/purchase/addorder.vue @@ -204,7 +204,7 @@ async function handleSubmit() { {{ item.int }} {{ item.cost }} {{ item.costt }} - {{ currencyOptions[item.currency_type] }} + {{ currencyOptions[item.currencytype] }}