diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts index 06a549647..9c5bb34ad 100644 --- a/src/api/06_retirement/api.retirement.ts +++ b/src/api/06_retirement/api.retirement.ts @@ -1,3 +1,4 @@ +import type { StringDictionary } from "quasar"; import env from "../index"; const retirement = `${env.API_URI}/retirement`; const retirementDischarge = `${retirement}/discharge`; @@ -24,8 +25,8 @@ export default { listResign: () => `${retirement}/resign`, resignReport: `${retirement}/resign/report`, resingByid: (id: string) => `${retirement}/resign/${id}`, - resignConfirm: (id: string) => `${retirement}/resign/confirm/${id}`, - resignReject: (id: string) => `${retirement}/resign/reject/${id}`, + resignConfirm: (role: String, id: string) => `${retirement}/resign/${role}/confirm/${id}`, + resignReject: (role: String, id: string) => `${retirement}/resign/${role}/reject/${id}`, listExitInterview: () => `${retirement}/resign/questionnaire`, ExitInterviewByid: (id: string) => `${retirement}/resign/questionnaire/${id}`, ExitInterviewReport: `${retirement}/resign/questionnaire/report`, diff --git a/src/modules/05_placement/components/PersonalList/TableView.vue b/src/modules/05_placement/components/PersonalList/TableView.vue index f6d36f091..43ac8bea8 100644 --- a/src/modules/05_placement/components/PersonalList/TableView.vue +++ b/src/modules/05_placement/components/PersonalList/TableView.vue @@ -1,106 +1,3 @@ - - + + + diff --git a/src/modules/05_placement/components/RepatriationOrder/step03.vue b/src/modules/05_placement/components/RepatriationOrder/step03.vue index d7521a80d..4baeab77f 100644 --- a/src/modules/05_placement/components/RepatriationOrder/step03.vue +++ b/src/modules/05_placement/components/RepatriationOrder/step03.vue @@ -1,3 +1,109 @@ + + - diff --git a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue index 4cf2ca7f2..6dcdc0ffb 100644 --- a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue +++ b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue @@ -1,13 +1,11 @@ \ No newline at end of file + diff --git a/src/modules/07_insignia/components/5_Borrow/Main.vue b/src/modules/07_insignia/components/5_Borrow/Main.vue index 752fd205d..27ebd4fd1 100644 --- a/src/modules/07_insignia/components/5_Borrow/Main.vue +++ b/src/modules/07_insignia/components/5_Borrow/Main.vue @@ -11,17 +11,9 @@ import type { OptionDataYear } from "@/modules/07_insignia/interface/index/Main" import type { QTableProps, QInput } from "quasar"; import { useQuasar } from "quasar"; -// const router = useRouter(); const DataStore = useBrrowDataStore(); const mixin = useCounterMixin(); -const { - date2Thai, - dialogConfirm, - showLoader, - hideLoader, - messageError, - success, -} = mixin; +const { showLoader, hideLoader, messageError } = mixin; const $q = useQuasar(); const tab = ref(""); @@ -31,10 +23,8 @@ const selectRoundAllOption = ref([]); const modal = ref(false); const action = ref(""); -const personId = ref(); const profileId = ref(""); const roundYear = ref(); -const insigniaListAll = ref([]); const insigniaList = ref([]); onMounted(async () => { @@ -49,35 +39,29 @@ const fecthRound = async () => { selectRoundAllOption.value = [ { name: "ทั้งหมด", - id: "00000000-0000-0000-0000-000000000000", + id: "0", year: 0, }, ]; - data.map((e: any) => { - selectRoundOption.value = [ - ...selectRoundOption.value, - { - name: "รอบการเสนอขอพระราชทานเครื่องราชปี" + " " + (e.year + 543), - id: e.id, - year: e.year, - }, - ]; - - selectRoundAllOption.value = [ - ...selectRoundAllOption.value, - { - name: "รอบการเสนอขอพระราชทานเครื่องราชปี" + " " + (e.year + 543), - id: e.id, - year: e.year, - }, - ]; + selectRoundOption.value.push({ + name: "รอบการเสนอขอพระราชทานเครื่องราชปี" + " " + (e.year + 543), + id: e.id, + year: e.year, + }); + selectRoundAllOption.value.push({ + name: "รอบการเสนอขอพระราชทานเครื่องราชปี" + " " + (e.year + 543), + id: e.id, + year: e.year, + }); }); + selectRound.value = data[0].id; + yearRound.value = data[0].year; roundYear.value = data[0].year; }) .catch((err) => { - console.log(err); + messageError($q, err); }); }; @@ -85,7 +69,6 @@ const fecthInsignia = async () => { await http .get(config.API.insignia) .then((res) => { - // console.log(res); let data = res.data.result; DataStore.fetchDataInsignia(data); }) @@ -102,7 +85,6 @@ const fecthInsignia = async () => { const fecthInsigniaType = async () => { await http(config.API.insigniaType) .then(async (res) => { - // console.log(res); let data = res.data.result; DataStore.fetchDatainsigniaType(data); tab.value = DataStore.insigniaType[0].name; @@ -302,9 +284,11 @@ const selectorInsignia = async () => { : dataCopy; }; -// const selectorRound = (round: string) => { -// selectRound.value = round; -// }; +const yearRound = ref(); +const selectorRound = async (round: number) => { + roundYear.value = round; + await fecthlistInsignia(); +}; const rows = ref([]); const fecthlistInsignia = async () => { @@ -318,7 +302,6 @@ const fecthlistInsignia = async () => { rows.value = DataStore.rows; }) .catch((err) => { - console.log(err); messageError($q, err); }) .finally(() => { @@ -383,12 +366,24 @@ const resetFilter = () => { >
- +
+ +
{ :modal="modal" :close="close" :close-and-fecth="closeAndFecth" - :round-id=" - selectRound == '00000000-0000-0000-0000-000000000000' - ? 'all' - : selectRound - " + :round-id="selectRound == '0' ? 'all' : selectRound" :action="action" :profile-id="profileId" :select-round-option="selectRoundOption" diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue index beb1e5778..7c63bfe98 100644 --- a/src/modules/07_insignia/views/ResultPage.vue +++ b/src/modules/07_insignia/views/ResultPage.vue @@ -1,6 +1,5 @@