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

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-12-20 11:52:13 +07:00
commit d00c654404
2 changed files with 49 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/modules/02_organization/components/MainView.vue
View file

@ -327,22 +327,31 @@ onMounted(async () => {
</div>
</q-card>
<TreeTable
v-if="nodeId !== ''"
v-model:node-tree="nodeTree"
v-model:org-level="orgLevel"
v-model:tree-id="nodeId"
v-model:pos-master="posMaster"
v-model:req-master="reqMaster"
v-model:total-page="totalPage"
v-model:org-root-id="orgRootId"
v-model:total-data="totalData"
:short-name="shortName"
:main-tree="mainTree"
:fetch-data-table="fetchDataTable"
:filter-keyword="filterKeyword"
:fetch-data-tree="fetchDataTree"
/>
<q-card
falt
bordered
class="q-mt-xs q-gutter-xs scroll"
style="height: 72vh"
>
<div class="q-pa-sm">
<TreeTable
v-if="nodeId !== ''"
v-model:node-tree="nodeTree"
v-model:org-level="orgLevel"
v-model:tree-id="nodeId"
v-model:pos-master="posMaster"
v-model:req-master="reqMaster"
v-model:total-page="totalPage"
v-model:org-root-id="orgRootId"
v-model:total-data="totalData"
:short-name="shortName"
:main-tree="mainTree"
:fetch-data-table="fetchDataTable"
:filter-keyword="filterKeyword"
:fetch-data-tree="fetchDataTree"
/>
</div>
</q-card>
</div>
<div class="row col-12 items-center" v-else>
<q-banner class="q-pa-lg col-12 text-center">

39
src/modules/16_positionEmployee/views/main.vue
View file

@ -288,21 +288,30 @@ onMounted(() => {
</div>
</q-card>
<TreeTable
v-if="nodeId !== ''"
v-model:node-tree="nodeTree"
v-model:org-level="orgLevel"
v-model:tree-id="nodeId"
v-model:pos-master="posMaster"
v-model:req-master="reqMaster"
v-model:total-page="totalPage"
v-model:total-data="totalData"
:short-name="shortName"
:main-tree="mainTree"
:fetch-data-table="fetchDataTable"
:fetch-data-tree="fetchDataTree"
:filter-keyword="filterKeyword"
/>
<q-card
falt
bordered
class="q-mt-xs q-gutter-xs scroll"
style="height: 72vh"
>
<div class="q-pa-sm">
<TreeTable
v-if="nodeId !== ''"
v-model:node-tree="nodeTree"
v-model:org-level="orgLevel"
v-model:tree-id="nodeId"
v-model:pos-master="posMaster"
v-model:req-master="reqMaster"
v-model:total-page="totalPage"
v-model:total-data="totalData"
:short-name="shortName"
:main-tree="mainTree"
:fetch-data-table="fetchDataTable"
:fetch-data-tree="fetchDataTree"
:filter-keyword="filterKeyword"
/>
</div>
</q-card>
</div>
<div class="row col-12 items-center" v-else>
<q-banner class="q-pa-lg col-12 text-center">