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

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

@@ -260,7 +260,7 @@
 											</div>
 										</div>
 										<div class="itp_form_in">
-											<div class="form-group">
+											<div class="form-group border">
 												<label class="col-xs-2 itp_lb">정산타입*</label>
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-7 itp_in">
@@ -341,7 +341,7 @@
 											</div>
 										</div>
 										<div class="itp_form_in">
-											<div class="form-group">
+											<div class="form-group border">
 												<label class="col-xs-2 itp_lb">수정일</label>
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-12 itp_in fnSysChgDttm"></div>
@@ -365,8 +365,7 @@
 								<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_VIEW_CD" name="viewCd" value="R">
 								<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_STORE_ID" name="storeId" 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">

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

@@ -57,8 +57,7 @@
 								<input type="hidden" id="ITP_FORM_STINFO03010_DETAIL_CORP_FILE_NO" name="bbookCopyFileNo" 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">
@@ -78,7 +77,7 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">공급업체번호</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-7 itp_in fnSpplyId" style="top:4px;"></div>
+												<div class="col-xs-11 itp_in fnSpplyId" style="top:4px;"></div>
 												<!--<div class="col-xs-4 itp_in" style="margin-left:5px;">
 													<button type="button" id="ITP_BTN_STINFO03010_RESET_PW" class="btn btn-danger btn-sm PWC" style="margin: -1px 0px 0px 3px; display:block;">비밀번호 초기화</button>
 												</div>-->
@@ -96,7 +95,7 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">공급업체명 *</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-9 itp_in">
+												<div class="col-xs-7 itp_in">
 													<input type="text" id="ITP_FORM_STINFO03010_DETAIL_SPPLY_NM" data-check-required="empty" class="form-control itp_input" name="spplyNm" value="">
 												</div>
 											</div>
@@ -245,7 +244,7 @@
 												<div class="col-xs-1 itp_in">
 													<input type="text" id="ITP_FORM_STINFO03010_DETAIL_ZIPNO" data-check-required="empty" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">
 												</div>
-												<div class="col-xs-2 itp_in" style="width:10%;">
+												<div class="col-xs-a itp_in">
 													<button type="button" id="ITP_FORM_STINFO03010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
 												</div>
 												<div class="col-xs-4 itp_in" style="margin:0 5px;">
@@ -259,7 +258,7 @@
 									</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" style="width:auto;">
@@ -305,7 +304,7 @@
 								</section>				
 							</form>
 							<div class="itp_form_in">
-								<div class="itp_table_head fix" style="background:#f5f5f5;">
+								<div class="itp_table_head fix" style="background:#fff;">
 									<h4 class="itp_table_tit">공급업체 담당자 정보</h4>
 									<div class="pull-right itp_cicon">
 										<button type="button" id="ITP_BTN_STINFO03010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;행추가&nbsp;&nbsp;</button>
@@ -333,8 +332,7 @@
 								<input type="hidden" id="ITP_FORM_STINFO03010_VIEW_FILE_NO" name="popFileNo" 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">
@@ -482,7 +480,7 @@
 								</section>				
 							</form>
 							<div class="itp_form_in">
-								<div class="itp_table_head fix" style="background:#f5f5f5;">
+								<div class="itp_table_head fix" style="background:#fff;">
 									<h4 class="itp_table_tit">공급업체 담당자 정보</h4>
 								</div>
 								<div id="ITP_STINFO03010_VIEW_jqGrid_list" class="itp_tb_list">

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

@@ -90,17 +90,16 @@
 								<input type="hidden" id="ITP_FORM_STINFO04010_DETAIL_ITEM_ID" name="itemId" value="">
 								<input type="hidden" id="ITP_FORM_STINFO04010_DETAIL_FILE_NO" name="itemImageFileNo" 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">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in fnBrandNm">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">상태 *</label>
-											<div class="col-xs-3 itp_ip">
-												<div class="col-xs-9 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
 								               		<select id="ITP_FORM_STINFO04010_DETAIL_ITEM_ST_CD" data-select-code="ITEM_ST_CD" data-check-required="empty" class="form-control itp_input default_st_cd" name="itemStCd"></select>
 												</div>
 											</div>
@@ -136,14 +135,14 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">품목번호</label>
-											<div class="col-xs-5 itp_ip fnItemClassMgntNo"></div>
+											<div class="col-xs-4 itp_ip fnItemClassMgntNo"></div>
 											<label class="col-xs-2 itp_lb">품목유형 *</label>
-											<div class="col-xs-5 itp_ip">
-												<div class="col-xs-9 itp_in">
-								                <select id="ITP_FORM_STINFO04010_DETAIL_ITEM_TYPE" data-select-code="ITEM_TYPE" data-check-required="empty" class="form-control itp_input" name="itemType">
-													<option value="">소모품</option>
-													<option value="">자산용</option>
-												</select>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
+									                <select id="ITP_FORM_STINFO04010_DETAIL_ITEM_TYPE" data-select-code="ITEM_TYPE" data-check-required="empty" class="form-control itp_input" name="itemType">
+														<option value="">소모품</option>
+														<option value="">자산용</option>
+													</select>
 												</div>
 											</div>
 										</div>
@@ -151,14 +150,14 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">품목명 *</label>
-											<div class="col-xs-5 itp_ip">
-												<div class="col-xs-9 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_ITEM_NM" data-check-required="empty" class="form-control itp_input" name="itemNm" value="품목A">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">내외자구분</label>
-											<div class="col-xs-5 itp_ip">
-												<div class="col-xs-9 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
 									                <select id="ITP_FORM_STINFO04010_DETAIL_IMP_DVSN" data-select-code="IMP_DVSN" class="form-control itp_input" name="impDvsn">
 														<option value="">국내</option>
 														<option value="">수입</option>
@@ -170,7 +169,7 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">발주여부 *</label>
-											<div class="col-xs-5 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in">
 													<select id="ITP_FORM_STINFO04010_DETAIL_PODR_PSSBL_DVSN" data-select-code="PODR_PSSBL_DVSN" data-check-required="empty" class="form-control itp_input" name="podrPssblDvsn">
 														<option value="">발주가능</option>
@@ -179,8 +178,8 @@
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">기본단위 *</label>
-											<div class="col-xs-5 itp_ip">
-												<div class="col-xs-9 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
 									                <select id="ITP_FORM_STINFO04010_DETAIL_UNIT" data-select-code="DSTRBT_COST_UNIT" data-check-required="empty" class="form-control itp_input detail_item_unit" name="unit"></select>
 												</div>
 											</div>
@@ -189,7 +188,7 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">구매품목여부 *</label>
-											<div class="col-xs-5 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in">
 													<select id="ITP_FORM_STINFO04010_DETAIL_PCH_ITEM_YN" data-check-required="empty" class="form-control itp_input" name="pchItemYn">
 														<option value="">구매품목여부</option>
@@ -199,8 +198,8 @@
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">구매단위</label>
-											<div class="col-xs-5 itp_ip">
-												<div class="col-xs-9 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
 									                <select id="ITP_FORM_STINFO04010_DETAIL_PCH_UNIT" data-select-code="DSTRBT_COST_UNIT" class="form-control itp_input detail_item_unit" name="pchUnit"></select>
 												</div>
 											</div>
@@ -209,7 +208,7 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">판매품목여부 *</label>
-											<div class="col-xs-5 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in">
 													<select id="ITP_FORM_STINFO04010_DETAIL_SALE_ITEM_YN" data-check-required="empty" class="form-control itp_input" name="saleItemYn">
 														<option value="">판매품목여부</option>
