Merge branch 'dev' into 'kangsun'

# Conflicts:
#   admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java
This commit is contained in:
이강선 매니저/ST
2025-06-16 11:00:44 +00:00
28 changed files with 680 additions and 109 deletions

View File

@@ -21,4 +21,9 @@ public interface ResearcherMapper {
List<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
Integer visitHouseholdDelete(@Param("selectIds") List<Integer> selectIds,@Param("deletedBy") String deletedBy);
void deleteHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("deletedBy") String deletedBy);
Integer insertHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("createdBy") String createdBy);
}

View File

@@ -6,7 +6,7 @@ import app.module.admin.usecase.researcher.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListUIReqVO;
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
import org.springframework.data.domain.Page;

View File

@@ -12,7 +12,7 @@ import app.module.admin.usecase.researcher.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListUIReqVO;
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
import app.module.core.config.application.util.CommonUtil;
@@ -88,4 +88,16 @@ public class ResearcherServiceImpl implements ResearcherService {
return new PageImpl<>(households, pageable,
households.isEmpty() ? 0 : households.get(0).getTotal());
}
@Override
public Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO) {
int i = 0;
String deletedBy = CommonUtil.getLoginUsername();
for(Integer householdSeq : reqVO.getSelectedIds()) {
researcherMapper.deleteHouseholdResearcherMapping(reqVO.getResearcherSeq(), householdSeq,deletedBy);
i += researcherMapper.insertHouseholdResearcherMapping(reqVO.getResearcherSeq(), householdSeq,deletedBy);
}
return i;
}
}

View File

@@ -69,10 +69,8 @@ class ResearcherController {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.searchMappingHousehold(reqVO));
}
@PostMapping("/mappingHousehold/")
@ResponseBody
public String registerSurveyor(@RequestParam("surveyorId") String surveyorId) {
//surveyorService.registerSurveyor(surveyorId);
return "success";
@PostMapping("/mappingHousehold/update")
ResponseEntity<?> updateMappingHousehold(@RequestBody MappingHouseholdListReqVO reqVO ) {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.updateMappingHousehold(reqVO));
}
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.researcher.web.model;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
@Getter
@Setter
public class MappingHouseholdListReqVO {
private List<Integer> selectedIds;
private Integer researcherSeq;
}

View File

@@ -1,22 +0,0 @@
package app.module.admin.usecase.researcher.web.model;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class MappingHouseholdListUIReqVO {
private Integer page;
private Integer size;
private String searchRegionMainCode;
public Integer getPage() {
// 요청 페이지 넘버 - 초기값 `0`
return page != null ? page : 0;
}
public Integer getSize() {
// 페이지 당 아이템 수 - 초기값 `10`
return size != null ? size : 10;
}
}

View File

@@ -37,6 +37,7 @@ class UICodeSaveController {
saveVO.getOrderNo(),
saveVO.getCodeText(),
saveVO.getCodeValue(),
saveVO.getCodeType(),
saveVO.getMsgCode(),
saveVO.getInUse()),
"create".equals(saveVO.getMode()));

View File

