fix: 레이블 이름 조정

팝업 검색 필드 레이아웃 변경 및 정렬 fix
dev
Jonguk. Lim 5 months ago
parent 9cc45e4bcd
commit fd46c0ea7b

@ -1,34 +1,19 @@
package cokr.xit.adds.nims.web; package cokr.xit.adds.nims.web;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.apache.poi.ss.usermodel.CellStyle;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import cokr.xit.adds.nims.service.DsuseMgtReceiptService;
import cokr.xit.adds.nims.DsuseMgtReceiptQuery; import cokr.xit.adds.nims.DsuseMgtReceiptQuery;
import cokr.xit.base.code.CommonCode; import cokr.xit.adds.nims.service.DsuseMgtReceiptService;
import cokr.xit.base.docs.xls.CellDef;
import cokr.xit.base.docs.xls.Format;
import cokr.xit.base.docs.xls.Style;
import cokr.xit.base.docs.xls.XLSWriter;
import cokr.xit.base.user.ManagedUser;
import cokr.xit.base.web.ApplicationController;
import cokr.xit.foundation.web.AbstractController; import cokr.xit.foundation.web.AbstractController;
import lombok.RequiredArgsConstructor;
@Controller @Controller
@RequestMapping( @RequestMapping(
name = "마약류폐기 신청서 접수", name = "마약류 폐기 신청서 접수",
value = {"/adds/nims"} value = {"/adds/nims"}
) )
public class DsuseMgtReceiptController extends AbstractController { public class DsuseMgtReceiptController extends AbstractController {

@ -1,19 +1,19 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
<c:set var="prefixName" scope="request">취급자 정보 조회</c:set> <c:set var="prefixName" scope="request">마약류 취급업체 조회</c:set>
<!-- 입력 영역 --> <!-- 입력 영역 -->
<form id="frmSearch--${pageName}" name="frmSearch"> <form id="frmSearch--${pageName}" name="frmSearch">
<div class="container-search"> <div class="container-search">
<!-- hidden --> <!-- hidden -->
<label for="bssh--${pageName}">취급자 정보</label> <%-- <label for="bssh--${pageName}">마약류 취급업체 정보</label>--%>
<div class="row my-1 mx-4 g-1 border-card rounded-3"> <div class="row my-1 mx-4 g-1" style="align-items: baseline">
<div class="col-md-4"> <div class="col-md-4">
<label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">업체명</label> <label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">취급업체명</label>
<input type="text" class="form-control w-60" id="bsshNm--${pageName}" name="schBsshNm" data-map="BSSH_NM" > <input type="text" class="form-control w-60" id="bsshNm--${pageName}" name="schBsshNm" data-map="BSSH_NM" >
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label for="bsshCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">식별번호</label> <label for="bsshCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">취급자번호</label>
<input type="text" class="form-control w-60" id="bsshNm--${pageName}" name="schBsshCd" data-map="BSSH_CD" > <input type="text" class="form-control w-60" id="bsshNm--${pageName}" name="schBsshCd" data-map="BSSH_CD" >
</div> </div>
<button type="button" class="btn btn-search w-px-120" id="btnSearch--${pageName}" title="검색">검색</button> <button type="button" class="btn btn-search w-px-120" id="btnSearch--${pageName}" title="검색">검색</button>
@ -38,7 +38,7 @@
<thead> <thead>
<tr><th style="width: 15.828px;text-align:center;" tabindex="0">No</th> <tr><th style="width: 15.828px;text-align:center;" tabindex="0">No</th>
<th class="sorting" style="width: 146.156px;">취급자번호</th> <th class="sorting" style="width: 146.156px;">취급자번호</th>
<th class="sorting" style="width: 160.141px;">취급명</th> <th class="sorting" style="width: 160.141px;">취급업체명</th>
<th class="sorting" style="width: 160.141px;">업종명</th> <th class="sorting" style="width: 160.141px;">업종명</th>
<th class="sorting" style="width: 230.469px;">대표자</th> <th class="sorting" style="width: 230.469px;">대표자</th>
<th class="sorting" style="width: 230.469px;">허가번호</th> <th class="sorting" style="width: 230.469px;">허가번호</th>
@ -94,7 +94,7 @@
load : wctx.url("/adds/nims/bssh-list.do") load : wctx.url("/adds/nims/bssh-list.do")
} }
, prefix: "bsshMain" , prefix: "bsshMain"
, prefixName: "취급자 정보 조회" , prefixName: "마약류 취급업체 조회"
, keymapper: info => info ? info.bsshCd : "" , keymapper: info => info ? info.bsshCd : ""
, dataGetter : obj => obj.bsshMainList , dataGetter : obj => obj.bsshMainList
, appendData: true , appendData: true
@ -187,7 +187,8 @@
**************************************************************************/ **************************************************************************/
$P.fnSearchList = () => { $P.fnSearchList = () => {
// 검색조건 // 검색조건
// FIXME: 업체명 또는 식별번호중 하나는 필수
$P.control.query = $P.formFields.get(); // 검색 조건 $P.control.query = $P.formFields.get(); // 검색 조건
$P.control.query.fetchSize = $P.control.defaultFetchSize; // 한번에 조회되는 자료 건수 $P.control.query.fetchSize = $P.control.defaultFetchSize; // 한번에 조회되는 자료 건수
$P.control.query.delYn = "N"; // 삭제 여부 $P.control.query.delYn = "N"; // 삭제 여부

@ -13,7 +13,7 @@
<!-- 입력 영역 --> <!-- 입력 영역 -->
<form id="frmEdit--${pageName}" name="frmEdit"> <form id="frmEdit--${pageName}" name="frmEdit">
<!-- hidden --> <!-- hidden -->
<label for="bssh--${pageName}">취급자 정보</label> <label for="bssh--${pageName}">마약류 취급업체 정보</label>
<div class="row my-1 mx-4 g-1 border-card rounded-3"> <div class="row my-1 mx-4 g-1 border-card rounded-3">
<div class="col-md-4"> <div class="col-md-4">
<label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">업체명</label> <label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">업체명</label>
@ -254,7 +254,7 @@
} }
$P.control.getBsshInfo = (gdccId) => { $P.control.getBsshInfo = (gdccId) => {
let dialogTitle = "취급자 정보 조회"; let dialogTitle = "마약류 취급자 조회";
let params = {}; let params = {};
ajax.get({ ajax.get({

@ -297,7 +297,7 @@
} }
$P.control.getBsshInfo = (gdccId) => { $P.control.getBsshInfo = (gdccId) => {
let dialogTitle = "취급자 정보 조회"; let dialogTitle = "마약류 취급자 조회";
let params = {}; let params = {};
ajax.get({ ajax.get({

@ -14,7 +14,7 @@
<!-- <form id="frmEdit--${pageName}" name="frmEdit"> --> <!-- <form id="frmEdit--${pageName}" name="frmEdit"> -->
<form id="bssh--${pageName}" name="bssh"> <form id="bssh--${pageName}" name="bssh">
<!-- hidden --> <!-- hidden -->
<label for="bssh--${pageName}">취급자 정보</label> <label for="bssh--${pageName}">마약류 취급업체 정보</label>
<div class="row my-1 mx-4 g-1 border-card rounded-3"> <div class="row my-1 mx-4 g-1 border-card rounded-3">
<div class="col-md-4"> <div class="col-md-4">
<label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">업체명</label> <label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">업체명</label>
@ -201,7 +201,7 @@
} }
$P.control.getBsshInfo = () => { $P.control.getBsshInfo = () => {
let dialogTitle = "취급자 정보 조회"; let dialogTitle = "마약류 취급업체 조회";
let params = {openPage : "bssh--${pageName}"}; let params = {openPage : "bssh--${pageName}"};
ajax.get({ ajax.get({
@ -220,7 +220,7 @@
} }
$P.control.getProductInfo = () => { $P.control.getProductInfo = () => {
let dialogTitle = "취급자 정보 조회"; let dialogTitle = "마약류 제품 조회";
let params = {openPage : "product--${pageName}"}; let params = {openPage : "product--${pageName}"};
ajax.get({ ajax.get({

@ -280,7 +280,7 @@
// 신청서 정보 dialog // 신청서 정보 dialog
$P.control.getInfo = (gdccId) => { $P.control.getInfo = (gdccId) => {
let dialogTitle = "신청서 정보 등록"; let dialogTitle = "폐기 신청서 접수";
let params = {}; let params = {};
ajax.get({ ajax.get({
@ -373,7 +373,7 @@
, success: resp => { , success: resp => {
dialog.open({ dialog.open({
id: "dsuseMgtinfoDialog" id: "dsuseMgtinfoDialog"
, title: "신청서 정보 상세" , title: "폐기 신청 접수 상세"
, content: resp , content: resp
, size: "xl" , size: "xl"
, init: () => { } , init: () => { }
@ -384,7 +384,7 @@
} }
$P.control.getBsshInfo = (gdccId) => { $P.control.getBsshInfo = (gdccId) => {
let dialogTitle = "취급자 정보 조회"; let dialogTitle = "마약류 취급업체 조회";
let params = {openPage : "frmSearch--${pageName}"}; let params = {openPage : "frmSearch--${pageName}"};
ajax.get({ ajax.get({

@ -205,7 +205,7 @@
// 신청서 정보 dialog // 신청서 정보 dialog
$P.control.getInfo = (gdccId) => { $P.control.getInfo = (gdccId) => {
let dialogTitle = "신청서 정보 등록"; let dialogTitle = "폐기 결과[통보] 등록";
let params = {}; let params = {};
ajax.get({ ajax.get({
@ -286,7 +286,7 @@
, success: resp => { , success: resp => {
dialog.open({ dialog.open({
id: "dsuseMgtReceiptinfoDialog" id: "dsuseMgtReceiptinfoDialog"
, title: "신청서 정보 상세" , title: "폐기 신청 상세"
, content: resp , content: resp
, size: "xl" , size: "xl"
, init: () => { } , init: () => { }
@ -297,7 +297,7 @@
} }
$P.control.getBsshInfo = (gdccId) => { $P.control.getBsshInfo = (gdccId) => {
let dialogTitle = "취급자 정보 조회"; let dialogTitle = "마약류 취급업체 조회";
let params = {}; let params = {};
ajax.get({ ajax.get({

@ -1,13 +1,12 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
<c:set var="prefixName" scope="request">취급자 정보 조회</c:set> <c:set var="prefixName" scope="request">마약류 제품 조회</c:set>
<!-- 입력 영역 --> <!-- 입력 영역 -->
<form id="frmSearch--${pageName}" name="frmSearch"> <form id="frmSearch--${pageName}" name="frmSearch">
<div class="container-search"> <div class="container-search">
<!-- hidden --> <!-- hidden -->
<label for="product--${pageName}">취급자 정보</label> <div class="row my-1 mx-4 g-1" style="align-items: baseline">
<div class="row my-1 mx-4 g-1 border-card rounded-3">
<div class="col-md-4"> <div class="col-md-4">
<label for="ProductNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제품명</label> <label for="ProductNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제품명</label>
<input type="text" class="form-control w-60" id="productNm--${pageName}" name="schProductNm" > <input type="text" class="form-control w-60" id="productNm--${pageName}" name="schProductNm" >
@ -97,7 +96,7 @@
load : wctx.url("/adds/nims/product-list.do") load : wctx.url("/adds/nims/product-list.do")
} }
, prefix: "productMain" , prefix: "productMain"
, prefixName: "취급자 정보 조회" , prefixName: "마약류 제품 조회"
, keymapper: info => info ? info.productCd : "" , keymapper: info => info ? info.productCd : ""
, dataGetter : obj => obj.productMainList , dataGetter : obj => obj.productMainList
, appendData: true , appendData: true

Loading…
Cancel
Save