diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java index 3cf21a5d..52a2c63a 100644 --- a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java @@ -29,7 +29,7 @@ public class GetBanks { private Integer count; private String unitCode; - private String unite; + private String unit; private Integer price; private String month; diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java index a5c8510f..ce4b828c 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java @@ -69,8 +69,8 @@ class CreateBankInputController { String incomdeCode = null; String expenseCode = null; if(reqVO.getTransferType().equals("code.bank.input")){ - incomdeCode = !code.getId().equals(reqVO.getTransferType()+".99") && code.getCodeType().equals("INPUT") ? code.getCodeValue() : null; - expenseCode = !code.getId().equals(reqVO.getTransferType()+".99") && code.getCodeType().equals("OUTPUT") ?code.getCodeValue() : null; + incomdeCode = !code.getId().equals(reqVO.getTransferType()+".self") && code.getCodeType().equals("INPUT") ? code.getCodeValue() : null; + expenseCode = !code.getId().equals(reqVO.getTransferType()+".self") && code.getCodeType().equals("OUTPUT") ?code.getCodeValue() : null; } createBankPortIn.operate(new CreateBankCmd( AuthUtil.getUserSeq(), diff --git a/front/src/main/resources/static/ui/commonUtil.js b/front/src/main/resources/static/ui/commonUtil.js index 695f2e1c..1ff1d6be 100644 --- a/front/src/main/resources/static/ui/commonUtil.js +++ b/front/src/main/resources/static/ui/commonUtil.js @@ -142,6 +142,13 @@ kri.form.error = function(errorList){ } }); + + if(errorList && errorList.length > 0){ + const target = $('[name="' + errorList[0].field + '"]'); + if (target.length > 0) { + target.focus(); + } + } } diff --git a/front/src/main/resources/templates/info/bank/input.html b/front/src/main/resources/templates/info/bank/input.html index bd894996..0781d016 100644 --- a/front/src/main/resources/templates/info/bank/input.html +++ b/front/src/main/resources/templates/info/bank/input.html @@ -285,10 +285,19 @@ ENV.elementRefs.select.unitCodeSelect.core.init($select3,{ selectItemCallback({selectValue, dataValue}){ document.querySelector('#unitCode').value=dataValue; + if(dataValue === "code.record.unit.self") { + document.querySelector('#unit').value=""; + document.querySelector('#unitDiv').style.display ='block'; + } else { + document.querySelector('#unit').value=""; + document.querySelector('#unitDiv').style.display ='none'; + } } }); ENV.module.modalPopup.open(); + + document.querySelector('.modal-content').scrollTop = 0; }, function(code, rstData) { kri.logger.error('Do nothing. code: '+ code, rstData); @@ -351,24 +360,37 @@ const errors = []; if (!form.transferCategoryCode.value) errors.push({field: 'transferCategoryCode', message: '수입종류를 선택해주세요.'}); - if (form.transferCategoryCode.value && document.getElementById(form.transferCategoryCode.value+"_value") + if(document.getElementById(form.transferCategoryCode.value+"_value")){ + if (form.transferCategoryCode.value && document.getElementById(form.transferCategoryCode.value+"_value") && !document.getElementById(form.transferCategoryCode.value+"_value").value){ errors.push({field: form.transferCategoryCode.value+"_value", message: '수입대상을 입력해주세요.'}); + } } if (!form.sourcePurpose.value) errors.push({field: 'sourcePurpose', message: '수입원을 입력해주세요.'}); - if (form.count.value && !form.unitCode.value) errors.push({ - field: 'unitCode', - message: '단위를 선택해주세요.' - }); + if(form.count.value){ + if(!form.unitCode.value){ + errors.push({ + field: 'unitCode', + message: '단위를 선택해주세요.' + }); + } else if (form.unitCode.value && form.unitCode.value =="code.record.unit.self" && !form.unit.value){ + + errors.push({ + field: 'unit', + message: '단위를 입력해주세요.' + }); + } + } if (!form.price.value) errors.push({field: 'price', message: '금액을 입력해주세요.'}); console.log(errors) ////////////////////////// kri.form.error(errors); if (errors.length > 0) { return; } - - form.transferCategory.value = document.getElementById(form.transferCategoryCode.value+"_value").value;//입력값 + if(document.getElementById(form.transferCategoryCode.value+"_value")){ + form.transferCategory.value = document.getElementById(form.transferCategoryCode.value+"_value").value;//입력값 + } const formData = new FormData(form); const product = {}; formData.forEach((value, key) => product[key] = value); @@ -411,15 +433,20 @@ const field = form.elements.namedItem(key); if (field) { field.value = val; - if(key == 'transferCategoryCode'){ + if(key == 'transferCategoryCode' && val == "code.bank.input.self"){ document.getElementById(val+"_value").value = product["transferCategory"]; } + if(key == 'unitCode' && val == "code.record.unit.self"){ + document.getElementById("unitDiv").style.display = ""; + } } }); ENV.elementRefs.select.cropCodeSelect.setValue(product.cropCode); ENV.elementRefs.select.transferCategoryCodeSelect.setValue(product.transferCategoryCode); ENV.elementRefs.select.unitCodeSelect.setValue(product.unitCode); + document.getElementById("unit").value = product.unit; + },100) }, @@ -481,13 +508,16 @@ const categoryCode = product.transferCategoryCode; const categoryCodeInputValue = product.transferCategory; const categoryValue = product[`${categoryCode}_value`] ? product[`${categoryCode}_value`] : categoryCodeInputValue; - const tagTitle = categoryCode === 'code.bank.input.99' - ? categoryValue - : `${getCategory(categoryCode)}(${categoryValue})`; + const tagTitle = categoryCode === 'code.bank.input.self' + ? categoryCodeInputValue + : `${getCategory(categoryCode)}`; - const tagCount = product.count - ? `
수량
${format(product.count)}${getUnit(product.unitCode)}수량
${format(product.count)}${getUnit(product.unitCode)}수량
${format(product.count)}${product.unit}수량
${format(product.count)}${getUnit(product.unitCode)}수량
${format(product.count)}${getUnit(product.unitCode)}수량
${format(product.count)}${product.unit}+
지목
${getPurpose(product.landType)}지목
${product.landType}가능면적
${format(product.availableArea)}평주생산물 수확량 / 판매량
${format(product.mainYield)}${getUnit(product.mainYieldUnitCode)} / ${format(product.mainSaleAmount)}${getUnit(product.mainSaleUnitCode)}주생산물 수확량 / 판매량
${format(product.mainYield)}${getUnit(product.mainYieldUnitCode,product.mainYieldUnit)} / ${format(product.mainSaleAmount)}${getUnit(product.mainSaleUnitCode,product.mainSaleUnit)}주생산물 수확량
${format(product.mainYield)}${getUnit(product.mainYieldUnitCode)}주생산물 수확량
${format(product.mainYield)}${getUnit(product.mainYieldUnitCode,product.mainYieldUnit)}주생산물 판매량
${format(product.mainSaleAmount)}${getUnit(product.mainSaleUnitCode)}주생산물 판매량
${format(product.mainSaleAmount)}${getUnit(product.mainSaleUnitCode,product.mainSaleUnit)}부생산물 수확량 / 판매량
${format(product.subYield)}${getUnit(product.subYieldUnitCode)} / ${format(product.subSaleAmount)}${getUnit(product.subSaleUnitCode)}부생산물 수확량 / 판매량
${format(product.subYield)}${getUnit(product.subYieldUnitCode,product.subYieldUnit)} / ${format(product.subSaleAmount)}${getUnit(product.subSaleUnitCode,product.subSaleUnit)}부생산물 수확량
${format(product.subYield)}${getUnit(product.subYieldUnitCode)}부생산물 수확량
${format(product.subYield)}${getUnit(product.subYieldUnitCode,product.subYieldUnit)}부생산물 판매량
${format(product.subSaleAmount)}${getUnit(product.subSaleUnitCode)}부생산물 판매량
${format(product.subSaleAmount)}${getUnit(product.subSaleUnitCode,product.subSaleUnit)}