Merge branch 'develop' into nice_dev

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-08-04 12:07:53 +07:00
commit 20a84e95e5
206 changed files with 30456 additions and 3204 deletions

View file

@ -535,7 +535,7 @@ const clickDelete = (id: string) => {
};
// const deleteData = async (id: string) => {
// loaderPage(true);
// showLoader();
// await http
// .delete(config.API.orderReplace(id))
// .then((res) => {
@ -545,7 +545,7 @@ const clickDelete = (id: string) => {
// messageError($q, e);
// })
// .finally(async () => {
// loaderPage(false);
// hideLoader();
// await fetchData();
// });
// };

View file

@ -85,16 +85,15 @@
import { onMounted, ref } from "vue";
import { useRoute } from "vue-router";
import { useCounterMixin } from "@/stores/mixin";
import { useDataStore } from "@/stores/data";
import { useQuasar } from "quasar";
import http from "@/plugins/http";
import config from "@/app.config";
const $q = useQuasar();
const mixin = useCounterMixin();
const { modalError, messageError } = mixin;
const dataStore = useDataStore();
const { loaderPage } = dataStore;
const { modalError, messageError, showLoader, hideLoader } = mixin;
const step = ref<number>(1);
const stepRaw = ref<number>(1);
const tittle = ref<string>("");