xit-app
/
adds-fo
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 그리드 및 버튼 위치 조정

Browse Source
dev
Jonguk. Lim 5 months ago
parent 52fd32c96f
commit 6ce878297b
5 changed files with 56 additions and 47 deletions
Show Stats Download Patch File Download Diff File

3
src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml
Unescape Escape View File

@ -6,7 +6,8 @@
--> -->
<sql id="select"> <sql id="select">
SELECT tdm.dscdmng_id, /* 폐기관리 ID */ SELECT tdm.dscdmng_id, /* 폐기관리 ID */
tdm.dsuse_de, /* 폐기관리 ID */
tdm.dept_cd, /* 부서 코드 */ tdm.dept_cd, /* 부서 코드 */
tdm.user_id, /* 사용자 ID */ tdm.user_id, /* 사용자 ID */
tdm.prgrs_stts_cd, /* 진행 상태 코드 */ tdm.prgrs_stts_cd, /* 진행 상태 코드 */

41
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp
Unescape Escape View File

@ -86,18 +86,18 @@
<tr id="theadTr--${pageName}" <tr id="theadTr--${pageName}"
data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}"> data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
<th class="cmn" style="width: 72px;">No.</th> <th class="cmn" style="width: 72px;">No.</th>
<th class="cmn" style="width: 160.141px;">취급일자</th> <th class="cmn" style="width: 130.141px;">폐기관리번호</th>
<th class="cmn" style="width: 160.141px;">관리번호</th> <th class="cmn" style="width: 120.141px;">취급일자</th>
<th class="cmn" style="width: 230.469px;">업체명</th> <th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 100px;">보고건수</th> <th class="cmn" style="width: 250.469px;">업체명</th>
<th class="cmn" style="width: 230.469px;">처리상태</th> <th class="cmn" style="width: 90px;">폐기건수</th>
<th class="cmn" style="width: 180px;">폐기구분</th> <th class="cmn" style="width: 170.469px;">처리상태</th>
<th class="cmn" style="width: 230.469px;">폐기사유</th> <th class="cmn" style="width: 150.469px;">폐기결과보고서</th>
<th class="cmn" style="width: 180px;">폐기방법</th> <th class="cmn" style="width: 170.469px;">폐기처리내역및사진</th>
<th class="cmn" style="width: 230.469px;">폐기장소</th> <th class="cmn" style="width: 180.469px;">폐기사유</th>
<th class="cmn" style="width: 230.469px;">폐기일자</th> <th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 230.469px;">폐기결과보고서</th> <th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 230.469px;">폐기처리내역및사진</th> <th class="cmn" style="width: 200.469px;">폐기장소</th>
</tr> </tr>
</thead> </thead>
<tbody id="tbody--${pageName}"> <tbody id="tbody--${pageName}">
@ -105,18 +105,18 @@
<template id="${infoPrefix}Row--${pageName}"> <template id="${infoPrefix}Row--${pageName}">
<tr data-key="dscdmng_id"> <tr data-key="dscdmng_id">
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{hdr_de}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dscdmng_id}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dscdmng_id}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{hdr_de}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_de}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{bssh_nm}</td> <td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{bssh_nm}</td>
<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{rnd_dtl_rpt_cnt}</td> <td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{rnd_dtl_rpt_cnt}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{prgrs_stts_nm}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{prgrs_stts_nm}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_se_nm}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_rslt_doc}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_rslt_list_photo}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_prv_nm}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_prv_nm}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_se_nm}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_mth_nm}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_mth_nm}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_loc}</td> <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_loc}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_de}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_rslt_doc}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_rslt_list_photo}</td>
<%-- <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{USR_RPT_ID_NO}</td>--%> <%-- <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{USR_RPT_ID_NO}</td>--%>
</tr> </tr>
</template> </template>
@ -161,8 +161,6 @@
$P.control = new DatasetControl({ $P.control = new DatasetControl({
urls : { urls : {
load : wctx.url("/adds/nims/dsuseMgtDoc-list.do") load : wctx.url("/adds/nims/dsuseMgtDoc-list.do")
// FIXME: POST로 변경
//load : '<c:url value="${apiHost}/api/biz/nims/v1/getDsuseMgts" />'
} }
, prefix: "dsuseMgtMapping" , prefix: "dsuseMgtMapping"
, prefixName: "폐기 보고 확인" , prefixName: "폐기 보고 확인"
@ -171,9 +169,8 @@
, appendData: true , appendData: true
, infoSize: "xl" , infoSize: "xl"
, formats: { , formats: {
RPT_DE: dateFormat hdr_de: dateFormat
, HDR_DE: dateFormat , dsuse_de: dateFormat
, DSUSE_DE: dateFormat
} }
}); });
// $P.control 설정 // $P.control 설정

