Merge branch 'develop' into dev-tee

# Conflicts:
#	src/modules/06_retirement/components/ExitInterview/exitRegistry.vue
This commit is contained in:
setthawutttty 2023-10-09 15:36:01 +07:00
commit a03c46e35a
17 changed files with 637 additions and 265 deletions

View file

@ -10,6 +10,7 @@ const placemenRelocation = `${placement}/relocation`;
const placemenOther = `${env.API_URI}/retirement/other`;
const placemenAppointment = `${placement}/appointment`;
export default {
MainDetail: (year: number) => `${placement}/exam/${year}`,
yearOptions: () => `${placement}/fiscal`,
@ -59,6 +60,10 @@ export default {
// clear Position
clearPosition: (personalId: string) =>
`${placement}/position/clear/${personalId}`,
// Document
documentByid: (personalId: string) => `${placement}/doc/${personalId}`,
documentDelid: (personalId: string, docid: string) => `${placement}/doc/${personalId}/${docid}`,
// order
organizationsOrder: () => `${order}/order/organizations`,

View file

@ -56,7 +56,10 @@ export default {
fileRetirement: (id: string) => `${retirement}/upload/${id}`,
checkfileupload: (id: string) => `${retirement}/upload/check/${id}`,
editDetail: (retireId: string) => `${retirement}/detail/${retireId}`
editDetail: (retireId: string) => `${retirement}/detail/${retireId}`,
// ตำถาม Exit interview
questionnaireList: () => `${retirement}/resign/questionnaire/question`
};