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

Merge branch 'nice_dev' into develop

Browse source 
# Conflicts:
#	src/modules/13_salary/views/salaryLists.vue
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-03-18 16:06:23 +07:00
commit bbbb157866
11 changed files with 283 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/api/13_salary/api.salary.ts
View file

@ -2,6 +2,7 @@ import env from "../index";
const salary = `${env.API_URI}/salary`;
const salaryRate = `${env.API_URI}/salary/rate`;
const salaryPeriod = `${env.API_URI}/salary/period`;
const salaryPeriodEmp = `${env.API_URI}/salary/period-employee`;
const salaryOrg = `${env.API_URI}/org/employee`;
const salaryFormula = `${env.API_URI}/salary/formula`;
@ -31,7 +32,8 @@ export default {
salaryListPeriodProfileById: (id: string) => `${salaryPeriod}/profile/${id}`,
salaryListPerson: `${env.API_URI}/org/profile/salary/gen`,
salaryPeriodProfile: `${salary}/period/org/profile`,
salaryReportListsByid: (type: string, rootId: string, periodId: string) =>
`${salary}/report/${type}/${rootId}/${periodId}`,
salaryProperty: (id: string) => `${salaryPeriod}/org/property/${id}`,
/** รายการเงินเดือนลูกจ้างประจำ*/
@ -45,13 +47,21 @@ export default {
salaryEmployeeRateList: `${salaryRate}/employee`,
salaryEmployeeRateListByid: (id: string) => `${salaryRate}/employee/${id}`,
salaryEmployeePosType:()=>`${salaryOrg}/pos/type`,
salaryFormula:()=>`${salaryFormula}`,
salaryFormulaById:(id:string)=>`${salaryFormula}/${id}`,
salaryEmployeePositionType:(key:string)=>`${salaryOrg}/pos/position?keyword=${key}&type=positionType`,
salaryEmployeeActive :()=>`${salary}/employee/active`,
salaryEmployeePosType: () => `${salaryOrg}/pos/type`,
salaryFormula: () => `${salaryFormula}`,
salaryFormulaById: (id: string) => `${salaryFormula}/${id}`,
salaryEmployeePositionType: (key: string) =>
`${salaryOrg}/pos/position?keyword=${key}&type=positionType`,
salaryEmployeeActive: () => `${salary}/employee/active`,
salaryPeriodStatus: (type: string, periodId: string, rootId: string) =>
`${salaryPeriod}/${type}/approve/${periodId}/${rootId}`,
salaryPeriodStatusComment: (type: string, periodId: string, rootId: string) =>
`${salaryPeriod}/${type}/comment/${periodId}/${rootId}`,
salaryPeriodStatus:(type:string,periodId:string,rootId:string)=>`${salaryPeriod}/${type}/approve/${periodId}/${rootId}`,
salaryPeriodStatusComment:(type:string,periodId:string,rootId:string)=>`${salaryPeriod}/${type}/comment/${periodId}/${rootId}`
/** รายการเงินเดือนลูกจ้างประจำ*/
salaryListPeriodLatestEmp: `${salaryPeriodEmp}/latest`,
salaryListPeriodQuotaEmp: (id: string) => `${salaryPeriodEmp}/quota/${id}`,
salaryListPeriodORGEmp: (id: string) => `${salaryPeriodEmp}/org/${id}`,
salaryPeriodProfileEmp: `${salaryPeriodEmp}/org/profile`,
};