@@ -24,6 +24,7 @@ public class UICodeSaveVO {
private String codeText;
@NotBlank(message = "{valid.common.required}")
private String codeValue;
private String codeType;
private String msgCode;
private Boolean inUse;
private String mode;

View File

@@ -83,16 +83,16 @@
im.code_text AS industry_middle_code_name,
case h.is_panel when false then '유지' when true then '탈락' end panel_flag
from household h
join admin_has_role ahr ON h.seq = ahr.admin_seq
join researcher_has_household rhh ON h.seq = rhh.household_seq and rhh.is_deleted = false
left join uicode rm ON rm.parent_id = 'code.region.main' AND rm.id = h.region_main_code
left join uicode rs ON rs.parent_id = 'code.region.sub' AND rs.id = h.region_sub_code
left join uicode rd ON rd.parent_id = 'code.region.detail' AND rd.id = h.region_detail_code
left join uicode il ON il.parent_id = 'code.industry.large' AND il.id = h.industry_large_code
left join uicode im ON im.parent_id = 'code.industry.middle' AND im.id = h.industry_middle_code
where ahr.role_id = 'ROLE_RESEARCHER' and ahr.is_deleted = false
<if test="seq > 0">
and ahr.admin_seq = #{seq}
</if>
where 1=1
<if test="seq > 0">
and rhh.admin_seq = #{seq}
</if>
LIMIT #{size} OFFSET #{page}*#{size}
</select>
@@ -100,10 +100,10 @@
select
count(*)
from household h
join admin_has_role ahr ON h.seq = ahr.admin_seq
where ahr.role_id = 'ROLE_RESEARCHER' and ahr.is_deleted = false
join researcher_has_household rhh ON h.seq = rhh.household_seq and rhh.is_deleted = false
where 1=1
<if test="seq > 0">
and ahr.admin_seq = #{seq}
and rhh.admin_seq = #{seq}
</if>
</select>
@@ -155,4 +155,31 @@
</foreach>)
</update>
<update id="deleteHouseholdResearcherMapping">
update researcher_has_household
set is_deleted = true,
deleted_at = NOW(),
deleted_by = #{deletedBy}
where household_seq = #{householdSeq}
</update>
<update id="insertHouseholdResearcherMapping">
insert into researcher_has_household(
id,
admin_seq,
household_seq,
created_at,
created_by,
updated_at,
updated_by
)values(
nextval('household_has_role_seq'),
#{researcherSeq},
#{householdSeq},
NOW(),
#{createdBy},
NOW(),
#{createdBy}
)
</update>
</mapper>

View File

