diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue index 1b9f722f1..776bae52c 100644 --- a/src/modules/04_registryPerson/views/edit/components/Table.vue +++ b/src/modules/04_registryPerson/views/edit/components/Table.vue @@ -539,26 +539,6 @@ function onShow(data: DataPosition, colName: string) { formData.commandYear = data.commandYear; } -/** ฟังก์ชันกำหนดค่า FormData ทำงานเมื่อ popup editปิด*/ -function onHide() { - formData.positionLevel = ""; - formData.positionCee = ""; - formData.amount = 0; - formData.amountSpecial = 0; - formData.orgRoot = ""; - formData.orgChild1 = ""; - formData.orgChild2 = ""; - formData.orgChild3 = ""; - formData.orgChild4 = ""; - formData.posNoAbb = ""; - formData.posNo = ""; - formData.commandCode = ""; - formData.posNumCodeSit = ""; - formData.posNumCodeSitAbb = ""; - formData.commandNo = ""; - formData.commandYear = null; -} - /** * ฟังก์ชันบันทึกข้อมูลการแก้ไข * @param val @@ -939,7 +919,6 @@ onMounted(async () => { label-set="บันทึก" label-cancel="ยกเลิก" @before-show="onShow(props.row, col.name)" - @hide="onHide" :persistent="col.name === 'commandNo'" >
@@ -1201,7 +1180,6 @@ onMounted(async () => { label-set="บันทึก" label-cancel="ยกเลิก" @before-show="onShow(props.row, col.name)" - @hide="onHide" >
{{ `แก้ไข${col.label}` }} @@ -1298,7 +1276,6 @@ onMounted(async () => { label-cancel="ยกเลิก" @save="onSave" @before-show="onShow(props.row, col.name)" - @hide="onHide" >
{{ `แก้ไข${col.label}` }} diff --git a/src/modules/13_salary/views/05_salaryListsEmployee.vue b/src/modules/13_salary/views/05_salaryListsEmployee.vue index f05ea0eb8..56e0713d7 100644 --- a/src/modules/13_salary/views/05_salaryListsEmployee.vue +++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue @@ -592,7 +592,7 @@ onMounted(async () => { v-model:is-officer="isOfficer" v-model:is-staff="isStaff" system-name="SALARY_EMP" - :command-type-code-array="['C-PM-36', 'C-PM-37']" + :command-type-code-array="['C-PM-36', 'C-PM-37', 'C-PM-45', 'C-PM-46']" :salary-period-id="salaryPeriodId" :title-command="titleCommand" />