From e95ed065f37467962a940f3f58d7d78db34af331 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 2 Sep 2024 11:06:25 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B8=E0=B8=99=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B8=A8=E0=B8=B6=E0=B8=81=E0=B8=A9=E0=B8=B2/?= =?UTF-8?q?=E0=B8=9D=E0=B8=B6=E0=B8=81=E0=B8=AD=E0=B8=9A=E0=B8=A3=E0=B8=A1?= =?UTF-8?q?=20=3D=3D>=20=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20path=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/15_development/api.development.ts | 2 +- .../components/scholarship/DetailView.vue | 181 ++++++++++-------- 2 files changed, 97 insertions(+), 86 deletions(-) diff --git a/src/api/15_development/api.development.ts b/src/api/15_development/api.development.ts index 5bc9fab8d..ef86028b3 100644 --- a/src/api/15_development/api.development.ts +++ b/src/api/15_development/api.development.ts @@ -28,7 +28,7 @@ export default { /** ทุนการศึกษา/ฝึกอบรม*/ devScholarship, - devScholarshipByid: (id: string) => `${devScholarship}/${id}`, + devScholarshipByid: (id: string) => `${devScholarship}/admin/${id}`, devScholarshipStatus: (id: string, status: string) => `${devScholarship}/status/${id}/${status}`, diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue index 0f3f08748..9d9fbe855 100644 --- a/src/modules/15_development/components/scholarship/DetailView.vue +++ b/src/modules/15_development/components/scholarship/DetailView.vue @@ -171,9 +171,9 @@ function fetchDataDetail(id: string) { showLoader(); http .get(config.API.devScholarshipByid(id)) - .then((res) => { - const data: DataSholarship = res.data.result; - console.log(data); + .then(async (res) => { + const data: DataSholarship = await res.data.result; + formBody.profileId = data.profileId; formBody.rank = data.rank; formBody.prefix = data.prefix; @@ -295,11 +295,11 @@ function onSubmit() { : config.API.devScholarship; const method = scholarshipId.value ? "put" : "post"; await http[method](url, formBody); - success($q, "บันทึกข้อมูลสำเร็จ"); scholarshipId.value ? fetchDataDetail(scholarshipId.value) : router.push("/development/scholarship"); + success($q, "บันทึกข้อมูลสำเร็จ"); } catch (e) { messageError($q, e); } finally { @@ -508,6 +508,17 @@ function downloadFileBackReceived() { } } +/** + * class inputgreen + * @param val + */ +const classInput = (val: boolean) => { + return { + "full-width inputgreen cursor-pointer": val, + "full-width cursor-pointer": !val, + }; +}; + /** ดึงข้อมูลเมื่อคอมโพเนนต์โหลดเสร็จสมบูรณ์ */ onMounted(() => { if (scholarshipId.value) { @@ -571,7 +582,7 @@ onMounted(() => { - +
@@ -636,6 +647,7 @@ onMounted(() => {
{ option-value="id" emit-value map-options - class="inputgreen" label="เลือกประเภททุน" :rules="[ (val: string) => @@ -669,7 +680,7 @@ onMounted(() => { outlined hide-bottom-space lazy-rules - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.fundType" :options="fundTypeOp" option-label="name" @@ -726,7 +737,7 @@ onMounted(() => { :readonly="checkRouteDetail" dense outlined - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.scholarshipYear ? Number(formBody.scholarshipYear) + 543 @@ -759,7 +770,7 @@ onMounted(() => { :readonly="checkRouteDetail" dense outlined - class="inputgreen" + :class="classInput(!checkRouteDetail)" label="แหล่งงบประมาณ" hide-bottom-space v-model="formBody.budgetSource" @@ -780,7 +791,7 @@ onMounted(() => { dense outlined hide-bottom-space - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.budgetApprove" label="งบประมาณที่ได้รับอนุมัติตลอดหลักสูตร" mask="###,###,###,###,###,###" @@ -812,7 +823,7 @@ onMounted(() => { :readonly="checkRouteDetail" dense outlined - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.bookNo" label="เลขที่หนังสืออนุมัติ" hide-bottom-space @@ -840,7 +851,7 @@ onMounted(() => { :readonly="checkRouteDetail" dense outlined - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.bookNoDate ? date2Thai(formBody.bookNoDate) : null " @@ -881,7 +892,7 @@ onMounted(() => { dense :readonly="checkRouteDetail" outlined - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.bookApproveDate ? date2Thai(formBody.bookApproveDate) @@ -922,7 +933,7 @@ onMounted(() => { :readonly="checkRouteDetail" outlined dense - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.changeDetail" label="เปลี่ยนแปลงรายละเอียด" rows="3" @@ -945,7 +956,7 @@ onMounted(() => { lazy-rules hide-bottom-space label="เลขที่สัญญา" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.contractNo" :rules="[ (val: string) => @@ -971,7 +982,7 @@ onMounted(() => { dense :readonly="checkRouteDetail" outlined - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.contractDate ? date2Thai(formBody.contractDate) @@ -1003,7 +1014,7 @@ onMounted(() => { outlined hide-bottom-space lazy-rules - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.reportBackNo" label="เลขที่หนังสือรายงานตัวกลับ" :rules="[ @@ -1029,7 +1040,7 @@ onMounted(() => { :readonly="checkRouteDetail" dense outlined - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.reportBackNoDate ? date2Thai(formBody.reportBackNoDate) @@ -1072,7 +1083,7 @@ onMounted(() => { :readonly="checkRouteDetail" dense outlined - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.reportBackDate ? date2Thai(formBody.reportBackDate) @@ -1163,13 +1174,13 @@ onMounted(() => {
{ lazy-rules hide-bottom-space label="สถานที่ไปศึกษาดูงาน" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyPlace" :rules="[ (val: string) => @@ -1353,7 +1364,7 @@ onMounted(() => { lazy-rules hide-bottom-space label="หัวข้อการไปศึกษาดูงาน" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyTopic" :rules="[ (val: string) => @@ -1381,7 +1392,7 @@ onMounted(() => { dense outlined :readonly="checkRouteDetail" - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.studyStartDate ? date2Thai(formBody.studyStartDate) @@ -1426,7 +1437,7 @@ onMounted(() => { dense outlined :readonly="checkRouteDetail" - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.studyEndDate ? date2Thai(formBody.studyEndDate) @@ -1460,7 +1471,7 @@ onMounted(() => { lazy-rules hide-bottom-space label="ประเทศที่ไปศึกษาดูงาน" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyCountry" :rules="[ (val: string) => @@ -1476,7 +1487,7 @@ onMounted(() => { lazy-rules hide-bottom-space label="หัวข้อการไปศึกษาดูงานต่างประเทศ" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyAbroadTopic" :rules="[ (val: string) => @@ -1505,7 +1516,7 @@ onMounted(() => { { :readonly="checkRouteDetail" hide-bottom-space label="สถานที่ไปศึกษาดูงาน" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyPlace" :rules="[ (val: string) => @@ -1767,7 +1778,7 @@ onMounted(() => { lazy-rules hide-bottom-space label="หัวข้อการไปศึกษาดูงาน" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyTopic" :rules="[ (val: string) => @@ -1795,7 +1806,7 @@ onMounted(() => { dense :readonly="checkRouteDetail" outlined - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.studyStartDate ? date2Thai(formBody.studyStartDate) @@ -1846,7 +1857,7 @@ onMounted(() => { dense :readonly="checkRouteDetail" outlined - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.studyEndDate ? date2Thai(formBody.studyEndDate) @@ -1879,7 +1890,7 @@ onMounted(() => { :readonly="checkRouteDetail" hide-bottom-space label="รวมระยะเวลาในการฝึกอบรม" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.totalPeriod" :rules="[ (val: string) => @@ -1904,7 +1915,7 @@ onMounted(() => { lazy-rules hide-bottom-space label="หลักสูตรการฝึกอบรม" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.course" :rules="[ (val: string) => @@ -1920,7 +1931,7 @@ onMounted(() => { :readonly="checkRouteDetail" hide-bottom-space label="สาขา" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.field" :rules="[ (val: string) => @@ -1936,7 +1947,7 @@ onMounted(() => { :readonly="checkRouteDetail" hide-bottom-space label="สถาบันการศึกษา/หน่วยงานผู้จัดการฝึกอบรม" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.educationalInstitution" :rules="[ (val: string) => @@ -1964,7 +1975,7 @@ onMounted(() => { dense outlined :readonly="checkRouteDetail" - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.startDate ? date2Thai(formBody.startDate) @@ -2009,7 +2020,7 @@ onMounted(() => { dense :readonly="checkRouteDetail" outlined - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.endDate ? date2Thai(formBody.endDate) : null " @@ -2040,7 +2051,7 @@ onMounted(() => { lazy-rules hide-bottom-space label="สถานที่ไปศึกษาดูงานในประเทศ" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyPlace" :rules="[ (val: string) => @@ -2056,7 +2067,7 @@ onMounted(() => { :readonly="checkRouteDetail" hide-bottom-space label="หัวข้อการไปศึกษาดูงานในประเทศ" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyTopic" :rules="[ (val: string) => @@ -2083,7 +2094,7 @@ onMounted(() => { { :readonly="checkRouteDetail" hide-bottom-space label="ประเทศที่ไปศึกษา ฝึกอบรม ประชุม ดูงาน และปฏิบัติการวิจัย" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyCountry" :rules="[ (val: string) => @@ -2548,7 +2559,7 @@ onMounted(() => { lazy-rules :readonly="checkRouteDetail" hide-bottom-space - class="inputgreen" + :class="classInput(!checkRouteDetail)" label="หลักสูตรการฝึกอบรม" v-model="formBody.course" :rules="[ @@ -2564,7 +2575,7 @@ onMounted(() => { lazy-rules :readonly="checkRouteDetail" hide-bottom-space - class="inputgreen" + :class="classInput(!checkRouteDetail)" label="สถาบันการศึกษา/หน่วยงานผู้จัดการฝึกอบรม" v-model="formBody.educationalInstitution" :rules="[ @@ -2593,7 +2604,7 @@ onMounted(() => { { :readonly="checkRouteDetail" hide-bottom-space label="สถานที่ไปศึกษาดูงานในประเทศ" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyPlace" :rules="[ (val: string) => @@ -2685,7 +2696,7 @@ onMounted(() => { lazy-rules hide-bottom-space label="หัวข้อการไปศึกษาดูงานในประเทศ" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyTopic" :rules="[ (val: string) => @@ -2713,7 +2724,7 @@ onMounted(() => { dense outlined :readonly="checkRouteDetail" - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.studyStartDate ? date2Thai(formBody.studyStartDate) @@ -2764,7 +2775,7 @@ onMounted(() => { dense outlined :readonly="checkRouteDetail" - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.studyEndDate ? date2Thai(formBody.studyEndDate) @@ -2798,7 +2809,7 @@ onMounted(() => { :readonly="checkRouteDetail" hide-bottom-space label="ประเทศที่ไปศึกษาดูงาน" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyCountry" :rules="[ (val: string) => @@ -2814,7 +2825,7 @@ onMounted(() => { :readonly="checkRouteDetail" hide-bottom-space label="หัวข้อการไปศึกษาดูงานต่างประเทศ" - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.studyAbroadTopic" :rules="[ (val: string) => @@ -2842,7 +2853,7 @@ onMounted(() => { dense outlined :readonly="checkRouteDetail" - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.studyAbroadStartDate ? date2Thai(formBody.studyAbroadStartDate) @@ -2893,7 +2904,7 @@ onMounted(() => { dense outlined :readonly="checkRouteDetail" - class="inputgreen" + :class="classInput(!checkRouteDetail)" :model-value=" formBody.studyAbroadEndDate ? date2Thai(formBody.studyAbroadEndDate) @@ -2926,7 +2937,7 @@ onMounted(() => { :readonly="checkRouteDetail" hide-bottom-space label="รวมระยะเวลาในการฝึกอบรม " - class="inputgreen" + :class="classInput(!checkRouteDetail)" v-model="formBody.totalPeriod" :rules="[ (val: string) => @@ -2944,7 +2955,7 @@ onMounted(() => { > - +