diff --git a/src/modules/09_leave/interface/response/round.ts b/src/modules/09_leave/interface/response/round.ts index 56882fdf7..402b5f92e 100644 --- a/src/modules/09_leave/interface/response/round.ts +++ b/src/modules/09_leave/interface/response/round.ts @@ -10,7 +10,6 @@ interface dataRowRound { amOut: string pm: string pmOut: string - note: string status: boolean isDefault: boolean } @@ -22,7 +21,6 @@ interface roundShow { pmOut: string; amRound: string; pmRound: string; - note: string; status: boolean; isDefault: boolean; } diff --git a/src/modules/09_leave/stores/RoundStores.ts b/src/modules/09_leave/stores/RoundStores.ts index 8c8cc09be..e7e3ee335 100644 --- a/src/modules/09_leave/stores/RoundStores.ts +++ b/src/modules/09_leave/stores/RoundStores.ts @@ -45,15 +45,6 @@ export const useRoundDataStore = defineStore( headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "note", - align: "left", - label: "คำอธิบาย", - sortable: true, - field: "note", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, { name: "status", align: "center", @@ -77,7 +68,6 @@ export const useRoundDataStore = defineStore( pmOut: e.pmOut, amRound:`${e.am}-${e.amOut}`, pmRound:`${e.pm}-${e.pmOut}`, - note: e.note === '' ? '-':e.note, status: e.status, isDefault: e.isDefault, }; diff --git a/src/modules/09_leave/views/LeaveListMain.vue b/src/modules/09_leave/views/LeaveListMain.vue index 481095986..4d2a76929 100644 --- a/src/modules/09_leave/views/LeaveListMain.vue +++ b/src/modules/09_leave/views/LeaveListMain.vue @@ -67,7 +67,7 @@ function changTab() { (false) -const detailData = ref() -const editCheck = ref('') +const modal = ref(false); +const detailData = ref(); +const editCheck = ref(""); // ค้นหาในตาราง const filterKeyword = ref(""); const filterRef = ref(null); @@ -35,17 +35,17 @@ const paginationLabel = (start: string, end: string, total: string) => { else return start + "-" + end + " ใน " + total; }; -function openModal(data:any,check:string){ - modal.value = true - editCheck.value = check - if(check === 'edit'){ - detailData.value = data - } -}; +function openModal(data: any, check: string) { + modal.value = true; + editCheck.value = check; + if (check === "edit") { + detailData.value = data; + } +} -function closeDialog(){ - modal.value = false - editCheck.value = 'add' +function closeDialog() { + modal.value = false; + editCheck.value = "add"; } onMounted(() => { dataStore.fetchData([ @@ -54,36 +54,32 @@ onMounted(() => { amOut: "12:00", pm: "13:00", pmOut: "15:30", - note: "", status: true, - isDefault:true + isDefault: true, }, { am: "08:30", amOut: "12:00", pm: "13:00", pmOut: "15:30", - note: "", status: false, - isDefault:false + isDefault: false, }, { am: "09:30", amOut: "12:00", pm: "13:00", pmOut: "15:30", - note: "", status: true, - isDefault:false + isDefault: false, }, { am: "10:30", amOut: "12:00", pm: "13:00", pmOut: "15:30", - note: "", status: true, - isDefault:false + isDefault: false, }, ]); }); @@ -97,7 +93,7 @@ onMounted(() => {
{ v-for="col in props.cols" :key="col.name" :props="props" - style="color: #000000; font-weight: 500;" + style="color: #000000; font-weight: 500" > - {{ col.label }} + {{ col.label }} @@ -182,15 +178,20 @@ onMounted(() => { - เวลา Default + v-if="props.row.isDefault === true" + name="mdi-bookmark" + size="xs" + color="primary" + > + เวลา Default - +
{
- +