svcm/dmz
1
0
Fork 0
mirror of https://git.hmsn.ink/kospo/svcm/dmz.git synced 2026-03-19 21:05:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

디자인 변경

Browse Source
This commit is contained in:
bangae1
2025-05-28 08:58:34 +00:00
parent ccf45a1946
commit d8c9711568
15 changed files with 243 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/images/avatars/svg/person-1.svg
View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools --> <?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
<svg fill="#89B7FF" width="800px" height="800px" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><path d="M16 15.503A5.041 5.041 0 1 0 16 5.42a5.041 5.041 0 0 0 0 10.083zm0 2.215c-6.703 0-11 3.699-11 5.5v3.363h22v-3.363c0-2.178-4.068-5.5-11-5.5z"/></svg> <svg fill="#014099" width="800px" height="800px" viewBox="0 0 56 56" xmlns="http://www.w3.org/2000/svg"><path d="M 27.9999 51.9063 C 41.0546 51.9063 51.9063 41.0781 51.9063 28 C 51.9063 14.9453 41.0312 4.0937 27.9765 4.0937 C 14.8983 4.0937 4.0937 14.9453 4.0937 28 C 4.0937 41.0781 14.9218 51.9063 27.9999 51.9063 Z M 27.9999 35.9922 C 20.9452 35.9922 15.5077 38.5 13.1405 41.3125 C 9.9999 37.7968 8.1014 33.1328 8.1014 28 C 8.1014 16.9609 16.9140 8.0781 27.9765 8.0781 C 39.0155 8.0781 47.8983 16.9609 47.9219 28 C 47.9219 33.1563 46.0234 37.8203 42.8593 41.3359 C 40.4921 38.5234 35.0546 35.9922 27.9999 35.9922 Z M 27.9999 32.0078 C 32.4999 32.0547 36.0390 28.2109 36.0390 23.1719 C 36.0390 18.4375 32.4765 14.5 27.9999 14.5 C 23.4999 14.5 19.9140 18.4375 19.9609 23.1719 C 19.9843 28.2109 23.4765 31.9609 27.9999 32.0078 Z"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 955 B

2
public/images/avatars/svg/person-2.svg
View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools --> <?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
<svg fill="#89B7FF" width="800px" height="800px" viewBox="0 0 56 56" xmlns="http://www.w3.org/2000/svg"><path d="M 27.9999 51.9063 C 41.0546 51.9063 51.9063 41.0781 51.9063 28 C 51.9063 14.9453 41.0312 4.0937 27.9765 4.0937 C 14.8983 4.0937 4.0937 14.9453 4.0937 28 C 4.0937 41.0781 14.9218 51.9063 27.9999 51.9063 Z M 27.9999 35.9922 C 20.9452 35.9922 15.5077 38.5 13.1405 41.3125 C 9.9999 37.7968 8.1014 33.1328 8.1014 28 C 8.1014 16.9609 16.9140 8.0781 27.9765 8.0781 C 39.0155 8.0781 47.8983 16.9609 47.9219 28 C 47.9219 33.1563 46.0234 37.8203 42.8593 41.3359 C 40.4921 38.5234 35.0546 35.9922 27.9999 35.9922 Z M 27.9999 32.0078 C 32.4999 32.0547 36.0390 28.2109 36.0390 23.1719 C 36.0390 18.4375 32.4765 14.5 27.9999 14.5 C 23.4999 14.5 19.9140 18.4375 19.9609 23.1719 C 19.9843 28.2109 23.4765 31.9609 27.9999 32.0078 Z"/></svg> <svg fill="#ffffff" width="800px" height="800px" viewBox="0 0 56 56" xmlns="http://www.w3.org/2000/svg"><path d="M 27.9999 51.9063 C 41.0546 51.9063 51.9063 41.0781 51.9063 28 C 51.9063 14.9453 41.0312 4.0937 27.9765 4.0937 C 14.8983 4.0937 4.0937 14.9453 4.0937 28 C 4.0937 41.0781 14.9218 51.9063 27.9999 51.9063 Z M 27.9999 35.9922 C 20.9452 35.9922 15.5077 38.5 13.1405 41.3125 C 9.9999 37.7968 8.1014 33.1328 8.1014 28 C 8.1014 16.9609 16.9140 8.0781 27.9765 8.0781 C 39.0155 8.0781 47.8983 16.9609 47.9219 28 C 47.9219 33.1563 46.0234 37.8203 42.8593 41.3359 C 40.4921 38.5234 35.0546 35.9922 27.9999 35.9922 Z M 27.9999 32.0078 C 32.4999 32.0547 36.0390 28.2109 36.0390 23.1719 C 36.0390 18.4375 32.4765 14.5 27.9999 14.5 C 23.4999 14.5 19.9140 18.4375 19.9609 23.1719 C 19.9843 28.2109 23.4765 31.9609 27.9999 32.0078 Z"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 955 B

