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

no message

Browse source
This commit is contained in:
setthawutttty 2023-07-25 09:32:45 +07:00
parent 707d3f13a2
commit cd683d2296
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/06_retirement/api.retirement.ts
View file

@ -3,17 +3,13 @@ const retirement = `${env.API_URI}/retirement`
export default { export default {
<<<<<<< HEAD
retirement:(type:string,year:number) => `${retirement}/${type}/${year}`
=======
profile: (type: string, year: number) => `${retirement}/profile/${type}/${year}`, profile: (type: string, year: number) => `${retirement}/profile/${type}/${year}`,
profileRetire: (retireId: string) => `${retirement}/profile/${retireId}`, profileRetire: (retireId: string) => `${retirement}/profile/${retireId}`,
getprofileRetire: (retireId: string) => `${retirement}/${retireId}`, getprofileRetire: (retireId: string) => `${retirement}/${retireId}`,
createnote: () => `${retirement}/reason/`, createnote: () => `${retirement}/reason/`,
reasonId: (retireId:string) => `${retirement}/reason/${retireId}`, reasonId: (retireId:string) => `${retirement}/reason/${retireId}`,
retirement:(type:string) => `${retirement}/${type}/2023` retirement:(type:string,year:number) => `${retirement}/${type}/${year}`
>>>>>>> develop
}; };

2
src/modules/06_retirement/views/Main.vue
View file

@ -37,7 +37,7 @@
:outlined="true" :outlined="true"
:hide-dropdown-icon="false" :hide-dropdown-icon="false"
style="min-width: 150px" style="min-width: 150px"
@update:model-value="searchFilterTable"
/> />
<div> <div>
<q-btn <q-btn