6
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
Unescape Escape View File

@ -148,10 +148,10 @@
<td {onclick}="" {ondblclick}="">{ROW_NUM}</td> <td {onclick}="" {ondblclick}="">{ROW_NUM}</td>
<td {onclick}="" {ondblclick}="">{PRDUCT_NM}</td> <td {onclick}="" {ondblclick}="">{PRDUCT_NM}</td>
<td {onclick}="" {ondblclick}="">{PRDUCT_CD}</td> <td {onclick}="" {ondblclick}="">{PRDUCT_CD}</td>
<td class="text-end" {onclick}="" {ondblclick}="">{DSUSE_QY}</td> <td class="text-end" {onclick}="" {ondblclick}="">{DSUSE_QY} {PCE_UNIT}</td>
<td class="text-center" {onclick}="" {ondblclick}="">{PRD_VALID_DE}</td> <td class="text-center" {onclick}="" {ondblclick}="">{PRD_VALID_DE}</td>
<td class="text-center" {onclick}="" {ondblclick}="">{MIN_DISTB_QY}{MIN_DISTB_UNIT}</td> <td class="text-center" {onclick}="" {ondblclick}="">{MIN_DISTB_QY} {MIN_DISTB_UNIT}</td>
<td class="text-center" {onclick}="" {ondblclick}="">{PCE_QY}{PCE_UNIT}</td> <td class="text-center" {onclick}="" {ondblclick}="">{PCE_QY} {PCE_UNIT}</td>
</tr> </tr>
</template> </template>
<template id="${infoPrefix}NotFound--${pageName}Detail"> <template id="${infoPrefix}NotFound--${pageName}Detail">

48
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
Unescape Escape View File

