diff --git a/package-lock.json b/package-lock.json index e0da68418..7c4200ef5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7709,7 +7709,7 @@ }, "node_modules/vue": { "version": "3.2.47", - "resolved": "https://npm.joolsoft.com/vue/-/vue-3.2.47.tgz", + // "resolved": "https://npm.joolsoft.com/vue/-/vue-3.2.47.tgz", "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==", "dependencies": { "@vue/compiler-dom": "3.2.47", @@ -13775,7 +13775,7 @@ }, "vue": { "version": "3.2.47", - "resolved": "https://npm.joolsoft.com/vue/-/vue-3.2.47.tgz", + // "resolved": "https://npm.joolsoft.com/vue/-/vue-3.2.47.tgz", "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==", "requires": { "@vue/compiler-dom": "3.2.47", diff --git a/src/api/05_placement/api.probation.ts b/src/api/05_placement/api.probation.ts index db4aadfa1..f13c26d26 100644 --- a/src/api/05_placement/api.probation.ts +++ b/src/api/05_placement/api.probation.ts @@ -24,6 +24,8 @@ export default { calculateDate: () => `${calculate}/assign-finish`, saveFinish: (personalId: string) => `${finish}/probation-assign?personal_id=${personalId}`, + saveEditAssign: (personalId: string) => + `${finish}/probation-assign?id=${personalId}`, personalAdd: () => `${personal}/add`, probationGetAssignList: (personalId:string) => `${finish}/probation-assign-list?personal_id=${personalId}`, @@ -36,7 +38,7 @@ export default { formevaluate: (id: string) => `${evaluate}/evaluate-record?assign_id=${id}`, formevaluateround: (id: string, no: string) => `${evaluate}/evaluate-record?assign_id=${id}&evaluate_no=${no}`, formevaluateRecord: (id: string) => `${evaluate}/evaluate-record/create?assign_id=${id}`, - createformevaluate: (id: string) => `${evaluate}/evaluate-record?id=${id}`, + createformevaluate: (id: string) => `${evaluate}/evaluate-record?assign_id=${id}`, //แบบประเมินผล (ผู้บังคับบัญชา) evaluateCreate: (id: string) => `${evaluate}/evaluate/create?assign_id=${id}`, diff --git a/src/api/07_insignia/api.insignia.ts b/src/api/07_insignia/api.insignia.ts index 41ccd6778..db50f6aac 100644 --- a/src/api/07_insignia/api.insignia.ts +++ b/src/api/07_insignia/api.insignia.ts @@ -16,6 +16,12 @@ export default { // manage insigniaManage: (type: string) => `${insignia}/manage/${type}`, - insigniaList: (insigniaPeriodId: any, ocId: string, role: string, status: any) => `${insignia}/request/${insigniaPeriodId}/${ocId}/${role}/${status}` + insigniaCreate: () => `${insignia}/request`, + insigniaList: (insigniaPeriodId: any, ocId: string, role: string, status: any) => `${insignia}/request/${insigniaPeriodId}/${ocId}/${role}/${status}`, + insigniaReject: (profileId: string) => `${insignia}/status/reject/${profileId}`, + insigniaDelete: (profileId: string) => `${insignia}/status/delete/${profileId}`, + insigniaEdit: (profileId: string) => `${insignia}/request/${profileId}`, + insigniaAgency: () => `${insignia}/request/agency`, + insigniaDashboard: (insigniaPeriodId: string) => `${insignia}/request/dashboard/${insigniaPeriodId}`, }; diff --git a/src/api/index.ts b/src/api/index.ts index 9b092ddf6..4c46a4e20 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -29,6 +29,7 @@ const config = ref({ // API_PROBATION_URI: "https://ehr.joolsoft.com/v1", API_PROBATION_URI: "https://bmaehr.joolsoft.com/nodeapi/v1", // API_PROBATION_URI: "http://192.168.1.151:7776/v1", + API_REPORT2_URI: "https://bma-ehr.frappet.synology.me/api/v2", }, test: { API_URI: "http://localhost:5010/api/v1", @@ -50,6 +51,7 @@ const config = ref({ MEET_URI: "meet.frappet.com", API_RETIREMENT_URI: `${window.location.protocol}//${window.location.host}/api/v1`, API_PROBATION_URI: "https://bmaehr.joolsoft.com/nodeapi/v1", + API_REPORT2_URI: `${window.location.protocol}//${window.location.host}/api/v2`, }, }); @@ -78,6 +80,9 @@ const API_URI_ORG_TREE = ref(config.value[env.value].API_URI_ORG_TREE); const API_PROBATION_URI = ref( config.value[env.value].API_PROBATION_URI ); +const API_REPORT2_URI = ref( + config.value[env.value].API_REPORT2_URI +); export default { env: env.value, @@ -93,4 +98,5 @@ export default { MEET_URI: MEET_URI.value, API_RETIREMENT_URI: API_RETIREMENT_URI.value, API_PROBATION_URI: API_PROBATION_URI.value, + API_REPORT2_URI: API_REPORT2_URI.value, }; diff --git a/src/api/reports/api.report.ts b/src/api/reports/api.report.ts new file mode 100644 index 000000000..c025232d2 --- /dev/null +++ b/src/api/reports/api.report.ts @@ -0,0 +1,10 @@ +/** + * api รายงานทั้งหมด + */ +import env from "../index"; +const reportOrder = `${env.API_REPORT2_URI}/report/order`; + +export default { + reportOrderCover: (fileType: string, id: string) => `${reportOrder}/cover/${fileType}/${id}`, + reportOrderAttachment: (fileType: string, id: string) => `${reportOrder}/attachment/${fileType}/${id}`, +}; diff --git a/src/app.config.ts b/src/app.config.ts index b8bb88983..801a88941 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -40,6 +40,9 @@ import insignia from "./api/07_insignia/api.insignia"; /** API dashboard */ import message from "./api/00_dashboard/api.message"; +/** API reports */ +import reports from "./api/reports/api.report"; + // environment variables export const compettitivePanel = import.meta.env.VITE_COMPETITIVE_EXAM_PANEL; export const qualifyDisableExamPanel = import.meta.env @@ -80,6 +83,9 @@ const API = { //dashboard ...message, + + //reports + ...reports, }; export default { diff --git a/src/modules/05_placement/components/AppointMent/Detail.vue b/src/modules/05_placement/components/AppointMent/Detail.vue index e95135d42..7e184c97d 100644 --- a/src/modules/05_placement/components/AppointMent/Detail.vue +++ b/src/modules/05_placement/components/AppointMent/Detail.vue @@ -42,7 +42,7 @@ const salary = ref(""); const educationOld = ref(""); const reason = ref(""); const date = ref(null); - +const status = ref(""); onMounted(async () => { await fecthappointmentByid(); }); @@ -61,7 +61,8 @@ const fecthappointmentByid = async () => { title.value.organizationPositionOld = data.organizationPositionOld ?? "-"; title.value.positionLevelOld = data.positionLevelOld ?? "-"; title.value.positionTypeOld = data.positionTypeOld ?? "-"; - + status.value = data.status, + console.log("🚀 ~ file: Detail.vue:65 ~ .then ~ status:", status.value) educationOld.value = data.educationOld; organizationPositionOld.value = data.organizationPositionOld; positionTypeOld.value = data.positionTypeOld; @@ -71,6 +72,7 @@ const fecthappointmentByid = async () => { // organization.value = data.organization; //ไม่มี reason.value = data.reason; date.value = data.positionDate; + }) .catch((e) => { messageError($q, e); @@ -189,7 +191,8 @@ const getClass = (val: boolean) => { แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย -
+
+
@@ -198,6 +201,10 @@ const getClass = (val: boolean) => {
+ + + +
diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue index 3f0854ee7..9165fa683 100644 --- a/src/modules/05_placement/components/AppointMent/Main.vue +++ b/src/modules/05_placement/components/AppointMent/Main.vue @@ -8,6 +8,7 @@ import DialogOrgTree from "@/modules/05_placement/components/AppointMent/Appoint import { useCounterMixin } from "@/stores/mixin"; import http from "@/plugins/http"; import config from "@/app.config"; +import { WeekNumberContainer } from "@fullcalendar/core/internal"; const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง const { showLoader, @@ -53,6 +54,7 @@ const visibleColumns = ref([ "fullname", "organizationName", "birthday", + "createdAt", "status", ]); const visibleColumns2 = ref([ @@ -105,6 +107,8 @@ const fecthlistappointment = async () => { positionNumber: e.positionNumber, positionPath: e.positionPath, status: status(e.status), + createdAt:date2Thai(e.createdAt), + birthday: e.dateOfBirth == null ? "-" : date2Thai(e.dateOfBirth), })); // console.log(rows.value); @@ -169,8 +173,7 @@ const columns = ref([ field: "organizationName", headerStyle: "font-size: 14px", style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + }, { name: "birthday", @@ -181,6 +184,17 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "createdAt", + align: "left", + label: "วันที่ดำเนินการ", + sortable: true, + field: "createdAt", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + sort: (a, b) => (b.createdAt) - (a.createdAt) + + }, { name: "status", align: "left", @@ -191,6 +205,7 @@ const columns = ref([ style: "font-size: 14px", }, ]); + const columns2 = ref([ { name: "no", @@ -239,6 +254,7 @@ const columns2 = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + ]); const openModalTree = (id: string) => { @@ -390,7 +406,7 @@ const status = (val: string) => { :columns="columns" :rows="rows" :filter="filterKeyword" - row-key="fullname" + row-key="citizenId" :visible-columns="visibleColumns" >