From a8d35e8719d093dead7cd4c7ee35ada12852bfc3 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Tue, 25 Jul 2023 18:03:55 +0700 Subject: [PATCH 1/9] no message --- .../components/probation/FormAssign.vue | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue index 871af71dc..3724bae39 100644 --- a/src/modules/05_placement/components/probation/FormAssign.vue +++ b/src/modules/05_placement/components/probation/FormAssign.vue @@ -65,7 +65,7 @@ @click="addCaretaker" /> รีเช็ต - - {{ caretakerCount }} - +
@@ -127,9 +125,7 @@ @click="resetActivity" >รีเช็ต - - {{ activityCount }} - +
รีเช็ต - - {{ knowledgeCount }} - +
@@ -654,9 +644,7 @@ @click="resetProductivity" >รีเช็ต - - {{ productivityCount }} - +
@@ -1088,7 +1076,7 @@ const routeName = router.currentRoute.value.name; const name = ref("นายสมคิด ยอดใจ"); const position = ref("นักจัดการงานทั่วไป"); -const caretakerCount = ref(1); +const caretakerCount = ref(2); const caretakerMax = ref(6); const caretakers = ref(Array(caretakerCount.value).fill("")); const caretaker2 = ref(""); @@ -1107,7 +1095,7 @@ const getOptions = (item: number) => { return OPcaretaker; }; const resetCaretakers = () => { - caretakerCount.value = 1; + caretakerCount.value = 2; caretakers.value = Array(caretakerCount.value).fill(""); }; //-----------------(3.1)-----------// From 97b5e638136512ac957c71d0c2e227e7e637034e Mon Sep 17 00:00:00 2001 From: waruneeta Date: Tue, 25 Jul 2023 21:14:52 +0700 Subject: [PATCH 2/9] =?UTF-8?q?update=20=E0=B9=80=E0=B8=81=E0=B8=A9?= =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=93=20+=20=E0=B8=9B=E0=B8=B4=E0=B8=94?= =?UTF-8?q?=20route=20=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5?= =?UTF-8?q?=E0=B8=A2=E0=B8=94=E0=B8=96=E0=B8=B6=E0=B8=87=E0=B9=81=E0=B8=81?= =?UTF-8?q?=E0=B9=88=E0=B8=81=E0=B8=A3=E0=B8=A3=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ListRetirement/AddList.vue | 16 +++---- .../components/ListRetirement/TableList.vue | 47 +++++++++---------- .../components/resign/Deceased.vue | 4 +- src/modules/06_retirement/views/Main.vue | 8 ++-- 4 files changed, 36 insertions(+), 39 deletions(-) diff --git a/src/modules/06_retirement/components/ListRetirement/AddList.vue b/src/modules/06_retirement/components/ListRetirement/AddList.vue index 865c20433..a9e7a4636 100644 --- a/src/modules/06_retirement/components/ListRetirement/AddList.vue +++ b/src/modules/06_retirement/components/ListRetirement/AddList.vue @@ -16,7 +16,10 @@ const id = route.params.id; const props = defineProps({ retireld: String, listId: String, - UpdateListId: Function, + UpdateListId: { + type: Function, + default: () => console.log("UpdateListId"), + }, }); const modal = ref(false); @@ -125,11 +128,8 @@ watch(modal, () => { fecthlistRetire(); } }); -const updateListId = (val: any) => { - listId.value = val; - if (props.UpdateListId) { - props.UpdateListId(listId.value); - } +const updateListData = (retireld: string, pId: string) => { + props.UpdateListId(retireld, pId); }; const fecthlistRetire = async () => { showLoader(); @@ -199,12 +199,12 @@ const clickAdd = (props: any) => { persistent: true, }) .onOk(async () => { - console.log("เพิ่มข้อมูล"); + // console.log("เพิ่มข้อมูล"); await http .put(config.API.profileRetire(retireld.value), { profileId: data }) .then((res) => { success($q, "เพิ่มข้อมูลสำเร็จ"); - updateListId(data); + updateListData(retireld.value, data); }) .catch((e) => { messageError($q, e); diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue index aa9311d18..29f390b44 100644 --- a/src/modules/06_retirement/components/ListRetirement/TableList.vue +++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue @@ -19,23 +19,23 @@ const modalNote = ref(false); const note = ref(""); const retireProfileId = ref(""); const retireld = ref(); -const listId = ref(""); +const profileId = ref(""); onMounted(() => { - console.log(route.params); - if (route.params.id === undefined) { + // console.log(route.params); + if (retireld_params === undefined) { fecthlistprofile(type_params, year_params); - } - if (route.params.id !== undefined) { + } else { fecthlist(retireld_params); } }); + const fecthlistprofile = async (type: any, year: any) => { showLoader(); await http .get(config.API.profile(type, year)) .then((res: any) => { - console.log(res); + // console.log(res); retireld.value = res.data.result.id; rows.value = res.data.result.profile.map((e: any) => ({ id: e.id, @@ -62,10 +62,11 @@ const fecthlist = async (id: any) => { await http .get(config.API.listRetire(id)) .then((res: any) => { - console.log(res); + // console.log(res); retireld.value = res.data.result.id; rows.value = res.data.result.map((e: any) => ({ id: e.id, + profileId: e.profileId, order: e.order, fixname: e.prefix, name: e.fullName, @@ -76,7 +77,7 @@ const fecthlist = async (id: any) => { positionLavel: e.positionEmployeeLevel, bureau: e.oc, })); - console.log(rows.value); + // console.log(rows.value); }) .catch((e: any) => { messageError($q, e); @@ -250,7 +251,7 @@ const visibleColumns = ref([ const filter = ref(""); const clickDelete = (prop: any) => { - console.log(prop.id); + // console.log(prop.id); $q.dialog({ title: "ยืนยันการลบข้อมูล", message: "ต้องการลบข้อมูลนี้ใช่หรือไม่?", @@ -270,7 +271,7 @@ const clickDelete = (prop: any) => { messageError($q, e); }) .finally(() => { - if (route.params.id === undefined) { + if (retireld_params === undefined) { fecthlistprofile(type_params, year_params); } else fecthlist(retireld_params); }); @@ -285,7 +286,7 @@ const fetchReason = async (val: string) => { await http .get(config.API.reasonId(val)) .then((res: any) => { - console.log(res.data.result); + // console.log(res.data.result); note.value = res.data.result.reason; retireProfileId.value = res.data.result.id; @@ -305,7 +306,7 @@ const saveNote = () => { persistent: true, }) .onOk(async () => { - console.log("บันทึกข้อมูล"); + // console.log("บันทึกข้อมูล"); await http .post(config.API.createnote(), { retireProfileId: retireProfileId.value, @@ -330,13 +331,10 @@ const visibleNote = computed(() => { return true; } }); -watch(listId, () => { - if (route.params.id === undefined) { - fecthlistprofile(type_params, year_params); - } else fecthlist(retireld_params); -}); -const UpdateListId = (newListId: string) => { - listId.value = newListId; + +const UpdateListId = async (retireld: string, pId: string) => { + profileId.value = pId + await fecthlist(retireld) }; // const saveList = () => { // $q.dialog({ @@ -366,14 +364,13 @@ const UpdateListId = (newListId: string) => { // .onDismiss(() => {}); // }; const classrow = (prop: any) => { - console.log(prop.id); - if (prop.id === listId.value) { - return "color: #26a69a "; + if (prop.profileId === profileId.value) { + return "color: #26a69a; border: 1px solid #26a69a;"; } else return ""; }; const paging = ref(true); const pagination = ref({ - sortBy: "fullname", + sortBy: "order", descending: true, page: 1, rowsPerPage: 10, @@ -403,8 +400,8 @@ const paginationLabel = (start: number, end: number, total: number) => { diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue index b5a054580..6574a1f67 100644 --- a/src/modules/06_retirement/views/Main.vue +++ b/src/modules/06_retirement/views/Main.vue @@ -246,15 +246,15 @@ const visibleColumns2 = ref(["no", "name", "retireNumber"]); const getYear = () => { yearOptions.length = 0; yearOptions.push(currentYear + 543); - console.log(yearOptions); + // console.log(yearOptions); get(type.value, currentYear); fiscalyear.value = currentYear + 543; }; -const get = async (type: string, year: string) => { +const get = async (type: string, year: any) => { await http .get(config.API.retirement(type, year)) .then((res) => { - console.log(res); + // console.log(res); rows.value = []; let data = res.data.result; @@ -410,7 +410,7 @@ const paginationLabel = (start: string, end: string, total: string) => { else return start + "-" + end + " ใน " + total; }; const nextPage = (prop: any) => { - console.log(prop.id); + // console.log(prop.id); router.push(`/retirement/listretire/${prop.id}/${type.value}`); }; From d035692f44460c19770aa5bc780c02a2640f42ae Mon Sep 17 00:00:00 2001 From: waruneeta Date: Wed, 26 Jul 2023 00:57:05 +0700 Subject: [PATCH 3/9] test & update --- .../components/ListRetirement/AddList.vue | 14 +++++++----- .../components/ListRetirement/TableList.vue | 22 ++++++++++--------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/modules/06_retirement/components/ListRetirement/AddList.vue b/src/modules/06_retirement/components/ListRetirement/AddList.vue index a9e7a4636..7f72cdc63 100644 --- a/src/modules/06_retirement/components/ListRetirement/AddList.vue +++ b/src/modules/06_retirement/components/ListRetirement/AddList.vue @@ -117,7 +117,7 @@ const rows = ref([ ]); const filter = ref(""); watch(modal, () => { - console.log(props); + // console.log(props); if (modal.value === true) { retireld.value = props.retireld; @@ -137,7 +137,7 @@ const fecthlistRetire = async () => { .get(config.API.profileOrganizRoot) .then((res) => { const id = res.data.result[0].id; - console.log(id); + // console.log(id); if (id !== "") { findlist(id); } @@ -152,20 +152,20 @@ const findlist = async (id: string) => { if (type.value === "officer") { data = [{ criteriaType: "is_retire", criteriaValue: "false" }]; } else if (type.value === "all") { - console.log("all"); + // console.log("all"); data = [ { criteriaType: "is_retire", criteriaValue: "false" }, { criteriaType: "employee_class", criteriaValue: "perm" }, ]; } - console.log(data); + // console.log(data); await http .post(config.API.profileSearchNewOcIdType(id, type.value), { criterias: data, }) .then((res) => { - console.log(res.data.result); + // console.log(res.data.result); rows.value = res.data.result.map((e: any) => ({ id: e.id, fullname: e.fullname, @@ -182,13 +182,15 @@ const findlist = async (id: string) => { }); }; const clickAdd = (props: any) => { - console.log(retireld.value, id); + // console.log("props===>",props.row.id) if (retireld.value == undefined) { retireld.value = id; } let data: any = props.row.id; + console.log("retireld & profileId",retireld.value, data); + $q.dialog({ title: "ยืนยันการเพิ่มข้อมูล", message: "ต้องการเพิ่มข้อมูลนี้ใช่หรือไม่?", diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue index 29f390b44..1fb471a7c 100644 --- a/src/modules/06_retirement/components/ListRetirement/TableList.vue +++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue @@ -332,9 +332,11 @@ const visibleNote = computed(() => { } }); -const UpdateListId = async (retireld: string, pId: string) => { +const UpdateListId = (retireld: string, pId: string) => { profileId.value = pId - await fecthlist(retireld) + fecthlist(retireld) + console.log("profileId",profileId.value); + }; // const saveList = () => { // $q.dialog({ @@ -363,15 +365,15 @@ const UpdateListId = async (retireld: string, pId: string) => { // .onCancel(() => {}) // .onDismiss(() => {}); // }; -const classrow = (prop: any) => { - if (prop.profileId === profileId.value) { - return "color: #26a69a; border: 1px solid #26a69a;"; - } else return ""; -}; +// const classrow = (prop: any) => { +// if (profileId.value!=='' && prop.profileId === profileId.value) { +// return "color: #26a69a;"; +// } else return ""; +// }; const paging = ref(true); const pagination = ref({ sortBy: "order", - descending: true, + descending: false, page: 1, rowsPerPage: 10, }); @@ -401,7 +403,7 @@ const paginationLabel = (start: number, end: number, total: number) => { \ No newline at end of file + diff --git a/src/modules/05_placement/components/probation/MainDetail.vue b/src/modules/05_placement/components/probation/MainDetail.vue index 551575019..f1a22fc3e 100644 --- a/src/modules/05_placement/components/probation/MainDetail.vue +++ b/src/modules/05_placement/components/probation/MainDetail.vue @@ -1,171 +1,170 @@ \ No newline at end of file + diff --git a/src/modules/05_placement/components/probation/ProbationDetail.vue b/src/modules/05_placement/components/probation/ProbationDetail.vue index 7faf54272..cb43dad2d 100644 --- a/src/modules/05_placement/components/probation/ProbationDetail.vue +++ b/src/modules/05_placement/components/probation/ProbationDetail.vue @@ -1,274 +1,302 @@ + + +
+
+ + + diff --git a/src/modules/05_placement/components/probation/form/formEva2.vue b/src/modules/05_placement/components/probation/form/formEva2.vue new file mode 100644 index 000000000..0b4771475 --- /dev/null +++ b/src/modules/05_placement/components/probation/form/formEva2.vue @@ -0,0 +1,289 @@ + + + diff --git a/src/modules/05_placement/components/probation/form/formEva3.vue b/src/modules/05_placement/components/probation/form/formEva3.vue new file mode 100644 index 000000000..e368f2dc6 --- /dev/null +++ b/src/modules/05_placement/components/probation/form/formEva3.vue @@ -0,0 +1,130 @@ + + + + diff --git a/src/modules/05_placement/components/probation/form/formEvaOrder.vue b/src/modules/05_placement/components/probation/form/formEvaOrder.vue new file mode 100644 index 000000000..2a0c7f662 --- /dev/null +++ b/src/modules/05_placement/components/probation/form/formEvaOrder.vue @@ -0,0 +1,83 @@ + + + diff --git a/src/modules/05_placement/components/probation/form/formEvacomment.vue b/src/modules/05_placement/components/probation/form/formEvacomment.vue new file mode 100644 index 000000000..5dc58496c --- /dev/null +++ b/src/modules/05_placement/components/probation/form/formEvacomment.vue @@ -0,0 +1,45 @@ + + diff --git a/src/modules/05_placement/components/probation/tabs/tabs2.vue b/src/modules/05_placement/components/probation/tabs/tabs2.vue new file mode 100644 index 000000000..60ed911ee --- /dev/null +++ b/src/modules/05_placement/components/probation/tabs/tabs2.vue @@ -0,0 +1,116 @@ + + diff --git a/src/modules/05_placement/components/probation/tabs/tabs3.vue b/src/modules/05_placement/components/probation/tabs/tabs3.vue new file mode 100644 index 000000000..62cebf32c --- /dev/null +++ b/src/modules/05_placement/components/probation/tabs/tabs3.vue @@ -0,0 +1,116 @@ + + diff --git a/src/modules/05_placement/components/probation/tabs/tabs4.vue b/src/modules/05_placement/components/probation/tabs/tabs4.vue new file mode 100644 index 000000000..62cebf32c --- /dev/null +++ b/src/modules/05_placement/components/probation/tabs/tabs4.vue @@ -0,0 +1,116 @@ + + diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts index 8b1d5a8d3..90d23090b 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -21,7 +21,7 @@ const detailOrderReplace = () => "@/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue" ); - // ระบบทดลองงาน +// ระบบทดลองงาน const mainProbation = () => import("@/modules/05_placement/components/probation/MainProbation.vue"); @@ -33,179 +33,178 @@ const probationFormEvaluation = () => const probationWorkAdd = () => import("@/modules/05_placement/components/probation/MainDetail.vue"); - const probationFormAssign = () => - import("@/modules/05_placement/components/probation/FormAssign.vue"); - const transfer = () => - import("@/modules/05_placement/components/Transfer/transferMain.vue"); - const transferbyId = () => - import("@/modules/05_placement/components/Transfer/transferRegistry.vue"); +const probationFormAssign = () => + import("@/modules/05_placement/components/probation/FormAssign.vue"); +const transfer = () => + import("@/modules/05_placement/components/Transfer/transferMain.vue"); +const transferbyId = () => + import("@/modules/05_placement/components/Transfer/transferRegistry.vue"); - - // คำสั่งช่วยราชการ/ส่งตัวกลับ - const RepatriationOrder = () => +// คำสั่งช่วยราชการ/ส่งตัวกลับ +const RepatriationOrder = () => import("@/modules/05_placement/components/RepatriationOrder/List.vue"); - const RepatriationOrderAdd = () => +const RepatriationOrderAdd = () => import("@/modules/05_placement/components/RepatriationOrder/AddOrder.vue"); - export default [ - { - path: "/placement", - name: "placement", - component: PlacementMain, - meta: { - Auth: true, - Key: [6.1], - Role: "placement", - }, +export default [ + { + path: "/placement", + name: "placement", + component: PlacementMain, + meta: { + Auth: true, + Key: [6.1], + Role: "placement", }, - { - path: "/placement/personal-list/:examId", - name: "placementDetail", - component: PlacementDetail, - meta: { - Auth: true, - Key: [6.1], - Role: "placement", - }, + }, + { + path: "/placement/personal-list/:examId", + name: "placementDetail", + component: PlacementDetail, + meta: { + Auth: true, + Key: [6.1], + Role: "placement", }, - { - path: "/placement/personal-detail/:personalId", - name: "PlacementPersonalDetail", - component: PlacementPersonalDetail, - meta: { - Auth: true, - Key: [6.1], - Role: "placement", - }, + }, + { + path: "/placement/personal-detail/:personalId", + name: "PlacementPersonalDetail", + component: PlacementPersonalDetail, + meta: { + Auth: true, + Key: [6.1], + Role: "placement", }, - { - path: "/placement/order", - name: "Orderplacement", - component: MainOrderPlacement, - meta: { - Auth: true, - Key: [6.2], - Role: "placement", - }, + }, + { + path: "/placement/order", + name: "Orderplacement", + component: MainOrderPlacement, + meta: { + Auth: true, + Key: [6.2], + Role: "placement", }, - { - path: "/placement/order/detail", - name: "OrderplacementDetail", - component: detailOrderReplace, - meta: { - Auth: true, - Key: [6.2], - Role: "placement", - }, + }, + { + path: "/placement/order/detail", + name: "OrderplacementDetail", + component: detailOrderReplace, + meta: { + Auth: true, + Key: [6.2], + Role: "placement", }, - { - path: "/placement/addOrderPlacement", - name: "addOrderPlacement", - component: addOrderPlacement, - meta: { - Auth: true, - Key: [6.2], - Role: "placement", - }, + }, + { + path: "/placement/addOrderPlacement", + name: "addOrderPlacement", + component: addOrderPlacement, + meta: { + Auth: true, + Key: [6.2], + Role: "placement", }, - { - path: "/probation", - name: "probation", - component: mainProbation, - meta: { - Auth: true, - Key: [6.3], - Role: "placement", - }, + }, + { + path: "/probation", + name: "probation", + component: mainProbation, + meta: { + Auth: true, + Key: [6.3], + Role: "placement", }, - { - path: "/probation/detail/:id", - name: "probationDetail", - component: probationDetail, - meta: { - Auth: true, - Key: [6.3], - Role: "placement", - }, + }, + { + path: "/probation/detail/:id", + name: "probationDetail", + component: probationDetail, + meta: { + Auth: true, + Key: [6.3], + Role: "placement", }, - { - path: "/probation/form", - name: "probationForm", - component: probationFormEvaluation, - meta: { - Auth: true, - Key: [6.3], - Role: "placement", - }, + }, + { + path: "/probation/detail/:id/:form", + name: "probationForm", + component: probationFormEvaluation, + meta: { + Auth: true, + Key: [6.3], + Role: "placement", }, - { - path: "/probation/work/add", - name: "probationWorkAdd", - component: probationWorkAdd, - meta: { - Auth: true, - Key: [6.3], - Role: "placement", - }, + }, + { + path: "/probation/work/add", + name: "probationWorkAdd", + component: probationWorkAdd, + meta: { + Auth: true, + Key: [6.3], + Role: "placement", }, - { - path: "/probation/work/:id", - name: "probationWork", - component: probationWorkAdd, - meta: { - Auth: true, - Key: [6.3], - Role: "placement", - }, + }, + { + path: "/probation/work/:id", + name: "probationWork", + component: probationWorkAdd, + meta: { + Auth: true, + Key: [6.3], + Role: "placement", }, - { - path: "/probation/add", - name: "probationWorkAdd", - component: probationFormAssign, - meta: { - Auth: true, - Key: [6.3], - Role: "placement", - }, + }, + { + path: "/probation/add", + name: "probationWorkAdd", + component: probationFormAssign, + meta: { + Auth: true, + Key: [6.3], + Role: "placement", }, - { - path: "/transfer", - name: "transfer", - component: transfer, - meta: { - Auth: true, - Key: [6.4], - Role: "placement", - } + }, + { + path: "/transfer", + name: "transfer", + component: transfer, + meta: { + Auth: true, + Key: [6.4], + Role: "placement", }, - { - path: "/transfer/:id", - name: "transfer-id", - component: transferbyId, - meta: { - Auth: true, - Key: [6.4], - Role: "placement", - } + }, + { + path: "/transfer/:id", + name: "transfer-id", + component: transferbyId, + meta: { + Auth: true, + Key: [6.4], + Role: "placement", }, - { - path: "/repatriation-order", - name: "repatriation-order", - component: RepatriationOrder, - meta: { - Auth: true, - Key: [6.6], - Role: "placement", - }, + }, + { + path: "/repatriation-order", + name: "repatriation-order", + component: RepatriationOrder, + meta: { + Auth: true, + Key: [6.6], + Role: "placement", }, - { - path: "/repatriation-order/add", - name: "repatriation-order-add", - component: RepatriationOrderAdd, - meta: { - Auth: true, - Key: [6.6], - Role: "placement", - }, + }, + { + path: "/repatriation-order/add", + name: "repatriation-order-add", + component: RepatriationOrderAdd, + meta: { + Auth: true, + Key: [6.6], + Role: "placement", }, - ]; + }, +]; diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts index 3f51227be..29f73c9b7 100644 --- a/src/modules/05_placement/store.ts +++ b/src/modules/05_placement/store.ts @@ -281,3 +281,17 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => { DataMainOrder, }; }); + +export const useProbationDataStore = defineStore("probationDataStore", () => { + const ratingColors = ref([ + "light-blue-3", + "light-blue-6", + "blue", + "blue-9", + "blue-10", + ]); + + return { + ratingColors, + }; +}); From 18d9494fd879428b99b3f3d7c450be45ed8f0d5e Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Wed, 26 Jul 2023 09:16:19 +0700 Subject: [PATCH 6/9] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94?= =?UTF-8?q?=E0=B8=82=E0=B8=AD=E0=B9=82=E0=B8=AD=E0=B8=99=20status=20?= =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Transfer/transferRegistry.vue | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/modules/05_placement/components/Transfer/transferRegistry.vue b/src/modules/05_placement/components/Transfer/transferRegistry.vue index 5c884ef06..cc833aaee 100644 --- a/src/modules/05_placement/components/Transfer/transferRegistry.vue +++ b/src/modules/05_placement/components/Transfer/transferRegistry.vue @@ -38,7 +38,7 @@
{{ position }}
-
+
ระดับ
{{ level }}
@@ -50,27 +50,6 @@
{{ institution }}
-
-
-
สถานะการทดลองงาน
-
- - - - {{ status }} -
-
-
From 4dce59d844253e4702bf6e67ee89cad0eec0ac09 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Wed, 26 Jul 2023 14:50:07 +0700 Subject: [PATCH 7/9] =?UTF-8?q?ui=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=A1=E0=B8=AD=E0=B8=9A?= =?UTF-8?q?=E0=B8=AB=E0=B8=A1=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=97=E0=B8=94=E0=B8=A5=E0=B8=AD?= =?UTF-8?q?=E0=B8=87=E0=B8=9B=E0=B8=8F=E0=B8=B4=E0=B8=9A=E0=B8=B1=E0=B8=95?= =?UTF-8?q?=E0=B8=B4=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=97=E0=B8=B5?= =?UTF-8?q?=E0=B9=88=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/probation/FormAssign.vue | 284 ++++++++++++------ 1 file changed, 199 insertions(+), 85 deletions(-) diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue index e654ca766..55e1e48cf 100644 --- a/src/modules/05_placement/components/probation/FormAssign.vue +++ b/src/modules/05_placement/components/probation/FormAssign.vue @@ -49,6 +49,73 @@ label="ตำแหน่ง" /> +
+ ระยะเวลาการทดลองปฎิบัติหน้าที่ราชการ +
+
+ + + + + +
+ +
+ + + + + +
+
@@ -58,7 +125,7 @@
2 ผู้ดูแลการทดลองปฏิบัติหน้าที่ราชการ (อาจมีได้มากกว่า 1 คน) - - รีเช็ต - + /> -->
+
+
3 @@ -118,22 +182,11 @@ class="q-ml-sm" @click="addActivity" /> - รีเช็ต -
-
+
-
+
+ +
+ +
+
@@ -187,23 +254,12 @@ class="q-ml-sm" @click="addKnowledge" /> - รีเช็ต -
-
-
+
+
+
+
+
+
ความรู้เรื่องกฎหมายและกฎระเบียบ (ไม่เกิน 20 หัวข้อ) @@ -335,17 +404,25 @@
{{ item.text }}
-
- -
+
3. กฎหมายอื่นๆ ที่เกี่ยวข้องกับการปฏิบัติงาน
+
+
+
+ +
+
@@ -644,22 +721,10 @@ class="q-ml-sm" @click="addProductivity" /> - รีเช็ต -
-
+
+
+ +
@@ -1077,15 +1154,24 @@ + \ No newline at end of file diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue new file mode 100644 index 000000000..15c6ee09e --- /dev/null +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue @@ -0,0 +1,369 @@ + + + + + diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue new file mode 100644 index 000000000..15c6ee09e --- /dev/null +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue @@ -0,0 +1,369 @@ + + + + + diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue new file mode 100644 index 000000000..c5aa2bc4f --- /dev/null +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue @@ -0,0 +1,469 @@ + + + + + diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Header.vue b/src/modules/05_placement/components/probation/FormEvaluation/Header.vue new file mode 100644 index 000000000..579b4e5c6 --- /dev/null +++ b/src/modules/05_placement/components/probation/FormEvaluation/Header.vue @@ -0,0 +1,115 @@ + + + \ No newline at end of file diff --git a/src/modules/05_placement/components/probation/FormEvaluation/SubForm/Part1.vue b/src/modules/05_placement/components/probation/FormEvaluation/SubForm/Part1.vue new file mode 100644 index 000000000..d33baba54 --- /dev/null +++ b/src/modules/05_placement/components/probation/FormEvaluation/SubForm/Part1.vue @@ -0,0 +1,432 @@ + + + + + diff --git a/src/modules/05_placement/components/probation/FormEvaluation/SubForm/Part1Template2.vue b/src/modules/05_placement/components/probation/FormEvaluation/SubForm/Part1Template2.vue new file mode 100644 index 000000000..2f4120f67 --- /dev/null +++ b/src/modules/05_placement/components/probation/FormEvaluation/SubForm/Part1Template2.vue @@ -0,0 +1,312 @@ + + + + diff --git a/src/modules/05_placement/components/probation/FormEvaluation/SubForm/Part2.vue b/src/modules/05_placement/components/probation/FormEvaluation/SubForm/Part2.vue new file mode 100644 index 000000000..0b4771475 --- /dev/null +++ b/src/modules/05_placement/components/probation/FormEvaluation/SubForm/Part2.vue @@ -0,0 +1,289 @@ + + + diff --git a/src/modules/05_placement/components/probation/FormEvaluation/SubForm/Part3.vue b/src/modules/05_placement/components/probation/FormEvaluation/SubForm/Part3.vue new file mode 100644 index 000000000..d4b0b14d5 --- /dev/null +++ b/src/modules/05_placement/components/probation/FormEvaluation/SubForm/Part3.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/modules/05_placement/components/probation/FormEvaluation/SubForm/PartHighlightImprove.vue b/src/modules/05_placement/components/probation/FormEvaluation/SubForm/PartHighlightImprove.vue new file mode 100644 index 000000000..5dc58496c --- /dev/null +++ b/src/modules/05_placement/components/probation/FormEvaluation/SubForm/PartHighlightImprove.vue @@ -0,0 +1,45 @@ + + diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue new file mode 100644 index 000000000..251df64ee --- /dev/null +++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue @@ -0,0 +1,31 @@ + + + \ No newline at end of file diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue new file mode 100644 index 000000000..72f5cc6db --- /dev/null +++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue @@ -0,0 +1,29 @@ + + + \ No newline at end of file diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue new file mode 100644 index 000000000..e0adc68a6 --- /dev/null +++ b/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue @@ -0,0 +1,30 @@ + + + \ No newline at end of file diff --git a/src/modules/05_placement/components/probation/MainDetail.vue b/src/modules/05_placement/components/probation/MainDetail.vue index f1a22fc3e..1a58e429e 100644 --- a/src/modules/05_placement/components/probation/MainDetail.vue +++ b/src/modules/05_placement/components/probation/MainDetail.vue @@ -1,3 +1,34 @@ + + -