สถานะการใช้งาน
diff --git a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue b/src/modules/09_leave/components/4_specialTime/DialogApprove.vue index 93e3953f5..0e52be3fc 100644 --- a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue +++ b/src/modules/09_leave/components/4_specialTime/DialogApprove.vue @@ -29,6 +29,8 @@ const props = defineProps({ date: { type: String, default: "" }, dateFix: { type: String, default: "" }, id: { type: String, default: "" }, + checkInStatus: { type: String, default: "NORMAL" }, + checkOutStatus: { type: String, default: "NORMAL" }, closeDialog: { type: Function, default: () => {} }, detailData: Object, }); @@ -151,6 +153,13 @@ watch( formData.checkOutEdit = props.detailData.checkOutEdit; } } + if (props.modal === true) { + formData.checkInStatus = "NORMAL"; + formData.checkOutStatus = "NORMAL"; + } else { + formData.checkInStatus = props.checkInStatus; + formData.checkOutStatus = props.checkOutStatus; + } } ); diff --git a/src/modules/09_leave/views/ChangeRoundMain.vue b/src/modules/09_leave/views/ChangeRoundMain.vue index 1c7fd2c71..9cd0d57d8 100644 --- a/src/modules/09_leave/views/ChangeRoundMain.vue +++ b/src/modules/09_leave/views/ChangeRoundMain.vue @@ -21,7 +21,7 @@ const dataStore = useChangeRoundDataStore(); const $q = useQuasar(); const modal = ref