Merge branch 'kangsun' into 'dev'
[FO] 마이페이지 수정사항 반영 See merge request korea-research/korea-research!57
This commit is contained in:
@@ -369,7 +369,6 @@
|
||||
errors.push({field: form.transferCategoryCode.value+"_value", message: '수입대상을 입력해주세요.'});
|
||||
}
|
||||
}
|
||||
if (!form.sourcePurpose.value) errors.push({field: 'sourcePurpose', message: '수입원을 입력해주세요.'});
|
||||
|
||||
if(form.count.value){
|
||||
if(!form.unitCode.value){
|
||||
@@ -559,7 +558,9 @@
|
||||
</div>
|
||||
<ul class="detail-list">
|
||||
<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li>
|
||||
<li><p>수입원</p><span>${product.sourcePurpose}</span></li>
|
||||
${product.sourcePurpose != null && product.sourcePurpose != ''
|
||||
? `<li><p>수입원</p><span>${product.sourcePurpose}</span></li>`
|
||||
: ''}
|
||||
${tagCount}
|
||||
<li><p>현금</p><span>${format(product.price)}원</span></li>
|
||||
</ul>
|
||||
|
||||
@@ -86,12 +86,16 @@
|
||||
<!-- transferCategory+Text-->
|
||||
<th:block th:each="item : ${transferCategoryList}">
|
||||
<div class="component-input " th:data-option="${item.codeText}">
|
||||
<div class="input-field">
|
||||
<input type="text" th:id="${item.id}+'_value'" th:name="${item.id}+'_value'" value="" placeholder="수입 대상을 입력해 주세요." maxlength="30">
|
||||
<div class="input-field" th:if="${item.id != 'code.bank.input.10' and item.id != 'code.bank.input.12' and item.id != 'code.bank.input.13'}">
|
||||
<input type="text" th:id="${item.id}+'_value'" th:name="${item.id}+'_value'"
|
||||
value="" maxlength="30"
|
||||
th:placeholder="${item.id == 'code.bank.input.self' ? '수입의 종류를 입력해 주세요.' : '수입 대상을 입력해 주세요.'}">
|
||||
</div>
|
||||
<th:block th:if="${item.id == 'code.bank.input.1' or item.id == 'code.bank.input.4'}">
|
||||
<ul class="guide-info" th:if="${item.msgCode}">
|
||||
<li class="txt-blue" th:text="${item.msgCode}"></li>
|
||||
</ul>
|
||||
</th:block>
|
||||
</div>
|
||||
</th:block>
|
||||
</div>
|
||||
@@ -100,7 +104,6 @@
|
||||
<div class="input-label">
|
||||
<label for="sourcePurpose" class="label-txt">
|
||||
수입원
|
||||
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
|
||||
@@ -361,7 +361,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
if (!form.sourcePurpose.value) errors.push({field: 'sourcePurpose', message: '용도 입력해주세요.'});
|
||||
if(form.count.value){
|
||||
if(!form.unitCode.value){
|
||||
errors.push({
|
||||
@@ -552,7 +551,9 @@
|
||||
${buttonGroupHtml}
|
||||
</div>
|
||||
<ul class="detail-list">
|
||||
<li><p>용도</p><span>${product.sourcePurpose}</span></li>
|
||||
${product.sourcePurpose != null && product.sourcePurpose != ''
|
||||
? `<li><p>용도</p><span>${product.sourcePurpose}</span></li>`
|
||||
: ''}
|
||||
${tagCount}
|
||||
<li><p>현금</p><span>${format(product.price)}원</span></li>
|
||||
</ul>
|
||||
|
||||
@@ -63,7 +63,6 @@
|
||||
<div class="input-label">
|
||||
<label for="sourcePurpose" class="label-txt">
|
||||
용도
|
||||
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
|
||||
Reference in New Issue
Block a user