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

Merge branch 'phatt' into development

Browse source
This commit is contained in:
puri-ph4tt 2023-12-07 10:40:01 +07:00
commit 8193b4f80d
4 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Services/client/src/components/FileSearched.vue
View file

@ -156,7 +156,7 @@ function confirmDelete() {
setTimeout(() => {
isActFoundFile.value = true
}, 300)
}, 1000)
}
}

2
Services/client/src/components/PageLayout.vue
View file

@ -55,7 +55,7 @@ onMounted(getCabinet)
<div class="q-my-md row items-center">
<div class="col">
<h5 class="q-my-none" v-if="mode === 'admin'">จัดเก็บเอกสาร</h5>
<h5 class="q-my-none" v-else>สืบค้นเอกสาร</h5>
<h5 class="q-my-none" v-else>สืบค้นผลงาน</h5>
</div>
<search-bar :mode="mode" v-if="mode === 'admin'" />
</div>

21
Services/client/src/modules/01_user/components/FileDownload.vue
View file

@ -10,6 +10,8 @@ import FileIcon from '@/components/FileIcon.vue'
const { isFilePreview, fileInfo } = storeToRefs(useFileInfoStore())
const { getType, getFormatDate, getSize } = useFileInfoStore()
const filePath =
(fileInfo.value?.pathname || '').split('/').slice(0, -1).join(' / ') + ' / '
async function downloadSubmit(path: string | undefined) {
if (path) {
@ -66,6 +68,9 @@ async function downloadSubmit(path: string | undefined) {
</q-btn>
{{ fileInfo?.title }}</span
>
<span class="q-ml-lg text-grey">
{{ filePath }}
</span>
</div>
<div class="row q-mt-lg justify-center">
@ -113,7 +118,7 @@ async function downloadSubmit(path: string | undefined) {
<div class="col-grow q-px-lg q-gutter-md q-pt-md">
<div class="row">
<div class="col-12 col-md-2">
<div class="col-12 col-md-3">
<span>ชื่อไฟล์</span>
</div>
<div class="col-grow">
@ -122,7 +127,7 @@ async function downloadSubmit(path: string | undefined) {
</div>
<q-separator />
<div class="row">
<div class="col-12 col-md-2">
<div class="col-12 col-md-3">
<span>ชื่อเรื่อง</span>
</div>
<div class="col-grow">
@ -131,7 +136,7 @@ async function downloadSubmit(path: string | undefined) {
</div>
<q-separator />
<div class="row">
<div class="col-12 col-md-2">
<div class="col-12 col-md-3">
<span>รายละเอียด</span>
</div>
<div class="col-grow">
@ -140,7 +145,7 @@ async function downloadSubmit(path: string | undefined) {
</div>
<q-separator />
<div class="row">
<div class="col-12 col-md-2">
<div class="col-12 col-md-3">
<span>กลุ่ม/หมวดหมู่</span>
</div>
<div class="col-grow">
@ -149,7 +154,7 @@ async function downloadSubmit(path: string | undefined) {
</div>
<q-separator />
<div class="row">
<div class="col-12 col-md-2">
<div class="col-12 col-md-3">
<span>คำสำคัญ</span>
</div>
<div class="col-grow">
@ -158,7 +163,7 @@ async function downloadSubmit(path: string | undefined) {
</div>
<q-separator />
<div class="row">
<div class="col-12 col-md-2">
<div class="col-12 col-md-3">
<span>ขนาดไฟล์</span>
</div>
<div class="col-grow">
@ -167,7 +172,7 @@ async function downloadSubmit(path: string | undefined) {
</div>
<q-separator />
<div class="row">
<div class="col-12 col-md-2">
<div class="col-12 col-md-3">
<span>ประเภทไฟล์</span>
</div>
<div class="col-grow">
@ -176,7 +181,7 @@ async function downloadSubmit(path: string | undefined) {
</div>
<q-separator />
<div class="row">
<div class="col-12 col-md-2">
<div class="col-12 col-md-3">
<span>วันที่อัปโหลด</span>
</div>
<div class="col-grow">

2
Services/client/src/modules/01_user/components/SearchBar.vue
View file

@ -95,8 +95,6 @@ async function searchSubmit() {
`${import.meta.env.VITE_API_ENDPOINT}/search`,
submitSearchData.value,
)
console.log(submitSearchData)
getFoundFile(res.data)
isSearch.value = true
} catch (error) {