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

Merge branch 'phatt_dev' into develop

Browse source
This commit is contained in:
puriphatt 2024-03-19 12:31:11 +07:00
commit a0f8eb3108
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
View file

@ -7,6 +7,7 @@ import config from "@/app.config";
import type { QTableProps, QForm } from "quasar"; import type { QTableProps, QForm } from "quasar";
import { useCounterMixin } from "@/stores/mixin"; import { useCounterMixin } from "@/stores/mixin";
import { useInsigniaDataStore } from "@/modules/04_registryNew/stores/insignia";
import HistoryTable from "@/components/TableHistory.vue"; import HistoryTable from "@/components/TableHistory.vue";
import DialogHeader from "@/components/DialogHeader.vue"; import DialogHeader from "@/components/DialogHeader.vue";
import type { import type {
@ -18,15 +19,12 @@ import type {
RequestItemsObject, RequestItemsObject,
FormData, FormData,
} from "@/modules/04_registryNew/interface/request/Insignia"; } from "@/modules/04_registryNew/interface/request/Insignia";
import type { import type { ResponseObject } from "@/modules/04_registryNew/interface/response/Insignia";
ResponseObject,
ResponseInsigniaObject,
ResponseInsigniaType,
} from "@/modules/04_registryNew/interface/response/Insignia";
import type { ResponseObject as Insignia } from "@/modules/07_insignia/interface/response/Main"; import type { ResponseObject as Insignia } from "@/modules/07_insignia/interface/response/Main";
const $q = useQuasar(); const $q = useQuasar();
const route = useRoute(); const route = useRoute();
const store = useInsigniaDataStore();
const mixin = useCounterMixin(); const mixin = useCounterMixin();
const { const {
date2Thai, date2Thai,
@ -454,8 +452,6 @@ async function fetchData() {
const res = await http.get( const res = await http.get(
config.API.profileNewInsignByProfileId(profileId.value) config.API.profileNewInsignByProfileId(profileId.value)
); );
console.log(res.data.result);
rows.value = res.data.result; rows.value = res.data.result;
} catch (error) { } catch (error) {
messageError($q, error); messageError($q, error);
@ -470,16 +466,14 @@ async function fetchInsignia() {
const res = await http.get(config.API.insigniaOrg); const res = await http.get(config.API.insigniaOrg);
const data = res.data.result; const data = res.data.result;
let option: DataOptionInsignia[] = []; store.insigniaOption = [];
data.map((r: Insignia) => { data.map((r: Insignia) => {
option.push({ store.insigniaOption.push({
id: r.id.toString(), id: r.id.toString(),
name: r.name.toString() + ` (${r.shortName})`, name: r.name.toString() + ` (${r.shortName})`,
typeName: r.insigniaTypeName.toString(), typeName: r.insigniaTypeName.toString(),
}); });
}); });
Ops.value.insigniaOptions = option;
OpsFilter.value.insigniaOptions = option;
} catch (error) { } catch (error) {
messageError($q, error); messageError($q, error);
} finally { } finally {
@ -640,8 +634,10 @@ watch(
); );
onMounted(async () => { onMounted(async () => {
await fetchInsignia();
await fetchData(); await fetchData();
store.insigniaOption.length === 0 ? await fetchInsignia() : "";
Ops.value.insigniaOptions = store.insigniaOption;
OpsFilter.value.insigniaOptions = store.insigniaOption;
}); });
</script> </script>

8
src/modules/04_registryNew/stores/insignia.ts Normal file
View file

@ -0,0 +1,8 @@
import { ref, computed } from "vue";
import { defineStore } from "pinia";
import type { DataOptionInsignia } from "@/modules/04_registryNew/interface/index/Main";
export const useInsigniaDataStore = defineStore("insigniaDataStore", () => {
const insigniaOption = ref<DataOptionInsignia[]>([]);
return { insigniaOption };
});