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

แก้ไข เงินเดือนทะเบียน

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-09-14 09:27:01 +07:00
parent 9aed7b5b9c
commit 8783a54691
4 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/modules/04_registry/components/Salary.vue
View file

@ -643,10 +643,10 @@ const {
const route = useRoute();
const id = ref<string>("");
const date = ref<Date>(new Date());
const amount = ref<number | null>(0);
const amount = ref<number | undefined>(0);
// const salary = ref<number | null>(null);
const positionSalaryAmount = ref<number | null>(0);
const mouthSalaryAmount = ref<number | null>(0);
const positionSalaryAmount = ref<number | undefined>(0);
const mouthSalaryAmount = ref<number | undefined>(0);
const ocId = ref<string>();
const positionId = ref<string>();
const positionLineId = ref<string>();
@ -1816,13 +1816,13 @@ const templateDetail = async () => {
* กดบันทึกใน dialog
*/
const clickSave = async () => {
if (amount.value == 0) {
amount.value = null;
} else if (positionSalaryAmount.value == 0) {
positionSalaryAmount.value = null;
} else if (mouthSalaryAmount.value == 0) {
mouthSalaryAmount.value = null;
}
// if (amount.value == 0) {
// amount.value = null;
// } else if (positionSalaryAmount.value == 0) {
// positionSalaryAmount.value = null;
// } else if (mouthSalaryAmount.value == 0) {
// mouthSalaryAmount.value = null;
// }
myForm.value.validate().then(async (result: boolean) => {
if (result) {
@ -2018,9 +2018,9 @@ const addData = () => {
edit.value = true;
date.value = new Date();
date.value = new Date();
amount.value = 0;
positionSalaryAmount.value = 0;
mouthSalaryAmount.value = 0;
amount.value = undefined;
positionSalaryAmount.value = undefined;
mouthSalaryAmount.value = undefined;
ocId.value = "";
positionId.value = "";
posNoId.value = "";

18
src/modules/04_registry/components/SalaryEmployee.vue
View file

@ -617,9 +617,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[]>([]);
@ -1717,9 +1717,9 @@ const templateDetail = async () => {
* กดบันทึกใน dialog
*/
const clickSave = async () => {
if (amount.value === 0) {
amount.value = null;
}
// if (amount.value === 0) {
// amount.value = null;
// }
myForm.value.validate().then(async (result: boolean) => {
if (result) {
if (modalEdit.value) {
@ -1919,9 +1919,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 = "";

18
src/modules/04_registry/components/SalaryEmployeeTemp.vue
View file

@ -592,9 +592,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 expanded = ref<string[]>([]);
const selected = ref<string>("");
@ -1746,9 +1746,9 @@ const templateDetail = async () => {
* กดบันทึกใน dialog
*/
const clickSave = async () => {
if (amount.value == 0) {
amount.value = null;
}
// if (amount.value == 0) {
// amount.value = null;
// }
myForm.value.validate().then(async (result: boolean) => {
if (result) {
if (modalEdit.value) {
@ -1948,9 +1948,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 = "";

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 = "";