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

Merge pull request #1526 from Frappet/fix/salary

Browse source 
fix:command-type-code-array
This commit is contained in:
Warunee Tamkoo 2025-12-03 09:55:33 +07:00 • committed by GitHub
commit 81cf45756d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/13_salary/views/04_salaryLists.vue
View file

@ -80,6 +80,15 @@ const titleCommand = computed(() => {
return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นเงินเดือน ${txt}`;
});
//ประเภทคำสั่ง
const commandTypeCodeArray = computed(() => {
if (roundFilter.value?.shortCode === "OCT") {
return ["C-PM-33", "C-PM-34", "C-PM-35"];
} else {
return ["C-PM-33", "C-PM-34"];
}
});
/** function เรียกข้อมูลรอบการขึ้นเงินเดือน*/
async function getRound() {
showLoader();
@ -644,13 +653,14 @@ onMounted(async () => {
/>
</q-card>
<!-- '' -->
<DialogCommand
v-model:modal="modalCommand"
v-model:root-id="agencyFilter"
v-model:is-officer="isOfficer"
v-model:is-staff="isStaff"
system-name="SALARY"
:command-type-code-array="['C-PM-33', 'C-PM-34', 'C-PM-35']"
:command-type-code-array="commandTypeCodeArray"
:salary-period-id="salaryPeriodId"
:title-command="titleCommand"
:is-deputy="isDeputy"

11
src/modules/13_salary/views/05_salaryListsEmployee.vue
View file

@ -79,6 +79,15 @@ const titleCommand = computed(() => {
return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นค่าจ้าง${txt}`;
});
//ประเภทคำสั่ง
const commandTypeCodeArray = computed(() => {
if (roundFilter.value?.shortCode === "OCT") {
return ["C-PM-36", "C-PM-37", "C-PM-45", "C-PM-46"];
} else {
return ["C-PM-36", "C-PM-37"];
}
});
/**
* function เรียกข้อมูลรอบการขึ้นค่าจ้าง
*/
@ -592,7 +601,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', 'C-PM-45', 'C-PM-46']"
:command-type-code-array="commandTypeCodeArray"
:salary-period-id="salaryPeriodId"
:title-command="titleCommand"
/>