@@ -219,8 +218,8 @@
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">판매단위</label>
-											<div class="col-xs-5 itp_ip">
-												<div class="col-xs-9 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
 								      	          	<select id="ITP_FORM_STINFO04010_DETAIL_SALE_UNIT" data-select-code="DSTRBT_COST_UNIT" class="form-control itp_input detail_item_unit" name="saleUnit"></select>
 												</div>
 											</div>
@@ -229,14 +228,14 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">자산정보</label>
-											<div class="col-xs-5 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in">
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_ASSET_INFO" class="form-control itp_input" name="assetInfo" value="">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">재고단위</label>
-											<div class="col-xs-5 itp_ip">
-												<div class="col-xs-9 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
 								      	          	<select id="ITP_FORM_STINFO04010_DETAIL_STCK_UNIT" data-select-code="DSTRBT_COST_UNIT" class="form-control itp_input detail_item_unit" name="stckUnit"></select>
 												</div>
 											</div>
@@ -245,7 +244,7 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">중량</label>
-											<div class="col-xs-5 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in">
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WEIGHT" data-check-required="number" class="form-control itp_input" name="weight" value="">
 												</div>
@@ -254,11 +253,11 @@
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">부피</label>
-											<div class="col-xs-3 itp_ip">
-												<div class="col-xs-5 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-3 itp_in">
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_VOLUME" class="form-control itp_input" name="volume" value="">
 												</div>
-												<div class="col-xs-6 itp_in">
+												<div class="col-xs-4 itp_in">
 	              									<select id="ITP_FORM_STINFO04010_DETAIL_VOLUME_UNIT" data-select-code="VOLUME_UNIT" class="form-control itp_input detail_item_unit" name="volume_unit"></select>
 												</div>
 											</div>
@@ -267,7 +266,7 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">가로</label>
-											<div class="col-xs-5 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in">
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WIDTH" class="form-control itp_input" name="width" value="">
 												</div>
@@ -276,11 +275,11 @@
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">세로</label>
-											<div class="col-xs-3 itp_ip">
-												<div class="col-xs-5 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-3 itp_in">
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HEIGHT" class="form-control itp_input" name="height" value="">
 												</div>
-												<div class="col-xs-6 itp_in">
+												<div class="col-xs-4 itp_in">
 	              									<select id="ITP_FORM_STINFO04010_DETAIL_HEIGHT_UNIT" data-select-code="HEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="height_unit"></select>
 												</div>
 											</div>
@@ -289,7 +288,7 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">높이</label>
-											<div class="col-xs-5 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in">
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HIGH" class="form-control itp_input" name="high" value="">
 												</div>
@@ -298,8 +297,8 @@
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">1Box수량</label>
-											<div class="col-xs-5 itp_ip">
-												<div class="col-xs-9 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
 								                	<input type="text" id="ITP_FORM_STINFO04010_DETAIL_ONE_BOX_QTY" class="form-control itp_input" name="oneBoxQty" value="">
 												</div>
 											</div>
@@ -308,7 +307,7 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">유통기한여부 *</label>
-											<div class="col-xs-5 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in">
 													<select id="ITP_FORM_STINFO04010_DETAIL_EXPRY_YN" data-check-required="empty" class="form-control itp_input" name="expryYn">
 														<option value="">유통기한여부</option>
@@ -318,11 +317,11 @@
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">유통가능기간</label>
-											<div class="col-xs-3 itp_ip">
-												<div class="col-xs-5 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
 								                	<input type="text" id="ITP_FORM_STINFO04010_DETAIL_EXPRY_PERIOD" class="form-control itp_input" name="expryPeriod" value="30">
 												</div>
-												<div class="col-xs-5 itp_in">
+												<div class="col-xs-a itp_in">
 													<label class="itp_in">(Day)</label>
 												</div>
 											</div>
@@ -331,7 +330,7 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">반품기능여부</label>
-											<div class="col-xs-5 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in">
 													<select id="ITP_FORM_STINFO04010_DETAIL_RTN_PSSBL_YN" class="form-control itp_input" name="rtnPssblYn">
 														<option value="">반품기능여부</option>
@@ -341,8 +340,8 @@
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">반품구분</label>
-											<div class="col-xs-5 itp_ip">
-												<div class="col-xs-9 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
 													<select id="ITP_FORM_STINFO04010_DETAIL_RTN_DVSN" data-select-code="RTN_DVSN" class="form-control itp_input" name="rtnDvsn">
 														<option value="">실물반품</option>
 														<option value="">폐기반품</option>
@@ -413,13 +412,10 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">품목분류 *</label>
 											<div class="col-xs-12 itp_ip">
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass1" style="width:auto;"></div>
-												<label class="col-xs-1 itp_in" style="width:2%;">></label>
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass2" style="width:auto;"></div>
-												<label class="col-xs-1 itp_in" style="width:2%;">></label>
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass3" style="width:auto;"></div>
-												<label class="col-xs-1 itp_in" style="width:2%;">></label>
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass4" style="width:auto;"></div>
+												<div class="col-xs-a itp_in itp_noMar fnItemClass1"></div>
+												<div class="col-xs-a itp_in itp_noMar fnItemClass2"></div>
+												<div class="col-xs-a itp_in itp_noMar fnItemClass3"></div>
+												<div class="col-xs-a itp_in itp_noMar fnItemClass4"></div>
 											</div>
 										</div>
 									</div>
@@ -514,9 +510,9 @@
 											</div>
 											<label class="col-xs-2 itp_lb">부피</label>
 											<div class="col-xs-3 itp_ip">
-												<div class="col-xs-5 itp_in fnVolume" style="width:auto;">
+												<div class="col-xs-3 itp_in fnVolume" style="width:auto;">
 												</div>
-												<div class="col-xs-6 itp_in fnUnit">
+												<div class="col-xs-4 itp_in fnUnit">
 												</div>
 											</div>
 										</div>
@@ -532,9 +528,9 @@
 											</div>
 											<label class="col-xs-2 itp_lb">세로</label>
 											<div class="col-xs-3 itp_ip">
-												<div class="col-xs-5 itp_in fnHeight" style="width:auto;">
+												<div class="col-xs-3 itp_in fnHeight" style="width:auto;">
 												</div>
-												<div class="col-xs-6 itp_in fnUnit">
+												<div class="col-xs-4 itp_in fnUnit">
 												</div>
 											</div>
 										</div>

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

