Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/app/oper/OPER01010.html

@@ -22,11 +22,15 @@
 									<input type="hidden" id="ITP_FORM_OPER01010_SEARCH_AFFL_BRAND_ID" name="brandId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" />
+											<div class="input-group">
+												<input readonly type="text" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" readonly="readonly">
+												<span class="input-group-btn">
+													<button id="ITP_FORM_OPER01010_DELETE_AFFL_SHOP" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
 											<button type="button" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP" class="btn btn-orange btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_OPER01010_DELETE_AFFL_SHOP" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_OPER01010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId">
@@ -84,11 +88,15 @@
 											<label class="col-xs-2 itp_lb">브랜드그룹</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" name="afflShopNm" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" placeholder="브랜드그룹명" readonly>
+													<div class="input-group">
+														<input type="text" name="afflShopNm" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" placeholder="브랜드그룹명" readonly>
+														<span class="input-group-btn">
+															<button id="ITP_FORM_OPER01010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-default btn-sm itp_btn SHOW" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+														</span>
+													</div>
 												</div>
 												<div class="col-xs-3 itp_in">
 													<button type="button" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_FORM_OPER01010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm SEB"><i class="glyphicon glyphicon-erase"></i></button>
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">브랜드</label>

src/main/webapp/app/oper/OPER02010.html

@@ -21,11 +21,15 @@
 									<input type="hidden" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_ID" name="safflShopId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" readonly/>
+												<span class="input-group-btn">
+													<button id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>										
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
 											<button type="button" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_BTN" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_OPER02010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId">
@@ -76,11 +80,15 @@
 											<label class="col-xs-2 itp_lb">브랜드그룹</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in" style="width:65%;">
-													<input type="text" name="afflShopNm" id="ITP_FORM_OPER02010_DETAIL_AFFL_SHOP_NM" class="form-control itp_input" placeholder="브랜드그룹명" readonly>
+													<div class="input-group">
+														<input type="text" name="afflShopNm" id="ITP_FORM_OPER02010_DETAIL_AFFL_SHOP_NM" class="form-control itp_input" placeholder="브랜드그룹명" readonly>
+														<span class="input-group-btn">
+															<button id="ITP_FORM_OPER02010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+														</span>
+													</div>
 												</div>
 												<div class="col-xs-3 itp_in">
 													<button type="button" id="ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_FORM_OPER02010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm SEB"><i class="glyphicon glyphicon-erase"></i></button>
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">브랜드</label>

src/main/webapp/app/oper/OPER06010.html

@@ -20,11 +20,15 @@
 									<input type="hidden" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID" name="safflShopId" />
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" readonly="readonly" />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_OPER06010_DELETE_AFFL_SHOP" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
 											<button type="button" id="ITP_BTN_OPER06010_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_OPER06010_DELETE_AFFL_SHOP" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_OPER06010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId">

src/main/webapp/app/stinfo/STINFO04010.html

@@ -393,8 +393,7 @@
 								<input type="hidden" id="ITP_FORM_STINFO04010_VIEW_ITEM_ID" name="itemId" value="">
 								<input type="hidden" id="ITP_FORM_STINFO04010_VIEW_FILE_NO" name="fileNo" value="">
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">품목정보-상세</h4>
-									<div class="itp_form_in">
+									<div class="itp_form_in border-top">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-5 itp_ip">

src/main/webapp/app/stinfo/STINFO05010.html

@@ -30,12 +30,16 @@
 											<select id="ITP_FORM_STINFO05010_SEARCH_ST_CD" data-select-code="UNIT_ST_CD" class="form-control itp_input" name="sunitStCd"></select>
 										</div>
 										<div class="col-xs-7 itp_ip itp_noMar">
-											<div class="col-xs-6 itp_in itp_noMar">
-												<input type="text" id="ITP_FORM_STINFO05010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" />
+											<div class="col-xs-6 itp_in">
+												<div class="input-group">
+													<input type="text" id="ITP_FORM_STINFO05010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" maxlength="20">
+													<span class="input-group-btn">
+														<button id="ITP_BTN_STINFO05010_SEARCH_DELETE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-search"></i></button>
+													</span>
+												</div>
 											</div>
 											<div class="col-xs-2 itp_ip itp_noMar">
 												<button type="button" id="ITP_BTN_STINFO05010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-												<button type="button" id="ITP_BTN_STINFO05010_SEARCH_DELETE" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 											</div>
 										</div>
 									</div>
@@ -92,8 +96,7 @@
 								<input type="hidden" id="ITP_FORM_STINFO05010_DETAIL_FILE_NO" name="shortContFileNo" value="">
 					
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">단가정보-신규</h4>
-									<div class="itp_form_in">
+									<div class="itp_form_in border-top">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 												<div class="col-xs-4 itp_ip fnBrandNm">
@@ -212,20 +215,9 @@
 											<label class="col-xs-3 itp_in">&nbsp;</label>
 										</div>								
 									</div>