@ -12,7 +12,7 @@
<!-- 입력 영역 --> <!-- 입력 영역 -->
<form id="bssh--${pageName}" name="bssh"> <form id="bssh--${pageName}" name="bssh">
<!-- hidden --> <!-- hidden -->
<label for="bssh--${pageName}">마약류 취급업체 정보</label> <label for="bssh--${pageName}" style="margin-top: 10px; padding-left: 20px;"><strong>취급업체 정보</strong></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>
@ -52,7 +52,7 @@
<div class="row my-1 mx-1 g-1 border-card rounded"></div> <div class="row my-1 mx-1 g-1 border-card rounded"></div>
</form> </form>
<form id="product--${pageName}" name="product"> <form id="product--${pageName}" name="product">
<label for="product--${pageName}">폐기 신청 정보 상세</label> <label for="product--${pageName}" style="margin-top: 10px; padding-left: 20px;"><strong>신청 정보</strong></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="prductNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제품명</label> <label for="prductNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제품명</label>
@ -93,11 +93,14 @@
<input type="text" class="form-control w-60" id="dsuseQy--${pageName}" name="dsuseQy" data-map="dsuseQy"> <input type="text" class="form-control w-60" id="dsuseQy--${pageName}" name="dsuseQy" data-map="dsuseQy">
</div> </div>
</div> </div>
<div style=" align-content: center; text-align: center;"> <div class="row my-1 mx-1 g-1 border-card rounded"></div>
<span> <div>
<!-- 업무 버튼 --> <span class="container-page-btn">
<button type="button" class="btn btn-primary w-px-80" id="btnAdd--${pageName}" title="저장">추가</button> <span class="container-window-btn-right">
<button type="button" class="btn btn-primary w-px-80" id="btnDel--${pageName}" title="저장">제거</button> <!-- 업무 버튼 -->
<button type="button" class="btn btn-primary w-px-80" id="btnAdd--${pageName}" title="저장">추가</button>
<button type="button" class="btn btn-primary w-px-80" id="btnDel--${pageName}" title="저장">제거</button>
</span>
</span> </span>
</div> </div>
</form> </form>
@ -110,14 +113,12 @@
<th class="sorting" style="width: 146.156px;">제품코드</th> <th class="sorting" style="width: 146.156px;">제품코드</th>
<th class="sorting sorting_asc" aria-sort="ascending" style="width: 300.719px;">제품명</th> <th class="sorting sorting_asc" aria-sort="ascending" style="width: 300.719px;">제품명</th>
<th class="sorting" style="width: 100.469px;">폐기수량</th> <th class="sorting" style="width: 100.469px;">폐기수량</th>
<th class="sorting" style="width: 100.469px;">유효기간</th> <th class="sorting" style="width: 230.469px;">이미지</th>
<th class="sorting" style="width: 120.469px;">유효기간</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: 130.469px;">유통단위수량</th>
<th class="sorting" style="width: 160.469px;">유통단위수량</th>
<th class="sorting" style="width: 120.469px;">유통단위</th>
<th class="sorting" style="width: 130.469px;">낱개단위수량</th> <th class="sorting" style="width: 130.469px;">낱개단위수량</th>
<th class="sorting" style="width: 100.469px;">낱개단위</th>
</tr> </tr>
</thead> </thead>
<tbody id="tbody--productList"> <tbody id="tbody--productList">
@ -125,16 +126,14 @@
<template id="productListRow--productList"> <template id="productListRow--productList">
<tr data-key="{prductCd}"> <tr data-key="{prductCd}">
<td class="cmn text-center" {onclick}="" {ondblclick}="">{prductCd}</td> <td class="cmn text-center" {onclick}="" {ondblclick}="">{prductCd}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{prductNm}</td> <td {onclick}="" {ondblclick}="">{prductNm}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{pceQy}</td> <td class="cmn text-end" {onclick}="" {ondblclick}="">{pceQy}</td>
<td class="cmn text-center prdDsuseImg" {onclick}="" {ondblclick}=""></td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{prdValidDe}</td> <td class="cmn text-center" {onclick}="" {ondblclick}="">{prdValidDe}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{mnfNo}</td> <td class="cmn text-center" {onclick}="" {ondblclick}="">{mnfNo}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{mnfSeq}</td> <td class="cmn text-center" {onclick}="" {ondblclick}="">{mnfSeq}</td>
<td class="cmn text-center prdDsuseImg" {onclick}="" {ondblclick}=""></td> <td class="cmn text-center" {onclick}="" {ondblclick}="">{minDistbQy} {minDistbUnit}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{minDistbQy}</td> <td class="cmn text-center" {onclick}="" {ondblclick}="">{pceQy} {pceUnit}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{minDistbUnit}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{pceUnit}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{dsuseQy}</td>
</tr> </tr>
</template> </template>
<template id="productListNotFound--productList"> <template id="productListNotFound--productList">
@ -207,8 +206,17 @@
prefix: "dsuseMgtReceiptProductList" prefix: "dsuseMgtReceiptProductList"
, prefixName: "마약류 제품 조회" , prefixName: "마약류 제품 조회"
, keymapper: info => info ? info.prductCd : "" , keymapper: info => info ? info.prductCd : ""
, dataGetter: obj => obj , dataGetter: obj => {
if (!obj.success){
dialog.alert(obj.message);
return false;
}
return obj.data;
}
, infoSize: "xl" , infoSize: "xl"
, formats: {
prdValidDe: dateFormat
}
}); });
/************************************************************************** /**************************************************************************

5
src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp
Unescape Escape View File

@ -110,7 +110,7 @@
return false; return false;
} }
// 제품 목록 // 제품 목록
return obj.data.map(item => { return obj.data?.map(item => {
// mnfSeqInfos 배열의 데이터 갯수만큼 반복문 실행 // mnfSeqInfos 배열의 데이터 갯수만큼 반복문 실행
return item.mnfSeqInfos.map(info => ({ return item.mnfSeqInfos.map(info => ({
prductCd: item.prductCd, prductCd: item.prductCd,
@ -130,6 +130,9 @@
} }
, appendData: true , appendData: true
, infoSize: "xl" , infoSize: "xl"
, formats: {
prdValidDe: dateFormat
}
}); });
// $P.control 설정 // $P.control 설정

Write Preview
Loading…
Cancel
Save