[FO] 수정사항 : 은행자동이체내역 수입,지출 수량 단위를 개,직접입력 으로 구성

This commit is contained in:
kangsunlee
2025-06-30 11:04:49 +09:00
parent dcc42dacea
commit 22b2fbbb32
7 changed files with 22 additions and 22 deletions

View File

@@ -22,7 +22,7 @@
bat.source_purpose AS sourcePurpose, /* 수입원 */ bat.source_purpose AS sourcePurpose, /* 수입원 */
bat.count, /* 수량 */ bat.count, /* 수량 */
CASE CASE
WHEN ui_unit.id = 'code.record.unit.self' WHEN ui_unit.id = 'code.count.unit.self'
THEN bat.unit THEN bat.unit
ELSE ui_unit.code_text ELSE ui_unit.code_text
END AS unitText, /* 단위 */ END AS unitText, /* 단위 */
@@ -33,7 +33,7 @@
AND ui_crop.id = bat.crop_code AND ui_crop.id = bat.crop_code
AND ui_crop.is_deleted = false AND ui_crop.is_deleted = false
LEFT JOIN uicode ui_unit LEFT JOIN uicode ui_unit
ON ui_unit.parent_id = 'code.record.unit' ON ui_unit.parent_id = 'code.count.unit'
AND ui_unit.id = bat.unit_code AND ui_unit.id = bat.unit_code
AND ui_unit.is_deleted = false AND ui_unit.is_deleted = false
LEFT JOIN uicode ui_category LEFT JOIN uicode ui_category
@@ -59,7 +59,7 @@
bat.source_purpose AS sourcePurpose, /* 용도 */ bat.source_purpose AS sourcePurpose, /* 용도 */
bat.count, /* 수량 */ bat.count, /* 수량 */
CASE CASE
WHEN ui_unit.id = 'code.record.unit.self' WHEN ui_unit.id = 'code.count.unit.self'
THEN bat.unit THEN bat.unit
ELSE ui_unit.code_text ELSE ui_unit.code_text
END AS unitText, /* 단위 */ END AS unitText, /* 단위 */
@@ -67,7 +67,7 @@
FROM bank_auto_transfer bat FROM bank_auto_transfer bat
LEFT JOIN LEFT JOIN
uicode ui_unit uicode ui_unit
ON ui_unit.parent_id = 'code.record.unit' ON ui_unit.parent_id = 'code.count.unit'
AND ui_unit.id = bat.unit_code AND ui_unit.id = bat.unit_code
AND ui_unit.is_deleted = false AND ui_unit.is_deleted = false
LEFT JOIN LEFT JOIN

View File

@@ -96,7 +96,7 @@ class GetBankInputUIController {
model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input")); model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input"));
model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop"));
model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); model.addAttribute("countList", uiCodeListPortIn.connect("code.count.unit"));
model.addAttribute("MonthStatus", MonthStatus.class); model.addAttribute("MonthStatus", MonthStatus.class);
model.addAttribute("editable", editable); model.addAttribute("editable", editable);
@@ -112,7 +112,7 @@ class GetBankInputUIController {
model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input")); model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input"));
model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop"));
model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); model.addAttribute("countList", uiCodeListPortIn.connect("code.count.unit"));
return "info/bank/inputForm"; return "info/bank/inputForm";
} }

View File

@@ -101,7 +101,7 @@ class GetBankOutputUIController {
model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.output")); model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.output"));
model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop"));
model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); model.addAttribute("countList", uiCodeListPortIn.connect("code.count.unit"));
model.addAttribute("MonthStatus", MonthStatus.class); model.addAttribute("MonthStatus", MonthStatus.class);
model.addAttribute("editable", editable); model.addAttribute("editable", editable);
@@ -116,7 +116,7 @@ class GetBankOutputUIController {
model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.output")); model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.output"));
model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop"));
model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); model.addAttribute("countList", uiCodeListPortIn.connect("code.count.unit"));
return "info/bank/outputForm"; return "info/bank/outputForm";
} }

View File

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

View File

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

View File

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

View File

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