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

fix : 결과 화면 수정 및 맵핑 화면 수정.

Browse Source
dev
Leeyh1121 5 months ago
parent 48123ffe88
commit 8e3d020b6a
5 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/cokr/xit/adds/nims/web/DsuseMgtMappingController.java
Unescape Escape View File

@ -26,7 +26,7 @@ public class DsuseMgtMappingController extends AbstractController {
;
}
@RequestMapping(name="마약류폐기 신청서 접수 메인", value=METHOD_URL.dsuseMgtMappingMain)
@RequestMapping(name="폐기 보고 확인 메인", value=METHOD_URL.dsuseMgtMappingMain)
public ModelAndView main() {
ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtMapping-main");
@ -40,7 +40,7 @@ public class DsuseMgtMappingController extends AbstractController {
;
}
@RequestMapping(name="마약류폐기 신청서 접수 상세", value=METHOD_URL.dsuseMgtMappinginfo)
@RequestMapping(name="페기 보고 확인 등록", value=METHOD_URL.dsuseMgtMappinginfo)
public ModelAndView getdsuseMgtReceiptInfo() {
ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtMapping-info");

7
src/main/java/cokr/xit/adds/nims/web/DsuseMgtRsltController.java
Unescape Escape View File

@ -56,13 +56,14 @@ public class DsuseMgtRsltController extends AbstractController {
}
@RequestMapping(name="마약류폐기 신청서 접수 상세", value=METHOD_URL.dsuseMgtRsltInfo)
public ModelAndView getdsuseMgtReceiptInfo() {
public ModelAndView getdsuseMgtReceiptInfo(String usrRptIdNo) {
ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtRslt-info");
return mav
.addObject("pageName", "dsuseMgtRsltInfo") // View(jsp)에서 사용할 id 뒤에 붙일 suffix
// .addObject("infoPrefix", "dsuseMgtReceipt") // prefix
// .addObject("infoPrefixUrl", "/adds/nims") // prefixUrl
.addObject("infoPrefix", "dsuseMgtRsltInfo") // prefix
.addObject("infoPrefixUrl", "/adds/nims") // prefixUrl
.addObject("usrRptIdNo", usrRptIdNo) // View(jsp)에서 사용할 id 뒤에 붙일 suffix
;
}
}

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

@ -98,15 +98,13 @@
</div>
</form>
<form id="productList--${pageName}" name="productList">
<div class="table-responsive ox-scroll oy-scroll h-px-300" id="table-responsive-1--${pageName}">
<div class="table-responsive ox-scroll oy-scroll h-px-300" id="table-responsive--${pageName}">
<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--productList" aria-describedby="DataTables_Table_0_info">
<thead class="sticky-thead">
<tr id="theadTr--productList"
data-by="by--productList" data-by-output="byOutput--productList" data-main-option="mainOption--productList" data-sub-option="subOption--productList">
<th style="width: 15.828px;text-align:center;" tabindex="0">No</th>
<th class="sorting sorting_asc" aria-sort="ascending" style="width: 223.719px;">제품명</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: 230.469px;">유효기간</th>
@ -122,9 +120,8 @@
</tbody>
<template id="productListRow--productList">
<tr data-key="{prductCd}">
<td style="text-align:center;"><input value="prductCd" onchange="userControl.select('{prductCd}', this.checked);" type="checkbox" class="form-check-input"></td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{prductCd}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{prductNm}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{prductCd}</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}="">{prdValidDe}</td>
@ -133,7 +130,7 @@
<td class="cmn text-center" {onclick}="" {ondblclick}="">{pceQy}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{pceUnit}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}="">{dsuseQy}</td>
<td class="cmn text-center" {onclick}="" {ondblclick}=""></td>
<td class="cmn text-center aaaa" {onclick}="" {ondblclick}=""></td>
</tr>
</template>
<template id="productListNotFound--productList">
@ -293,7 +290,7 @@
$P.productList.onDatasetChange = item => {
if (!item) return;
let empty = $P.productListList.empty;
let empty = $P.productList.empty;
// 업무별 DataTables(그리드) tr, td
let foundContent = document.getElementById("productListRow--productList").content;
@ -311,7 +308,9 @@
let trs = empty ? [document.getElementById("$productListNotFound--productList").content.outerHTML]
: $P.productList.inStrings(foundTr.outerHTML, replacer);
$("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore);
$("#table-responsive--${pageName}")[0].changeContent(trs.join(), true, true);
fnMakeGridImageViewer($("#tbody--productList").find("td.aaaa").get(), "dsusePrdImgFiles");
}
/**************************************************************************
@ -362,7 +361,7 @@
//추가
$P.fnAdd = () => {
$P.productList.addData($P.productFormFields.get());
$P.productList.addData([$P.productFormFields.get()]);
}
$P.fnDel = () => {

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

@ -246,7 +246,7 @@
let noMore = (totalSize == ${infoPrefix}List.length);
let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0);
$("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore);
$("#table-responsive--${pageName}")[0].changeContent(trs.join(), true, true);
if ($P.control.untilPageNum != 0) {
$P.control.query.fetchSize = $P.control.defaultFetchSize;
@ -308,19 +308,15 @@
$("#btnSave--${pageName}").on("click", () => $P.fnSave()); // 저장
}
// DataTables width 변경 조정 (업무별 그리드가 존재 한다면.. crdn06010-main.jsp 참고)
fnMakeResizableTable($("#table-responsive--${pageName}")[0]);
// DataTables 스크롤 이벤트 생성
fnMakeScrollableTable($("#table-responsive--${pageName}")[0], $P.scrollDataList);
// 초기 화면 설정
$P.initForm = () => {
// Dialog 마우스로 드래그 할 수 있도록 설정.
// fnMakeDraggableDialog(document.getElementById($P.control.prefix + "Dialog"));
console.log("#${usrRptIdNo}");
// input, select 초기화
let searchForm = $("#frmSearch--${pageName}");
searchForm.find("input[type='checkbox']").prop("checked", false);

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

@ -283,7 +283,9 @@
// 신청서 정보 dialog
$P.control.getInfo = (gdccId) => {
let dialogTitle = "폐기 결과[통보] 등록";
let params = {};
var usrRptIdNo = $P.control.dataset.getCurrent().USR_RPT_ID_NO;
if (typeof usrRptIdNo == "undefined" || usrRptIdNo == null || usrRptIdNo == "") return;
let params = {usrRptIdNo : usrRptIdNo};
ajax.get({
url : wctx.url("/adds/nims/dsuseMgtRslt-lnfo.do")
@ -294,7 +296,7 @@
, title : dialogTitle
, content : resp
, size : $P.control.infoSize
, onClose : () => { $P.RefreshList(); }
, onClose : () => { $P.fnRefreshList(); }
});
}
});

Write Preview
Loading…
Cancel
Save