diff --git a/src/modules/13_salary/components/SalaryRound/DialogForm.vue b/src/modules/13_salary/components/SalaryRound/DialogForm.vue index 3a0075201..49e979f62 100644 --- a/src/modules/13_salary/components/SalaryRound/DialogForm.vue +++ b/src/modules/13_salary/components/SalaryRound/DialogForm.vue @@ -16,6 +16,7 @@ const isActive = ref(false); const period = ref(""); const modal = defineModel("modal", { required: true }); const effective = defineModel("effective", { required: true }); +const year = defineModel("year"); const mixin = useCounterMixin(); const { dialogConfirm, date2Thai, messageError } = mixin; const isReadonly = ref(false); // อ่านได้อย่างเดียว @@ -68,6 +69,7 @@ function clearForm() { isActive.value = false; period.value = ""; effective.value = null; + year.value = 0 } function close() { @@ -81,6 +83,7 @@ function editSummit(){ period: period.value, isActive: isActive.value, effectiveDate: effective.value, + year: year.value, }; http .put(config.API.salaryPeriod()+`/${props.idRound}`, body) @@ -102,6 +105,7 @@ function onSubmit() { period: period.value, isActive: isActive.value, effectiveDate: effective.value, + year: year.value, }; http .post(config.API.salaryPeriod(), body) @@ -133,6 +137,7 @@ watch( effectiveDate.value = props.effectiveDate ? props.effectiveDate:null; isActive.value = props.isActive; }else{ + year.value = 0 effective.value = null period.value = '' isActive.value = false @@ -154,6 +159,40 @@ watch(
+ + + + + + + { rows.value = data.map((i: RowList) => ({ id: i.id, period: i.period !== null ? i.period : null, + year: i.year !== null ? i.year : null, isActive: i.isActive !== null ? i.isActive : null, effectiveDate: i.effectiveDate !== null ? i.effectiveDate : null, status: i.status !== null ? i.status : null, diff --git a/src/modules/13_salary/views/salaryRound.vue b/src/modules/13_salary/views/salaryRound.vue index 69d4357a7..470763df8 100644 --- a/src/modules/13_salary/views/salaryRound.vue +++ b/src/modules/13_salary/views/salaryRound.vue @@ -25,6 +25,7 @@ const period = ref(""); const isActive = ref(false); const effectiveDate = ref(null); +const yearData = ref(0) const maxPage = ref(1); const currentPage = ref(1); const page = ref(1); @@ -38,6 +39,7 @@ const pagination = ref({ const visibleColumns = ref([ "no", "period", + "year", "effectiveDate", "isActive", ]); @@ -62,6 +64,15 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "year", + align: "left", + label: "ปีงบประมาณ", + sortable: true, + field: "year", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "effectiveDate", align: "left", @@ -147,6 +158,7 @@ function editPopup(data:RowList) { console.log(dialog.value) idRound.value = data.id; period.value = data.period ? data.period:''; + yearData.value = data.year ? data.year:0; effectiveDate.value = data.effectiveDate as Date; isActive.value = data.isActive ? data.isActive:false; } @@ -314,6 +326,9 @@ onMounted(async () => {
{{ date2Thai(props.row.effectiveDate)}}
+
+ {{ props.row.year ? props.row.year + 543:'-'}} +
{{ dataStore.statusTothai(props.row.period)}}
@@ -379,6 +394,7 @@ onMounted(async () => { :period="period" v-model:effective="effectiveDate" :isActive="isActive" + v-model:year="yearData" />