From bb6afbb98ef0c8babbf793597b4c607d98b733f7 Mon Sep 17 00:00:00 2001 From: "STW_TTTY\\stwtt" Date: Tue, 9 Jul 2024 10:39:49 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=82=E0=B8=84?= =?UTF-8?q?=E0=B9=89=E0=B8=94=E0=B8=95=E0=B8=B2=E0=B8=A1=20issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.ts | 20 +-- .../components/salaryNew/Salary.vue | 168 +++++++++--------- .../components/probation/FormAssign.vue | 45 +++-- .../components/EditEmployee/Salary.vue | 128 +++++++------ .../10_order/components/step/step01.vue | 2 + .../Tab/Dialog/01_FormIndicator.vue | 2 + .../components/Tab/Topic/02_Competency.vue | 2 +- .../components/FollowResult.vue | 33 ++-- .../15_development/components/MainTab.vue | 2 +- .../15_development/components/Other.vue | 3 +- .../components/ProjectDetail.vue | 77 +++++++- .../15_development/components/Target.vue | 93 +++++----- 12 files changed, 323 insertions(+), 252 deletions(-) diff --git a/src/api/index.ts b/src/api/index.ts index b29b5fb3d..c83ba8b29 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -11,31 +11,31 @@ export const apiUrlConfigReport = import.meta.env.VITE_API_REPORT_URL; const config = ref({ development: { // API_URI: "http://localhost:13001/api/v1", - API_URI: "https://bma-ehr.frappet.synology.me/api/v1", + API_URI: "https://bma-ehr.frappet.com/api/v1", // API_URI_ORG_SERVICE: "https://localhost:7056/api/v1", //ใช้ชั่วคราว - API_URI_ORG_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว + API_URI_ORG_SERVICE: "https://bma-ehr.frappet.com/api/v1", //ใช้ชั่วคราว // API_URI_ORG_EMPLOYEE_SERVICE: "https://localhost:7208/api/v1", //ใช้ชั่วคราว - API_URI_ORG_EMPLOYEE_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว + API_URI_ORG_EMPLOYEE_SERVICE: "https://bma-ehr.frappet.com/api/v1", //ใช้ชั่วคราว // API_URI_PROFILE_SERVICE: "https://localhost:7159/api/v1", - API_URI_PROFILE_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว + API_URI_PROFILE_SERVICE: "https://bma-ehr.frappet.com/api/v1", //ใช้ชั่วคราว // API_CANDIDATE_URI: "https://localhost:7007/api/v1", - API_CANDIDATE_URI: "https://bma-ehr.frappet.synology.me/api/v1", + API_CANDIDATE_URI: "https://bma-ehr.frappet.com/api/v1", // API_REPORT_URI: "https://localhost:7187/api/v1", - API_REPORT_URI: "https://bma-ehr.frappet.synology.me/api/v1", + API_REPORT_URI: "https://bma-ehr.frappet.com/api/v1", // API_PLACEMENT_URI: "https://localhost:7260/api", - API_PLACEMENT_URI: "https://bma-ehr.frappet.synology.me/api/v1", + API_PLACEMENT_URI: "https://bma-ehr.frappet.com/api/v1", API_URI_ORG_TREE: "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/tree_20230712_172702.json", MEET_URI: "meet.frappet.com", - API_RETIREMENT_URI: "https://bma-ehr.frappet.synology.me/api/v1", + API_RETIREMENT_URI: "https://bma-ehr.frappet.com/api/v1", // API_PROBATION_URI: "https://ehr.joolsoft.com/v1", - API_PROBATION_URI: "https://bma-ehr.frappet.synology.me/api/v1/probation", + API_PROBATION_URI: "https://bma-ehr.frappet.com/api/v1/probation", // API_PROBATION_URI: "http://192.168.1.151:7776/v1", API_REPORT2_URI: "https://bma-ehr.frappet.synology.me/api/v2", LINK_EVALUATE_PUBLISH: "https://bma-ehr-publish.frappet.synology.me", API_REPORT_TEMPLATE_URI: "https://report-server.frappet.synology.me/api/v1/report-template", - API_SUPPORT_URI: "https://bma-ehr.frappet.synology.me/api/v1/support", + API_SUPPORT_URI: "https://bma-ehr.frappet.com/api/v1/support", }, test: { API_URI: "http://localhost:5010/api/v1", diff --git a/src/modules/04_registry/components/salaryNew/Salary.vue b/src/modules/04_registry/components/salaryNew/Salary.vue index 608fbddef..7006e7f5b 100644 --- a/src/modules/04_registry/components/salaryNew/Salary.vue +++ b/src/modules/04_registry/components/salaryNew/Salary.vue @@ -1706,52 +1706,50 @@ const fetchData = async () => { .then((res) => { let data = res.data.result; rows.value = []; - data.map((e: any) => { - rows.value.push({ - id: e.id, - date: new Date(e.date), - amount: e.amount, - positionSalaryAmount: e.positionSalaryAmount, - mouthSalaryAmount: e.mouthSalaryAmount, - oc: e.oc, - ocId: e.ocId, - position: e.position, - positionName: e.positionName, - positionId: - e.positionId !== "00000000-0000-0000-0000-000000000000" - ? e.positionId - : "", - posNo: e.posNo, - posNoId: - e.posNoId !== "00000000-0000-0000-0000-000000000000" - ? e.posNoId - : "", - positionLine: e.positionLine, - positionLineName: e.positionLineName, - positionLineId: e.positionLineId, - positionPathSide: e.positionPathSide, - positionPathSideId: e.positionPathSideId, - positionPathSideName: e.positionPathSideName, - positionType: e.positionType, - positionTypeId: e.positionTypeId, - positionLevelId: e.positionLevelId, - positionLevel: e.positionLevel, - positionExecutive: e.positionExecutive, - positionExecutiveId: e.positionExecutiveId, - positionExecutiveName: e.positionExecutiveName, - positionExecutiveSide: e.positionExecutiveSide, - positionExecutiveSideId: e.positionExecutiveSideId, - salaryClass: e.salaryClass, - salaryRef: e.salaryRef, - salaryStatus: e.salaryStatus, - refCommandNo: e.refCommandNo, - createdFullName: e.createdFullName, - orgName: e.orgName, - agencyName: e.agencyName, - cLevel: e.cLevel, - createdAt: new Date(e.createdAt), - }); - }); + rows.value = data.map((e: any) => ({ + id: e.id, + date: new Date(e.date), + amount: e.amount, + positionSalaryAmount: e.positionSalaryAmount, + mouthSalaryAmount: e.mouthSalaryAmount, + oc: e.oc, + ocId: e.ocId, + position: e.position, + positionName: e.positionName, + positionId: + e.positionId !== "00000000-0000-0000-0000-000000000000" + ? e.positionId + : "", + posNo: e.posNo, + posNoId: + e.posNoId !== "00000000-0000-0000-0000-000000000000" + ? e.posNoId + : "", + positionLine: e.positionLine, + positionLineName: e.positionLineName, + positionLineId: e.positionLineId, + positionPathSide: e.positionPathSide, + positionPathSideId: e.positionPathSideId, + positionPathSideName: e.positionPathSideName, + positionType: e.positionType, + positionTypeId: e.positionTypeId, + positionLevelId: e.positionLevelId, + positionLevel: e.positionLevel, + positionExecutive: e.positionExecutive, + positionExecutiveId: e.positionExecutiveId, + positionExecutiveName: e.positionExecutiveName, + positionExecutiveSide: e.positionExecutiveSide, + positionExecutiveSideId: e.positionExecutiveSideId, + salaryClass: e.salaryClass, + salaryRef: e.salaryRef, + salaryStatus: e.salaryStatus, + refCommandNo: e.refCommandNo, + createdFullName: e.createdFullName, + orgName: e.orgName, + agencyName: e.agencyName, + cLevel: e.cLevel, + createdAt: new Date(e.createdAt), + })); }) .catch((e) => { messageError($q, e); @@ -2257,46 +2255,44 @@ const clickHistory = async (row: RequestItemsObject) => { .then((res) => { let data = res.data.result; rowsHistory.value = []; - data.map((e: any) => { - rowsHistory.value.push({ - id: e.id, - date: new Date(e.date), - amount: e.amount, - positionSalaryAmount: e.positionSalaryAmount, - mouthSalaryAmount: e.mouthSalaryAmount, - oc: e.oc, - ocId: e.ocId, - position: e.position, - positionId: e.positionId, - positionName: e.positionName, - posNo: e.posNo, - posNoId: e.posNoId, - positionLine: e.positionLine, - positionLineName: e.positionLineName, - positionLineId: e.positionLineId, - positionPathSide: e.positionPathSide, - positionPathSideId: e.positionPathSideId, - positionPathSideName: e.positionPathSideName, - positionType: e.positionType, - positionTypeId: e.positionTypeId, - positionLevel: e.positionLevel, - positionLevelId: e.positionLevelId, - positionExecutive: e.positionExecutive, - positionExecutiveId: e.positionExecutiveId, - positionExecutiveName: e.positionExecutiveName, - positionExecutiveSide: e.positionExecutiveSide, - positionExecutiveSideId: e.positionExecutiveSideId, - salaryClass: e.salaryClass, - salaryStatus: e.salaryStatus, - salaryRef: e.salaryRef, - refCommandNo: e.refCommandNo, - createdFullName: e.createdFullName, - orgName: e.orgName, - agencyName: e.agencyName, - cLevel: e.cLevel, - createdAt: new Date(e.createdAt), - }); - }); + rowsHistory.value = data.map((e: any) => ({ + id: e.id, + date: new Date(e.date), + amount: e.amount, + positionSalaryAmount: e.positionSalaryAmount, + mouthSalaryAmount: e.mouthSalaryAmount, + oc: e.oc, + ocId: e.ocId, + position: e.position, + positionId: e.positionId, + positionName: e.positionName, + posNo: e.posNo, + posNoId: e.posNoId, + positionLine: e.positionLine, + positionLineName: e.positionLineName, + positionLineId: e.positionLineId, + positionPathSide: e.positionPathSide, + positionPathSideId: e.positionPathSideId, + positionPathSideName: e.positionPathSideName, + positionType: e.positionType, + positionTypeId: e.positionTypeId, + positionLevel: e.positionLevel, + positionLevelId: e.positionLevelId, + positionExecutive: e.positionExecutive, + positionExecutiveId: e.positionExecutiveId, + positionExecutiveName: e.positionExecutiveName, + positionExecutiveSide: e.positionExecutiveSide, + positionExecutiveSideId: e.positionExecutiveSideId, + salaryClass: e.salaryClass, + salaryStatus: e.salaryStatus, + salaryRef: e.salaryRef, + refCommandNo: e.refCommandNo, + createdFullName: e.createdFullName, + orgName: e.orgName, + agencyName: e.agencyName, + cLevel: e.cLevel, + createdAt: new Date(e.createdAt), + })); }) .catch((e) => { messageError($q, e); diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue index adc2cba5d..c3d6187b8 100644 --- a/src/modules/05_placement/components/probation/FormAssign.vue +++ b/src/modules/05_placement/components/probation/FormAssign.vue @@ -299,6 +299,8 @@ function deleteProductivitys(item: number) { } } + + /** get ข้อมูล */ async function getUser() { await http @@ -980,17 +982,18 @@ watch(knowledge.value, () => { * @param update fn */ function filterFnCaretaker(val: string, update: any) { + const dataFilter = filtermantor(OPcaretaker.value, [caretaker2.value]).filter( + (i: any) => i.id !== chairman.value.id + ); if (val == "") { update(() => { - optionCaretaker.value = filtermantor(OPcaretaker.value, [ - caretaker2.value, - ]); + optionCaretaker.value = dataFilter; }); } else { update(() => { - optionCaretaker.value = filtermantor(OPcaretaker.value, [ - caretaker2.value, - ]).filter((e: any) => e.name.search(val) !== -1); + optionCaretaker.value = dataFilter.filter( + (e: any) => e.name.search(val) !== -1 + ); }); } } @@ -1002,17 +1005,18 @@ function filterFnCaretaker(val: string, update: any) { */ function filterFnCaretaker2(val: string, update: any) { + const dataFilter = filtermantor(OPcaretaker.value, [caretaker1.value]).filter( + (i: any) => i.id !== chairman.value.id + ); if (val == "") { update(() => { - optionCaretaker2.value = filtermantor(OPcaretaker.value, [ - caretaker1.value, - ]); + optionCaretaker2.value = dataFilter; }); } else { update(() => { - optionCaretaker2.value = filtermantor(OPcaretaker.value, [ - caretaker1.value, - ]).filter((e: any) => e.name.search(val) !== -1); + optionCaretaker2.value = dataFilter.filter( + (e: any) => e.name.search(val) !== -1 + ); }); } } @@ -1024,13 +1028,16 @@ function filterFnCaretaker2(val: string, update: any) { */ function filterFnCommander(val: string, update: any) { + const dataFilter = OPcommander.value.filter( + (i: any) => i.id !== chairman.value.id + ); if (val == "") { update(() => { - OPcommanderFn.value = OPcommander.value; + OPcommanderFn.value = dataFilter; }); } else { update(() => { - OPcommanderFn.value = OPcommander.value.filter( + OPcommanderFn.value = dataFilter.filter( (e: any) => e.name.search(val) !== -1 ); }); @@ -1044,13 +1051,19 @@ function filterFnCommander(val: string, update: any) { */ function filterFnChairman(val: string, update: any) { + const dataFilter = OPchairman.value.filter( + (i: any) => + i.id !== caretaker1.value.id && + i.id !== caretaker2.value.id && + i.id !== commander.value.id + ); if (val == "") { update(() => { - OPchairmanFn.value = OPchairman.value; + OPchairmanFn.value = dataFilter; }); } else { update(() => { - OPchairmanFn.value = OPchairman.value.filter( + OPchairmanFn.value = dataFilter.filter( (e: any) => e.name.search(val) !== -1 ); }); diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Salary.vue b/src/modules/08_registryEmployee/components/EditEmployee/Salary.vue index 07deb7ae4..e04767679 100644 --- a/src/modules/08_registryEmployee/components/EditEmployee/Salary.vue +++ b/src/modules/08_registryEmployee/components/EditEmployee/Salary.vue @@ -972,39 +972,37 @@ const fetchData = async () => { .then((res) => { let data = res.data.result; rows.value = []; - data.map((e: ResponseObject) => { - rows.value.push({ - id: e.id, - date: new Date(e.date), - amount: e.amount, - positionSalaryAmount: e.positionSalaryAmount, - mouthSalaryAmount: e.mouthSalaryAmount, - oc: e.oc, - ocId: e.ocId, - position: e.position, - positionId: e.positionId, - posNo: e.posNo, - posNoId: e.posNoId, - positionLine: e.positionLine, - positionLineId: e.positionLineId, - positionPathSide: e.positionPathSide, - positionPathSideId: e.positionPathSideId, - positionType: e.positionType, - positionTypeId: e.positionTypeId, - positionLevel: e.positionLevel, - positionLevelId: e.positionLevelId, - positionExecutive: e.positionExecutive, - positionExecutiveId: e.positionExecutiveId, - positionExecutiveSide: e.positionExecutiveSide, - positionExecutiveSideId: e.positionExecutiveSideId, - salaryClass: e.salaryClass, - salaryRef: e.salaryRef, - salaryStatus: e.salaryStatus, - refCommandNo: e.refCommandNo, - createdFullName: e.createdFullName, - createdAt: new Date(e.createdAt), - }); - }); + rows.value = data.map((e: ResponseObject) => ({ + id: e.id, + date: new Date(e.date), + amount: e.amount, + positionSalaryAmount: e.positionSalaryAmount, + mouthSalaryAmount: e.mouthSalaryAmount, + oc: e.oc, + ocId: e.ocId, + position: e.position, + positionId: e.positionId, + posNo: e.posNo, + posNoId: e.posNoId, + positionLine: e.positionLine, + positionLineId: e.positionLineId, + positionPathSide: e.positionPathSide, + positionPathSideId: e.positionPathSideId, + positionType: e.positionType, + positionTypeId: e.positionTypeId, + positionLevel: e.positionLevel, + positionLevelId: e.positionLevelId, + positionExecutive: e.positionExecutive, + positionExecutiveId: e.positionExecutiveId, + positionExecutiveSide: e.positionExecutiveSide, + positionExecutiveSideId: e.positionExecutiveSideId, + salaryClass: e.salaryClass, + salaryRef: e.salaryRef, + salaryStatus: e.salaryStatus, + refCommandNo: e.refCommandNo, + createdFullName: e.createdFullName, + createdAt: new Date(e.createdAt), + })); }) .catch((e) => { messageError($q, e); @@ -1450,39 +1448,37 @@ const clickHistory = async (row: RequestItemsObject) => { .then((res) => { let data = res.data.result; rowsHistory.value = []; - data.map((e: ResponseObject) => { - rowsHistory.value.push({ - id: e.id, - date: new Date(e.date), - amount: e.amount, - positionSalaryAmount: e.positionSalaryAmount, - mouthSalaryAmount: e.mouthSalaryAmount, - oc: e.oc, - ocId: e.ocId, - position: e.position, - positionId: e.positionId, - posNo: e.posNo, - posNoId: e.posNoId, - positionLine: e.positionLine, - positionLineId: e.positionLineId, - positionPathSide: e.positionPathSide, - positionPathSideId: e.positionPathSideId, - positionType: e.positionType, - positionTypeId: e.positionTypeId, - positionLevel: e.positionLevel, - positionLevelId: e.positionLevelId, - positionExecutive: e.positionExecutive, - positionExecutiveId: e.positionExecutiveId, - positionExecutiveSide: e.positionExecutiveSide, - positionExecutiveSideId: e.positionExecutiveSideId, - salaryClass: e.salaryClass, - salaryRef: e.salaryRef, - refCommandNo: e.refCommandNo, - salaryStatus: e.salaryStatus, - createdFullName: e.createdFullName, - createdAt: new Date(e.createdAt), - }); - }); + rowsHistory.value = data.map((e: ResponseObject) => ({ + id: e.id, + date: new Date(e.date), + amount: e.amount, + positionSalaryAmount: e.positionSalaryAmount, + mouthSalaryAmount: e.mouthSalaryAmount, + oc: e.oc, + ocId: e.ocId, + position: e.position, + positionId: e.positionId, + posNo: e.posNo, + posNoId: e.posNoId, + positionLine: e.positionLine, + positionLineId: e.positionLineId, + positionPathSide: e.positionPathSide, + positionPathSideId: e.positionPathSideId, + positionType: e.positionType, + positionTypeId: e.positionTypeId, + positionLevel: e.positionLevel, + positionLevelId: e.positionLevelId, + positionExecutive: e.positionExecutive, + positionExecutiveId: e.positionExecutiveId, + positionExecutiveSide: e.positionExecutiveSide, + positionExecutiveSideId: e.positionExecutiveSideId, + salaryClass: e.salaryClass, + salaryRef: e.salaryRef, + refCommandNo: e.refCommandNo, + salaryStatus: e.salaryStatus, + createdFullName: e.createdFullName, + createdAt: new Date(e.createdAt), + })); }) .catch((e) => { messageError($q, e); diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue index f06b8cbe3..e06d50818 100644 --- a/src/modules/10_order/components/step/step01.vue +++ b/src/modules/10_order/components/step/step01.vue @@ -899,6 +899,7 @@ const getClass = (val: boolean) => { :rules="[(val) => !!val || `${'กรุณากรอก พ.ศ.'}`]" :label="`${'พ.ศ.'}`" dense + hide-bottom-space outlined > @@ -927,6 +928,7 @@ const getClass = (val: boolean) => { :class="getClass(true)" outlined dense + hide-bottom-space class="full-width datepicker" :model-value=" dateCommand != null ? date2Thai(dateCommand) : null diff --git a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue index 7086a9a29..d543fdbe7 100644 --- a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue +++ b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue @@ -863,6 +863,7 @@ const title = computed(() => { autoApply :enableTimePicker="false" week-start="0" + @update:model-value="formDetail.endDate = null" >