-									<div class="itp_form_in">	
-										<div class="form-group border">
-											<label class="col-xs-2 itp_lb">계약문서</label>
-											<div class="col-xs-10 itp_ip colspan">
-												<div class="fileupload-wrapper">
-													<!-- data-show-yn: 파일업로드를 할 수 있는 권한이 있는지 없는지.. -->
-													<div id="ITP_STINFO05010_DETAIL_UPLOAD" data-show-yn="Y"></div>
-												</div>
-											</div>
-										</div>	
-									</div>
 									<div class="itp_form_info">	
 										<div class="itp_form_in">
-											<div class="form-group border">
+											<div class="form-group">
 												<label class="col-xs-2 itp_lb">등록자/등록일 </label>
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-a itp_in">
@@ -249,6 +241,17 @@
 											</div>	
 										</div>		
 									</div>
+									<div class="itp_form_in">	
+										<div class="form-group border">
+											<label class="col-xs-2 itp_lb">계약문서</label>
+											<div class="col-xs-10 itp_ip colspan">
+												<div class="fileupload-wrapper">
+													<!-- data-show-yn: 파일업로드를 할 수 있는 권한이 있는지 없는지.. -->
+													<div id="ITP_STINFO05010_DETAIL_UPLOAD" data-show-yn="Y"></div>
+												</div>
+											</div>
+										</div>	
+									</div>
 								</section>								
 							</form>
 						</div>
@@ -263,8 +266,7 @@
 								<input type="hidden" id="ITP_FORM_STINFO05010_VIEW_BRAND_UNIT_UNQ_NO" name="brandUnitUnqNo" value="">
 					
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">단가정보-상세</h4>
-									<div class="itp_form_in">
+									<div class="itp_form_in border-top">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 												<div class="col-xs-4 itp_ip fnBrandNm">

src/main/webapp/css/style.css

@@ -89,7 +89,7 @@ a, button {outline:none !important; text-decoration:none !important;}
 
 /* ITP_LOGIN */
 #ITP_LOGIN {width:100%; height:100%; font-family: 'GmarketSansMedium'}
-#ITP_LOGIN .itp_head {margin:0 5%; letter-spacing:-1px; width:90%; height:40px; margin-bottom:50px;}
+#ITP_LOGIN .itp_head {margin:0 5%; letter-spacing:-3px; width:90%; height:40px; margin-bottom:50px; padding-left:18px;}
 #ITP_LOGIN .itp_bar {width:4px; height:26px; padding:0; float:left; margin:8px 7px 0 7px; font-size:27px; font-weight:100; background:#ccc;}
 #ITP_LOGIN .itp_logo {margin:0; padding:0; color:#000; font-size:39px; float:left; font-weight:700;}
 #ITP_LOGIN .itp_tit {margin:0; padding:7px 0 0 0; float:left; font-size:27px;}
