Merge branch 'dev' into deploy-dev-front

This commit is contained in:
kangsunlee
2025-06-30 11:08:36 +09:00
13 changed files with 152 additions and 32 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

View File

@@ -0,0 +1,15 @@
{
"name": "My App",
"short_name": "MyApp",
"start_url": "/",
"display": "standalone",
"background_color": "#ffffff",
//"theme_color": "#4BBC43",
"icons": [
{
"src": "kri_appimg.png",
"sizes": "512x512",
"type": "image/png"
}
]
}

View File

@@ -8516,13 +8516,15 @@ button.swiper-pagination-bullet {
}
.regist-item-area .item-list .list-item .detail-list li p {
position: relative;
min-width: -webkit-fit-content;
min-width: -moz-fit-content;
min-width: fit-content;
margin-right: 0.4rem;
padding-right: 0.9rem;
font-size: 1.6rem;
line-height: 140%;
color: #868e96;
word-break: break-all;
white-space: nowrap;
}
.regist-item-area .item-list .list-item .detail-list li p::before {
position: absolute;
@@ -9067,14 +9069,92 @@ button.swiper-pagination-bullet {
line-height: 140%;
font-weight: 700;
}
.regi-wrap .month-detail .btn-column-list a {
.regi-wrap .month-detail .btn-column-list li {
padding: 2rem 1.6rem;
}
.regi-wrap .month-detail .btn-column-list li.view {
padding: 0;
}
.regi-wrap .month-detail .btn-column-list li.view .label {
position: relative;
padding-right: 2rem;
}
.regi-wrap .month-detail .btn-column-list li.view .label::before {
position: absolute;
display: block;
content: "";
width: 2rem;
height: 2rem;
background: url("../images/common/ico_arr_right_gray.svg") center/contain no-repeat;
right: 0;
top: 50%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
}
.regi-wrap .month-detail .btn-column-list li.view a {
padding: 2rem 1.6rem;
}
.regi-wrap .month-detail .btn-column-list li.view a:before {
display: none;
}
.regi-wrap .month-detail .btn-column-list .value li {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
padding: 0;
box-shadow: none;
border: 0;
}
.regi-wrap .month-detail .btn-column-list .value li + li {
margin-top: 0.6rem;
}
.regi-wrap .month-detail .btn-column-list .value li.total {
margin-top: 0.4rem;
}
.regi-wrap .month-detail .btn-column-list .value li.total span {
color: #4bbc43 !important;
}
.regi-wrap .month-detail .btn-column-list .value li.total span:last-child {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
margin-left: auto;
}
.regi-wrap .month-detail .btn-column-list .value li.total strong {
margin-right: 0.2rem;
font-size: 2rem;
line-height: 140%;
font-weight: 600;
}
.regi-wrap .month-detail .btn-column-list .value li span {
font-size: 1.6rem;
line-height: 140%;
font-weight: 400;
color: #212529;
}
.regi-wrap .month-detail .btn-column-list .value li span:first-child {
padding-right: 1.2rem;
position: relative;
color: #868e96;
white-space: nowrap;
}
.regi-wrap .month-detail .btn-column-list .value li span:first-child:before {
position: absolute;
display: block;
content: ":";
font-size: 1.6rem;
line-height: 140%;
right: 0.5rem;
top: 50%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
}
.regi-wrap .component-select.bottom-sheet {
width: -webkit-fit-content;
width: -moz-fit-content;
@@ -9113,6 +9193,7 @@ button.swiper-pagination-bullet {
padding: 3.2rem 0rem;
}
.regi-wrap .month-filter .summary {
margin-top: 2rem;
display: -webkit-box;
display: -webkit-flex;
display: flex;
@@ -9157,4 +9238,14 @@ button.swiper-pagination-bullet {
line-height: 140%;
font-weight: 700;
}
.regi-wrap .regist-item-area .month-tit {
margin-bottom: 1.6rem;
font-size: 2rem;
line-height: 140%;
font-weight: 700;
color: #212529;
}
.regi-wrap .regist-item-area .item-list + .month-tit {
margin-top: 2.4rem;
}
/*# sourceMappingURL=style.css.map */

View File

@@ -27,8 +27,13 @@
<meta name="_csrf_header" th:content="${_csrf.headerName}"/>
<meta name="robots" content="noindex, nofollow">
<!--/* TODO : theme-color */-->
<link rel="icon" th:href="@{/kri_appimg.png}" sizes="512x512">
<!-- iOS 홈화면 -->
<link rel="apple-touch-icon" th:href="@{/static/assets/images/kri_appimg.png}">
<!-- PWA -->
<link rel="manifest" th:href="@{/static/assets/json/manifest.json}">
<link rel="icon" type="image/x-icon" th:href="@{/static/assets/images/kri_favicon.ico}" />
<link rel="shortcut icon" type="image/x-icon" th:href="@{/static/assets/images/kri_favicon.ico}" />
<link th:href="@{/static/assets/styles/style.css}" type="text/css" rel="stylesheet" />
<script th:src="@{/static/assets/scripts/common.ui.plugin.js}"></script>
<script th:src="@{/static/assets/scripts/common.ui.js}" data-init></script>

View File

@@ -113,7 +113,7 @@
data: {
transferCategoryCodeList: /*[[${transferCategoryList}]]*/ [],
codeRecordCropList: /*[[${codeRecordCropList}]]*/ [],
unitList: /*[[${unitList}]]*/ [],
countList: /*[[${countList}]]*/ [],
bankList : /*[[${bankList.content}]]*/ [],
pastBankList : /*[[${pastBankList.content}]]*/ [],
id: /*[[${currentMonthlyInfo.id}]]*/'',
@@ -288,7 +288,7 @@
ENV.elementRefs.select.unitCodeSelect.core.init($select3,{
selectItemCallback({selectValue, dataValue}){
document.querySelector('#unitCode').value=dataValue;
if(dataValue === "code.record.unit.self") {
if(dataValue === "code.count.unit.self") {
document.querySelector('#unit').value="";
document.querySelector('#unitDiv').style.display ='block';
} else {
@@ -381,7 +381,7 @@
field: 'unitCode',
message: '단위를 선택해주세요.'
});
} else if (form.unitCode.value && form.unitCode.value =="code.record.unit.self" && !form.unit.value){
} else if (form.unitCode.value && form.unitCode.value =="code.count.unit.self" && !form.unit.value){
errors.push({
field: 'unit',
@@ -417,7 +417,7 @@
},
// 단위 코드
getUnitLabel(code) {
const found = ENV.data.unitList.find(i => i.id === code);
const found = ENV.data.countList.find(i => i.id === code);
return found ? found.codeText : '-';
},
// 재배형태
@@ -441,7 +441,7 @@
if(key == 'transferCategoryCode' && val == "code.bank.input.self"){
document.getElementById(val+"_value").value = product["transferCategory"];
}
if(key == 'unitCode' && val == "code.record.unit.self"){
if(key == 'unitCode' && val == "code.count.unit.self"){
document.getElementById("unitDiv").style.display = "";
}
}
@@ -535,7 +535,7 @@
let tagCount = '';
if (product.count > 0) {
const unitText = product.unitCode !== 'code.record.unit.self'
const unitText = product.unitCode !== 'code.count.unit.self'
? getUnit(product.unitCode)
: product.unit;

View File

@@ -152,7 +152,7 @@
</div>
<div class="select-scroll">
<ul class="">
<th:block th:each="item : ${unitList}">
<th:block th:each="item : ${countList}">
<li class="option" th:data-value="${item.id}"
th:text="${item.codeText}">option1
</li>

View File

@@ -113,7 +113,7 @@
data: {
transferCategoryCodeList: /*[[${transferCategoryList}]]*/ [],
codeRecordCropList: /*[[${codeRecordCropList}]]*/ [],
unitList: /*[[${unitList}]]*/ [],
countList: /*[[${countList}]]*/ [],
bankList : /*[[${bankList.content}]]*/ [],
pastBankList : /*[[${pastBankList.content}]]*/ [],
id: /*[[${currentMonthlyInfo.id}]]*/'',
@@ -279,7 +279,7 @@
ENV.elementRefs.select.unitCodeSelect.core.init($select3,{
selectItemCallback({selectValue, dataValue}){
document.querySelector('#unitCode').value=dataValue;
if(dataValue === "code.record.unit.self") {
if(dataValue === "code.count.unit.self") {
document.querySelector('#unit').value="";
document.querySelector('#unitDiv').style.display ='block';
} else {
@@ -372,7 +372,7 @@
field: 'unitCode',
message: '단위를 선택해주세요.'
});
} else if (form.unitCode.value && form.unitCode.value =="code.record.unit.self" && !form.unit.value){
} else if (form.unitCode.value && form.unitCode.value =="code.count.unit.self" && !form.unit.value){
errors.push({
field: 'unit',
@@ -411,7 +411,7 @@
},
// 단위 코드
getUnitLabel(code) {
const found = ENV.data.unitList.find(i => i.id === code);
const found = ENV.data.countList.find(i => i.id === code);
return found ? found.codeText : '-';
},
// 재배형태
@@ -435,7 +435,7 @@
if (key === 'transferCategoryCode' && val === "code.bank.input.self") {
document.getElementById(val + "_value").value = product["transferCategory"];
}
if (key === 'unitCode' && val === "code.record.unit.self") {
if (key === 'unitCode' && val === "code.count.unit.self") {
document.getElementById("unitDiv").style.display = "";
}
}
@@ -528,7 +528,7 @@
let tagCount = '';
if (product.count > 0) {
const unitText = product.unitCode !== 'code.record.unit.self'
const unitText = product.unitCode !== 'code.count.unit.self'
? getUnit(product.unitCode)
: product.unit;

View File

@@ -111,7 +111,7 @@
</div>
<div class="select-scroll">
<ul class="">
<th:block th:each="item : ${unitList}">
<th:block th:each="item : ${countList}">
<li class="option" th:data-value="${item.id}"
th:text="${item.codeText}">option1
</li>