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

Merge branch 'oat' into dev/front

Browse source
This commit is contained in:
oat 2023-11-28 13:02:53 +07:00 • committed by Methapon2001
commit 4fa8ad3adf
No known key found for this signature in database
GPG key ID: 849924FEF46BD132
1 changed files with 46 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Services/client/src/components/FileItem.vue
View file

@ -39,9 +39,10 @@ const props = withDefaults(
</script> </script>
<template> <template>
<div class="q-mt-md"> <div class="q-my-md">
<span class="text-h6 text-weight-light" v-if="currentDept === 3" <span class="text-h6 text-weight-light" v-if="currentDept === 3"
>แฟ้มย่อย</span> >แฟ้มย่อย</span
>
<div class="q-gutter-md" v-if="currentDept < 3"> <div class="q-gutter-md" v-if="currentDept < 3">
<div <div
:key="value.name" :key="value.name"
@ -80,7 +81,7 @@ const props = withDefaults(
</div> </div>
<span <span
class="text-center q-pt-md text-overflow-handle" class="text-center q-pt-md text-overflow-handle"
style="max-width: 150px" style="max-width: 132px"
>{{ value.name }}</span >{{ value.name }}</span
> >
</q-card-section> </q-card-section>
@ -106,7 +107,7 @@ const props = withDefaults(
<q-card-section class="column justify-center relative q-px-xl"> <q-card-section class="column justify-center relative q-px-xl">
<q-icon <q-icon
:name="currentIcon" :name="currentIcon"
class="add-icon" class="column justify-center relative q-px-lg"
size="6em" size="6em"
color="primary" color="primary"
/> />
@ -122,7 +123,6 @@ const props = withDefaults(
</div> </div>
</div> </div>
<div class="q-gutter-md q-mt-sm" v-if="currentDept === 3"> <div class="q-gutter-md q-mt-sm" v-if="currentDept === 3">
<div <div
:key="value.name" :key="value.name"
@ -132,7 +132,12 @@ const props = withDefaults(
<div class="box border-radius-inherit q-px-sm q-py-sm"> <div class="box border-radius-inherit q-px-sm q-py-sm">
<q-card flat @click="() => getFolder(value.pathname)"> <q-card flat @click="() => getFolder(value.pathname)">
<q-td> <q-td>
<q-icon :name="currentIcon" size="3em" color="primary" class="col" /> <q-icon
:name="currentIcon"
size="3em"
color="primary"
class="col"
/>
<span class="q-mx-md">{{ value.name }}</span> <span class="q-mx-md">{{ value.name }}</span>
<file-item-action <file-item-action
:editname="value.name" :editname="value.name"
@ -166,8 +171,18 @@ const props = withDefaults(
" "
> >
<q-td> <q-td>
<q-icon :name="currentIcon" size="3em" color="primary" class="col" /> <q-icon
<q-btn round class="add-button-folder-level" color="white" size="6px"> :name="currentIcon"
size="3em"
color="primary"
class="col"
/>
<q-btn
round
class="add-button-folder-level"
color="white"
size="6px"
>
<q-icon name="add" color="primary" size="1.2rem"></q-icon> <q-icon name="add" color="primary" size="1.2rem"></q-icon>
</q-btn> </q-btn>
<span class="q-mx-md">สร้าง{{ DEPT_NAME[currentDept] }}ใหม่</span> <span class="q-mx-md">สร้าง{{ DEPT_NAME[currentDept] }}ใหม่</span>
@ -177,8 +192,9 @@ const props = withDefaults(
</div> </div>
</div> </div>
</div> </div>
<div class="q-mt-xl"> <span class="text-h6 text-weight-light" v-if="currentDept > 2"
<span class="text-h6 text-weight-light" v-if="currentDept > 2">เอกสาร</span> >เอกสาร</span
>
<div class="q-gutter-md q-mt-xs"> <div class="q-gutter-md q-mt-xs">
<div <div
v-for="(value, index) in currentFile" v-for="(value, index) in currentFile"
@ -240,7 +256,6 @@ const props = withDefaults(
</div> </div>
</div> </div>
</div> </div>
</div>
<from-edit <from-edit
:drawer="drawer" :drawer="drawer"
@ -281,7 +296,7 @@ const props = withDefaults(
.add-button { .add-button {
position: absolute; position: absolute;
top: 75px; top: 75px;
right: 45px; right: 70px;
background-color: white; background-color: white;
} }
.add-button-folder-level { .add-button-folder-level {