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

space to enter

Browse source
This commit is contained in:
setthawutttty 2025-03-26 14:39:09 +07:00
parent 5b07feb52b
commit f2378ff1c7
9 changed files with 224 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/10_registry/02_Government/01_Government.vue
View file

@ -431,7 +431,7 @@ onMounted(async () => {
<div class="col-12 col-sm-12 col-md-6">
<div class="row q-col-gutter-y-sm">
<div class="col-5 text-grey-6 text-weight-medium">สังกัด</div>
<div class="col-7">
<div class="col-7 text-html">
{{ formData.org ? formData.org : "-" }}
</div>
<div class="col-5 text-grey-6 text-weight-medium">

36
src/modules/10_registry/02_Government/07_Position.vue
View file

@ -30,6 +30,7 @@ const {
onSearchDataTable,
formatDatePosition,
findOrgName,
findOrgNameHtml,
} = mixin;
const idByRow = ref<string>("");
@ -543,9 +544,20 @@ onMounted(async () => {
</div>
<div
v-else-if="col.name == 'organization'"
class="table_ellipsis"
class="text-html"
style="width: 300px"
>
{{ col.value ? col.value : "-" }}
{{
props.row
? findOrgNameHtml({
root: props.row.orgRoot,
child1: props.row.orgChild1,
child2: props.row.orgChild2,
child3: props.row.orgChild3,
child4: props.row.orgChild4,
})
: "-"
}}
</div>
<div v-else>
{{ col.value ? col.value : "-" }}
@ -588,7 +600,25 @@ onMounted(async () => {
col.label
}}</q-item-label>
</q-item-section>
<q-item-section class="fix_top">
<q-item-section
v-if="col.name == 'organization'"
class="fix_top text-html"
>
<q-item-label class="text-dark text-weight-medium">
{{
props.row
? findOrgNameHtml({
root: props.row.orgRoot,
child1: props.row.orgChild1,
child2: props.row.orgChild2,
child3: props.row.orgChild3,
child4: props.row.orgChild4,
})
: "-"
}}</q-item-label
>
</q-item-section>
<q-item-section v-else class="fix_top">
<q-item-label class="text-dark text-weight-medium">{{
col.value ? col.value : "-"
}}</q-item-label>

36
src/modules/10_registry/03_Salary/01_Salary.vue
View file

@ -23,6 +23,7 @@ const {
date2Thai,
onSearchDataTable,
findOrgName,
findOrgNameHtml,
} = mixin;
const idByRow = ref<string>("");
@ -724,8 +725,18 @@ onMounted(async () => {
<div v-else-if="col.name == 'status'">
{{ props.row.status ? props.row.status : "-" }}
</div>
<div v-else-if="col.name == 'organization'" class="table_ellipsis">
{{ col.value ? col.value : "-" }}
<div v-else-if="col.name == 'organization'" class="text-html">
{{
props.row
? findOrgNameHtml({
root: props.row.orgRoot,
child1: props.row.orgChild1,
child2: props.row.orgChild2,
child3: props.row.orgChild3,
child4: props.row.orgChild4,
})
: "-"
}}
</div>
<div v-else>
{{ col.value ? col.value : "-" }}
@ -768,7 +779,26 @@ onMounted(async () => {
col.label
}}</q-item-label>
</q-item-section>
<q-item-section class="fix_top">
<q-item-section
v-if="col.name == 'organization'"
class="fix_top text-html"
>
<q-item-label class="text-dark text-weight-medium">
{{
props.row
? findOrgNameHtml({
root: props.row.orgRoot,
child1: props.row.orgChild1,
child2: props.row.orgChild2,
child3: props.row.orgChild3,
child4: props.row.orgChild4,
})
: "-"
}}</q-item-label
>
</q-item-section>
<q-item-section v-else class="fix_top">
<q-item-label class="text-dark text-weight-medium">{{
col.value ? col.value : "-"
}}</q-item-label>

15
src/modules/10_registry/Dialog/DialogHistory.vue
View file

@ -7,7 +7,7 @@ import { useCounterMixin } from "@/stores/mixin";
const type = ref<string>("");
const mixin = useCounterMixin();
const { date2Thai, onSearchDataTable } = mixin;
const { date2Thai, onSearchDataTable, findOrgNameHtml } = mixin;
const modal = defineModel<boolean>("modal", { required: true });
const title = defineModel<string>("title", { required: true });
@ -158,6 +158,19 @@ watch(
<div v-else-if="col.name == 'status' && type == 'Leave'">
{{ props.row.status ? statusLeave(props.row.status) : "-" }}
</div>
<div v-else-if="col.name == 'organization'">
{{
props.row
? findOrgNameHtml({
root: props.row.orgRoot,
child1: props.row.orgChild1,
child2: props.row.orgChild2,
child3: props.row.orgChild3,
child4: props.row.orgChild4,
})
: "-"
}}
</div>
<div v-else>
{{ col.value ? col.value : "-" }}
</div>