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

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>