diff --git a/src/modules/03_recruiting/components/Career.vue b/src/modules/03_recruiting/components/Career.vue index 97aeb80c3..bb7ff708e 100644 --- a/src/modules/03_recruiting/components/Career.vue +++ b/src/modules/03_recruiting/components/Career.vue @@ -12,6 +12,7 @@ :add="clickAdd" :edit="clickEdit" :addData="false" + :bottom="true" :editData="status == 'checkRegister' || status == 'payment'" name="ประวัติการทำงาน (ตั้งแต่เริ่มปฏิบัติงานกับกรุงเทพมหานคร - ปัจจุบัน)" icon="mdi-briefcase" @@ -550,13 +551,13 @@ const fetchData = async () => { yearDiff = yearDiff + d.yearDiff; monthDiff = monthDiff + d.monthDiff; dayDiff = dayDiff + d.dayDiff; - if (dayDiff > 30) { - dayDiff = dayDiff % 30; + if (dayDiff >= 30) { monthDiff = monthDiff + parseInt((dayDiff / 30).toString()); + dayDiff = dayDiff % 30; } - if (monthDiff > 12) { - monthDiff = monthDiff % 12; + if (monthDiff >= 12) { yearDiff = yearDiff + parseInt((monthDiff / 12).toString()); + monthDiff = monthDiff % 12; } total.value = `${yearDiff > 0 ? yearDiff + " ปี " : ""}${ monthDiff > 0 ? monthDiff + " เดือน " : "" diff --git a/src/modules/03_recruiting/components/TableCan.vue b/src/modules/03_recruiting/components/TableCan.vue index 1ac843d17..097cf69c1 100644 --- a/src/modules/03_recruiting/components/TableCan.vue +++ b/src/modules/03_recruiting/components/TableCan.vue @@ -77,6 +77,9 @@ +