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

ปรับ text ระบบเงินเดือน

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-11-01 13:04:37 +07:00
parent 4021af92a5
commit beb1522145
3 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
<script setup lang="ts">
import { onMounted, ref } from "vue";
import { computed, onMounted, ref } from "vue";
import { useQuasar } from "quasar";
import { useSalaryListSDataStore } from "@/modules/13_salary/store/SalaryListsStore";
@ -55,6 +55,15 @@ const lastPage = ref<number>(0);
const modalCommand = ref<boolean>(false);
const isOfficer = ref<boolean>(false);
const isStaff = ref<boolean>(false);
const titleCommand = computed(() => {
return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นเงินเดือน ${
roundFilter.value?.shortCode === "SPECIAL"
? roundFilter.value?.name
? roundFilter.value?.name
: ""
: `1 ${roundFilter.value?.name ? roundFilter.value?.name : ""}`
} `;
});
/**
* function เรียกข้อมูลรอบการขึ้นเงินเดือน
@ -246,7 +255,6 @@ async function fetchSalalyPeriod(
.post(config.API.salaryListPeriodLatest, body)
.then(async (res) => {
const data = await res.data.result;
console.log(data);
if (roundFilter.value.shortCode !== "SPECIAL") {
if (Object.values(data).includes(null)) {
@ -464,7 +472,7 @@ onMounted(async () => {
<q-select
v-if="roundFilter ? roundFilter.shortCode !== 'SPECIAL' : false"
v-model="snapFilter"
label="รอบ"
label="ราชชื่อรอบ"
dense
outlined
emit-value
@ -565,6 +573,7 @@ onMounted(async () => {
system-name="SALARY"
:command-type-code-array="['C-PM-33', 'C-PM-34', 'C-PM-35']"
:salary-period-id="salaryPeriodId"
:title-command="titleCommand"
/>
</template>

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

@ -1,5 +1,5 @@
<script setup lang="ts">
import { onMounted, ref, nextTick } from "vue";
import { onMounted, ref, nextTick, computed } from "vue";
import { useQuasar } from "quasar";
import { useSalaryEmployeeListSDataStore } from "@/modules/13_salary/store/SalaryEmployeeListsStore";
@ -57,6 +57,15 @@ const nextPage = ref<number>(1);
const modalCommand = ref<boolean>(false);
const isOfficer = ref<boolean>(false);
const isStaff = ref<boolean>(false);
const titleCommand = computed(() => {
return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นเงินเดือน ${
roundFilter.value?.shortCode === "SPECIAL"
? roundFilter.value?.name
? roundFilter.value?.name
: ""
: `1 ${roundFilter.value?.name ? roundFilter.value?.name : ""}`
} `;
});
/**
* function เรียกข้อมูลรอบการขึ้นค่าจ้าง
@ -463,7 +472,7 @@ onMounted(async () => {
<q-select
v-if="roundFilter ? roundFilter.shortCode !== 'SPECIAL' : false"
v-model="snapFilter"
label="รอบ"
label="ราชชื่อรอบ"
dense
outlined
emit-value
@ -557,6 +566,7 @@ onMounted(async () => {
system-name="SALARY_EMP"
:command-type-code-array="['C-PM-36', 'C-PM-37']"
:salary-period-id="salaryPeriodId"
:title-command="titleCommand"
/>
</template>