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

Merge branch 'develop' into feat/issue

Browse source 
* develop:
  fix: edit email
  fix:tooltip card organization-chart
  fix: delete import defineProps
  fix:disable organization-chart
  ปิดตารางประวัติตำแหน่งไปก่อน
  ปิดไม่แสดงข้อมูลตำแหน่งและเงินเดือน
  feat: add position and salary review

# Conflicts:
#	src/api/org/api.org.ts
This commit is contained in:
Warunee Tamkoo 2026-01-30 14:58:25 +07:00
commit 85738041cf
15 changed files with 1677 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/api/index.ts
View file

@ -12,8 +12,8 @@ export const apiUrlConfigReport = import.meta.env.VITE_API_REPORT_URL;
const config = ref<any>({
development: {
// API_URI: "https://localhost:7260/api",
API_URI: "https://bma-ehr.frappet.synology.me/api/v1",
API_URL_SUPPORT: "https://bma-ehr.frappet.synology.me/api/v1/support",
API_URI: "https://hrmsbkk.case-collection.com/api/v1",
API_URL_SUPPORT: "https://hrmsbkk.case-collection.com/api/v1/support",
MEET_URI: "meet.frappet.com",
LINK_EVALUATE_PUBLISH: "https://bma-ehr-publish.frappet.synology.me",
API_REPORT_TEMPLATE_URI:

8
src/api/org/api.org.ts
View file

@ -3,7 +3,6 @@ import env from "../index";
const metadata = `${env.API_URI}/org/metadata/`;
const org = `${env.API_URI}/org`;
const profileOrg = `${env.API_URI}/org/profile`;
const report = `${env.API_URI}/org`;
const workflow = `${env.API_URI}/org/workflow`;
export default {
orgCommandCode: `${metadata}commandCode`,
@ -70,9 +69,9 @@ export default {
dataUserOtherByType: (type: string) => `${org}/profile${type}/other/user`,
profileReportId: (profileId: string, type: string) =>
`${report}/${type}/kk1/${profileId}`,
`${org}/${type}/kk1/${profileId}`,
profileKp7ShortId: (profileId: string, type: string) =>
`${report}/${type}/kp7-short/${profileId}`,
`${org}/${type}/kp7-short/${profileId}`,
/** history */
dataUserInformatioHistory: (type: string) =>
@ -177,4 +176,7 @@ export default {
orgAssistance: (id: string) => `${profileOrg}/assistance/${id}`,
orgIssues: `${env.API_URI}/org/issues`,
// ตรวจสอบข้อมูลตำแหน่งและเงินเดือน
profileSalaryTemp: `${profileOrg}/salaryTemp`,
};