@@ -317,7 +317,7 @@ html:lang(en) #ITP_CONTAINER .itp_detail .itp_form .itp_thumb_inline .itp_thumb_
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_ip.itp_dual_ipL .itp_btn {border-right:0; border-top-right-radius:0; border-bottom-right-radius:0;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_ip.itp_dual_ipR {margin-left:-15px;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_ip.itp_dual_ipR .itp_input {border-top-left-radius:0; border-bottom-left-radius:0;}
-#ITP_CONTAINER .itp_detail .itp_lg_form .itp_btn {padding:4px 10px; background:#fff;}
+#ITP_CONTAINER .itp_detail .itp_lg_form .itp_btn {padding:3.8px 11px; background:#fff;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_btn_dark {padding:3px 10px; margin-top:1px; color:#fff; background-color:rgb(109, 110, 114); border-color:rgb(109, 110, 114);}
 #ITP_CONTAINER .itp_detail .itp_lg_form .input-daterange .input-group-addon {padding:3px 5px;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_date_to {background:#fff;}

src/main/webapp/css/ui.jqgrid-bootstrap.css

@@ -232,7 +232,7 @@ div.tablediv > .table-bordered {
 .ui-jqgrid tr.jqfoot td {
 	white-space: nowrap;
 }
-.ui-jqgrid tr.ui-row-ltr td {font-size:13px;color:#333; font-weight:bold;}
+.ui-jqgrid tr.ui-row-ltr td {font-size:13px;color:#333;}
 .ui-jqgrid tr.ui-row-rtl td {font-size:13px;color:#333;}
 .ui-jqgrid .ui-jqgrid-resize-mark {
 	width:2px;
@@ -1039,4 +1039,4 @@ td.menu_text {
 
 .ui-jqgrid .jqgrid-rownum {background-color: transparent !important;}
 .table>tbody>tr.active .jqgrid-rownum {background:#e8e8e8 !important; z-index:1}
-.table>tbody>tr.success .jqgrid-rownum {background:#FDFDF5 !important;}
+.table>tbody>tr.success .jqgrid-rownum {background:#E3FEE4 !important;}

src/main/webapp/js/app/config.js

@@ -403,17 +403,26 @@ var fn_make_user_info = {
 	},
 	view: function() {
 		// 사용자명
-		console.log("====================");
-		console.log(this.get('authTpCd'));
 		$('#ITP_LOGIN_USER').text(this.get('userNm'));
-		let authTypeNm = (this.get('authTpNm') === undefined) ? '오더퀸' : this.get('authTpNm');
+		
+		let authTypeNm = '오더퀸' ;
+		
+		if (this.get('authTpCd') == "10" || this.get('authTpCd') == "20") {
+			authTypeNm ='오더퀸';
+		} else if (this.get('authTpCd') == "30" ) {
+			authTypeNm = this.get('afflShopNm');
+		} else { 
+			authTypeNm = this.get('brandNm');
+		}
+		
 		
 		if (this.get('authTpCd') == "10" || this.get('authTpCd') == "20" || this.get('authTpCd') == "30") {
 			$('#ITP_TXT_MAIN_SHR_AFFL').text(authTypeNm);
 			var brandNm = (this.get('brandNm')) ? '(' + this.get('brandNm') + ')' : '';
 			$('#ITP_TXT_MAIN_SHR_BRAND').text(brandNm);
 		} else {
-			$('#ITP_BTN_MAIN_SHR_AFFL').css('display','none');
+			$('#ITP_TXT_MAIN_SHR_AFFL').text(authTypeNm);
+			$('.itp_sch_brand').css('display','none');
 			$('#ITP_TXT_MAIN_SHR_BRAND').css('display','none');
 		}
 	},

src/main/webapp/js/app/stinfo/ITP_STINFO05010.js

@@ -51,7 +51,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목번호
-			width: '100', fixed: false, align: 'center',
+			width: '20', fixed: false, align: 'center',
 			sortable: false, hidden: false ,frozen:true
 		},
 		{
@@ -99,7 +99,7 @@ const gridColModel = {
 		{
 			index: 'LEAD_TIME', name: 'leadTime',
 			label: ITP_MSG_LOCALE.label.leadTime, //리드타임 (Day)
-			width: '16', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{

src/main/webapp/mobile/app/mpomng/MPOMNG02010.html

@@ -172,7 +172,7 @@
         <div class="line">
           <label>구매요청금액</label>
           <div class="line_right">
-            <div class="fnPchReqTotalAmt">0원</div>
+            <div class="fnPchReqAmtTot">0원</div>
           </div>
         </div>
         <div class="line">

src/main/webapp/mobile/app/mpomng/MPOMNG04010.html

@@ -113,31 +113,31 @@
 				<div class="line">
 					<label>발주일자</label>
 					<div class="line_right">
-						<div class="fnPodrDt">2022.10.10</div>
+						<div class="fnPodrDt"></div>
 					</div>
 				</div>
 				<div class="line">
 					<label>발주금액</label>
 					<div class="line_right">
-						<div class="fnPodrTotalAmt">424,000원</div>
+						<div class="fnPodrTotalAmt"></div>
 					</div>
 				</div>
 				<div class="line">
 					<label>납품장소</label>
 					<div class="line_right">
-						<div class="fnShmtWhsDvsnNm">A매장내</div>
+						<div class="fnShmtWhsDvsnNm"></div>
 					</div>
 				</div>
 				<div class="line">
 					<label>공급업체</label>
 					<div class="line_right">
-						<div class="fnSpplyNm">A공급업체</div>
+						<div class="fnSpplyNm"></div>
 					</div>
 				</div>
 				<div class="line">
 					<label>납기요청일</label>
 					<div class="line_right">
-						<div class="fnDlvReqDt">2022.10.10</div>
+						<div class="fnDlvReqDt"></div>
 					</div>
 				</div>
 				<div class="table_header">

src/main/webapp/mobile/app/mpomng/MPOMNG05010.html

@@ -6,7 +6,7 @@
 			<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_IDX" name="sidx" value="0">
 			<div class="content">
 				<div class="line">
-					<select class="label" name="dtlGubun" id="ITP_FORM_MPOMNG05010_LIST_DTL_GUBUN">
+					<select name="dtlGubun" id="ITP_FORM_MPOMNG05010_LIST_DTL_GUBUN">
 						<option value="1">발주생성일</option>
 						<option value="2">납품요청일</option>
 						<option value="3">납품예정일</option>

src/main/webapp/mobile/app/mrtnmng/MRTNMNG04010.html

@@ -103,8 +103,8 @@
 							<div class="nomal">
 								<label>반품발주일자 &nbsp;:</label>
 								<div class="history">
-									<div class="fnRtnOdrRegDt">2022.10.01</div>
-									(<div class="fnRtnOdrMgrNm"></div>)
+									<div class="fnRtnOdrRegDt"></div>
+									(<div class="fnColDvsnNm"></div>)
 								</div>
 							</div>
 						</div>
@@ -112,11 +112,11 @@
 							<div class="nomal">
 								<label>반품발주상태 &nbsp;:</label>
 								<div class="history">
-									<div class="fnRtnOdrStNm">대기</div>
+									<div class="fnRtnOdrStNm"></div>
 								</div>
 								<label>납품장소명&nbsp;:</label>
 								<div class="history">
-									<div class="fnWhsNm">A매장내</div>
+									<div class="fnWhsNm"></div>
 								</div>
 							</div>
 						</div>
@@ -126,7 +126,7 @@
 								<div class="history">
 									<div class="fnRtnDodrItemQty">품목수($)</div>
 									<i>-</i>
-									<div class="fnRtnDodrTotalAmt">1,200,000</div>원
+									<div class="fnRtnDodrTotalAmt"></div>
 								</div>
 							</div>
 						</div>
@@ -134,7 +134,7 @@
 							<div class="nomal">
 								<label>반품입고장소 &nbsp;:</label>
 								<div class="history">
-									<div class="fnRtnWhsNm">A공급업체</div>
+									<div class="fnRtnWhsNm"></div>
 								</div>
 							</div>
 						</div>
@@ -184,15 +184,15 @@
 								<div class="thick">
 									<div class="fnItemNm">품목명</div>
 									<i>-</i>
-									<div class="fnRtnQty"></div>
+									<div class="fnRtnOdrQty"></div>
 								</div>
 							</div>
 							<div class="left_info col-6">
 								<div class="thick">
 									<label>수량/금액</label>
-									<div class="fnRtnReqQty">2</div>
+									<div class="fnRtnReqQty"></div>
 									<i>/</i>
-									<div class="fnUnitAmt">24,000</div>
+									<div class="fnUnitAmt"></div>
 								</div>
 							</div>
 							<div class="left_info col-4">

src/main/webapp/mobile/app/mrtnmng/MRTNMNG06010.html

@@ -25,7 +25,7 @@
 					<label>반품입고장소</label>
 					<div class="search_wrap">
 						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="매장명">
+							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="매장명" readonly>
 							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
 						</div>
 						<div class="float_left_btn">

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG01010.js

@@ -181,17 +181,17 @@ let mobContentObj = {
 			var _this = this;
 			var id = '#ITP_AJAX_MCOLLMNG01010_VIEW_CONTAINER';
 			$(id).find('.fnBrandNm').text(result.brandNm);
-			$(id).find('.fnRtnPodrUnqNo').text(result.rtnPodrUnqNo);
-			$(id).find('.fnRtnOdrRegDt').text(result.rtnOdrRegDt);
-			$(id).find('.fnRtnOdrStNm').text(result.rtnOdrStNm);
-			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
-			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
-			$(id).find('.fnRtnMgrNm').text(result.rtnMgrNm);
+			$(id).find('.fnPchPodrUnqNo').text(result.pchPodrUnqNo);
+			$(id).find('.fnPodrDt').text(result.podrDt);
+			$(id).find('.fnPchOdrStNm').text(result.pchOdrStNm);
+			$(id).find('.fnWhsNm').text(result.whsNm);
+			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrItemQty));
+			$(id).find('.fnPodrMgrNm').text(result.podrMgrNm);
 			$.each(result.rtnOdrDtlList, function (i, item) {
 				$('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWCOPY').html());
 				var $li = $('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group > .list-row:last');
 				$li.find('.fnRtnPodrDtlNo').text(item.rtnPodrDtlNo);
-				$li.find('.fnItemId').text(item.itemId);
+				$li.find('.fnItemid').text(item.itemId);
 				$li.find('.fnItemNm').text(item.itemNm);
 				$li.find('.fnUnitQty').text(item.unitQty);
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG02010.js

@@ -243,15 +243,15 @@ let mobContentObj = {
 				var item = {
 					'rtnPodrDtlNo': row.rtnPodrDtlNo,
 					'rtnPodrUnqNo': row.rtnPodrUnqNo,
-					'colQty': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(),
+					'coltQty': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(),
 					'rtnRsnDvsn': $(this).find("#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN option:selected").val(),
 					'rtnRsn': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN').val()
 				};
-				if(item.colQty.length < 1) {
+				if(item.coltQty.length < 1) {
 					alert('수거수량을 입력해 주세요.');
 					return false;
 				}
-				if(item.colQty > row.rtnOdrQty) {
+				if(item.coltQty > row.rtnOdrQty) {
 					alert('수거수량은 수거요청수량을 초과할 수 없습니다.');
 					return false;
 				}
@@ -259,6 +259,7 @@ let mobContentObj = {
 					alert('수거사유를 선택해 주세요.');
 					return false;
 				}
+				item.expryDate = item.expryDate.replace(/-/g, ".");
 				gridInsertData.push(item);
 				isValid = true;
 			});

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG03010.js

@@ -62,8 +62,8 @@ let mobPageObj = {
 			$('button[id^="ITP_BTN_MCOLLMNG03010_VIEW"]').on('click', function() {
 				var id = $(this).attr('id');
 				switch (id) {
-					case 'ITP_BTN_MCOLLMNG03010_VIEW_ADD'			: mobContentObj.view.add();		break;
-					case 'ITP_BTN_MCOLLMNG03010_VIEW_CONFIRM'		: mobContentObj.view.cancel();	break;
+					case 'ITP_BTN_MCOLLMNG03010_VIEW_ADD'			: mobContentObj.view.add();	break;
+					case 'ITP_BTN_MCOLLMNG03010_VIEW_CANCEL_LIST'	: mobContentObj.view.cancel();	break;
 				}
 				return false;
 			});
@@ -221,9 +221,6 @@ let mobContentObj = {
 				$li.find('.fnRtnRsnDvsnNm').text(item.rtnRsnDvsnNm);
 				_this.rows.push(item);
 			});
-			$.each(result.fileLogNoList, function (i, item) {
-				$(id).find('.detail_logo').appendChild('<img src="' + item.filePath + '" />');
-			});
 		},
 		reset: function() {
 			var id = '#ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER';

src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG02010.js

@@ -40,8 +40,8 @@ let mobPageObj = {
 			// $('#ITP_FORM_MORDMNG02010_LIST_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
 			// $('#ITP_FORM_MORDMNG02010_LIST_SEARCH_TO_DT').datepicker('setDate', new Date());
 
-			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
-			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
+			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', 0));
+			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 1));
 		},
 		info: function() {
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));

src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG03010.js

@@ -62,7 +62,7 @@ let mobPageObj = {
 			$('button[id^="ITP_BTN_MORDMNG03010_VIEW"]').on('click', function() {
 				var id = $(this).attr('id');
 				switch (id) {
-					case 'ITP_BTN_MORDMNG03010_VIEW_ADD'			: mobContentObj.view.add();		break;
+					case 'ITP_BTN_MORDMNG03010_VIEW_ADD'			: mobContentObj.view.add();	break;
 					case 'ITP_BTN_MORDMNG03010_VIEW_CONFIRM'		: mobContentObj.view.cancel();	break;
 				}
 				return false;

src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -33,6 +33,8 @@ let mobPageObj = {
 		info: function() {
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
 			$('input:hidden[id$="_STORE_ID"]').val(fn_make_user_info.get('storeId'));
+
+			$('#ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT').val(itp_fn_date_add('M', 0));
 		}
 	},
 	event: {
@@ -298,51 +300,68 @@ let mobPopObj = {
 	},
 	popReqConfirm: {
 		init: function (parentId) {
+			this.formId = '#ITP_FORM_MPOMNG01010_DETAIL';
 			this.pchReqStCd = (parentId === 'ITP_BTN_MPOMNG01010_DETAIL_REQ_ORDER') ? PCH_REQ_ST_CD_REQUEST_SAVE : PCH_REQ_ST_CD_TEMP_SAVE;
 			this.view();
 			this.action();
 		},
 		view: function() {
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT').val());
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContObj.list.rows.length, '개'));
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add($('#ITP_FORM_MPOMNG01010_DETAIL .fnPchReqAmtTot').text()));
 			if(this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE) {
-				$('#ITP_POP_MPOMNG01010_REQ_AREA .msg_save').text('구매요청 하시겠습니까?');
+				var popMsg = '구매요청 하시겠습니까?';
+				let param = $(this.formId).serializeObject();
+				var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG01010_DETAIL .fnOrdUseAmt').text());
+				var pchReqAmtTot = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG01010_DETAIL .fnPchReqAmtTot').text());
+				if (parseInt(ordUseAmt) < parseInt(pchReqAmtTot)) {
+					popMsg = (param.loanDvsn !== 'LD03' && param.loanDvsn === 'LD01') ? ITP_MSG_LOCALE.message.ajax.lackReqAmt : ITP_MSG_LOCALE.message.ajax.lackReqAmt;
+					$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('결제');
+					this.saveMode = 'PAY';
+				}
+				$('#ITP_POP_MPOMNG01010_REQ_AREA .msg_save').text(popMsg);
 			} else {
+				this.saveMode = 'SAVE';
 				$('#ITP_POP_MPOMNG01010_REQ_AREA .msg_save').text('임시저장 하시겠습니까?');
+				$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
 			}
-			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT').val());
-			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContObj.list.rows.length, '개'));
-			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add($('#ITP_FORM_MPOMNG01010_DETAIL .fnPchReqAmtTot').text()));
 		},
 		action: function() {
 			var _this = this;
 			$('#ITP_POP_MPOMNG01010_REQ_AREA button[id="ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM"]').off('click').on('click', function() {
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD').val(_this.pchReqStCd);
-				_this.save('#ITP_FORM_MPOMNG01010_DETAIL');
+				_this.save();
 			});
 		},
-		save: function(formId) {
-			let param = $(formId).serializeObject();
+		save: function() {
+			let param = $(this.formId).serializeObject();
+			console.log(JSON.stringify(param));
 
-			if (param.loanDvsn !== 'LD03' && this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE ) {
-				var pchActAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text();
-				var pchReqAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text();
+			// if (param.loanDvsn !== 'LD03' && this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE ) {
+			// 	var pchActAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text();
+			// 	var pchReqAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text();
+			//
+			// 	if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
+			// 		alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
+			// 		return;
+			// 	}
+			// }
 
-				if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
-					alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
-					return;
-				}
+			if(this.saveMode === 'PAY') {
+				alert('결제 페이지 이동!!!');
+			} else {
+				$.each(mobContObj.list.rows, function(index, item) {
+					item['viewCd'] = 'C';
+				});
+				param.gridInsertData = mobContObj.list.rows;
+				param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
+				console.log(JSON.stringify(param));
+				var saveFn = function (result) {
+					console.log(result);
+					mobPopObj.hide('ITP_POP_MPOMNG01010_REQ_AREA');
+				};
+				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
 			}
-
-			$.each(mobContObj.list.rows, function(index, item) {
-				item['viewCd'] = 'C';
-			});
-			param.gridInsertData = mobContObj.list.rows;
-			param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
-			console.log(JSON.stringify(param));
-			var saveFn = function (result) {
-				console.log(result);
-				mobPopObj.hide('ITP_POP_MPOMNG01010_REQ_AREA');
-			};
-			fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
 		}
 	},
 	show: function(popId, parentId) {
@@ -357,8 +376,13 @@ let mobPopObj = {
 			var formId = '#ITP_FORM_MPOMNG01010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
 			if (itp_fn_form_event.isValid(formId)) {
-				$('#' + popId).show();
-				mobPopObj.init(popId, parentId);
+				if($('#ITP_LIST_MPOMNG01010_DETAIL_ROWS > li').size() < 1) {
+					alert('품목추가 버튼을 이용하여 품목을 추가해 주세요.');
+					return false;
+				} else {
+					$('#' + popId).show();
+					mobPopObj.init(popId, parentId);
+				}
 			}
 		} else {
 			$('#' + popId).show();

src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG02010.js

@@ -345,7 +345,7 @@ let mobContentObj = {
 					var amt = item.unitAmt;
 					reqAmt += Number(qty) * amt;
 				});
-				$('#ITP_AJAX_MPOMNG02010_LIST_CONTAINER').find('.fnPchReqAmtTot').text(CommonObj.currency.add(reqAmt));
+				$('#ITP_AJAX_MPOMNG02010_MODIFY_CONTAINER').find('.fnPchReqAmtTot').text(CommonObj.currency.add(reqAmt));
 			}
 		},
 		cancel: function () {
@@ -515,20 +515,32 @@ let mobPopObj = {
 		popId: 'ITP_POP_MPOMNG02010_REQ_AREA',
 		pchReqStCd: '',
 		init: function (pchReqStCd) {
+			this.formId = '#ITP_FORM_MPOMNG02010_MODIFY';
 			this.pchReqStCd = pchReqStCd;
 			mobPopObj.show(this.popId);
 			this.view();
 			this.action();
 		},
 		view: function() {
+			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT').val());
+			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContentObj.modify.list.rows.length, '개'));
+			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnOrdAmt').text($('#ITP_FORM_MPOMNG02010_MODIFY .fnPchReqAmtTot').text());
 			if(this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE) {
-				$('#ITP_POP_MPOMNG02010_REQ_AREA .msg_save').text('구매요청 하시겠습니까?');
+				var popMsg = '구매요청 하시겠습니까?';
+				let param = $(this.formId).serializeObject();
+				var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG02010_DETAIL .fnOrdUseAmt').text());
+				var pchReqAmtTot = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG02010_DETAIL .fnPchReqAmtTot').text());
+				if (parseInt(ordUseAmt) < parseInt(pchReqAmtTot)) {
+					popMsg = (param.loanDvsn !== 'LD03' && param.loanDvsn === 'LD01') ? ITP_MSG_LOCALE.message.ajax.lackReqAmt : ITP_MSG_LOCALE.message.ajax.lackReqAmt;
+					$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('결제');
+					this.saveMode = 'PAY';
+				}
+				$('#ITP_POP_MPOMNG02010_REQ_AREA .msg_save').text(popMsg);
 			} else {
+				this.saveMode = 'SAVE';
 				$('#ITP_POP_MPOMNG02010_REQ_AREA .msg_save').text('임시저장 하시겠습니까?');
+				$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
 			}
-			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT').val());
-			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContentObj.modify.list.rows.length, '개'));
-			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add($('#ITP_FORM_MPOMNG02010_MODIFY .fnPchReqTotalAmt').text()));
 		},
 		action: function() {
 			var _this = this;
@@ -541,41 +553,35 @@ let mobPopObj = {
 			var _this = this;
 			let param = $(formId).serializeObject();
 
-			if (param.loanDvsn !== 'LD03' && this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE ) {
-				var ordUseAmt = $('#ITP_FORM_MPOMNG02010_MODIFY .fnOrdUseAmt').text();
-				var pchReqTotalAmt = $('#ITP_FORM_MPOMNG02010_VIEW .fnPchReqTotalAmt').text();
-
-				if (parseInt(CommonObj.onlyNumber(ordUseAmt)) < parseInt(CommonObj.onlyNumber(pchReqTotalAmt))) {
-					alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
-					return;
-				}
+			if(this.saveMode === 'PAY') {
+				alert('결제 페이지 이동!!!');
+			} else {
+				var gridInsertData = [];
+				var gridUpdateData = [];
+				var gridDeleteData = [];
+				$.each(mobContentObj.modify.list.rows, function(index, item) {
+					item['pchReqUnqNo'] = param.pchReqUnqNo;
+					if(item.viewCd === 'R' || item.viewCd === 'C' ) {
+						item['viewCd'] = 'C';
+						gridInsertData.push(item);
+					} else if(item.viewCd === 'U') {
+						gridUpdateData.push(item);
+					} else if(item.viewCd === 'D') {
+						gridDeleteData.push(item);
+					}
+				});
+				param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
+				param.gridInsertData = gridInsertData;
+				param.gridUpdateData = gridUpdateData;
+				param.gridDeleteData = gridDeleteData;
+				console.log(JSON.stringify(param));
+				var saveFn = function (result) {
+					console.log(result);
+					mobPopObj.hide(_this.popId);
+					mobContentObj.list.init();
+				};
+				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
 			}
-
-			var gridInsertData = [];
-			var gridUpdateData = [];
-			var gridDeleteData = [];
-			$.each(mobContentObj.modify.list.rows, function(index, item) {
-				item['pchReqUnqNo'] = param.pchReqUnqNo;
-				if(item.viewCd === 'R' || item.viewCd === 'C' ) {
-					item['viewCd'] = 'C';
-					gridInsertData.push(item);
-				} else if(item.viewCd === 'U') {
-					gridUpdateData.push(item);
-				} else if(item.viewCd === 'D') {
-					gridDeleteData.push(item);
-				}
-			});
-			param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
-			param.gridInsertData = gridInsertData;
-			param.gridUpdateData = gridUpdateData;
-			param.gridDeleteData = gridDeleteData;
-			console.log(JSON.stringify(param));
-			var saveFn = function (result) {
-				console.log(result);
-				mobPopObj.hide(_this.popId);
-				mobContentObj.list.init();
-			};
-			fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
 		}
 	},
 	show: function(popId) {

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG01010.js

@@ -37,7 +37,7 @@ let mobPageObj = {
 		},
 		view: function() {
 			// 조회일자 지정
-			$('#ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT').val(itp_fn_date_add('M', 0));
+			$('#ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT').val(itp_fn_date_add('M', 1));
 		}
 	},
 	event: {
@@ -316,7 +316,7 @@ let mobPopObj = {
 			}
 			$('#ITP_POP_MRTNMNG01010_RTN_AREA .fnRtnReqDt').text($('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT').val());
 			$('#ITP_POP_MRTNMNG01010_RTN_AREA .fnItemQty').text(CommonObj.currency.add(mobContObj.list.rows.length, '개'));
-			$('#ITP_POP_MRTNMNG01010_RTN_AREA .fnRtnAmt').text(CommonObj.currency.add($('#ITP_FORM_MRTNMNG01010_DETAIL .fnRtnReqAmt').text()));
+			$('#ITP_POP_MRTNMNG01010_RTN_AREA .fnRtnAmt').text($('#ITP_FORM_MRTNMNG01010_DETAIL .fnRtnReqAmt').text());
 			$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_RTN_REQ_ST_CD').val(this.rtnReqStCd);
 		},
 		action: function() {
@@ -354,6 +354,7 @@ let mobPopObj = {
 			var saveFn = function (result) {
 				console.log(result);
 				mobPopObj.hide('ITP_POP_MRTNMNG01010_RTN_AREA');
+				$('#ITP_LIST_MRTNMNG01010_DETAIL_ROWS').empty();
 			};
 			fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
 		}

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG04010.js

@@ -37,8 +37,8 @@ let mobPageObj = {
 			});
 
 			// 조회일자 지정
-			$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
-			$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
+			$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', 0));
+			$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 1));
 		},
 		info: function() {
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -144,7 +144,7 @@ let mobContentObj = {
 					$('#ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWCOPY').html());
 					var $li = $('#ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA .panel-group > .list-row:last');
 					$li.find('.fnRtnOdrRegDt').text(item.rtnOdrRegDt);
-					$li.find('.fnRtnOdrMgrNm').text(item.rtnOdrMgrNm);
+					$li.find('.fnColDvsnNm').text(item.colDvsnNm);
 					$li.find('.fnRtnOdrStNm').text(item.rtnOdrStNm);
 					$li.find('.fnWhsNm').text(item.whsNm);
 					$li.find('.fnRtnDodrItemQty').text($li.find('.fnRtnDodrItemQty').text().replace('$', item.rtnDodrItemQty));
@@ -182,7 +182,7 @@ let mobContentObj = {
 		view: function(result) {
 			var _this = this;
 			var id = '#ITP_AJAX_MRTNMNG04010_VIEW_CONTAINER';
-			$('#ITP_BTN_MRTNMNG04010_VIEW_RTN_PO_CANCEL').prop('disabled', (result.rtnOdrStCd !== 'RO20'));
+			$('#ITP_BTN_MRTNMNG04010_VIEW_RTN_PO_CANCEL').prop('disabled', (result.rtnRsnDvsn !== 'RR00'));
 			$(id).find('.fnRtnOdrRegDt').text(result.rtnOdrRegDt);
 			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
 			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
@@ -192,7 +192,7 @@ let mobContentObj = {
 				var $li = $('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA .panel-group > .list-row:last');
 				console.log(item);
 				$li.find('.fnItemNm').text(item.itemNm);
-				$li.find('.fnRtnQty').text(item.rtnQty + item.unit);
+				$li.find('.fnRtnOdrQty').text(item.rtnOdrQty + item.unit);
 				$li.find('.fnRtnReqQty').text(CommonObj.comma.set(item.rtnReqQty));
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
 				$li.find('.fnRtnOdrAmt').text(CommonObj.currency.add(item.rtnOdrAmt));

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG06010.js

@@ -117,11 +117,19 @@ let mobContentObj = {
 			// this.search();
 		},
 		search: function() {
-			this.listPage = 0;
-			this.totPage = 0;
-			this.rows.length = 0;
-			$('#ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS').empty();
-			this.load();
+			if($('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM').val().length < 1) {
+				alert('수거창고를 지정해주세요!');
+				return;
+			}
+			var formId = '#ITP_FORM_MRTNMNG05010_LIST_SEARCH';
+			itp_fn_form_clear_validate(null, formId);
+			if (itp_fn_form_event.isValid(formId)) {
+				this.listPage = 0;
+				this.totPage = 0;
+				this.rows.length = 0;
+				$('#ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS').empty();
+				this.load();
+			}
 		},
 		load: function() {
 			var _this = this;

src/main/webapp/mobile/js/config.js

@@ -183,6 +183,7 @@ var fn_make_slide_menu = {
 		var _this = this;
 		$('#ITP_SIDEBAR .accordion-toggle').off('click').on('click', function() {
 			console.log('accordion-toggle');
+			$(this).find('i.indicator').toggleClass('glyphicon-chevron-down glyphicon-chevron-up');
 		});
 		$('#ITP_SIDEBAR .itp_nav_link').off('click').on('click', function() {
 			const id = $(this).attr('data-itp-nav-id');
@@ -194,6 +195,7 @@ var fn_make_slide_menu = {
 				const href = MOBILE_CONTEXTPATH + connUrl;
 				_this.loadPage(id, href);
 				$('#ITP_MENU').toggle();
+				$('.name_info .fnMenuNm').text($(this).find('.fnMenuNm').text() + '|');
 			}
 		});
 	},