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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2024-03-18 13:14:16 +07:00
commit 629f437163
5 changed files with 38 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/13_salary/components/SalaryLists/TabMain.vue
View file

@ -324,12 +324,12 @@ onMounted(async () => {
>
<q-tab :name="item.name" :label="item.lable">
<q-tooltip>
<q-list dense v-if="item.name === 'group1'">
<q-list dense v-if="item.name === 'group1'" class="tootip-txt-normal">
<q-item>
<q-item-section>
<q-item-label lines="1">
<span class="text-bold">ทั่วไป: </span>
<span> ปฏิบัติงาน,ชำนาญงาน,อาวุโส</span></q-item-label
<span> ปฏิบัติงาน, ชำนาญงาน, อาวุโส</span></q-item-label
>
</q-item-section>
</q-item>
@ -337,7 +337,9 @@ onMounted(async () => {
<q-item-section>
<q-item-label lines="1">
<span class="text-bold">วิชาการ: </span>
<span> ปฏิบัติการ,ชำนาญการ,ชำนาญการพิเศษ</span></q-item-label
<span>
ปฏิบัติการ, ชำนาญการ, ชำนาญการพิเศษ</span
></q-item-label
>
</q-item-section>
</q-item>
@ -351,7 +353,7 @@ onMounted(async () => {
</q-item-section>
</q-item>
</q-list>
<q-list dense v-if="item.name === 'group2'">
<q-list dense v-if="item.name === 'group2'" class="tootip-txt-normal">
<q-item>
<q-item-section>
<q-item-label lines="1">
@ -364,7 +366,7 @@ onMounted(async () => {
<q-item-section>
<q-item-label lines="1">
<span class="text-bold">วิชาการ: </span>
<span> เชี่ยวชาญ,ทรงคุณวุฒิ</span></q-item-label
<span> เชี่ยวชาญ, ทรงคุณวุฒิ</span></q-item-label
>
</q-item-section>
</q-item>
@ -381,7 +383,7 @@ onMounted(async () => {
<q-item-section>
<q-item-label lines="1">
<span class="text-bold">บริหาร: </span>
<span> ต้น,สูง</span></q-item-label
<span> ต้น, สูง</span></q-item-label
>
</q-item-section>
</q-item>
@ -555,4 +557,7 @@ onMounted(async () => {
.q-tabs--vertical .q-tab {
padding: 0 20px;
}
.tootip-txt-normal {
font-size: 0.8rem;
}
</style>

17
src/modules/13_salary/components/salaryEmployeeChart/TabCriteria.vue
View file

@ -16,7 +16,6 @@ import { useQuasar } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
import http from "@/plugins/http";
import config from "@/app.config";
import { br } from "@fullcalendar/core/internal-common";
const maxPage = ref<number>(1);
const $q = useQuasar();
@ -176,7 +175,7 @@ function getData() {
posName: item.position,
posLevel: item.posLevel,
rateOldMin: item.salaryMin,
groupOld: item.salaryEmployeeMin.sort((a,b)=>a -b),
groupOld: item.salaryEmployeeMin.sort((a, b) => a - b),
rateMaxOld: item.salary,
groupRateHigh: item.group,
rateHighMax: item.salaryMax,
@ -212,7 +211,7 @@ function updatePageSize(newPagination: NewPagination) {
function onClickDelete(id: string) {
dialogRemove($q, () => {
http
.delete(config.API.salaryFormula()+`/${id}`)
.delete(config.API.salaryFormula() + `/${id}`)
.then(() => {
getData();
success($q, "ลบข้อมูลสำเร็จ");
@ -317,16 +316,14 @@ onMounted(() => {
{{ col.value ? col.value.toLocaleString() : "-" }}
</div>
<div v-else-if="col.name == 'groupOld'">
<span v-for="item,index in col.value">
{{ item }}{{index+1 == col.value.length ?'':','}}
</span>
<!-- {{ col.value }} -->
<span v-for="(item, index) in col.value">
{{ item }}{{ index + 1 == col.value.length ? "" : "," }}
</span>
<!-- {{ col.value }} -->
</div>
<div v-else>{{ col.value != "" ? col.value : "-" }}</div>
</q-td>
<q-td>
<q-btn
flat