@@ -15,8 +15,10 @@
<section class="filter-wrap">
<div class="form-area">
<form autocomplete="off" method="get" name="reqHouseholdForm" id="reqHouseholdForm">
<input name="page" th:field="*{reqVO.page}" type="hidden"/>
<input type="hidden" name="page" th:field="*{reqVO.page}"/>
<input type="hidden" name="researcherSeq" id="researcherSeq" th:value="${researcherSeq}">
<input type="hidden" name="regionMainCode" th:value="${regionMainCode}">
<input type="hidden" name="researcherName" id="researcherName" th:value="${researcherName}">
<!-- 경영주 -->
<div class="input-group">
<div class="input-label">
@@ -141,8 +143,11 @@
<script th:inline="javascript">
const showHouseholdModal = (button) => {
// 버튼의 data-region-main-code 속성에서 regionMainCode 가져오기
const regionMainCode = button.getAttribute('data-region-main-code') || '';
const researcherSeq = button.getAttribute('data-researcher-seq') || '';
const researcherName = button.getAttribute('data-researcher-name') || '';
$('#researcherSeq').val(researcherSeq);
$('#researcherName').val(researcherName);
const existingModal = document.querySelector("#mappingHouseholdModal");
if (existingModal) {
existingModal.remove();
@@ -183,10 +188,10 @@
$(response.content).each((idx, ct) => {
tbody.append(
`
<tr data-id="${ct.id}">
<tr data-id="${ct.householdSeq}">
<td>
<label>
<input class="form-check-input" name="selectIds" type="checkbox" value="${ct.seq}"/>
<input class="form-check-input" name="householdSelect" type="checkbox" value="${ct.householdSeq}"/>
</label>
</td>
<td>${ct.householdNum}</td>
@@ -221,7 +226,7 @@
const registerHouseholds = () => {
const selectedIds = [];
$('input[name="householdSelect"]:checked').each(function () {
selectedIds.push($(this).val());
selectedIds.push(Number($(this).val()));
});
if (selectedIds.length === 0) {
@@ -229,21 +234,31 @@
return;
}
ajaxUtil._ajaxMethod(
'/researcher/mappingHousehold/search',
{ regionMainCode: regionMainCode },
function (response) {
$("#mappingHouseholdModal").append(response);
// 모달 표시
if(confirm("총 "+selectedIds.length+"건에 대하여 조사원을 "+$('#researcherName').val()+"으로 설정하시겠습니까?")) {
},
function (code, rstData) {
alert('임가 등록에 실패했습니다.');
},
'get',
'json',
null
);
const data = {
selectedIds: selectedIds,
researcherSeq: $('#researcherSeq').val()
};
ajaxUtil._ajaxMethod(
'/researcher/mappingHousehold/update',
JSON.stringify(data),
function (response) {
if (response === selectedIds.length) {
alert('맵핑 완료되었습니다.');
}
document.querySelector(".modal01").ui.close();
},
function (code, rstData) {
alert('임가 맵핑에 실패했습니다.');
document.querySelector(".modal01").ui.close();
},
'post',
'json',
null
);
}
};
</script>
</div>

View File

@@ -61,7 +61,7 @@
</p>
<div id="researcher-tab1" >
<button type="button" class="btn" th:data-region-main-code="${researcherDto.regionMainCode}" onclick="showHouseholdModal(this)">
<button type="button" class="btn" th:data-researcher-seq="${researcherDto.seq}" th:data-region-main-code="${researcherDto.regionMainCode}" th:data-researcher-name="${researcherDto.name}" onclick="showHouseholdModal(this)">
<span class="btn-txt">임가매핑</span>
</button>
</div>
@@ -236,7 +236,6 @@
);
}
// 임가 방문 정보
const getHouseholdVisitList = (pageNo) => {
const f = document.householdReqForm;
@@ -359,10 +358,6 @@
}
}
</script>
</th:block>

View File

@@ -37,7 +37,7 @@
</div>
<div class="row mb-3">
<label class="col-sm-3 col-form-label" for="text">Text *</label>
<label class="col-sm-3 col-form-label" for="codeText">Text *</label>
<div class="col-sm-9">
<input type="text" id="codeText" name="codeText" class="form-control"
placeholder="코드명을 입력하세요"/>
@@ -54,6 +54,14 @@
</div>
</div>
<div class="row mb-3">
<label class="col-sm-3 col-form-label" for="codeType">코드 타입</label>
<div class="col-sm-9">
<input type="text" id="codeType" name="codeType" class="form-control"
placeholder="코드타입을 입력하세요"/>
</div>
</div>
<div class="row mb-3">
<label class="col-sm-3 col-form-label" for="msgCode">메세지 코드</label>
<div class="col-sm-9">
@@ -62,6 +70,7 @@
</div>
</div>
<div class="row mb-3">
<label class="col-sm-3 col-form-label" for="inUse">사용여부</label>
<div class="col-sm-9">
@@ -210,6 +219,7 @@
f.id.value = data.id;
f.codeText.value = data.codeText;
f.codeValue.value = data.codeValue;
f.codeType.value = data.codeType;
f.msgCode.value = data.msgCode;
f.orderNo.value = data.orderNo;
f.parentId.value = data.parentId;
@@ -309,6 +319,7 @@
f.orderNo.value = '';
f.codeText.value = '';
f.codeValue.value = '';
f.codeType.value = '';
f.msgCode.value = '';
f.inUse.value = 'true';
}

View File

@@ -58,6 +58,7 @@ class SaveUiCodeController {
reqVO.getOrderNo(),
reqVO.getCodeText(),
reqVO.getCodeValue(),
reqVO.getCodeType(),
reqVO.getMsgCode(),
reqVO.getInUse()),
"create".equals(reqVO.getMode()));

View File

@@ -38,6 +38,11 @@ public class SaveUiCodeReqVO {
@Schema(description = "코드값", example = "120")
private String codeValue;
@NotBlank(message = "{valid.common.required}")
@Schema(description = "코드타입", example = "120")
private String codeType;
@Schema(description = "다국어 코드", example = "string")
private String msgCode;

View File

@@ -23,6 +23,8 @@ public class UICode extends AuditEntity {
private String codeValue;
private String codeType;
private String msgCode;
private Boolean inUse;

View File

@@ -33,36 +33,36 @@ public class InitUICodeData implements ApplicationRunner {
// root 노드 - code
uiCodeSavePortIn.connect(
new UICodeSaveCommand(UICODE, null, null, "UI Code", "", null, true), false);
new UICodeSaveCommand(UICODE, null, null, "UI Code", "", null,null, true), false);
// code - board
uiCodeSavePortIn.connect(
new UICodeSaveCommand(UICODE_PAGEABLE, UICODE, 0, "Pageable", "", null, true), false);
new UICodeSaveCommand(UICODE_PAGEABLE, UICODE, 0, "Pageable", "", null,null, true), false);
// code - board - rows
uiCodeSavePortIn.connect(
new UICodeSaveCommand(UICODE_PAGEABLE_ROWS, UICODE_PAGEABLE, 0, "ROW 갯수", "", null,
new UICodeSaveCommand(UICODE_PAGEABLE_ROWS, UICODE_PAGEABLE, 0, "ROW 갯수", "", null,null,
true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 0, "10", "10", null, true),
UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 0, "10", "10", null, null,true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 1, "20", "20", null, true),
UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 1, "20", "20", null,null, true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 2, "50", "50", null, true),
UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 2, "50", "50", null, null,true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 3, "100", "100", null, true),
UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 3, "100", "100", null,null, true),
false);
}
}

View File

@@ -15,6 +15,7 @@ public class UICodeElement {
private Integer orderNo;
private String codeText;
private String codeValue;
private String codeType;
private String msgCode;
private Boolean inUse;
}

View File

@@ -27,6 +27,7 @@ class UICodeSaveDao implements UICodeSavePortOut {
saveCommand.getOrderNo(),
saveCommand.getCodeText(),
saveCommand.getCodeValue(),
saveCommand.getCodeType(),
saveCommand.getMsgCode(),
saveCommand.getInUse()
);

View File

@@ -13,6 +13,7 @@ public class UICodeSaveCommand {
private Integer orderNo;
private String codeText;
private String codeValue;
private String codeType;
private String msgCode;
private Boolean inUse;
}

View File

@@ -14,6 +14,7 @@ public class UICodeView {
private Integer orderNo;
private String codeText;
private String codeValue;
private String codeType;
private String msgCode;
private Boolean inUse;
}

View File

@@ -10,6 +10,7 @@
order_no,
code_text,
code_value,
code_type,
msg_code,
in_use
FROM uicode

View File

@@ -9,6 +9,7 @@
order_no,
code_text,
code_value,
code_type,
msg_code,
in_use,
<include refid="common.fields.CreateUpdateBaseColumns"/>)
@@ -16,6 +17,7 @@
#{parentId},
#{orderNo},
#{codeText},
#{codeType},
#{codeValue},
#{msgCode},
#{inUse},
@@ -28,6 +30,7 @@
order_no = #{orderNo},
code_text = #{codeText},
code_value = #{codeValue},
code_type = #{codeType},
msg_code = #{msgCode},
in_use = #{inUse},
<include refid="common.fields.UpdateBaseSet"/>

View File

@@ -12,6 +12,7 @@
order_no,
code_text,
code_value,
code_type,
msg_code,
in_use
FROM uicode

View File

@@ -0,0 +1,40 @@
package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web;
import app.module.core.config.application.enums.MonthStatus;
import app.module.front.config.application.util.AuthUtil;
import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.GetMonthlyInputStatussPortIn;
import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatuss;
import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatussCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.NoSuchElementException;
@Controller
@RequiredArgsConstructor
class GetBankInputUIController {
private final GetMonthlyInputStatussPortIn portIn;
@GetMapping(path = "/info/bank/create/input/{id}")
String operate(Model model,
@PathVariable Long id,
@PageableDefault(sort = "createAt", direction = Sort.Direction.DESC, page = 0, size = 100) Pageable pageable) {
String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
return "info/bank/input";
}
}

View File

@@ -0,0 +1,40 @@
package app.module.front.usecase.info.bankUI.getBankOutputUI.adapters.web;
import app.module.core.config.application.enums.MonthStatus;
import app.module.front.config.application.util.AuthUtil;
import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.GetMonthlyInputStatussPortIn;
import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatuss;
import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatussCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.NoSuchElementException;
@Controller
@RequiredArgsConstructor
class GetBankOutputUIController {
private final GetMonthlyInputStatussPortIn portIn;
@GetMapping(path = "/info/bank/create/output/{id}")
String operate(Model model,
@PathVariable Long id,
@PageableDefault(sort = "createAt", direction = Sort.Direction.DESC, page = 0, size = 100) Pageable pageable) {
String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
return "info/bank/output";
}
}

View File

@@ -16,25 +16,25 @@
<li th:if="${monthStatus.bankAutoTransferInputStatus == MonthStatus.NONE}" >
<a href="">
<a th:href="@{/info/bank/create/input/{id}(id=${monthStatus.id})}">
<p class="list-tit">수입</p>
<span class="tag">미등록</span>
</a>
</li>
<li th:if="${monthStatus.bankAutoTransferInputStatus != MonthStatus.NONE} " class="complete">
<a href="">
<a th:href="@{/info/bank/create/input/{id}(id=${monthStatus.id})}">
<p class="list-tit">수입</p>
<span class="tag">등록완료</span>
</a>
</li>
<li th:if="${monthStatus.bankAutoTransferOutputStatus == MonthStatus.NONE} " >
<a href="">
<a th:href="@{/info/bank/create/output/{id}(id=${monthStatus.id})}">
<p class="list-tit">지출</p>
<span class="tag">미등록</span>
</a>
</li>
<li th:if="${monthStatus.bankAutoTransferOutputStatus != MonthStatus.NONE}" class="complete">
<a href="">
<a th:href="@{/info/bank/create/output/{id}(id=${monthStatus.id})}">
<p class="list-tit">지출</p>
<span class="tag">등록완료</span>
</a>

View File

@@ -2,32 +2,285 @@
<html layout:decorate="~{layout/layout}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.thymeleaf.org">
<div layout:fragment="content" th:classappend="'mypage-wrap'">
<div layout:fragment="content" th:classappend="'mypage'">
<main id="content" role="main">
<div class="inner">
<hgroup class="tit-group">
<h3>
이번달의 <br>
<strong>은행 자동이체 내역 입력 현황</strong>을
확인하세요.
<strong>은행 자동이체(수입) 내역 0건 등록</strong> 되었습니다.
</h3>
<p>수입 내역을 등록해 주세요.</p>
</hgroup>
<ul class="product-col-list">
<li>
<a href="">
<p class="list-tit">수입</p>
<span class="tag">미등록</span>
</a>
</li>
<li class="complete">
<a href="">
<p class="list-tit">지출</p>
<span class="tag">등록완료</span>
</a>
</li>
</ul>
<div class="component-btns">
<div class="btns-col">
<button type="button" class="btn btn-m btn-secondary btn-full">
<i class="ico-add ico-small" aria-hidden="true"></i>
<span class="btn-txt">추가 등록</span>
</button>
<button type="button" class="btn btn-m btn-link btn-full">
<span class="btn-txt">이전 정보 불러오기</span>
</button>
</div>
</div>
</div>
</main>
<!-- 하단 고정 버튼 -->
<div class="component-btns fixed">
<div class="btns-row">
<!-- 비활성화 스타일/ 버튼 속성 disabled 추가-->
<button type="button" class="btn btn-l btn-primary" disabled>
<span class="btn-txt">등록 완료</span>
</button>
</div>
</div>
<!-- 모달 팝업 -->
<div class="layer-wrap">
<div class="component-modal mypage-wrap modal01" data-props-dimm-click="true" data-state="open">
<div class="modal-dimm"></div>
<div class="modal-frame">
<div class="modal-container">
<div class="modal-header">
<h3 class="modal-tit">은행 자동이체(수입) 등록</h3>
</div>
<div class="modal-content">
<div class="modal-content-inner">
<form id="forestForm">
<input type="hidden" name="id" id="id">
<input type="hidden" name="transferType" id="transferType">
<p class="form-desc">필수입력</p>
<section class="form-group">
<!-- 재배형태 -->
<div class="select-group">
<div class="select-label">
<p class="label-txt">
재배형태
</p>
<span class="label-sub-txt">임산물 수입이 있는 경우, 등록해 주세요.</span>
</div>
<div id="cropCodeSelect" class="component-select bottom-sheet" data-props-default="재배형태를 선택해 주세요"
data-props-type="bottomSheet">
<input type="hidden" name="cropCode" id="cropCode"/>
<button type="button" class="select-box">
<span class="select-txt">재배형태를 선택해 주세요</span>
</button>
<div class="select-options">
<div class="select-header">
<p>재배형태</p>
<button type="button" class="select-close">
<span class="hide-txt">닫기</span>
</button>
</div>
<div class="select-scroll">
<ul class="">
<li class="option" data-value="option1">option1</li>
<li class="option" data-value="option2">option2</li>
<li class="option" data-value="option3">option3</li>
<li class="option" data-value="option4">option4</li>
<li class="option" data-value="option5">option5</li>
<li class="option" data-value="option6">option6</li>
</ul>
</div>
</div>
</div>
</div>
</section>
<hr>
<section class="form-group">
<!-- 수입의 종류 -->
<div class="select-group">
<div class="select-label">
<p class="label-txt">
수입의 종류
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
</p>
</div>
<div id="incomeCodeSelect" class="component-select bottom-sheet" data-props-default="수입 종류를 선택해 주세요"
data-props-type="bottomSheet">
<input type="hidden" name="incomeCode" id="incomeCode"/>
<button type="button" class="select-box">
<span class="select-txt"></span>
</button>
<div class="select-options">
<div class="select-header">
<p>수입의 종류</p>
<button type="button" class="select-close">
<span class="hide-txt">닫기</span>
</button>
</div>
<div class="select-scroll">
<ul class="">
<li class="option" data-value="option1">봉급</li>
<li class="option" data-value="option2">소득세</li>
<li class="option" data-value="option3">수당</li>
<li class="option" data-value="option4">직접 입력</li>
</ul>
</div>
</div>
</div>
<!-- 수당 인풋 -->
<div class="component-input input-invalid" data-option="수당">
<div class="input-field">
<input type="text" id="temp_input_invalid_0001" value="" placeholder="수입 대상을 입력해 주세요.">
</div>
<ul class="input-info">
<li>수입 대상을 입력해 주세요.</li>
<li class="txt-blue">봉급 중 자동적으로 공제되는 내용에 대해서도 기입해 주시기 바랍니다.</li>
</ul>
</div>
<!-- 소득세 인풋 -->
<div class="component-input input-valid" data-option="소득세">
<div class="input-field">
<input type="text" id="temp_input_invalid_0001" value="" placeholder="수입 대상을 입력해 주세요.">
</div>
<ul class="input-info">
<li>봉급 중 자동적으로 공제되는 내용에 대해서도 기입해 주시기 바랍니다.</li>
</ul>
</div>
<!-- 봉급 인풋 -->
<div class="component-input input-valid" data-option="봉급">
<div class="input-field">
<input type="text" id="temp_input_invalid_0001" value="" placeholder="수입 대상을 입력해 주세요.">
</div>
<ul class="input-info">
<li>봉급은 세금을 포함한 금액(실수령액이 아님)입니다.</li>
</ul>
</div>
<!-- 직접입력 인풋 -->
<div class="component-input input-invalid" data-option="직접 입력">
<div class="input-field">
<input type="text" id="temp_input_invalid_0001" value="" placeholder="수입의 종류를 입력해 주세요">
</div>
<ul class="input-info">
<li>수입 종류를 입력해 주세요.</li>
</ul>
</div>
</div>
<!-- 수입원 -->
<div class="component-input">
<div class="input-label">
<label for="temp_input_0001" class="label-txt">
수입원
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
</label>
</div>
<div class="input-field">
<input type="text" id="temp_input_0001" placeholder="수입원을 입력해 주세요">
</div>
</div>
</section>
<hr>
<section class="form-group">
<!-- 수량 -->
<div class="component-input">
<div class="input-label">
<label for="temp_input_0001" class="label-txt">
수량
</label>
</div>
<div class="input-field">
<input type="nubmer" id="temp_input_0001" placeholder="수량을 입력해 주세요">
</div>
<ul class="guide-info">
<li>예 : 2, 2.5</li>
</ul>
</div>
<!-- 단위 -->
<div class="select-group">
<div class="select-label">
<p class="label-txt">
단위
</p>
</div>
<div id="select3" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요"
data-props-type="bottomSheet">
<button type="button" class="select-box">
<span class="select-txt">선택</span>
</button>
<div class="select-options">
<div class="select-header">
<p>단위</p>
<button type="button" class="select-close">
<span class="hide-txt">닫기</span>
</button>
</div>
<div class="select-scroll">
<ul class="">
<li class="option" data-value="option1">option1</li>
<li class="option" data-value="option2">option2</li>
<li class="option" data-value="option3">option3</li>
<li class="option" data-value="option4">option4</li>
<li class="option" data-value="option5">option5</li>
<li class="option" data-value="option6">option6</li>
<li class="option" data-value="option7">option7</li>
</ul>
</div>
</div>
</div>
</div>
</section>
<hr>
<section class="form-group">
<!-- 현금 -->
<div class="component-input input-invalid">
<div class="input-label">
<label for="temp_input_0001" class="label-txt">
현금
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
</label>
</div>
<div class="input-field type-price">
<input type="text" id="temp_input_0001" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span>
</div>
<ul class="input-info">
<li>금액을 입력해 주세요.</li>
</ul>
<ul class="guide-info">
<li>예 : 30000</li>
</ul>
</div>
</section>
<div class="component-btns">
<div class="btns-row">
<button type="button" class="btn btn-full btn-l btn-primary">
<span class="btn-txt">등록</span>
</button>
</div>
</div>
</form>
</div>
</div>
<button type="button" class="modal-close"></button>
</div>
</div>
</div>
</div>
<!-- //모달 팝업 -->
</div>
<section layout:fragment="script">

View File

@@ -7,27 +7,192 @@
<div class="inner">
<hgroup class="tit-group">
<h3>
이번달의 <br>
<strong>은행 자동이체 내역 입력 현황</strong>을
확인하세요.
<strong>은행 자동이체(지출) 내역 0건 등록</strong> 되었습니다.
</h3>
<p>지출 내역을 등록해 주세요.</p>
</hgroup>
<ul class="product-col-list">
<li>
<a href="">
<p class="list-tit">수입</p>
<span class="tag">미등록</span>
</a>
</li>
<li class="complete">
<a href="">
<p class="list-tit">지출</p>
<span class="tag">등록완료</span>
</a>
</li>
</ul>
<div class="component-btns">
<div class="btns-col">
<button type="button" class="btn btn-m btn-secondary btn-full">
<i class="ico-add ico-small" aria-hidden="true"></i>
<span class="btn-txt">추가 등록</span>
</button>
<button type="button" class="btn btn-m btn-link btn-full">
<span class="btn-txt">이전 정보 불러오기</span>
</button>
</div>
</div>
</div>
</main>
<!-- 하단 고정 버튼 -->
<div class="component-btns fixed">
<div class="btns-row">
<!-- 비활성화 스타일/ 버튼 속성 disabled 추가-->
<button type="button" class="btn btn-l btn-primary" disabled>
<span class="btn-txt">등록 완료</span>
</button>
</div>
</div>
<!-- 모달 팝업 -->
<div class="layer-wrap">
<div class="component-modal mypage-wrap modal01" data-props-dimm-click="true" data-state="open">
<div class="modal-dimm"></div>
<div class="modal-frame">
<div class="modal-container">
<div class="modal-header">
<h3 class="modal-tit">은행 자동이체(지출) 등록</h3>
</div>
<div class="modal-content">
<div class="modal-content-inner">
<p class="form-desc">필수입력</p>
<section class="form-group">
<!-- 지출의 종류 -->
<!-- 에러케이스 input-invalid 클래스 -->
<div class="component-input input-invalid">
<div class="input-label">
<label for="temp_input_0001" class="label-txt">
지출의 종류<i class="ico-required-mark" role="img" aria-label="필수">*</i>
</label>
</div>
<div class="input-field">
<input type="text" id="temp_input_0001" placeholder="지출 종류를 입력해 주세요">
</div>
<ul class="input-info">
<li>지출 종류를 입력해주세요.</li>
</ul>
</div>
<!-- 용도 -->
<div class="component-input input-invalid">
<div class="input-label">
<label for="temp_input_0001" class="label-txt">
용도
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
</label>
</div>
<div class="input-field">
<input type="text" id="temp_input_0001" placeholder="용도를 입력해 주세요">
</div>
<ul class="input-info">
<li>용도를 입력해 주세요.</li>
</ul>
</div>
</section>
<hr>
<section class="form-group">
<!-- 수량 -->
<div class="component-input">
<div class="input-label">
<label for="temp_input_0001" class="label-txt">
수량
</label>
</div>
<div class="input-field">
<input type="nubmer" id="temp_input_0001" placeholder="수량을 입력해 주세요">
</div>
<ul class="guide-info">
<li>예 : 2, 2.5</li>
</ul>
</div>
<!-- 단위 -->
<div class="select-group">
<div class="select-label">
<p class="label-txt">
단위
</p>
</div>
<div id="select3" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요"
data-props-type="bottomSheet">
<button type="button" class="select-box">
<span class="select-txt">선택</span>
</button>
<div class="select-options">
<div class="select-header">
<p>단위</p>
<button type="button" class="select-close">
<span class="hide-txt">닫기</span>
</button>
</div>
<div class="select-scroll">
<ul class="">
<li class="option" data-value="option1">option1</li>
<li class="option" data-value="option2">option2</li>
<li class="option" data-value="option3">option3</li>
<li class="option" data-value="option4">option4</li>
<li class="option" data-value="option5">option5</li>
<li class="option" data-value="option6">option6</li>
<li class="option" data-value="option7">option7</li>
</ul>
</div>
</div>
</div>
</div>
</section>
<hr>
<section class="form-group">
<!-- 현금 -->
<div class="component-input input-invalid">
<div class="input-label">
<label for="temp_input_0001" class="label-txt">
현금
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
</label>
</div>
<div class="input-field type-price">
<input type="text" id="temp_input_0001" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span>
</div>
<ul class="input-info">
<li>금액을 입력해 주세요.</li>
</ul>
<ul class="guide-info">
<li>예 : 30000</li>
</ul>
</div>
</section>
<div class="component-btns">
<div class="btns-row">
<button type="button" class="btn btn-full btn-l btn-primary">
<span class="btn-txt">등록</span>
</button>
</div>
</div>
</div>
</div>
<button type="button" class="modal-close"></button>
</div>
</div>
</div>
</div>
<!-- //모달 팝업 -->
</div>
<section layout:fragment="script">