hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into warunee-dev

Browse source 
# Conflicts:
#	src/modules/07_insignia/storeAllocate.ts
This commit is contained in:
Warunee Tamkoo 2023-08-28 16:02:14 +07:00
commit 7d2ea59231
11 changed files with 243 additions and 457 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/07_insignia/components/5_Borrow/DialogForm.vue
View file

@ -2,12 +2,12 @@
import { ref, watch, computed } from "vue";
import { QForm, useQuasar } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
import { useResultDataStore } from "@/modules/07_insignia/storeAllocate";
import { useAllocateDataStore } from "@/modules/07_insignia/storeAllocate";
import http from "@/plugins/http";
import config from "@/app.config";
import type { DataOption } from "@/modules/04_registry/components/profileType";
const DataStore = useResultDataStore();
const DataStore = useAllocateDataStore();
const $q = useQuasar();
const myForm = ref<QForm>();
const mixin = useCounterMixin();

7
src/modules/07_insignia/components/5_Borrow/Main.vue
View file

@ -3,7 +3,7 @@ import { ref, onMounted, watch } from "vue";
import { useCounterMixin } from "@/stores/mixin";
import http from "@/plugins/http";
import config from "@/app.config";
import { useResultDataStore } from "@/modules/07_insignia/storeAllocate";
import { useBrrowDataStore } from "@/modules/07_insignia/storeBrrow";
import DialogForm from "@/modules/07_insignia/components/5_Borrow/DialogForm.vue";
@ -12,7 +12,7 @@ import type { QTableProps, QInput } from "quasar";
import { useQuasar } from "quasar";
// const router = useRouter();
const DataStore = useResultDataStore();
const DataStore = useBrrowDataStore();
const mixin = useCounterMixin();
const {
date2Thai,
@ -79,7 +79,7 @@ const fecthInsignia = async () => {
.then((res) => {
// console.log(res);
let data = res.data.result;
DataStore.fetchDatainsignia(data);
DataStore.fetchDataInsignia(data);
})
.catch((err) => {
console.log(err);
@ -277,6 +277,7 @@ const columns = ref<QTableProps["columns"]>([
watch(tab, async () => {
insigniaList.value = await DataStore.insigniaOp.filter((x: any) => x.type == tab.value || x.type == '')
DataStore.insignia = ''
fecthlistInsignia();
});