hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev-tee

Browse source
This commit is contained in:
setthawutttty 2023-09-14 11:13:42 +07:00
commit 79ef6f87e0
9 changed files with 148 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/08_registryEmployee/views/SalaryEmployee.vue
View file

@ -625,9 +625,9 @@ const {
const route = useRoute();
const id = ref<string>("");
const date = ref<Date>(new Date());
const amount = ref<number | null>(null);
const positionSalaryAmount = ref<number | null>(null);
const mouthSalaryAmount = ref<number | null>(null);
const amount = ref<number | undefined>(0);
const positionSalaryAmount = ref<number | undefined>(0);
const mouthSalaryAmount = ref<number | undefined>(0);
const search = ref<string>("");
const refCommandNo = ref<any>();
const expanded = ref<string[]>([]);
@ -1712,9 +1712,9 @@ const templateDetail = async () => {
*/
const clickSave = async () => {
// dialogConfirm($q, () => SaveData());
if (amount.value == 0) {
amount.value = null;
}
// if (amount.value == 0) {
// amount.value = null;
// }
await myForm.value.validate().then(async (result: boolean) => {
if (result && agencyId.value) {
if (modalEdit.value) {
@ -1918,9 +1918,9 @@ const addData = () => {
modal.value = true;
edit.value = true;
date.value = new Date();
amount.value = 0;
positionSalaryAmount.value = null;
mouthSalaryAmount.value = null;
amount.value = undefined;
positionSalaryAmount.value = undefined;
mouthSalaryAmount.value = undefined;
posNoId.value = "";
posNoEmployee.value = "";