Merge branch 'kangsun' into 'dev'

[FO] 은행자동이체 수정

See merge request korea-research/korea-research!61
This commit is contained in:
이강선 매니저/ST
2025-06-27 06:40:55 +00:00
3 changed files with 14 additions and 13 deletions

View File

@@ -172,7 +172,7 @@ kri.form.errorInit = function (formElement) {
if (formElement.length > 0) { if (formElement.length > 0) {
$(formElement).find('.component-input').removeClass('input-invalid'); $(formElement).find('.component-input').removeClass('input-invalid');
$(formElement).find('.input-flex-group').removeClass('invalid'); $(formElement).find('.input-flex-group').removeClass('invalid');
$(formElement).find('.select-group').removeClass('select-invalid'); $(formElement).find('.select-group').removeClass('input-invalid');
$(formElement).find('.input-info').each(function () { $(formElement).find('.input-info').each(function () {
$(this).remove(); $(this).remove();
}); });
@@ -238,11 +238,12 @@ kri.form.error = function(errorList){
} }
}); });
if(errorList && errorList.length > 0){ // 포커스 이동
const target = $('[name="' + errorList[0].field + '"]'); if ($('.input-invalid').length != 0) {
if (target.length > 0) { $('.input-invalid').eq(0).find('input').focus();
target.focus(); }
} if ($('.select-invalid').length != 0) {
$('.select-invalid').eq(0).find('button').focus();
} }
} }

View File

@@ -332,6 +332,7 @@
const next = document.getElementById('complateBtn'); const next = document.getElementById('complateBtn');
const header = document.getElementById('listHeader'); const header = document.getElementById('listHeader');
const count = document.getElementById('listCount'); const count = document.getElementById('listCount');
const totalItems = document.getElementById('totalItems');
const total = ENV.data.bankList.length; const total = ENV.data.bankList.length;
@@ -339,6 +340,7 @@
status.style.display = total > 0 ? 'none' : ''; status.style.display = total > 0 ? 'none' : '';
callPastInfoBtn.style.display = total > 0 ? 'none' : ''; callPastInfoBtn.style.display = total > 0 ? 'none' : '';
count.textContent = total; count.textContent = total;
totalItems.textContent = total;
btn.disabled = isChecked; btn.disabled = isChecked;
@@ -474,9 +476,6 @@
ENV.data.bankList = []; ENV.data.bankList = [];
document.getElementById('listBody').innerHTML = ''; document.getElementById('listBody').innerHTML = '';
formControl.updateLayout(); formControl.updateLayout();
// TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신.
document.getElementById('totalItems').textContent = ENV.data.bankList.length;
}, },
}); });
}, },
@@ -557,7 +556,9 @@
${buttonGroupHtml} ${buttonGroupHtml}
</div> </div>
<ul class="detail-list"> <ul class="detail-list">
<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li> ${product.cropCode != null && product.cropCode != ''
? `<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li>`
: ''}
${product.sourcePurpose != null && product.sourcePurpose != '' ${product.sourcePurpose != null && product.sourcePurpose != ''
? `<li><p>수입원</p><span>${product.sourcePurpose}</span></li>` ? `<li><p>수입원</p><span>${product.sourcePurpose}</span></li>`
: ''} : ''}

View File

@@ -323,6 +323,7 @@
const next = document.getElementById('complateBtn'); const next = document.getElementById('complateBtn');
const header = document.getElementById('listHeader'); const header = document.getElementById('listHeader');
const count = document.getElementById('listCount'); const count = document.getElementById('listCount');
const totalItems = document.getElementById('totalItems');
const total = ENV.data.bankList.length; const total = ENV.data.bankList.length;
@@ -330,6 +331,7 @@
status.style.display = total > 0 ? 'none' : ''; status.style.display = total > 0 ? 'none' : '';
callPastInfoBtn.style.display = total > 0 ? 'none' : ''; callPastInfoBtn.style.display = total > 0 ? 'none' : '';
count.textContent = total; count.textContent = total;
totalItems.textContent = total;
btn.disabled = isChecked; btn.disabled = isChecked;
@@ -468,9 +470,6 @@
ENV.data.bankList = []; ENV.data.bankList = [];
document.getElementById('listBody').innerHTML = ''; document.getElementById('listBody').innerHTML = '';
formControl.updateLayout(); formControl.updateLayout();
// TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신.
document.getElementById('totalItems').textContent = ENV.data.bankList.length;
}, },
}); });
}, },