@@ -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:#dff0d8 !important;}
+.table>tbody>tr.success .jqgrid-rownum {background:#FDFDF5 !important;}

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

@@ -411,6 +411,28 @@ let viewObj = {
         pageObj.switchScreen('VIEW');
         $('#ITP_FORM_STINFO04010_VIEW #ITP_FORM_STINFO04010_VIEW_ITEM_ID').val(result.itemId);
         $('#ITP_FORM_STINFO04010_VIEW .fnStCd').text(result.itemStNm);
+        var itemClassNm = ""; //itemClassNm 값 없음
+		
+		if (result.itemClass1Nm != null && result.itemClass1Nm != "")//itemclass1Nm 값이 있을때
+		{
+			var itemClassNm = result.itemClass1Nm;  //itemClassNm 에 itemClass1Nm 값 넣음
+		}
+		
+		if (result.itemClass2Nm != null && result.itemClass2Nm != "")//itemclass2Nm 값이 있을때
+		{
+			var itemClassNm = itemClassNm + " " + ">" + " " + result.itemClass2Nm;	//itemClassNm 에 itemClassNm + > + itemClass2Nm 값 넣음
+		}
+		
+		if (result.itemClass3Nm != null && result.itemClass3Nm != "")//itemclass3Nm 값이 있을때
+		{
+			var itemClassNm = itemClassNm + " " + ">" + " " + result.itemClass3Nm;	//itemClassNm 에 itemClassNm + > + itemClass3Nm 값 넣음		
+		}
+		
+		if (result.itemClass4Nm != null && result.itemClass4Nm != "")//itemclass4Nm 값이 있을때
+		{
+			var itemClassNm = itemClassNm + " " + ">" + " " + result.itemClass4Nm;	//itemClassNm 에 itemClassNm + > + itemClass4Nm 값 넣음
+
+		}
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass1').text(result.itemClass1Nm);
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass2').text(result.itemClass2Nm);
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass3').text(result.itemClass3Nm);

src/main/webapp/mobile/app/mcollmng/MCOLLMNG01010.html

@@ -53,7 +53,10 @@
 			  <ul id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWS" class="panel-group"></ul>
 			  <div id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWCOPY" style="display:none;">
 				<li class="history_list list-row">
-				  <div>
+				  <div class="scroll_btn">
+			  		<input type="checkbox">
+			  	  </div>
+				  <div class="btn_check">
 					<div class="left">
 					  <div class="nomal">
 						<label>브랜드명 &nbsp;:</label>

src/main/webapp/mobile/app/mcollmng/MCOLLMNG02010.html

@@ -29,7 +29,7 @@
 			<div class="line">
 				<label>발주번호/품목명</label>
 			  <div class="search_wrap">
-				<input id="ITP_FORM_MCOLLMNG02010_LIST_ITEM_NM" name="ITEM_NM" style="width: 262px;" type="text" placeholder="검색어입력">
+				<input id="ITP_FORM_MCOLLMNG02010_LIST_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="검색어입력">
 			  </div>
 			</div>
 			<div class="line" style="height:45px;">
@@ -43,9 +43,12 @@
 		  </div>
 		   <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
 			  <ul id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS" class="panel-group"></ul>
-			  <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
+			  <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list3 list-row">
-				  <div>
+				  <div class="scroll_btn">
+			  		<input type="checkbox">
+			  	  </div>
+				  <div class="btn_check">
 					<div class="left">
 					  <div class="nomal">
 						<label class="col_0">브랜드명 &nbsp;:</label>
@@ -62,7 +65,7 @@
 					  <div class="nomal">
 						<label class="col_0">반품발주항번 &nbsp;:</label>
 						<div class="col_5">
-						  <div class="fnRtnPodrNo col_5">1</div>
+						  <div class="fnColReqDt col_5">1</div>
 						</div>
 						<label class="col_6">수거요청일 &nbsp;:</label>
 						<div>
@@ -104,9 +107,6 @@
 						<div>
 						  <div class="fnRtnDodrTotalAmt space0"></div>
 						</div>
-						<div class="scroll_btn">
-						  <button id="ITP_BTN_MCOLLMNG02010_LIST_CHOICE">선택</button>
-						</div>
 					  </div>
 					</div>
 				  </div>
@@ -147,12 +147,6 @@
 				<div class="fnRtnDodrTotalAmt"></div>
 			  </div>      
 			</div>
-			<div class="line">
-			<label class="col_6">수거일자</label>
-			  <div class="line_right">
-				  <input id="ITP_FORM_MORDMNG02010_VIEW_COL_SCH_DT" name="colSchDt" class="year" type="date">
-			  </div>
-			</div>
 			<div class="line">
 			  <label>수거장소</label>
 			  <div class="line_right">
@@ -165,11 +159,17 @@
 				<div class="fnPickTelNo"></div>
 			  </div>      
 			</div>
+			<div class="line">
+			  <label class="col_6">수거일자</label>
+			  <div class="line_right">
+				  <input id="ITP_FORM_MORDMNG02010_VIEW_COL_SCH_DT" name="colSchDt" class="year" type="date">
+			  </div>
+			</div>
 			<div class="line">
 			  <label>수거담당자</label>
 			  <div class="line_right">
-				<input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_NM" name="rtnMgrNm" class="left" type="text" style="width:100px;margin-right: 5px;" placeholder="이름">
-				<input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_TEL_NO" name="rtnMgrTelNo" class="left" type="text" style="width:140px;margin-right: 10px;" placeholder="연락처">
+				<input id="ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_NM" name="pickMgrNm" class="left" type="text" style="width:100px;margin-right: 5px;" placeholder="이름">
+				<input id="ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_TEL_NO" name="pickMgrTelNo" class="left" type="text" style="width:140px;margin-right: 10px;" placeholder="연락처">
 			  </div>
 			</div>
 			<div class="table_header">
@@ -178,7 +178,7 @@
 		  </div>
 			<div id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA" class="scroll_area row-5">
 			  <ul id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_ROWS" class="panel-group"></ul>
-			  <div id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_ROWCOPY" style="display: bl;">
+			  <div id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_ROWCOPY" style="display: none;">
 				<li class="history_list2 list-row">
 				  <div>
 					<div class="left">
@@ -221,7 +221,7 @@
 					  <div class="nomal">
 						<label>수거수량 &nbsp;:</label>
 						<div class="">
-						  <input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY" type="text" name="coltQty">
+						  <input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY" type="text" name="colQty">
 						</div>
 						<label>수거구분&nbsp;:</label>
 						<div class="">
@@ -247,8 +247,8 @@
 			</div>
 		  </div>
 		  <div class="button_bar">
-			<button id="ITP_BTN_MCOLLMNG02010_LIST_COL_ADD" class="ok col_12 btn-primary CRT">생성</button>
-			<!--<button id="ITP_BTN_MCOLLMNG02010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>-->
+			<button id="ITP_BTN_MCOLLMNG02010_VIEW_COL_ADD" class="btn_col_6 btn-primary CRT">생성</button>
+			<button id="ITP_BTN_MCOLLMNG02010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>
 		  </div>
 	  </form>
 	</div>

src/main/webapp/mobile/app/mcollmng/MCOLLMNG03010.html

@@ -46,7 +46,10 @@
 			  <ul id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS" class="panel-group"></ul>
 			  <div id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list3 list-row">
-				  <div>
+				  <div class="scroll_btn">
+			  		<input type="checkbox">
+			  	  </div>
+				  <div class="btn_check">
 					<div class="left">
 					  <div class="nomal">
 						<label class="col_0">브랜드명 &nbsp;:</label>
@@ -99,7 +102,7 @@
 					  <div class="nomal">
 						<label class="col_0">수거장소 &nbsp;:</label>
 						<div>
-						  <div class="fnWhsAddr space1"></div>
+						  <div class="fnWhsNm space1"></div>
 						</div>
 						<label>수거담당자&nbsp;:</label>
 						<div>
@@ -111,22 +114,20 @@
 				</li>
 			</div>
 			<div class="button_bar">
-			  <button id="ITP_BTN_MCOLLMNG03010_LIST_DLV_VIEW" class="btn_col_6 btn-primary IVDETAIL">납품서보기</button>
+			  <button id="ITP_BTN_MCOLLMNG03010_LIST_COL_VIEW" class="ok col_12 btn-primary IVDETAIL">수거서보기</button>
 			  <!--<button id="ITP_BTN_MCOLLMNG03010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
 			</div>
 		  </div>
 	  </form>
 	</div>
-	<div id="ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER" style="display: block;">
+	<div id="ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER" style="display: none;">
 		<form id="ITP_FORM_MCOLLMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG03010_VIEW_VIEW_CD" name="viewCd" value="C">
 		  <div class="detail_content">
 			<div class="detail_header">
-			  <div class="detail_logo">
-				<img src="../img/naver.png" alt="">
-			  </div>
+			  <div class="detail_logo"></div>
 			  <div class="detail_ok">
-				<label>납품 확인서</label>
+				<label>수거 확인서</label>
 			  </div>
 			</div>
 			<div class="detail_confirmation">
@@ -148,7 +149,7 @@
 			  <div class="detail_col">
 				<label>수거담당자</label>
 				<i>:</i>
-				<div class="fnColMgrNm">홍길동(010-1234-1548)</div>
+				<div class="fnPickMgrNm"></div>
 			  </div>
 			  <div class="detail_col">
 				<label>수거장소</label>
@@ -211,7 +212,7 @@
 		  </div>
 			<div id="ITP_LIST_MCOLLMNG03010_VIEW_ITEM_AREA" class="scroll_area row-7">
 				 <ul id="ITP_LIST_MCOLLMNG03010_VIEW_ITEM_ROWS" class="panel-group"></ul>
-				 <div id="ITP_LIST_MCOLLMNG03010_VIEW_ITEM_ROWCOPY" style="display: block;">
+				 <div id="ITP_LIST_MCOLLMNG03010_VIEW_ITEM_ROWCOPY" style="display: none;">
 				<li class="history_list5 list-row">
 				  <div>
 					<div class="left">
@@ -259,4 +260,42 @@
 		  </div>
 	  </form>
 	</div>
+	<div id="ITP_MOBILE_JS"></div>
+	<div id="ITP_POP_MCOLLMNG03010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
+		<div class="pop">
+			<div class="header">
+				<div class="header_left">
+					<label>> 납품장소</label>
+				</div>
+				<div class="header_right">
+					<button type="button" id="ITP_BTN_MCOLLMNG03010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
+				</div>
+			</div>
+			<div class="search_bar">
+				<form id="ITP_FORM_MCOLLMNG03010_POP_WHS" class="form-horizontal" onsubmit="return false;">
+					<input type="hidden" id="ITP_FORM_MCOLLMNG03010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
+					<input type="hidden" id="ITP_FORM_MCOLLMNG03010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
+					<input id="ITP_FORM_MCOLLMNG03010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
+				</form>
+			</div>
+			<div class="search_bar">
+				<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+			</div>
+			<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_AREA" class="popup_scroll">
+				<ul id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
+				<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWCOPY" style="display:none;">
+					<li class="list-row">
+						<div class="scroll_left">
+							<div class="fnWhsNm">브랜드 창고 명A</div>
+							<div class="fnLocationNm">(상세위치내용)</div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+				</div>
+			</div>
+		</div>
+	</div>
   </section>

src/main/webapp/mobile/app/mordmng/MORDMNG01010.html

@@ -55,7 +55,10 @@
 			  <ul id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWS" class="panel-group"></ul>
 			  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
 				<li class="history_list list-row">
-				  <div>
+				  <div class="scroll_btn">
+			  		<input type="checkbox">
+			  	  </div>
+				  <div class="btn_check">
 					<div class="left">
 					  <div class="nomal">
 						<label>브랜드명 &nbsp;:</label>

src/main/webapp/mobile/app/mordmng/MORDMNG02010.html

@@ -49,9 +49,12 @@
 		  </div>
 		   <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
 			  <ul id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWS" class="panel-group"></ul>
-			  <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY" style="display:none;">
+			  <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list3 list-row">
-				  <div>
+			 	  <div class="scroll_btn">
+				  	<input type="checkbox">
+				  </div>
+				  <div class="btn_check">
 					<div class="left">
 					  <div class="nomal">
 						<label class="col_0">브랜드명 &nbsp;:</label>
@@ -110,9 +113,6 @@
 						<div>
 						  <div class="fnPodrAmt space0"></div>
 						</div>
-						<!--<div class="scroll_btn">
-						  <button id="ITP_BTN_MORDMNG02010_LIST_CHOICE">선택</button>
-						</div>-->
 					  </div>
 					</div>
 				  </div>
@@ -184,7 +184,7 @@
 		  </div>
 			<div id="ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA" class="scroll_area row-5">
 			  <ul id="ITP_LIST_MORDMNG02010_VIEW_ITEM_ROWS" class="panel-group"></ul>
-			  <div id="ITP_LIST_MORDMNG02010_VIEW_ITEM_ROWCOPY" style="display: none;">
+			  <div id="ITP_LIST_MORDMNG02010_VIEW_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list2 list-row">
 				  <div>
 					<div class="left">

src/main/webapp/mobile/app/mordmng/MORDMNG03010.html

@@ -1,261 +1,264 @@
 <section id="ITP_MOBILE_MORDMNG03010">
 	<div id="ITP_AJAX_MORDMNG03010_LIST_CONTAINER" style="display: block;">
-	  <form id="ITP_FORM_MORDMNG03010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
-		  <input type="hidden" id="ITP_FORM_MORDMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
-		  <input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_STORE_ID" name="sstoreId" value="">
-		  <input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
-		  <div class="content">
-			<div class="line">
-			  <label>납품장소</label>
-				<div class="search_wrap">
-					<div class="float_left">
-						<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A매장명">
-						<input type="hidden" id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
+		<form id="ITP_FORM_MORDMNG03010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+			<input type="hidden" id="ITP_FORM_MORDMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
+			<input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_STORE_ID" name="sstoreId" value="">
+			<input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
+			<div class="content">
+				<div class="line">
+					<label>납품장소</label>
+					<div class="search_wrap">
+						<div class="float_left">
+							<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A매장명">
+							<input type="hidden" id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
+						</div>
+						<div class="float_left_btn">
+							<button type="button" id="ITP_BTN_MORDMNG03010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+							<button type="button" id="ITP_BTN_MORDMNG03010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
+						</div>
 					</div>
-					<div class="float_left_btn">
-						<button type="button" id="ITP_BTN_MORDMNG03010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
-						<button type="button" id="ITP_BTN_MORDMNG03010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
+				</div>
+				<div class="line">
+					<label>납품일자</label>
+					<div class="date_to">
+						<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
+						<div class="at">~</div>
+						<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
 					</div>
 				</div>
-			</div>
-			<div class="line">
-			  <label>납품일자</label>
-				<div class="date_to">
-					<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
-					<div class="at">~</div>
-					<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
+				<div class="line">
+					<label>발주번호/품목명</label>
+					<div class="search_wrap">
+						<input id="ITP_FORM_MORDMNG03010_LIST_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="검색어입력">
+					</div>
+				</div>
+				<div class="line" style="height:45px;">
+					<div class="search">
+						<button id="ITP_BTN_MORDMNG03010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
+					</div>
+				</div>
+				<div class="table_header">
+					<h1>> 수주 내역</h1>
 				</div>
 			</div>
-			<div class="line">
-				<label>발주번호/품목명</label>
-			  <div class="search_wrap">
-				  <input id="ITP_FORM_MORDMNG03010_LIST_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="검색어입력">
-			  </div>
-			</div>
-			<div class="line" style="height:45px;">
-			  <div class="search">
-				<button id="ITP_BTN_MORDMNG03010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
-			  </div>
-			</div>
-			<div class="table_header">
-			  <h1>> 수주 내역</h1>
-			</div>
-		  </div>
-		  <div id="ITP_LIST_MORDMNG03010_LIST_ITEM_AREA" class="scroll_area row-2">
-			  <ul id="ITP_LIST_MORDMNG03010_LIST_ITEM_ROWS" class="panel-group"></ul>
-			  <div id="ITP_LIST_MORDMNG03010_LIST_ITEM_ROWCOPY" style="display:none;">
-				<li class="history_list3 list-row">
-				  <div>
-					<div class="left">
-					  <div class="nomal">
-						<label class="col_0">브랜드명 &nbsp;:</label>
-						<div>
-						  <div class="fnBrandNm space1"></div>
-						</div>
-						<label>납품서번호&nbsp;:</label>
-						<div>
-						  <div class="fnDlvShmtUnqNo"></div>
+			<div id="ITP_LIST_MORDMNG03010_LIST_ITEM_AREA" class="scroll_area row-2">
+				<ul id="ITP_LIST_MORDMNG03010_LIST_ITEM_ROWS" class="panel-group"></ul>
+				<div id="ITP_LIST_MORDMNG03010_LIST_ITEM_ROWCOPY" style="display:none;">
+					<li class="history_list3 list-row">
+					<div class="scroll_btn">
+				  		<input type="checkbox">
+				  	</div>
+						<div class="btn_check">
+							<div class="left">
+								<div class="nomal">
+									<label class="col_0">브랜드명 &nbsp;:</label>
+									<div>
+										<div class="fnBrandNm space1"></div>
+									</div>
+									<label>납품서번호&nbsp;:</label>
+									<div>
+										<div class="fnDlvShmtUnqNo"></div>
+									</div>
+								</div>
+							</div>
+							<div class="left">
+								<div class="nomal">
+									<label class="col_6">납품서상태 &nbsp;:</label>
+									<div>
+										<div class="fnDlvStNm"></div>
+									</div>
+									<label class="col_0">수주일자&nbsp;:</label>
+									<div>
+										<div class="fnPodrRegDt"></div>
+									</div>
+								</div>
+							</div>
+							<div class="left">
+								<div class="nomal">
+									<label>납품요청일&nbsp;:</label>
+									<div>
+										<div class="fnDlvReqDt"></div>
+									</div>
+									<label>납품예정일&nbsp;:</label>
+									<div>
+										<div class="fnDlvSchDt"></div>
+									</div>
+								</div>
+							</div>
+							<div class="left">
+								<div class="nomal">
+									<label class="col_0">품목수량 &nbsp;:</label>
+									<div>
+										<div class="fnDlvQty space1"></div>
+									</div>
+									<label>발주총금액&nbsp;:</label>
+									<div>
+										<div class="fnPodrAmt"></div>
+									</div>
+								</div>
+							</div>
+							<div class="left">
+								<div class="nomal">
+									<label class="col_0">납품장소 &nbsp;:</label>
+									<div>
+										<div class="fnWhsNm space1"></div>
+									</div>
+									<label>납품담당자&nbsp;:</label>
+									<div>
+										<div class="fnDlvMgrNm space0"></div>
+									</div>
+								</div>
+							</div>
 						</div>
-					  </div>
+					</li>
+				</div>
+				<div class="button_bar">
+					<button id="ITP_BTN_MORDMNG03010_LIST_DLV_VIEW" class="ok col_12 btn-primary IVDETAIL">납품서보기</button>
+					<!--<button id="ITP_BTN_MORDMNG03010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
+				</div>
+			</div>
+		</form>
+	</div>
+	<div id="ITP_AJAX_MORDMNG03010_VIEW_CONTAINER" style="display: none;">
+		<form id="ITP_FORM_MORDMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
+			<input type="hidden" id="ITP_FORM_MORDMNG03010_VIEW_VIEW_CD" name="viewCd" value="C">
+			<div class="detail_content">
+				<div class="detail_header">
+					<div class="detail_logo"></div>
+					<div class="detail_ok">
+						<label>납품 확인서</label>
 					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label class="col_6">납품서상태 &nbsp;:</label>
-						<div>
-						  <div class="fnDlvStNm"></div>
+				</div>
+				<div class="detail_confirmation">
+					<div class="detail_col">
+						<label>발행일</label>
+						<i>:</i>
+						<div class="fnDlvRegDt"></div>
+					</div>
+					<div class="detail_col">
+						<label>납품서확인번호</label>
+						<i>:</i>
+						<div class="fnDlvSttmtUnqNo"></div>
+					</div>
+					<div class="detail_col">
+						<label>납품일</label>
+						<i>:</i>
+						<div class="fnDlvSchDt"></div>
+					</div>
+					<div class="detail_col">
+						<label>납품담당자</label>
+						<i>:</i>
+						<div class="fnDlvMgrNm"></div>
+					</div>
+					<div class="detail_col">
+						<label>납품장소</label>
+						<i>:</i>
+						<div class="fnWhsAddr"></div>
+					</div>
+					<div class="detail_col">
+						<label>전화번호</label>
+						<i>:</i>
+						<div class="fnWhsMgrTelNo"></div>
+					</div>
+				</div>
+				<div class="detail_company_info">
+					<div class="info_left">
+						<div class="weight">
+							<label>공급처</label>
 						</div>
-						<label class="col_0">수주일자&nbsp;:</label>
-						<div>
-						  <div class="fnPodrRegDt"></div>
+						<div class="company_info">
+							<label>등록번호&nbsp;:&nbsp;</label>
+							<div class="fnDlvBsnsRegno"></div>
 						</div>
-					  </div>
-					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label>납품요청일&nbsp;:</label>
-						<div>
-						  <div class="fnDlvReqDt"></div>
+						<div class="company_info">
+							<label>상호&nbsp;:&nbsp;</label>
+							<div class="fnDlvNm"></div>
 						</div>
-						<label>납품예정일&nbsp;:</label>
-						<div>
-						  <div class="fnDlvSchDt"></div>
+						<div class="company_info">
+							<label>성명&nbsp;:&nbsp;</label>
+							<div class="fnDlvOwnerNm"></div>
+						</div>
+						<div class="company_info">
+							<label>주소&nbsp;:&nbsp;</label>
+							<div class="fnDlvAddr"></div>
 						</div>
-					  </div>
 					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label class="col_0">품목수량 &nbsp;:</label>
-						<div>
-						  <div class="fnDlvQty space1"></div>
+					<div class="info_left">
+						<div class="weight">
+							<label>발주처</label>
 						</div>
-						<label>발주총금액&nbsp;:</label>
-						<div>
-						  <div class="fnPodrAmt"></div>
+						<div class="company_info">
+							<label>등록번호&nbsp;:&nbsp;</label>
+							<div class="fnPoBsnsRegno"></div>
 						</div>
-					  </div>
-					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label class="col_0">납품장소 &nbsp;:</label>
-						<div>
-						  <div class="fnWhsNm space1"></div>
+						<div class="company_info">
+							<label>상호&nbsp;:&nbsp;</label>
+							<div class="fnPoNm"></div>
 						</div>
-						<label>납품담당자&nbsp;:</label>
-						<div>
-						  <div class="fnDlvMgrNm space0"></div>
+						<div class="company_info">
+							<label>성명&nbsp;:&nbsp;</label>
+							<div class="fnPoOwnerNm"></div>
+						</div>
+						<div class="company_info">
+							<label>주소&nbsp;:&nbsp;</label>
+							<div class="fnPoAddr"></div>
 						</div>
-					  </div>
 					</div>
-				  </div>
-				</li>
-			</div>
-			<div class="button_bar">
-			  <button id="ITP_BTN_MORDMNG03010_LIST_DLV_VIEW" class="ok col_12 btn-primary IVDETAIL">납품서보기</button>
-			  <!--<button id="ITP_BTN_MORDMNG03010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
-			</div>
-		  </div>
-	  </form>
-	</div>
-	<div id="ITP_AJAX_MORDMNG03010_VIEW_CONTAINER" style="display: none;">
-	  <form id="ITP_FORM_MORDMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
-		  <input type="hidden" id="ITP_FORM_MORDMNG03010_VIEW_VIEW_CD" name="viewCd" value="C">
-		  <div class="detail_content">
-			<div class="detail_header">
-			  <div class="detail_logo"></div>
-			  <div class="detail_ok">
-				<label>납품 확인서</label>
-			  </div>
-			</div>
-			<div class="detail_confirmation">
-			  <div class="detail_col">
-				<label>발행일</label>
-				<i>:</i>
-				<div class="fnDlvRegDt"></div>
-			  </div>
-			  <div class="detail_col">
-				<label>납품서확인번호</label>
-				<i>:</i>
-				<div class="fnDlvSttmtUnqNo"></div>
-			  </div>
-			  <div class="detail_col">
-				<label>납품일</label>
-				<i>:</i>
-				<div class="fnDlvSchDt"></div>
-			  </div>
-			  <div class="detail_col">
-				<label>납품담당자</label>
-				<i>:</i>
-				<div class="fnDlvMgrNm"></div>
-			  </div>
-			  <div class="detail_col">
-				<label>납품장소</label>
-				<i>:</i>
-				<div class="fnWhsAddr"></div>
-			  </div>
-			  <div class="detail_col">
-				<label>전화번호</label>
-				<i>:</i>
-				<div class="fnWhsMgrTelNo"></div>
-			  </div>
-			</div>
-			<div class="detail_company_info">
-			  <div class="info_left">
-				<div class="weight">
-				  <label>공급처</label>
-				</div>
-				<div class="company_info">
-				  <label>등록번호&nbsp;:&nbsp;</label>
-				  <div class="fnDlvBsnsRegno"></div>
-				</div>
-				<div class="company_info">
-				  <label>상호&nbsp;:&nbsp;</label>
-				  <div class="fnDlvNm"></div>
-				</div>
-				<div class="company_info">
-				  <label>성명&nbsp;:&nbsp;</label>
-				  <div class="fnDlvOwnerNm"></div>
-				</div>
-				<div class="company_info">
-				  <label>주소&nbsp;:&nbsp;</label>
-				  <div class="fnDlvAddr"></div>
 				</div>
-			  </div>
-			  <div class="info_left">
-				<div class="weight">
-				  <label>발주처</label>
+				<div class="table_header">
+					<h1>> 납품 상세 내역</h1>
 				</div>
-				<div class="company_info">
-				  <label>등록번호&nbsp;:&nbsp;</label>
-				  <div class="fnPoBsnsRegno"></div>
-				</div>
-				<div class="company_info">
-				  <label>상호&nbsp;:&nbsp;</label>
-				  <div class="fnPoNm"></div>
-				</div>
-				<div class="company_info">
-				  <label>성명&nbsp;:&nbsp;</label>
-				  <div class="fnPoOwnerNm"></div>
-				</div>
-				<div class="company_info">
-				  <label>주소&nbsp;:&nbsp;</label>
-				  <div class="fnPoAddr"></div>
-				</div>
-			  </div>
-			</div>
-			<div class="table_header">
-			  <h1>> 납품 상세 내역</h1>
 			</div>
-		  </div>
 			<div id="ITP_LIST_MORDMNG03010_VIEW_ITEM_AREA" class="scroll_area row-7">
-				 <ul id="ITP_LIST_MORDMNG03010_VIEW_ITEM_ROWS" class="panel-group"></ul>
-				 <div id="ITP_LIST_MORDMNG03010_VIEW_ITEM_ROWCOPY" style="display:none;">
-				<li class="history_list5 list-row">
-				  <div>
-					<div class="left">
-					  <div class="nomal">
-						<label>발주번호 &nbsp;:</label>
-						<div class="space2">
-						  <div class="fnPchPodrUnqNo"></div>
-						</div>
-						<label class="col_0">품목아이디&nbsp;:</label>
-						<div class="space2">
-						  <div class="fnItemId"></div>
-						</div>
-					  </div>
-					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label>품목명 &nbsp;:</label>
-						<div class="space2">
-						  <div class="fnItemNm"></div>
-						</div>
-						<label>유통기한&nbsp;:</label>
-						<div class="space2">
-						  <div class="fnExpryDate"></div>
-						</div>
-					  </div>
-					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label>발주수량 &nbsp;:</label>
-						<div class="space2">
-						  <div class="fnPodrQty"></div>
-						</div>
-						<label>납품수량&nbsp;:</label>
+				<ul id="ITP_LIST_MORDMNG03010_VIEW_ITEM_ROWS" class="panel-group"></ul>
+				<div id="ITP_LIST_MORDMNG03010_VIEW_ITEM_ROWCOPY" style="display:none;">
+					<li class="history_list5 list-row">
 						<div>
-						  <div class="fnDlvQty"></div>
+							<div class="left">
+								<div class="nomal">
+									<label>발주번호 &nbsp;:</label>
+									<div class="space2">
+										<div class="fnPchPodrUnqNo"></div>
+									</div>
+									<label class="col_0">품목아이디&nbsp;:</label>
+									<div class="space2">
+										<div class="fnItemId"></div>
+									</div>
+								</div>
+							</div>
+							<div class="left">
+								<div class="nomal">
+									<label>품목명 &nbsp;:</label>
+									<div class="space2">
+										<div class="fnItemNm"></div>
+									</div>
+									<label>유통기한&nbsp;:</label>
+									<div class="space2">
+										<div class="fnExpryDate"></div>
+									</div>
+								</div>
+							</div>
+							<div class="left">
+								<div class="nomal">
+									<label>발주수량 &nbsp;:</label>
+									<div class="space2">
+										<div class="fnPodrQty"></div>
+									</div>
+									<label>납품수량&nbsp;:</label>
+									<div>
+										<div class="fnDlvQty"></div>
+									</div>
+								</div>
+							</div>
 						</div>
-					  </div>
-					</div>
-				  </div>
-				</li>
+					</li>
+				</div>
+			</div>
+			<div class="button_bar">
+				<button id="ITP_BTN_MORDMNG03010_VIEW_CONFIRM" class="ok col_12 btn-gray COK">확인</button>
+				<!--<button id="ITP_BTN_MORDMNG03010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>-->
 			</div>
-		  </div>
-		  <div class="button_bar">
-			<button id="ITP_BTN_MORDMNG03010_VIEW_CONFIRM" class="ok col_12 btn-gray COK">확인</button>
-			  <!--<button id="ITP_BTN_MORDMNG03010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>-->
-		  </div>
-	  </form>
+		</form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
 	<div id="ITP_POP_MORDMNG03010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
@@ -295,4 +298,4 @@
 			</div>
 		</div>
 	</div>
-  </section>
+</section>

src/main/webapp/mobile/css/style.css

@@ -333,6 +333,10 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
 .scroll_area li .left_info .history input{width: 150px;}
 .scroll_area li.history_list {height: 140px; padding-top:8px;}
+.scroll_area li.history_list .btn_check {height:158px; margin-top:-5px; width:90%; float:right; padding-top:7px; }
+.scroll_area li.history_list .scroll_btn {width:10%; height:130px; margin-top:-5px; display:inline-flex;}
+
+
 .scroll_area li.history_list4 .button_right {float: right; display: grid;}
 .scroll_area li.history_list4 .button_right button {width: 65px; height: 75px; font-size: 1rem; margin: 0; border-radius: 0;}
 
@@ -340,6 +344,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li.history_list2 {height: 165px; padding-top:5px;}
 .scroll_area li.history_list2 label{min-width:95px; display:inline-flex;}
 .scroll_area li.history_list3 {height: 160px; padding-top:5px;}
+.scroll_area li.history_list3 .btn_check {height:158px; margin-top:-5px; width:90%; float:right; padding-top:7px; }
 .scroll_area li.history_list4 {height: 150px;}
 .scroll_area li.history_list5 {height: 100px; padding-top:5px;}
 .scroll_area li .history_info {width: auto;}
@@ -366,9 +371,11 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal .half {width:50%; float:left;}
 .scroll_area li .left .nomal .half label {font-weight:100;}
 .scroll_area li .left .nomal  input{width: 85px; height:30px;}
-.scroll_area li .left .nomal .scroll_btn {margin-bottom: 10px; min-width: 0;}
-.scroll_area li .left .nomal .scroll_btn button{top: 120px; position: absolute; width: 50px; height: 40px; font-size: 0.8rem; padding: 0; border-radius: 10px; background: rgb(198, 170, 250);}
 
+.scroll_area li .scroll_btn {width:10%; height:158px; margin-top:-5px; display:inline-flex;}
+
+.scroll_area li .scroll_btn input {width:15px; margin:auto 10px;}
+.scroll_area li .scroll_btn input:checked ~ .scroll_btn {background:#eee;}
 .scroll_area li .left .nomal span {margin:0 10px;}
 
 .scroll_area li .left .nomal .btn_bar{position: relative; width: auto; font-size: 2.2rem;}

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

@@ -173,7 +173,7 @@ let mobContentObj = {
 			const param = {
 				'brandId': fn_make_user_info.get('brandId'),
 				'spplyId': fn_make_user_info.get('userId'),
-				'pchPodrUnqNo': item.pchPodrUnqNo
+				'rtnPodrUnqNo': item.rtnPodrUnqNo
 			};
 			fn_ajax_call(API_MOBILE_INFO, param, callbackFn, 'GET');
 		},
@@ -181,17 +181,17 @@ let mobContentObj = {
 			var _this = this;
 			var id = '#ITP_AJAX_MCOLLMNG01010_VIEW_CONTAINER';
 			$(id).find('.fnBrandNm').text(result.brandNm);
-			$(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);
+			$(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);
 			$.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

@@ -35,8 +35,8 @@ let mobPageObj = {
 			});
 
 			// 조회일자 지정
-			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
-			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
+			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', 0));
+			$('#ITP_FORM_MCOLLMNG02010_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'));
@@ -63,13 +63,13 @@ let mobPageObj = {
 			$('button[id^="ITP_BTN_MCOLLMNG02010_VIEW"]').on('click', function() {
 				var id = $(this).attr('id');
 				switch (id) {
-					case 'ITP_BTN_MCOLLMNG02010_VIEW_ADD'			: mobContentObj.view.add();	break;
-					case 'ITP_BTN_MCOLLMNG02010_VIEW_CANCEL_LIST'	: mobContentObj.view.cancel();	break;
+					case 'ITP_BTN_MCOLLMNG02010_VIEW_COL_ADD'		: mobContentObj.view.add();			break;
+					case 'ITP_BTN_MCOLLMNG02010_VIEW_CANCEL_LIST'	: mobContentObj.view.cancel();		break;
 				}
 				return false;
 			});
 
-			$(document).on('click', '#ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS li', function() {
+			$(document).on('click', '#ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS li button', function() {
 				var item = mobContentObj.list.rows[$(this).index()];
 				mobContentObj.view.init(item);
 			});
@@ -196,8 +196,8 @@ let mobContentObj = {
 			var _this = this;
 			var id = '#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER';
 			$(id).find('.fnBrandNm').text(result.brandNm);
-			$(id).find('.fnRtnPodrDtlNo').text(result.rtnPodrUnqNo);
-			$(id).find('.fnRtnOdrRegDt').text(result.rtnOdrRegDt);
+			$(id).find('.fnRtnPodrUnqNo').text(result.rtnPodrUnqNo);
+			$(id).find('.fnColReqDt').text(result.colReqDt);
 			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
 			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
 			$(id).find('.fnPickTelNo').text(result.pickTelNo);
@@ -222,18 +222,18 @@ let mobContentObj = {
 			var _this = this;
 			var param = {};
 			var colSchDt = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MORDMNG02010_VIEW_COL_SCH_DT').val();
-			var pickMgrNm = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_NM').val();
-			var colMgrTelNo = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_COL_MGR_TEL_NO').val();
+			var pickMgrNm = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_NM').val();
+			var pickMgrTelNo = $('#ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER #ITP_FORM_MCOLLMNG02010_VIEW_PICK_MGR_TEL_NO').val();
 			if(colSchDt.length < 1) {
-				alert('수거수량을 입력해 주세요.');
+				alert('수거일자를 입력해 주세요.');
 				return false;
 			}
-			if(colMgrNm.length < 1) {
-				alert('발주담당자를 입력해 주세요.');
+			if(pickMgrNm.length < 1) {
+				alert('수거담당자를 입력해 주세요.');
 				return false;
 			}
-			if(colMgrTelNo.length < 1) {
-				alert('발주담당자 연락처를 입력해 주세요.');
+			if(pickMgrTelNo.length < 1) {
+				alert('수거담당자 연락처를 입력해 주세요.');
 				return false;
 			}
 			var gridInsertData = [];
@@ -243,19 +243,22 @@ let mobContentObj = {
 				var item = {
 					'rtnPodrDtlNo': row.rtnPodrDtlNo,
 					'rtnPodrUnqNo': row.rtnPodrUnqNo,
-					'coltQty': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(),
-					'rtnRsnDvsn': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN').val(),
+					'colQty': $(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.coltQty.length < 1) {
+				if(item.colQty.length < 1) {
 					alert('수거수량을 입력해 주세요.');
 					return false;
 				}
-				if(row.rtnOdrQty < item.coltQty) {
+				if(item.colQty > row.rtnOdrQty) {
 					alert('수거수량은 수거요청수량을 초과할 수 없습니다.');
 					return false;
 				}
-				item.expryDate = item.expryDate.replace(/-/g, ".");
+				if(item.rtnRsnDvsn.length < 1) {
+					alert('수거사유를 선택해 주세요.');
+					return false;
+				}
 				gridInsertData.push(item);
 				isValid = true;
 			});

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

@@ -8,7 +8,7 @@ require(['config'], function() {
 /*API URL*/
 const API_MOBILE_GRID_LIST 			= '/api/rtnmng/inoutmng/spply-pick-grid-list';	// 목록
 const API_POP_SEARCH_LIST			= '/api/whs/mng/pop-whs-search';
-const API_POP_INV_PICK 				= '/api/pomng/inoutmng/info-inv';
+const API_POP_INFO_PICK 			= '/api/rtnmng/inoutmng/info-pick';
 
 const PAGE_MODE_LIST				= "LIST";
 const PAGE_MODE_VIEW				= "VIEW";
@@ -34,8 +34,8 @@ let mobPageObj = {
 			});
 
 			// 조회일자 지정
-			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
-			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
+			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', 0));
+			$('#ITP_FORM_MCOLLMNG03010_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'));
@@ -51,9 +51,10 @@ let mobPageObj = {
 			$('button[id^="ITP_BTN_MCOLLMNG03010_LIST"]').on('click', function() {
 				var id = $(this).attr('id');
 				switch (id) {
-					case 'ITP_BTN_MCOLLMNG03010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 	break;
-					case 'ITP_BTN_MCOLLMNG03010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 	break;
-					case 'ITP_BTN_MCOLLMNG03010_LIST_SEARCH'			: mobContentObj.list.search();	break;
+					case 'ITP_BTN_MCOLLMNG03010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 		break;
+					case 'ITP_BTN_MCOLLMNG03010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 		break;
+					case 'ITP_BTN_MCOLLMNG03010_LIST_SEARCH'		: mobContentObj.list.search();		break;
+					case 'ITP_BTN_MCOLLMNG03010_LIST_COL_VIEW'		: mobContentObj.list.colPrint();	break;
 				}
 				return false;
 			});
@@ -61,15 +62,16 @@ 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_CANCEL_LIST'	: mobContentObj.view.cancel();	break;
+					case 'ITP_BTN_MCOLLMNG03010_VIEW_ADD'			: mobContentObj.view.add();		break;
+					case 'ITP_BTN_MCOLLMNG03010_VIEW_CONFIRM'		: mobContentObj.view.cancel();	break;
 				}
 				return false;
 			});
 
 			$(document).on('click', '#ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS li', function() {
-				var item = mobContentObj.list.rows[$(this).index()];
-				mobContentObj.view.init(item);
+				// var item = mobContentObj.list.rows[$(this).index()];
+				// mobContentObj.view.init(item);
+				mobContentObj.list.iChoice = $(this).index();
 			});
 
 			$(document).on('click', '#ITP_LIST_MCOLLMNG03010_POP_WHS_ROWS li button', function() {
@@ -118,6 +120,7 @@ let mobContentObj = {
 		totPage: 0,
 		isSearch: false,
 		rows: [],
+		iChoice: -1,
 		init: function() {
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
 			this.search();
@@ -126,6 +129,7 @@ let mobContentObj = {
 			this.listPage = 0;
 			this.totPage = 0;
 			this.rows.length = 0;
+			this.iChoice = -1;
 			$('#ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS').empty();
 			this.load();
 		},
@@ -147,7 +151,7 @@ let mobContentObj = {
 					$li.find('.fnColSchDt').text(item.colSchDt);
 					$li.find('.fnColReqQty').text(CommonObj.currency.add(item.colReqQty, '개'));
 					$li.find('.fnColReqAmt').text(CommonObj.currency.add(item.colReqAmt));
-					$li.find('.fnWhsAddr').text(item.whsAddr);
+					$li.find('.fnWhsNm').text(item.whsNm);
 					$li.find('.fnPickMgrNm').text(item.pickMgrNm);
 					_this.rows.push(item);
 				});
@@ -159,13 +163,20 @@ let mobContentObj = {
 			param.fromDt = CommonObj.onlyNumber(param.fromDt);
 			param.toDt = CommonObj.onlyNumber(param.toDt);
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
+		},
+		colPrint: function() {
+			if(this.iChoice < 0) {
+				alert("수거서를 선택해주세요 (대표 수거서번호)");
+				return;
+			}
+			mobContentObj.view.init(this.rows[this.iChoice]);
 		}
 	},
 	view: {
 		rows: [],
 		init: function(item) {
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
-			this.cancel();
+			this.reset();
 			this.search(item);
 		},
 		search: function(item) {
@@ -176,10 +187,9 @@ let mobContentObj = {
 			};
 			const param = {
 				'brandId': fn_make_user_info.get('brandId'),
-				'spplyId': fn_make_user_info.get('userId'),
-				'pchPodrUnqNo': item.pchPodrUnqNo
+				'colPickUnqNo': item.colPickUnqNo
 			};
-			fn_ajax_call(API_POP_INV_PICK, param, callbackFn, 'GET');
+			fn_ajax_call(API_POP_INFO_PICK, JSON.stringify(param), callbackFn, 'POST');
 		},
 		view: function(result) {
 			var _this = this;
@@ -187,7 +197,7 @@ let mobContentObj = {
 			$(id).find('.fnColRegDt').text(result.colRegDt);
 			$(id).find('.fnColPickUnqNo').text(result.colPickUnqNo);
 			$(id).find('.fnColSchDt').text(result.colSchDt);
-			$(id).find('.fnColMgrNm').text(result.colMgrNm + '('+ result.pndrTelNo + ')');
+			$(id).find('.fnPickMgrNm').text(result.pickMgrNm);
 			$(id).find('.fnWhsAddr').text(result.whsAddr);
 			$(id).find('.fnPndrTelNo').text(result.pndrTelNo);
 
@@ -196,7 +206,7 @@ let mobContentObj = {
 			$(id).find('.fnRtnOwnerNm').text(result.rtnOwnerNm);
 			$(id).find('.fnRtnAddr').text(result.rtnAddr);
 
-			$(id).find('.fnColBsnsRegNo').text(result.colBsnsRegNo);
+			$(id).find('.fnColBsnsRegNo').text(result.colBsnsRegno);
 			$(id).find('.fnColNm').text(result.colNm);
 			$(id).find('.fnColOwnerNm').text(result.colOwnerNm);
 			$(id).find('.fnColAddr').text(result.colAddr);
@@ -211,8 +221,11 @@ 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 + '" />');
+			});
 		},
-		cancel: function () {
+		reset: function() {
 			var id = '#ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER';
 			$(id).find('.fnColRegDt').text('');
 			$(id).find('.fnColPickUnqNo').text('');
@@ -231,6 +244,9 @@ let mobContentObj = {
 			$(id).find('.fnColOwnerNm').text('');
 			$(id).find('.fnColAddr').text('');
 			$('#ITP_LIST_MCOLLMNG03010_VIEW_ITEM_AREA .panel-group').empty();
+		},
+		cancel: function () {
+			this.reset();
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
 		}
 	}

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

@@ -185,7 +185,7 @@ let mobContentObj = {
 			this.item = item;
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
 			$('#ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT').val(itp_fn_date_add('M', 0));
-			this.cancel();
+			this.reset();
 			this.search(item);
 		},
 		search: function(item) {
@@ -287,7 +287,7 @@ let mobContentObj = {
 				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), callbackFn, 'POST');
 			}
 		},
-		cancel: function () {
+		reset: function() {
 			var id = '#ITP_AJAX_MORDMNG02010_VIEW_CONTAINER';
 			$(id + ' #ITP_FORM_MORDMNG02010_VIEW_DLV_SCH_DT').val('');
 			$(id + ' #ITP_FORM_MORDMNG02010_VIEW_DLV_MGR_NM').val('');
@@ -302,6 +302,9 @@ let mobContentObj = {
 			$(id).find('.fnPodrAmt').text('');
 			$(id).find('.fnDlvReqDt').text('');
 			$('#ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA .panel-group').empty();
+		},
+		cancel: function () {
+			this.reset();
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
 		}
 	}

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;
@@ -83,6 +83,7 @@ let mobPageObj = {
 		$('#ITP_MOBILE_MORDMNG03010').find('div[id$="_CONTAINER"]').each(function(i) {
 			$(this).hide();
 		});
+		console.log(mode);
 		if(mode === PAGE_MODE_LIST) {
 			$('#ITP_AJAX_MORDMNG03010_LIST_CONTAINER').show();
 			this.moreView(true);
@@ -176,7 +177,7 @@ let mobContentObj = {
 		rows: [],
 		init: function(item) {
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
-			this.cancel();
+			this.reset();
 			this.search(item);
 		},
 		search: function(item) {
@@ -225,7 +226,7 @@ let mobContentObj = {
 				$(id).find('.detail_logo').appendChild('<img src="' + item.filePath + '" />');
 			});
 		},
-		cancel: function () {
+		reset: function() {
 			var id = '#ITP_AJAX_MORDMNG03010_VIEW_CONTAINER';
 			$(id).find('.fnDlvRegDt').text('');
 			$(id).find('.fnDlvSttmtUnqNo').text('');
@@ -244,6 +245,9 @@ let mobContentObj = {
 			$(id).find('.fnPoOwnerNm').text('');
 			$(id).find('.fnPoAddr').text('');
 			$('#ITP_LIST_MORDMNG03010_VIEW_ITEM_AREA .panel-group').empty();
+		},
+		cancel: function () {
+			this.reset();
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
 		}
 	}