After

Width:  |  Height:  |  Size: 955 B

8
src/components/base/VAvatar.vue
View File

@@ -147,11 +147,11 @@ const { onceError } = useImageError()
} }
.avatar { .avatar {
width: 40px; width: 35px;
min-width: 40px; min-width: 30px;
height: 40px; height: 35px;
object-fit: cover; object-fit: cover;
border: 2px solid var(--white); //border: 2px solid var(--white);
&.is-squared { &.is-squared {
border-radius: 10px !important; border-radius: 10px !important;

8
src/components/layouts/navbar/Navbar.vue
View File

@@ -18,8 +18,8 @@ const isScrolling = computed(() => {
theme === 'colored' && 'is-colored', theme === 'colored' && 'is-colored',
]" ]"
> >
<div class="navbar-navbar-inner"> <div class="navbar-navbar-inner" style="padding:0 !important;">
<div class="left"> <div class="left" style="padding-left: 20px;">
<slot name="title" /> <slot name="title" />
</div> </div>
<div class="center"> <div class="center">
@@ -365,7 +365,9 @@ const isScrolling = computed(() => {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
width: 25%; width: 15%;
padding-right: 33px;
background-color: var(--primary);
.icon-link { .icon-link {
display: flex; display: flex;

2
src/components/layouts/navbar/NavbarItem.vue
View File

@@ -70,7 +70,7 @@ const { activeSubnavId, toggleSubnav } = useNavbarLayoutContext()
.router-link-active { .router-link-active {
//border-color: var(--primary) !important; //border-color: var(--primary) !important;
//background-color: var(--primary) !important; //background-color: var(--primary) !important;
border-bottom: 3px solid var(--primary) !important; border-bottom: 3px solid var(--primary-active) !important;
//.iconify { //.iconify {
// color: white !important; // color: white !important;
//} //}

129
src/components/pages/contract/ContractSave.vue
View File

@@ -156,31 +156,24 @@ watch(pbAtts.value, (newValue) => {
<div class="column is-12"> <div class="column is-12">
<VField> <VField>
<VLabel>첨부파일</VLabel> <VLabel>첨부파일</VLabel>
<VControl> <div
<div
v-for="f in props.prcs.prcsAtts" v-for="f in props.prcs.prcsAtts"
:key="f.logiFnm" :key="f.logiFnm"
class="content estimate-file-wrapper" class="content estimate-file-wrapper"
> >
<!-- <div>--> <!-- <div>-->
<!-- <i class="fa fa-file-pdf estimate-file-img" style="font-size:40px;" />--> <!-- <i class="fa fa-file-pdf estimate-file-img" style="font-size:40px;" />-->
<!-- </div>--> <!-- </div>-->
<div class="estimate-file-name"> <div class="estimate-file-name">
{{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb) {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
</div>
<div>
<i class="fa fa-download estimate-file-download" @click="onPrcsFileDownload(f.prcsNo, f.fileOrd, f.logiFnm)" />
</div>
</div> </div>
</VControl> <div>
<i class="fa fa-download estimate-file-download" @click="onPrcsFileDownload(f.prcsNo, f.fileOrd, f.logiFnm)" />
</div>
</div>
</VField> </VField>
</div> </div>
</div> </div>
</div>
</div>
<!--Fieldset-->
<div class="form-fieldset">
<div class="form-outer">
<div class="fieldset-heading"> <div class="fieldset-heading">
<h4>상세 규격</h4> <h4>상세 규격</h4>
</div> </div>
@@ -200,65 +193,65 @@ watch(pbAtts.value, (newValue) => {
<span>파일업로드</span> <span>파일업로드</span>
</VButton> </VButton>
</VLabel> </VLabel>
<VControl> <div v-if="pbAtts.length == 0" style="width:100%; height:10px;"></div>
<div <div
v-for="(f, i) in pbAtts" v-for="(f, i) in pbAtts"
:key="f.logiFnm" :key="f.logiFnm"
class="content estimate-file-wrapper" class="content estimate-file-wrapper"
> >
<!-- <div>--> <div class="estimate-file-name">
<!-- <i class="fa fa-file-pdf estimate-file-img" style="font-size:40px;" />--> {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
<!-- </div>-->
<div class="estimate-file-name">
{{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
</div>
<div>
<i class="fa fa-trash estimate-file-delete" @click="onFilDelete(i)" />
</div>
</div> </div>
</VControl> <div>
<i class="fa fa-trash estimate-file-delete" @click="onFilDelete(i)" />
</div>
</div>
</VField> </VField>
</div> </div>
<div class="column is-12"> <div class="column is-12">
<VField> <VField>
<VLabel> <div class="datatable-wrapper">
규격 <div class="table-container dtl-spec-table">
</VLabel> <table class="table datatable-table is-fullwidth">
<VControl> <colgroup>
<div class="datatable-wrapper"> <col width="50px"/>
<div class="table-container"> <col/>
<table class="table datatable-table is-fullwidth"> <col/>
<thead> <col width="50px"/>
<th>순번</th> <col width="50px"/>
<th>품명</th> <col width="120px"/>
<th>규격</th> <col width="100px"/>
<th>수량</th> </colgroup>
<th>단위</th> <thead>
<th>단가</th> <th>순번</th>
<th>금액</th> <th>품명</th>
</thead> <th>규격</th>
<tbody v-for="(dtl, index) in props.prcs.dtlSpecs" :key="dtl.dtlSpNo"> <th>수량</th>
<tr> <th>단위</th>
<td>{{ index + 1 }}</td> <th>단가</th>
<td>{{ dtl.itemNm }}</td> <th>금액</th>
<td>{{ dtl.spec }}</td> </thead>
<td>{{ dtl.qty }}</td> <tbody>
<td>{{ dtl.unit }}</td> <tr v-for="(dtl, index) in props.prcs.dtlSpecs" :key="dtl.dtlSpNo">
<td> <td class="text-center">{{ index + 1 }}</td>
<input <td>{{ dtl.itemNm }}</td>
v-model="estimates[index].unitPrc" <td>{{ dtl.spec }}</td>
type="number" <td>{{ dtl.qty }}</td>
class="input custom-text-filter" <td>{{ dtl.unit }}</td>
placeholder="10,000" <td>
> <input
</td> v-model="estimates[index].unitPrc"
<td>{{ totPrc[index] || 0 }}</td> type="number"
</tr> class="input custom-text-filter"
</tbody> placeholder="10,000"
</table> >
</div> </td>
<td>{{ totPrc[index] || 0 }}</td>
</tr>
</tbody>
</table>
</div> </div>
</VControl> </div>
</VField> </VField>
</div> </div>
</div> </div>

84
src/components/pages/contract/ContractView.vue
View File

@@ -197,68 +197,56 @@ watch(pbAtts.value, (newValue) => {
<div class="column is-12"> <div class="column is-12">
<VField> <VField>
<VLabel>첨부파일</VLabel> <VLabel>첨부파일</VLabel>
<VControl> <div
<div v-for="f in props.prcs.prcsAtts"
v-for="f in props.prcs.prcsAtts" :key="f.logiFnm"
:key="f.logiFnm" class="content estimate-file-wrapper"
class="content estimate-file-wrapper" >
>
<!-- <div>--> <!-- <div>-->
<!-- <i class="fa fa-file-pdf estimate-file-img" style="font-size:40px;" />--> <!-- <i class="fa fa-file-pdf estimate-file-img" style="font-size:40px;" />-->
<!-- </div>--> <!-- </div>-->
<div class="estimate-file-name"> <div class="estimate-file-name">
{{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb) {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
</div>
<div>
<i class="fa fa-download estimate-file-download" @click="onPrcsFileDownload(f.prcsNo, f.fileOrd, f.logiFnm)" />
</div>
</div> </div>
</VControl> <div>
<i class="fa fa-download estimate-file-download" @click="onPrcsFileDownload(f.prcsNo, f.fileOrd, f.logiFnm)" />
</div>
</div>
</VField> </VField>
</div> </div>
</div> </div>
</div>
</div>
<!--Fieldset-->
<div class="form-fieldset">
<div class="form-outer">
<div class="fieldset-heading"> <div class="fieldset-heading">
<h4>상세 규격</h4> <h4>상세 규격</h4>
</div> </div>
<div class="columns is-multiline"> <div class="columns is-multiline">
<div class="column is-12"> <div class="column is-12">
<VField> <VField>
<VLabel> <div class="datatable-wrapper">
규격 <div class="table-container">
</VLabel> <table class="table datatable-table is-fullwidth">
<VControl> <thead>
<div class="datatable-wrapper"> <th>순번</th>
<div class="table-container"> <th>품명</th>
<table class="table datatable-table is-fullwidth"> <th>규격</th>
<thead> <th>수량</th>
<th>순번</th> <th>단위</th>
<th>품명</th> <th>단가</th>
<th>규격</th> <th>금액</th>
<th>수량</th> </thead>
<th>단위</th> <tbody v-for="(dtl, index) in props.prcs.dtlSpecs" :key="dtl.dtlSpNo">
<th>단가</th> <tr>
<th>금액</th> <td>{{ index + 1 }}</td>
</thead> <td>{{ dtl.itemNm }}</td>
<tbody v-for="(dtl, index) in props.prcs.dtlSpecs" :key="dtl.dtlSpNo"> <td>{{ dtl.spec }}</td>
<tr> <td>{{ dtl.qty }}</td>
<td>{{ index + 1 }}</td> <td>{{ dtl.unit }}</td>
<td>{{ dtl.itemNm }}</td> <td>0</td>
<td>{{ dtl.spec }}</td> <td>{{ totPrc[index] || 0 }}</td>
<td>{{ dtl.qty }}</td> </tr>
<td>{{ dtl.unit }}</td> </tbody>
<td>0</td> </table>
<td>{{ totPrc[index] || 0 }}</td>
</tr>
</tbody>
</table>
</div>
</div> </div>
</VControl> </div>
</VField> </VField>
</div> </div>
</div> </div>

2
src/components/pages/dashboards/Dashboard.vue
View File

@@ -21,7 +21,7 @@ onMounted(() => {
<div class="column is-12"> <div class="column is-12">
<div class="dashboard-header"> <div class="dashboard-header">
<VAvatar <VAvatar
picture="/images/avatars/svg/person-2.svg" picture="/images/avatars/svg/person-1.svg"
size="xl" size="xl"
/> />
<div class="user-meta is-dark-bordered-12"> <div class="user-meta is-dark-bordered-12">

124
src/components/pages/estimate/EstimateUpdate.vue
View File

@@ -224,28 +224,21 @@ watch(pbAtts.value, (newValue) => {
<div class="column is-12"> <div class="column is-12">
<VField> <VField>
<VLabel>첨부파일</VLabel> <VLabel>첨부파일</VLabel>
<VControl> <div
<div v-for="f in props.estimate.prcsAtts"
v-for="f in props.estimate.prcsAtts" :key="f.logiFnm"
:key="f.logiFnm" class="content estimate-file-wrapper"
class="content estimate-file-wrapper" >
> <div class="estimate-file-name">
<div class="estimate-file-name"> {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
{{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
</div>
<div>
<i class="fa fa-download estimate-file-download" @click="onPrcsFileDownload(f.prcsNo, f.fileOrd, f.logiFnm)" />
</div>
</div> </div>
</VControl> <div>
<i class="fa fa-download estimate-file-download" @click="onPrcsFileDownload(f.prcsNo, f.fileOrd, f.logiFnm)" />
</div>
</div>
</VField> </VField>
</div> </div>
</div> </div>
</div>
</div>
<!--Fieldset-->
<div class="form-fieldset">
<div class="form-outer">
<div class="fieldset-heading"> <div class="fieldset-heading">
<h4>상세 규격</h4> <h4>상세 규격</h4>
</div> </div>
@@ -264,63 +257,56 @@ watch(pbAtts.value, (newValue) => {
<span>파일업로드</span> <span>파일업로드</span>
</VButton> </VButton>
</VLabel> </VLabel>
<VControl> <div
<div v-for="(f, i) in pbAtts"
v-for="(f, i) in pbAtts" :key="f.logiFnm"
:key="f.logiFnm" class="content estimate-file-wrapper"
class="content estimate-file-wrapper" >
> <div class="estimate-file-name">
<div class="estimate-file-name"> {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
{{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
</div>
<div>
<i class="fa fa-download estimate-file-download" @click="onPbAttDownload(f.prcsNo, f.bizNo, f.fileOrd, f.logiFnm)" />
<i class="fa fa-trash estimate-file-delete" @click="onFilDelete(f.bizNo, i, f.fileOrd)" />
</div>
</div> </div>
</VControl> <div>
<i class="fa fa-download estimate-file-download" @click="onPbAttDownload(f.prcsNo, f.bizNo, f.fileOrd, f.logiFnm)" />
<i class="fa fa-trash estimate-file-delete" @click="onFilDelete(f.bizNo, i, f.fileOrd)" />
</div>
</div>
</VField> </VField>
</div> </div>
<div class="column is-12"> <div class="column is-12">
<VField> <VField>
<VLabel> <div class="datatable-wrapper">
규격 <div class="table-container">
</VLabel> <table class="table datatable-table is-fullwidth">
<VControl> <thead>
<div class="datatable-wrapper"> <th>순번</th>
<div class="table-container"> <th>품명</th>
<table class="table datatable-table is-fullwidth"> <th>규격</th>
<thead> <th>수량</th>
<th>순번</th> <th>단위</th>
<th>품명</th> <th>단가</th>
<th>규격</th> <th>금액</th>
<th>수량</th> </thead>
<th>단위</th> <tbody v-for="(dtl, index) in props.estimate.dtlSpecs" :key="dtl.dtlSpNo">
<th>단가</th> <tr>
<th>금액</th> <td>{{ index + 1 }}</td>
</thead> <td>{{ dtl.itemNm }}</td>
<tbody v-for="(dtl, index) in props.estimate.dtlSpecs" :key="dtl.dtlSpNo"> <td>{{ dtl.spec }}</td>
<tr> <td>{{ dtl.qty }}</td>
<td>{{ index + 1 }}</td> <td>{{ dtl.unit }}</td>
<td>{{ dtl.itemNm }}</td> <td>
<td>{{ dtl.spec }}</td> <input
<td>{{ dtl.qty }}</td> v-model="estimates[index].unitPrc"
<td>{{ dtl.unit }}</td> type="number"
<td> class="input custom-text-filter"
<input placeholder="10,000"
v-model="estimates[index].unitPrc" >
type="number" </td>
class="input custom-text-filter" <td>{{ totPrc[index] || 0 }}</td>
placeholder="10,000" </tr>
> </tbody>
</td> </table>
<td>{{ totPrc[index] || 0 }}</td>
</tr>
</tbody>
</table>
</div>
</div> </div>
</VControl> </div>
</VField> </VField>
</div> </div>
</div> </div>

108
src/components/pages/estimate/EstimateView.vue
View File

@@ -179,28 +179,21 @@ const totPrc = computed(() => {
<div class="column is-12"> <div class="column is-12">
<VField> <VField>
<VLabel>첨부파일</VLabel> <VLabel>첨부파일</VLabel>
<VControl> <div
<div v-for="f in props.estimate.prcsAtts"
v-for="f in props.estimate.prcsAtts" :key="f.logiFnm"
:key="f.logiFnm" class="content estimate-file-wrapper"
class="content estimate-file-wrapper" >
> <div class="estimate-file-name">
<div class="estimate-file-name"> {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
{{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
</div>
<div>
<i class="fa fa-download estimate-file-download" @click="onPrcsFileDownload(f.prcsNo, f.fileOrd, f.logiFnm)" />
</div>
</div> </div>
</VControl> <div>
<i class="fa fa-download estimate-file-download" @click="onPrcsFileDownload(f.prcsNo, f.fileOrd, f.logiFnm)" />
</div>
</div>
</VField> </VField>
</div> </div>
</div> </div>
</div>
</div>
<!--Fieldset-->
<div class="form-fieldset">
<div class="form-outer">
<div class="fieldset-heading"> <div class="fieldset-heading">
<h4>상세 규격</h4> <h4>상세 규격</h4>
</div> </div>
@@ -210,55 +203,48 @@ const totPrc = computed(() => {
<VLabel> <VLabel>
견적서 견적서
</VLabel> </VLabel>
<VControl> <div
<div v-for="(f, i) in pbAtts"
v-for="(f, i) in pbAtts" :key="f.logiFnm"
:key="f.logiFnm" class="content estimate-file-wrapper"
class="content estimate-file-wrapper" >
> <div class="estimate-file-name">
<div class="estimate-file-name"> {{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
{{ f.logiFnm }} ({{ Math.ceil(f.size / 1024) }}kb)
</div>
<div>
<i class="fa fa-download estimate-file-download" @click="onPbAttDownload(f.prcsNo, f.bizNo, f.fileOrd, f.logiFnm)" />
</div>
</div> </div>
</VControl> <div>
<i class="fa fa-download estimate-file-download" @click="onPbAttDownload(f.prcsNo, f.bizNo, f.fileOrd, f.logiFnm)" />
</div>
</div>
</VField> </VField>
</div> </div>
<div class="column is-12"> <div class="column is-12">
<VField> <VField>
<VLabel> <div class="datatable-wrapper">
규격 <div class="table-container">
</VLabel> <table class="table datatable-table is-fullwidth">
<VControl> <thead>
<div class="datatable-wrapper"> <th>순번</th>
<div class="table-container"> <th>품명</th>
<table class="table datatable-table is-fullwidth"> <th>규격</th>
<thead> <th>수량</th>
<th>순번</th> <th>단위</th>
<th>품명</th> <th class="text-right">단가</th>
<th>규격</th> <th>금액</th>
<th>수량</th> </thead>
<th>단위</th> <tbody v-for="(dtl, index) in props.estimate.dtlSpecs" :key="dtl.dtlSpNo">
<th class="text-right">단가</th> <tr>
<th>금액</th> <td>{{ index + 1 }}</td>
</thead> <td>{{ dtl.itemNm }}</td>
<tbody v-for="(dtl, index) in props.estimate.dtlSpecs" :key="dtl.dtlSpNo"> <td>{{ dtl.spec }}</td>
<tr> <td>{{ dtl.qty }}</td>
<td>{{ index + 1 }}</td> <td>{{ dtl.unit }}</td>
<td>{{ dtl.itemNm }}</td> <td class="text-right">{{ String(estimates[index].unitPrc).replace(regex.currency, ',') }}</td>
<td>{{ dtl.spec }}</td> <td>{{ String(totPrc[index]).replace(regex.currency, ',') || 0 }}</td>
<td>{{ dtl.qty }}</td> </tr>
<td>{{ dtl.unit }}</td> </tbody>
<td class="text-right">{{ String(estimates[index].unitPrc).replace(regex.currency, ',') }}</td> </table>
<td>{{ String(totPrc[index]).replace(regex.currency, ',') || 0 }}</td>
</tr>
</tbody>
</table>
</div>
</div> </div>
</VControl> </div>
</VField> </VField>
</div> </div>
</div> </div>

8
src/components/partials/layout/toolbar/ToolbarUserProfile.vue
View File

@@ -109,7 +109,7 @@ function onRePassword() {
<VAvatar picture="/images/avatars/svg/person-2.svg" /> <VAvatar picture="/images/avatars/svg/person-2.svg" />
</a> </a>
</div> </div>
<div class="company-nm">{{ biz.compNm }}</div> <div class="company-nm" style="color:var(--modal-text-reverse)">{{ biz.compNm }}</div>
</div> </div>
</template> </template>
@@ -117,7 +117,7 @@ function onRePassword() {
<div class="dropdown-head"> <div class="dropdown-head">
<VAvatar <VAvatar
size="large" size="large"
picture="/images/avatars/svg/person-2.svg" picture="/images/avatars/svg/person-1.svg"
/> />
<div class="meta"> <div class="meta">
@@ -917,8 +917,8 @@ function onRePassword() {
} }
.company-nm { .company-nm {
padding-left: 20px; padding-left: 30px;
line-height:42px; line-height: 35px;
font-weight: 600; font-weight: 600;
color: var(--modal-text) color: var(--modal-text)
} }

25
src/scss/components/_custom-contract.scss
View File

@@ -45,8 +45,10 @@ input {
.datatable-wrapper { .datatable-wrapper {
margin-top: 10px !important; margin-top: 10px !important;
padding: 0 10px 10px 10px;
} }
.datatable-table { .datatable-table {
th { th {
padding: 10px !important; padding: 10px !important;
@@ -66,6 +68,17 @@ input {
} }
} }
.dtl-spec-table {
thead{
background-color: var(--light-grey) !important;
th {
color: #000;
border: 1px solid #ccc;
}
}
}
ul { ul {
list-style-type: none; list-style-type: none;
} }
@@ -127,16 +140,15 @@ a.mouse-pointer {
} }
} }
.estimate-file-wrapper { .estimate-file-wrapper {
display:flex; display:flex;
justify-content: space-between; justify-content: space-between;
border:1px solid #ccc; //border:1px solid #ccc;
background-color: #ededed;
border-radius:5px; border-radius:5px;
padding:0px 20px; padding:0 20px;
margin-bottom:10px; margin: 10px;
&:first-child {
margin-top: 5px;
}
.estimate-file-download, .estimate-file-delete { .estimate-file-download, .estimate-file-delete {
font-size: 17px; font-size: 17px;
line-height: 40px; line-height: 40px;
@@ -150,6 +162,7 @@ a.mouse-pointer {
.estimate-file-name { .estimate-file-name {
width: 400px; width: 400px;
line-height: 40px; line-height: 40px;
color: var(--modal-text-reverse)
} }
.estimate-file-size { .estimate-file-size {
width: 150px; width: 150px;

2
src/scss/css-variables/_colors.scss
View File

@@ -15,6 +15,8 @@
--primary--dark-color: color-mix(in oklab, var(--primary), black 5%); --primary--dark-color: color-mix(in oklab, var(--primary), black 5%);
--primary--light-color: color-mix(in oklab, var(--primary), white 90%); --primary--light-color: color-mix(in oklab, var(--primary), white 90%);
--primary-active: #dc5638;
--link: #485fc7; --link: #485fc7;
--link--color-invert: color-mix(in oklab, var(--link), white 85%); --link--color-invert: color-mix(in oklab, var(--link), white 85%);
--link--dark-color: color-mix(in oklab, var(--link), black 5%); --link--dark-color: color-mix(in oklab, var(--link), black 5%);

2
src/scss/css-variables/_fonts.scss
View File

@@ -3,6 +3,6 @@
:root { :root {
--font: 'Noto Sans KR', sans-serif; --font: 'Noto Sans KR', sans-serif;
--font-alt: 'Noto Sans KR', sans-serif; --font-alt: 'Noto Sans KR', sans-serif;
--font-monospace: 'Fira Code Variable', monospace; --font-monospace: 'Noto Sans KR', monospace;
--font-size: 14px; --font-size: 14px;
} }

7
src/scss/layout/_layout.scss
View File

@@ -15,6 +15,7 @@
body { body {
background: var(--background-grey); background: var(--background-grey);
font-family: var(--font);
&.opened { &.opened {
background: var(--white); background: var(--white);
@@ -231,10 +232,10 @@ body {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 34px; height: 37px;
width: 34px; width: 37px;
border-radius: var(--radius-rounded); border-radius: var(--radius-rounded);
margin: 0 4px; margin: 0 27px;
transition: all 0.3s; // transition-all test transition: all 0.3s; // transition-all test
&:hover { &:hover {