Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2024-12-20 13:33:41 +07:00
commit d84e590670
5 changed files with 151 additions and 136 deletions

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">