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-11-14 12:08:49 +07:00
commit 733f6c861f
18 changed files with 75 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/Dialogs/DialogOrgSelect.vue
View file

@ -545,7 +545,7 @@ onMounted(async () => {
dense
:nodes="lazy"
node-key="orgTreeId"
label-key="orgTreeName"
label-key="labelName"
:filter="filter"
no-results-label="ไม่พบข้อมูลที่ค้นหา"
no-nodes-label="ไม่มีข้อมูล"

11
src/components/Dialogs/DialogOrgSelectEmployee.vue
View file

@ -520,7 +520,7 @@ onMounted(() => {
dense
:nodes="lazy"
node-key="orgTreeId"
label-key="orgTreeName"
label-key="labelName"
:filter="filter"
no-results-label="ไม่พบข้อมูลที่ค้นหา"
no-nodes-label="ไม่มีข้อมูล"
@ -627,7 +627,6 @@ onMounted(() => {
map-options
:options="columns"
option-value="name"
style="min-width: 140px"
/>
</div>
@ -636,9 +635,7 @@ onMounted(() => {
<d-table
ref="table"
:columns="columns"
:rows="
positionNo.length !== 0 ? positionNo : []
"
:rows="positionNo.length !== 0 ? positionNo : []"
:filter="filters"
row-key="id"
flat
@ -779,7 +776,9 @@ onMounted(() => {
<d-table
ref="table"
:columns="columnsPostition"
:rows="rowsPosition.length !== 0 ? rowsPosition:[]"
:rows="
rowsPosition.length !== 0 ? rowsPosition : []
"
row-key="id"
flat
bordered

2
src/components/Dialogs/DialogOrgSelectOneStep.vue
View file

@ -274,7 +274,7 @@ onMounted(async () => {
dense
:nodes="lazy"
node-key="orgTreeId"
label-key="orgTreeName"
label-key="labelName"
:filter="filter"
no-results-label="ไม่พบข้อมูลที่ค้นหา"
no-nodes-label="ไม่มีข้อมูล"