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

src/main/webapp/app/inoutmng/INOUTMNG01010.html

@@ -20,35 +20,42 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_INOUTMNG01010_SEARCH_DLV_REQ_DT" class="form-control itp_input" name="serviceDlvReqDt">
-												<option value="A">납품요청일*</option>											
+											<select id="ITP_FORM_INOUTMNG01010_SEARCH_" class="form-control itp_input" name="serviceDlvReqDt">
+												<option value="A">납품요청일</option>											
 											</select>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
-										
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출고창고" />
-											<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID" class="form-control itp_input" name="sshmtWhsId"  />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출고창고" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID" class="form-control itp_input" name="sshmtWhsId"  />
+												<span class="input-group-btn">
+													<button id="ITP_FORM_INOUTMNG01010_DELETE_SHMT_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="padding:0px; width:10%;">
 											<button type="button" id="ITP_FORM_INOUTMNG01010_SEARCH_SHMT_WHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_INOUTMNG01010_DELETE_SHMT_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품매장창고" />
-											<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId" placeholder="납품창고" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품매장창고" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId" placeholder="납품창고" />
+												<span class="input-group-btn">
+													<button id="ITP_FORM_INOUTMNG01010_DELETE_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
 											<button type="button" id="ITP_FORM_INOUTMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_INOUTMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
@@ -74,8 +81,7 @@
 								<input type="hidden" id="ITP_FORM_INOUTMNG01010_DETAIL_" name="" value="">
 								<input type="hidden" id="ITP_FORM_INOUTMNG01010_DETAIL_BRAND_ID" class="form-control itp_input" name="brandId" />
 								<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">
@@ -85,12 +91,14 @@
 											</div>
 											<label class="col-xs-2 itp_lb">납품일자 *</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="input-daterange input-group date">
-													<input type="text" id="ITP_FORM_INOUTMNG01010_DETAIL_DLV_SCH_DT" class="form-control itp_input" name="dlvSchDt" value="">
+												<div class="col-xs-7 itp_in">
+													<div class="input-daterange input-group date">
+														<input type="text" id="ITP_FORM_INOUTMNG01010_DETAIL_DLV_SCH_DT" class="form-control itp_input" name="dlvSchDt" value="" readonly>
+													</div>
 												</div>
 											</div>
 										</div>
-										<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-7 itp_in">
@@ -110,11 +118,10 @@
 						</div>
 					</div>
 					<div class="itp_table fix">
-						<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_INOUTMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
-							<div id="ITP_INOUTMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
 							<table id="ITP_INOUTMNG01010_DETAIL_jqGrid"></table>
 							<div id="ITP_INOUTMNG01010_DETAIL_jqGridPager"></div>
 							<div id="ITP_INOUTMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/inoutmng/INOUTMNG02010.html

@@ -17,22 +17,28 @@
 								<input type="hidden" id="ITP_FORM_INOUTMNG02010_SEARCH_BRAND_ID" name="sbrandId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-                                            <label>출하일자 *</label>
+                                            <select id="ITP_FORM_INOUTMNG02010_SEARCH_" class="form-control itp_input" name="serviceDlvReqDt">
+												<option value="A">출하일자</option>											
+											</select>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출하창고" readonly/>
-											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID" class="form-control itp_input" name="sshmtWhsId" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출하창고" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID" class="form-control itp_input" name="sshmtWhsId" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_INOUTMNG02010_DELETE_SHMT_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
 											<button type="button" id="ITP_BTN_INOUTMNG02010_SEARCH_SHMT_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_INOUTMNG02010_DELETE_SHMT_WHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
@@ -41,13 +47,17 @@
 												<option value="">출하상태</option>											
 											</select>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장" />
-											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_INOUTMNG02010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
 											<button type="button" id="ITP_BTN_INOUTMNG02010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_INOUTMNG02010_DELETE_WHS_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />

src/main/webapp/app/inoutmng/INOUTMNG03010.html

@@ -25,32 +25,38 @@
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="반품입고창고" />
-											<input type="hidden" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="반품입고창고" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
+												<span class="input-group-btn">
+													<button id="ITP_FORM_INOUTMNG03010_DELETE_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="padding:0px; width:10%;">
 											<button type="button" id="ITP_FORM_INOUTMNG03010_SEARCH_WHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_INOUTMNG03010_DELETE_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
-										
-										
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm" placeholder="수거창고" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm" placeholder="수거창고" readonly/>
 											<input type="hidden" id="ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId"  />
+												<span class="input-group-btn">
+													<button id="ITP_FORM_INOUTMNG03010_DELETE_RTN_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
 											<button type="button" id="ITP_FORM_INOUTMNG03010_SEARCH_RTN_WHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_INOUTMNG03010_DELETE_RTN_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
-										<div class="col-xs-3 itp_ip itp_noMar">
+										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
 										</div>
 									</div>
@@ -74,8 +80,7 @@
 								<input type="hidden" id="ITP_FORM_INOUTMNG03010_DETAIL_" name="" value="">
 								<input type="hidden" id="ITP_FORM_INOUTMNG03010_DETAIL_BRAND_ID" class="form-control itp_input" name="brandId" />
 								<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">
@@ -87,12 +92,12 @@
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
 													<div class="input-daterange input-group date">
-														<input type="text" id="ITP_FORM_INOUTMNG03010_DETAIL_COL_SCH_DT" data-check-required="empty" class="form-control itp_input" name="colSchDt" value="">
+														<input type="text" id="ITP_FORM_INOUTMNG03010_DETAIL_COL_SCH_DT" data-check-required="empty" class="form-control itp_input" name="colSchDt" value="" readonly>
 													</div>
 												</div>
 											</div>
 										</div>
-										<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-7 itp_in">
@@ -112,11 +117,10 @@
 						</div>
 					</div>
 					<div class="itp_table fix">
-						<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_INOUTMNG03010_DETAIL_jqGrid_list" class="itp_tb_list">
-							<div id="ITP_INOUTMNG03010_DETAIL_jqGridView" class="itp_views fix"></div>
 							<table id="ITP_INOUTMNG03010_DETAIL_jqGrid"></table>
 							<div id="ITP_INOUTMNG03010_DETAIL_jqGridPager"></div>
 							<div id="ITP_INOUTMNG03010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/inoutmng/INOUTMNG04010.html

@@ -23,18 +23,22 @@
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId" placeholder="반품매장" />
-											<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm"  placeholder="반품매장"/>
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm"  placeholder="반품매장" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId" placeholder="반품매장"/>
+												<span class="input-group-btn">
+													<button id="ITP_BTN_INOUTMNG04010_DELETE_RTN_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
 											<button type="button" id="ITP_BTN_INOUTMNG04010_SEARCH_RTN_WHS_ID" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_INOUTMNG04010_DELETE_RTN_WHS_ID" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
@@ -43,13 +47,17 @@
 												<option value="">수거상태</option>											
 											</select>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
-											<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="입고창고" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="입고창고" readonly/>
+												<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_INOUTMNG04010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
 											<button type="button" id="ITP_BTN_INOUTMNG04010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_INOUTMNG04010_DELETE_WHS_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_INOUTMNG04010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />

src/main/webapp/app/rtnmng/RTNMNG01010.html

@@ -24,8 +24,7 @@
 								<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_RTN_REQ_UNQ_NO" name="rtnReqUnqNo" 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"></div>
@@ -41,20 +40,24 @@
 													<input type="text" id="ITP_FORM_RTNMNG01010_DETAIL_RTN_WHS_NM" data-check-required="empty" class="form-control itp_input" name="rtnWhsNm" value="" readonly="readonly" />
 													<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_RTN_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
 												</div>
-												<div class="col-xs-4 itp_in">
+												<div class="col-xs-5 itp_in">
+													<div class="input-group">
 													<input type="text" id="ITP_FORM_RTNMNG01010_DETAIL_RTN_LOCATION_NM" data-check-required="empty" class="form-control itp_input" name="rtnLocationNm" value="" readonly="readonly" />
 													<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_RTN_LOCATION" class="form-control itp_input" name="rtnLocation" value="" />
+														<span class="input-group-btn">
+															<button id="ITP_FORM_RTNMNG01010_DELETE_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+														</span>
+													</div>
 												</div>
-												<div class="col-xs-1 itp_in" style="width:23%; padding:0px;">
+												<div class="col-xs-a itp_in">
 													<button type="button" id="ITP_FORM_RTNMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_FORM_RTNMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 								                </div>
 											</div>
 											<label class="col-xs-2 itp_lb">수거요청일</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-4 itp_in">
 													<div class="input-daterange input-group date">
-														<input type="text" id="ITP_FORM_RTNMNG01010_DETAIL_COL_REQ_DT" data-check-required="empty" class="form-control itp_input" name="colReqDt" value="">
+														<input type="text" id="ITP_FORM_RTNMNG01010_DETAIL_COL_REQ_DT" data-check-required="empty" class="form-control itp_input" name="colReqDt" value="" readonly>
 													</div>
 												</div>									
 											</div>
@@ -69,7 +72,7 @@
 										</div>
 									</div>
 									<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_RTNMNG01010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
@@ -77,7 +80,6 @@
 											</div>
 										</div>
 										<div id="ITP_RTNMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
-										  <div id="ITP_RTNMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
 										  <table id="ITP_RTNMNG01010_DETAIL_jqGrid"></table>
 										  <div id="ITP_RTNMNG01010_DETAIL_jqGridPager"></div>
 										  <div id="ITP_RTNMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/rtnmng/RTNMNG02010.html

@@ -22,7 +22,9 @@
 									<input type="hidden" id="ITP_FORM_RTNMNG02010_SEARCH_SWHS_ID" name="swhsId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<label>반품요청일</label>
+											<select id="ITP_FORM_RTNMNG02010_SEARCH_" class="form-control itp_input" name="service">
+												<option value="A">반품요청일</option>											
+											</select>
 										</div>											
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
@@ -33,17 +35,21 @@
 										</div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-3 itp_ip itp_noMar">
+										<div class="col-xs-4 itp_ip itp_noMar">
+											<div class="input-group">
 											<input type="text" id="ITP_FORM_RTNMNG02010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품장소 매장/창고" readonly/>
+												<span class="input-group-btn">
+													<button id="ITP_FORM_RTNMNG02010_SDELETE_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="padding-left: 5px; width:10%;">
+										<div class="col-xs-a itp_in" style="padding-left: 5px; width:5%;">
 											<button type="button" id="ITP_FORM_RTNMNG02010_SSEARCH_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_RTNMNG02010_SDELETE_SWHS_NM" class="btn btn-primary 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_RTNMNG02010_SEARCH_RTN_REQ_ST_CD" class="form-control itp_input" data-select-code="RTN_REQ_ST_CD" name="srtnReqStCd"></select>
 										</div>
-										<div class="col-xs-5 itp_ip itp_noMar">
+										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_RTNMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
 										</div>
 									</div>
@@ -71,8 +77,7 @@
 								<input type="hidden" id="ITP_FORM_RTNMNG02010_DETAIL_RTN_REQ_MGR_ID" name="rtnReqMgrId" 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"></div>
@@ -117,7 +122,7 @@
 									</div>
 									
 									<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_RTNMNG02010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
@@ -125,7 +130,6 @@
 											</div>
 										</div>
 										<div id="ITP_RTNMNG02010_DETAIL_jqGrid_list" class="itp_tb_list">
-										  <div id="ITP_RTNMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>
 										  <table id="ITP_RTNMNG02010_DETAIL_jqGrid"></table>
 										  <div id="ITP_RTNMNG02010_DETAIL_jqGridPager"></div>
 										  <div id="ITP_RTNMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
@@ -147,8 +151,7 @@
 								<input type="hidden" id="ITP_FORM_RTNMNG02010_VIEW_RTN_REQ_MGR_ID" name="rtnReqMgrId" 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"></div>
@@ -194,11 +197,10 @@
 									</div>
 									
 									<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_RTNMNG02010_VIEW_jqGrid_list" class="itp_tb_list">
-										  <div id="ITP_RTNMNG02010_VIEW_jqGridView" class="itp_views fix"></div>
 										  <table id="ITP_RTNMNG02010_VIEW_jqGrid"></table>
 										  <div id="ITP_RTNMNG02010_VIEW_jqGridPager"></div>
 										  <div id="ITP_RTNMNG02010_VIEW_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/rtnmng/RTNMNG03010.html

@@ -22,7 +22,9 @@
 									<input type="hidden" id="ITP_FORM_RTNMNG03010_SEARCH_SSTORE_ID" name="sstoreId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<label>반품요청일 *</label>
+											<select id="ITP_FORM_RTNMNG03010_SEARCH_" class="form-control itp_input" name="service">
+												<option value="A">반품요청일</option>											
+											</select>
 										</div>											
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
@@ -33,21 +35,29 @@
 										</div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_RTNMNG03010_SEARCH_SSPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly="readonly" />
-											<input type="hidden" id="ITP_FORM_RTNMNG03010_SEARCH_SSPPLY_ID" class="form-control itp_input" name="sspplyId" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_RTNMNG03010_SEARCH_SSPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly="readonly" />
+												<input type="hidden" id="ITP_FORM_RTNMNG03010_SEARCH_SSPPLY_ID" class="form-control itp_input" name="sspplyId" />
+												<span class="input-group-btn">
+													<button id="ITP_FORM_RTNMNG03010_SDELETE_SSPPLY_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="padding:0px; width:8%;">
+										<div class="col-xs-1 itp_in" style="padding:0px; width:5%;">
 											<button type="button" id="ITP_FORM_RTNMNG03010_SSEARCH_SSPPLY_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_RTNMNG03010_SDELETE_SSPPLY_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_RTNMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly="readonly" />
-											<input type="hidden" id="ITP_FORM_RTNMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_RTNMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly="readonly" />
+												<input type="hidden" id="ITP_FORM_RTNMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
+												<span class="input-group-btn">
+													<button id="ITP_FORM_RTNMNG03010_SDELETE_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="padding:0px; width:10%;">
+										<div class="col-xs-1 itp_in" style="padding:0px; width:5%;">
 											<button type="button" id="ITP_FORM_RTNMNG03010_SSEARCH_SWHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_RTNMNG03010_SDELETE_SWHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_RTNMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
@@ -82,8 +92,7 @@
 								<input type="hidden" id="ITP_FORM_RTNMNG03010_DETAIL_JOB_CD" name="jobCd" value="R">
 					
 								<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"></div>
@@ -133,22 +142,25 @@
 											</div>
 											<label class="col-xs-2 itp_lb">반품입고창고</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_RTNMNG03010_DETAIL_RTN_WHS_NM" class="form-control itp_input" name="rtnWhsNm" placeholder="창고/공급사" readonly/>
+												<div class="col-xs-6 itp_in">
+													<div class="input-group">
+														<input type="text" id="ITP_FORM_RTNMNG03010_DETAIL_RTN_WHS_NM" class="form-control itp_input" name="rtnWhsNm" placeholder="창고/공급사" readonly/>
+														<span class="input-group-btn">
+															<button id="ITP_BTN_RTNMNG03010_DETAIL_MODIFY" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+														</span>
+													</div>
 												</div>
-												<div class="col-xs-5 itp_in" style="padding-left:3px; ">
+												<div class="col-xs-a itp_in" style="padding-left:3px; ">
 													<button type="button" id="ITP_BTN_RTNMNG03010_DETAIL_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_RTNMNG03010_DETAIL_MODIFY" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 								                </div>
 											</div>
 										</div>
 									</div>
 									<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_RTNMNG03010_DETAIL_jqGrid_list" class="itp_tb_list">
-										  <div id="ITP_RTNMNG03010_DETAIL_jqGridView" class="itp_views fix"></div>
 										  <table id="ITP_RTNMNG03010_DETAIL_jqGrid"></table>
 										  <div id="ITP_RTNMNG03010_DETAIL_jqGridPager"></div>
 										  <div id="ITP_RTNMNG03010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
@@ -176,8 +188,7 @@
 								<input type="hidden" id="ITP_FORM_RTNMNG03010_NDETAIL_JOB_CD" name="jobCd" value="P">
 					
 								<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"></div>
@@ -189,12 +200,16 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">공급업체명</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_RTNMNG03010_NDETAIL_SPPLY_NM" class="form-control itp_input" name="spplyNm" placeholder="공급업체" readonly="readonly" />													
+												<div class="col-xs-6 itp_in">
+													<div class="input-group">
+														<input type="text" id="ITP_FORM_RTNMNG03010_NDETAIL_SPPLY_NM" class="form-control itp_input" name="spplyNm" placeholder="공급업체" readonly="readonly" />													
+														<span class="input-group-btn">
+															<button id="ITP_BTN_RTNMNG03010_SDELETE_SPPLY_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+														</span>
+													</div>
 												</div>
-												<div class="col-xs-5 itp_in" style="padding-left:3px; ">
+												<div class="col-xs-a itp_in" style="padding-left:3px; ">
 													<button type="button" id="ITP_BTN_RTNMNG03010_NDETAIL_SPPLY_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_BTN_RTNMNG03010_SDELETE_SPPLY_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 								                </div>
 											</div>
 											<label class="col-xs-2 itp_lb">수거요청일</label>
@@ -211,12 +226,16 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">수거장소</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_RTNMNG03010_NDETAIL_RTN_WHS_NM" data-check-required="empty" class="form-control itp_input" name="rtnWhsNm" placeholder="창고/공급사" readonly="readonly" />
+												<div class="col-xs-6 itp_in">
+													<div class="input-group">
+														<input type="text" id="ITP_FORM_RTNMNG03010_NDETAIL_RTN_WHS_NM" data-check-required="empty" class="form-control itp_input" name="rtnWhsNm" placeholder="창고/공급사" readonly="readonly" />
+														<span class="input-group-btn">
+															<button id="ITP_BTN_RTNMNG03010_NDETAIL_MODIFY" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+														</span>
+													</div>
 												</div>
 												<div class="col-xs-5 itp_in" style="padding-left:3px; ">
 													<button type="button" id="ITP_BTN_RTNMNG03010_NDETAIL_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_RTNMNG03010_NDETAIL_MODIFY" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 								                </div>
 											</div>
 											<label class="col-xs-2 itp_lb">반품 발주 총 금액</label>
@@ -244,16 +263,14 @@
 										</div>
 									</div>
 									<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_RTNMNG03010_NDETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
 												<button type="button" id="ITP_BTN_RTNMNG03010_NDETAIL_DELROW" class="btn btn-danger btn-sm DRB"><i class="glyphicon "></i>&nbsp;&nbsp;품목삭제&nbsp;&nbsp;</button>
 											</div>
 										</div>
 										<div id="ITP_RTNMNG03010_NDETAIL_jqGrid_list" class="itp_tb_list">
-										  <div id="ITP_RTNMNG03010_NDETAIL_jqGridView" class="itp_views fix"></div>
 										  <table id="ITP_RTNMNG03010_NDETAIL_jqGrid"></table>
 										  <div id="ITP_RTNMNG03010_NDETAIL_jqGridPager"></div>
 										  <div id="ITP_RTNMNG03010_NDETAIL_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/rtnmng/RTNMNG04010.html

@@ -22,7 +22,9 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<label>반품발주일자</label>
+											<select id="ITP_FORM_RTNMNG04010_SEARCH_" class="form-control itp_input" name="service">
+												<option value="A">반품발주일자</option>											
+											</select>
 										</div>										
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
@@ -31,18 +33,21 @@
 												<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar" style="width:12%"></div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_RTNMNG04010_SEARCH_RTN_ODR_ST_CD" data-select-code="RTN_ODR_ST_CD" class="form-control itp_input" name="srtnOdrStCd">
 												<option value="A">반품상태</option>											
 											</select>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="수거창고/매장" readonly="readonly" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="수거창고/매장" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_RTNMNG04010_SEARCH_DEL_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
 											<button type="button" id="ITP_BTN_RTNMNG04010_SEARCH_POP_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_RTNMNG04010_SEARCH_DEL_SWHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
@@ -51,23 +56,29 @@
 												<option value="A">수거구분</option>											
 											</select>
 										</div>
-										
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="반품입고 창고" readonly="readonly" />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="반품입고 창고" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_RTNMNG04010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
+										<div class="col-xs-1 itp_in" style="padding: 0px; width:5%;">
 											<button type="button" id="ITP_BTN_RTNMNG04010_SEARCH_POP_SRTN_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_RTNMNG04010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>										
-										
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_SSPPLY_NM" class="form-control itp_input" placeholder="반품입고 공급업체" readonly="readonly" />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_SSPPLY_NM" class="form-control itp_input" placeholder="반품입고 공급업체" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_RTNMNG04010_SEARCH_DEL_SSPPLY_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="padding: 0px; width:10%;">
+										<div class="col-xs-1 itp_in" style="padding: 0px; width:5%;">
 											<button type="button" id="ITP_BTN_RTNMNG04010_SEARCH_POP_SSPPLY_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_RTNMNG04010_SEARCH_DEL_SSPPLY_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
-										<div class="col-xs-2 itp_ip itp_noMar">
+										<div class="col-xs-3 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="반품발주번호/품목번호 /품목명" />
 										</div>
 									</div>
@@ -94,8 +105,7 @@
 								<input type="hidden" id="ITP_FORM_RTNMNG04010_DETAIL_RTN_ODR_ST_CD" name="rtnOdrStCd" 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"></div>
@@ -140,11 +150,10 @@
 										</div>
 									</div>
 									<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_RTNMNG04010_DETAIL_jqGrid_list" class="itp_tb_list">
-										  <div id="ITP_RTNMNG04010_DETAIL_jqGridView" class="itp_views fix"></div>
 										  <table id="ITP_RTNMNG04010_DETAIL_jqGrid"></table>
 										  <div id="ITP_RTNMNG04010_DETAIL_jqGridPager"></div>
 										  <div id="ITP_RTNMNG04010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/rtnmng/RTNMNG05010.html

@@ -21,8 +21,10 @@
 									<input type="hidden" id="ITP_FORM_RTNMNG05010_SEARCH_SWHS_ID" name="swhsId" value="">			<!-- 반품입고창고 -->
 								
 									<div class="form-group">
-										<div class="col-xs-1 itp_ip itp_noMar" style="width:10.7%;">
-											<label>수거요청일</label>
+										<div class="col-xs-2 itp_ip itp_noMar">
+											<select id="ITP_FORM_RTNMNG05010_SEARCH_" class="form-control itp_input" name="service">
+												<option value="A">수거요청일</option>											
+											</select>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
@@ -31,30 +33,42 @@
 												<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="수거창고" readonly="readonly" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="수거창고" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_RTNMNG05010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
 											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_POP_SRTN_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_SSPPLY_NM" class="form-control itp_input" placeholder="공급업체" readonly="readonly" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_SSPPLY_NM" class="form-control itp_input" placeholder="공급업체" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_RTNMNG05010_SEARCH_DEL_SSPPLY_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
 											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_POP_SSPPLY_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_DEL_SSPPLY_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
-						                <div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_RTNMNG05010_SEARCH_DEL_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
 											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_POP_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_DEL_SWHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
-										<div class="col-xs-5 itp_ip itp_noMar">
+										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
 										</div>
 									</div>

src/main/webapp/app/rtnmng/RTNMNG06010.html

@@ -20,8 +20,10 @@
 									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SWHS_ID" name="swhsId" value="">			<!-- 반품입고창고 -->
 								
 									<div class="form-group">
-										<div class="col-xs-1 itp_ip itp_noMar" style="width:10.7%;">
-											<label>수거일 *</label>
+										<div class="col-xs-2 itp_ip itp_noMar">
+											<select id="ITP_FORM_RTNMNG06010_SEARCH_" class="form-control itp_input" name="service">
+												<option value="A">수거일</option>											
+											</select>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
@@ -30,30 +32,42 @@
 												<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="매장/창고" readonly="readonly" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="매장/창고" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
 											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SRTN_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_NM" class="form-control itp_input" placeholder="공급업체" readonly="readonly" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_NM" class="form-control itp_input" placeholder="공급업체" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
 											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SSPPLY_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
-						                <div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
-										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
+										<div class="col-xs-1 itp_in" style="width:5%; padding:0px;">
 											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SWHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
-										<div class="col-xs-5 itp_ip itp_noMar">
+										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
 										</div>
 									</div>

src/main/webapp/css/style.css

@@ -460,7 +460,7 @@ html:lang(en) #ITP_CONTAINER .itp_detail .itp_form .itp_thumb_inline .itp_thumb_
 #ITP_CONTAINER .itp_form.itp_type1 .itp_form_in {margin:0; padding:0; display:table; width:100%;}
 #ITP_CONTAINER .itp_form.itp_type1 .form-group {margin:0; padding:0; display:table-row;}
 #ITP_CONTAINER .itp_form.itp_type1 .form-group .itp_lb,
-#ITP_CONTAINER .itp_form.itp_type1 .form-group .itp_ip {display:table-cell; padding:6px 15px; border-top:1px solid #ededed; float:none; vertical-align:middle; height:42px; }
+#ITP_CONTAINER .itp_form.itp_type1 .form-group .itp_ip {display:table-cell; padding:2px 15px 0 15px; border-top:1px solid #ededed; float:none; vertical-align:middle; height:32px; }
 #ITP_CONTAINER .itp_form.itp_type1 .form-group.border .itp_lb,
 #ITP_CONTAINER .itp_form.itp_type1 .form-group.border .itp_ip {border-bottom:1px solid #666;}
 #ITP_CONTAINER .itp_form.itp_type1 .form-group.noBor .itp_lb,
@@ -571,6 +571,9 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 #ITP_FOOTER .itp_modal .itp_form .input-daterange .input-group-addon {padding:3px 5px;}
 #ITP_FOOTER .itp_modal .itp_form .itp_date_to {background:#fff;}
 #ITP_FOOTER .itp_modal .itp_form .itp_lb.itp_required:before {content:'*'; color:#a94442; position:absolute; top:8px; left:8px;}
+#ITP_FOOTER .modal-body .itp_alt_box {display:inline-flex;}
+#ITP_FOOTER .modal-body .itp_alt_box label {text-align:left; min-width:80px;}
+#ITP_FOOTER .modal-body .itp_alt_box div {text-align:right; width:100px;}
 #ITP_FOOTER .modal.in .modal-dialog {
     -webkit-transform:translate(0, calc(50vh - 50%));
     -ms-transform:translate(0, 50vh) translate(0, -50%);
@@ -747,6 +750,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 .fnNumericDot {text-align: center;}
 
 /* 팝업 추가 */
+
 #ITP_POPUP_CONTAINER .modal-body .itp_title label {font-size:3rem; text-decoration:underline; text-underline-position:under;}
 #ITP_POPUP_CONTAINER .modal-body .itp_title .col-1 {width:100px;}
 #ITP_POPUP_CONTAINER .modal-body .itp_sign {float: right;}

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

@@ -2409,39 +2409,48 @@ function itp_fn_modal_confirm(msg, fn, args) {
 	}
 };
 // 구매요청확인
-function itp_fn_modal_confirm_req1(msg, fn, args) {
+function itp_fn_modal_confirm_req1(param, fn, args) {
 	$('#ITP_MODAL_PR_ALERT_CANCEL').show();
 	$('#ITP_MODAL_PR_ALERT').modal('show');
-	$('#ITP_MODAL_PR_ALERT').find('.itp_alert_txt').html(msg);
+	$('#ITP_MODAL_PR_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
+	$('#ITP_MODAL_PR_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
+	$('#ITP_MODAL_PR_ALERT').find('.fnPchReqAmt').html(param.dlvReqAmt + " 원");
+	
 	if (fn !== undefined || typeof fn !== 'undefined') {
+		console.log("config button");
 		$('#ITP_MODAL_PR_ALERT_CONFIRM').off('click');
 		$('#ITP_MODAL_PR_ALERT_CONFIRM').on('click', function() {
+			console.log("config button function");
 			fn.callBack(args);
 			$('#ITP_MODAL_PR_ALERT').modal('hide');
 		});
 	}
 };
 //선불매장결제확인
-function itp_fn_modal_confirm_req2(msg, fn, args) {
-	$('#ITP_MODAL_ADV_ALERT_CANCEL').show();
+function itp_fn_modal_confirm_req2(param, fn, args) {
+	$('#ITP_MODAL_ALERT_ADV_CANCEL').show();
 	$('#ITP_MODAL_ADV_ALERT').modal('show');
-	$('#ITP_MODAL_ADV_ALERT').find('.itp_alert_txt').html(msg);
+	$('#ITP_MODAL_ADV_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
+	$('#ITP_MODAL_ADV_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
+	$('#ITP_MODAL_ADV_ALERT').find('.fnDlvReqAmt').html(param.dlvReqAmt + " 원");
 	if (fn !== undefined || typeof fn !== 'undefined') {
-		$('#ITP_MODAL_ADV_ALERT_CONFIRM').off('click');
-		$('#ITP_MODAL_ADV_ALERT_CONFIRM').on('click', function() {
+		$('#ITP_MODAL_ALERT_ADV_CONFIRM').off('click');
+		$('#ITP_MODAL_ALERT_ADV_CONFIRM').on('click', function() {
 			fn.callBack(args);
 			$('#ITP_MODAL_ADV_ALERT').modal('hide');
 		});
 	}
 };
 //구매한도부족알림
-function itp_fn_modal_confirm_req3(msg, fn, args) {
-	$('#ITP_MODAL_LM_ALERT_CANCEL').show();
+function itp_fn_modal_confirm_req3(param, fn, args) {
+	$('#ITP_MODAL_ALERT_LM_CANCEL').show();
 	$('#ITP_MODAL_LM_ALERT').modal('show');
-	$('#ITP_MODAL_LM_ALERT').find('.itp_alert_txt').html(msg);
+	$('#ITP_MODAL_LM_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
+	$('#ITP_MODAL_LM_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
+	$('#ITP_MODAL_LM_ALERT').find('.fnDlvReqAmt').html(param.dlvReqAmt + " 원");
 	if (fn !== undefined || typeof fn !== 'undefined') {
-		$('#ITP_MODAL_LM_ALERT_CONFIRM').off('click');
-		$('#ITP_MODAL_LM_ALERT_CONFIRM').on('click', function() {
+		$('#ITP_MODAL_ALERT_LM_CONFIRM').off('click');
+		$('#ITP_MODAL_ALERT_LM_CONFIRM').on('click', function() {
 			fn.callBack(args);
 			$('#ITP_MODAL_LM_ALERT').modal('hide');
 		});

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG01010.js

@@ -47,31 +47,35 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.pchPodrUnqNo, //구매발주번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
 			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, //구매발주항번
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -84,6 +88,7 @@ const gridColModel = {
 			index: 'WHS_NM', name: 'whsNm',
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
 			width: '15', fixed: false, align: 'left',
+			minwidth: 220,
 			sortable: false, hidden: false
 		},
 		{
@@ -96,6 +101,7 @@ const gridColModel = {
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
 			width: '6', fixed: false, align: 'right',
+			minwidth: 80,
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -124,6 +130,7 @@ const gridColModel = {
 			index: 'EXPRY_YN', name: 'expryYn',
 			label: ITP_MSG_LOCALE.label.expryYn, //유통기한여부
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -151,6 +158,7 @@ const gridColModel = {
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
 			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -168,7 +176,8 @@ const gridColModel = {
 		{
 			index: 'SHMT_WHS_NM', name: 'shmtWhsNm',
 			label: ITP_MSG_LOCALE.label.shmtWhsNm, //출고창고명
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 220,
 			sortable: false, hidden: false
 		}
 	],
@@ -451,6 +460,8 @@ let pageObj = {
 		});
 		if(mode == 'LIST') { // 목록
 			$('#ITP_AJAX_INOUTMNG01010_LIST_CONTAINER').show();
+			$('#ITP_FORM_INOUTMNG01010_DELETE_SHMT_WHS_NM').show();
+			$('#ITP_FORM_INOUTMNG01010_DELETE_WHS_NM').show();
 			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG01010_SRH', '#ITP_BTN_INOUTMNG01010_OUC']);
 			$('#ITP_FORM_INOUTMNG01010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
 		} else if(mode == 'DETAIL') { // 출하지시 상세

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG02010.js

@@ -31,30 +31,34 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm,				// 브랜드명
-			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
+			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'SHMT_REQ_UNQ_NO', name: 'shmtReqUnqNo',
 			label: ITP_MSG_LOCALE.label.shmtReqUnqNo,			// 출하지시번호
+			minwidth: 140,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.pchPodrUnqNo,			// 발주번호
+			minwidth: 140,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
 			label: ITP_MSG_LOCALE.label.pchPodrDtlNo,			// 발주항번
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'SHMT_REQ_ST_CD', name: 'shmtReqStCd',
 			label: ITP_MSG_LOCALE.label.shmtReqStCd,			// 출하상태코드
+			minwidth: 120,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_PODR_DTL_ST_CD}
@@ -62,55 +66,61 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId,					// 품목번호
+			minwidth: 140,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm,					// 품목명
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_NM', name: 'whsNm',
 			label: ITP_MSG_LOCALE.label.whsNm,					// 납품장소
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 160,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'SHMT_QTY', name: 'shmtQty',
 			label: ITP_MSG_LOCALE.label.shmtQty,				// 출하수량
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'SHMT_AMT', name: 'shmtAmt',
 			label: ITP_MSG_LOCALE.label.shmtAmt,				// 출하금액
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
+			minwidth: 80,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_QTY', name: 'whsQty',
 			label: ITP_MSG_LOCALE.label.whsQty,					// 입고수량
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_AMT', name: 'whsAmt',
 			label: ITP_MSG_LOCALE.label.whsAmt,					// 입고금액
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_CNFM_NM', name: 'whsCnfmNm',
 			label: ITP_MSG_LOCALE.label.whsCnfmNm,				// 입고확인자
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_DT', name: 'whsDt',
 			label: ITP_MSG_LOCALE.label.whsDt,					// 입고일
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG03010.js

@@ -46,19 +46,21 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.rtnPodrUnqNo, //반품발주번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'RTN_PODR_DTL_NO', name: 'rtnPodrDtlNo',
 			label: ITP_MSG_LOCALE.label.rtnPodrDtlNo, //반품발주항번
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
@@ -77,12 +79,14 @@ const gridColModel = {
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -100,7 +104,7 @@ const gridColModel = {
 		{
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, //수거창고명
-			width: '15', fixed: false, align: 'center',
+			width: '15', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -108,6 +112,7 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
 			width: '6', fixed: false, align: 'right',
 			sortable: false, hidden: false,
+			minwidth: 60,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
@@ -180,6 +185,7 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -446,6 +452,8 @@ let pageObj = {
 		});
 		if(mode == 'LIST') { // 목록
 			$('#ITP_AJAX_INOUTMNG03010_LIST_CONTAINER').show();
+			$('#ITP_FORM_INOUTMNG03010_DELETE_WHS_NM').show();
+			$('#ITP_FORM_INOUTMNG03010_DELETE_RTN_WHS_NM').show();
 			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG03010_SRH', '#ITP_BTN_INOUTMNG03010_CUC']);
 			$('#ITP_FORM_INOUTMNG03010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
 		} else if(mode == 'DETAIL') { // 출하지시 상세

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG04010.js

@@ -38,30 +38,35 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm,				// 브랜드명
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'SHMT_REQ_UNQ_NO', name: 'colCmdUnqNo',
 			label: ITP_MSG_LOCALE.label.colCmdUnqNo,			// 수거지시번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_UNQ_NO', name: 'colCmdDtlNo',
 			label: ITP_MSG_LOCALE.label.colCmdDtlNo,			// 수거지시항번
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_DTL_NO', name: 'rtnPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.rtnPodrUnqNo,			// 반품발주번호
 			width: '8', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_DTL_NO', name: 'rtnPodrDtlNo',
 			label: ITP_MSG_LOCALE.label.rtnPodrDtlNo,			// 반품발주항번
 			width: '8', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -75,18 +80,21 @@ const gridColModel = {
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId,					// 품목번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm,					// 품목명
 			width: '10', fixed: false, align: 'left',
+			minwidth: 120,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_NM', name: 'rtnWhsNm',
-			label: ITP_MSG_LOCALE.label.rtnWhsNm,					// 반품장소
+			label: ITP_MSG_LOCALE.label.rtnWhsNm,			// 반품장소
 			width: '10', fixed: false, align: 'left',
+			minwidth: 200,
 			sortable: false, hidden: false
 		},
 		{
@@ -98,7 +106,7 @@ const gridColModel = {
 		},
 		{
 			index: 'WHS_QTY', name: 'colQty',
-			label: ITP_MSG_LOCALE.label.colQty,					// 수거수량
+			label: ITP_MSG_LOCALE.label.colQty,		// 수거수량
 			width: '8', fixed: false, align: 'rigth',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -107,6 +115,7 @@ const gridColModel = {
 			index: 'SHMT_AMT', name: 'colAmt',
 			label: ITP_MSG_LOCALE.label.colAmt,				// 수거금액
 			width: '8', fixed: false, align: 'rigth',
+			minwidth: 80,
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -114,12 +123,14 @@ const gridColModel = {
 			index: 'WHS_DT', name: 'colDt',
 			label: ITP_MSG_LOCALE.label.colDt,					// 수거일
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_CNFM_NM', name: 'colCnfmNm',
 			label: ITP_MSG_LOCALE.label.colCnfmNm,				// 수거확인자
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -199,6 +210,8 @@ let pageObj = {
         if(mode == 'LIST') { // 목록
             fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG04010_PRINT', '#ITP_BTN_INOUTMNG04010_SRH']);
             $('#ITP_AJAX_INOUTMNG04010_LIST_CONTAINER').show();
+            $('#ITP_BTN_INOUTMNG04010_DELETE_RTN_WHS_ID').show();
+            $('#ITP_BTN_INOUTMNG04010_DELETE_WHS_ID').show();
             $('#ITP_FORM_INOUTMNG04010_SEARCH #ITP_FORM_INOUTMNG04010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
         } 
     },

src/main/webapp/js/app/pomng/ITP_POMNG01010.js

@@ -347,11 +347,11 @@ let createObj = {
 			var dlvReqDt = $('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').val();
 			var itemcnt  = $(POMNG01010_DETAIL_GRID_ID).getGridParam('reccount');
 			var dlvReqAmt = $('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text();
-			var reqMsg = "";
+			
+			var apprArg = {};
 			
 			//정산 타입이 무정산이면 스킵
 			var apprTypeCd = "Y" // Y 정상결재, NP 선불, NA 후불   
-			
 			var loanDvsn = $('#ITP_FORM_POMNG01010_DETAIL_LOAN_DVSN').val();
 			
 			if (loanDvsn != null && loanDvsn != "") {
@@ -363,6 +363,8 @@ let createObj = {
 					var pchReqAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(),"","");
 					
 					if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
+						dlvReqAmt = itp_fn_number_comma(String(parseInt(pchReqAtm) - parseInt(pchActAtm)));
+						console.log(dlvReqAmt);
 						if (loanDvsn == 'LD01') {
 							apprTypeCd = 'NP';
 						} else {
@@ -372,7 +374,6 @@ let createObj = {
 				}    
 			}        
 			
-
 			if (itp_fn_form_event.isValid(formId)) {
 				// 품목대상 정보 확인 필요
 				var records = $(POMNG01010_DETAIL_GRID_ID).getGridParam('reccount');
@@ -387,13 +388,12 @@ let createObj = {
 									"." + (now.getMonth()+1 > 9 ? now.getMonth().toString() + 1: "0" + now.getMonth().toString() + 1) +
 									"." + (now.getDate() > 9 ? now.getDate().toString() : "0" + now.getDate().toString());
 				
-				
 				var dlvReqDt = $('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').val();
 				if (today > dlvReqDt) {
 					alert("납품요청일은 오늘 이후이어야 합니다.");
 					return;
 				}	
-				
+			
 				const rowChkData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
 				var chkQtyYn = "N";
 				$.each(rowChkData, function(key, value) {
@@ -403,25 +403,36 @@ let createObj = {
 						return false;
 					}
 				});
-				
 				if (chkQtyYn == "Y") return;
 				
 				if (arg == 'PR20') {
-					console.log(apprTypeCd);
+					
+					apprArg.dlvReqDt = dlvReqDt;
+					apprArg.itemcnt = itemcnt;
+					apprArg.dlvReqAmt = dlvReqAmt;
+					
 					if (apprTypeCd == "Y") {  // 여신 구분, 여신금액
-						reqMsg = ' 납품요청일 : ' + dlvReqDt + '<br> 품목수 : ' + itemcnt + '<br> 구매요청금액 : ' + dlvReqAmt + '<br><br>' + ITP_MSG_LOCALE.message.ajax.reqSave ;
-						itp_fn_modal_confirm(reqMsg, createObj.button.saveReq(arg), null);	
+						
+						var prIngFn =  {
+							callBack: function(args) {
+									createObj.button.saveLastReq(arg);
+								}
+							};
+						itp_fn_modal_confirm_req1(apprArg, prIngFn, arg);
+							
 					} else // 금액 부족시 
-						createObj.button.saveApprReq(arg,apprTypeCd);
-					} 
-					
+						createObj.button.saveApprReq(apprArg,apprTypeCd, arg);
 				} else {
-					createObj.button.saveReq(arg);
+					console.log("===");
+					console.log(arg);
+					createObj.button.saveReq(apprArg);
 				}
+			}
 				
 		},
 		saveReq: function(arg) {
 			const formId = '#ITP_FORM_POMNG01010_DETAIL';
+			
 			var saveFn = {
 				callBack: function(args) {
 						$(formId).val(arg);
@@ -458,14 +469,14 @@ let createObj = {
 				};
 			itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, saveFn, null);
 		},
-		saveApprReq: function(arg, apprTypeCd) {
+		saveApprReq: function(param, apprTypeCd, arg) {
 			var apprFn =  {
-				callBack: function(args,apprTypeCd) {
+				callBack: function(args) {
 						// 결재금액이 부족하여 결재란으로 이동처리
 						var popFn = function(rowDataPop) {
 							// 결재 성공시 승인처리함 
 							console.log(rowDataPop);
-							createObj.button.saveReq(arg);
+							createObj.button.saveLastReq(arg);
 						};			
 						// 결제 팝업 : LD01(선불(충전)), LD02(후불(신용))
 						// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))		
@@ -486,11 +497,46 @@ let createObj = {
 				};
 			
 			if (apprTypeCd == 'NP') {  // 선불
-				itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, apprFn, null);
+				itp_fn_modal_confirm_req2(param, apprFn, arg);
 			} else { //후불
-				itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, apprFn, null);
+				itp_fn_modal_confirm_req3(param, apprFn, arg);
 			}
-		}	
+		},
+		saveLastReq: function(arg) {
+			const formId = '#ITP_FORM_POMNG01010_DETAIL';
+			
+			$(formId).val(arg);
+			let gridInsertData = [];
+			let gridUpdateData = [];
+			let gridDeleteData = [];
+			
+			const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
+			
+			$.each(rowData, function(key, value) {
+				if (value.viewCd !== 'R') {
+					if (value.viewCd === 'C') {
+						gridInsertData.push(value);
+					} else if (value.viewCd === 'U') {
+						gridUpdateData.push(value);
+					} else if (value.viewCd === 'D') {
+						gridDeleteData.push(value);
+					}
+				}
+			});
+			
+			//if (chkQtyYn == "Y") return;
+			
+			let param = $(formId).serializeObject();
+			param.gridInsertData = gridInsertData;
+			param.gridUpdateData = gridUpdateData;
+			param.gridDeleteData = gridDeleteData;
+			console.log(JSON.stringify(param));
+			var searhFn = function() {
+				createObj.newinit();
+			};
+			fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');				
+				
+		},	
 			
 	},
 	load: function() {

src/main/webapp/js/app/pomng/ITP_POMNG02010.js

@@ -757,6 +757,10 @@ let modifyObj = {
 			var itemcnt  = $(POMNG02010_DETAIL_GRID_ID).getGridParam('reccount');
 			var dlvReqAmt = $('#ITP_FORM_POMNG02010_DETAIL .fnPchReqTotalAmt').text();
 			var reqMsg = "";
+			var apprArg = {};
+			
+			//정산 타입이 무정산이면 스킵
+			var apprTypeCd = "Y" // Y 정상결재, NP 선불, NA 후불   
 			
 			var now = new Date();
 			var today = now.getFullYear() +
@@ -778,11 +782,14 @@ let modifyObj = {
 					var pchActAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG02010_DETAIL .fnPchActAmt').text(),"","");
 					var pchReqAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG02010_DETAIL .fnPchReqTotalAmt').text(),"","");
 					
-					//console.log("========================");
-					
 					if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
-						alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
-						return;
+						dlvReqAmt = itp_fn_number_comma(String(parseInt(pchReqAtm) - parseInt(pchActAtm)));
+						console.log(dlvReqAmt);
+						if (loanDvsn == 'LD01') {
+							apprTypeCd = 'NP';
+						} else {
+							apprTypeCd = 'NA';
+						}
 					}
 				}    
 			}        
@@ -812,48 +819,137 @@ let modifyObj = {
 				
 				if (chkQtyYn == "Y") return;
 				
-				
-				var saveReq = {
-					callBack: function(args) {
-							$(formId).val(arg);
-							let gridInsertData = [];
-							let gridUpdateData = [];
-							let gridDeleteData = [];
-							const rowData = $(POMNG02010_DETAIL_GRID_ID).getRowData();
-							
-							$.each(rowData, function(key, value) {
-								if (value.viewCd != 'R') {
-									if (value.viewCd == 'C') {
-										gridInsertData.push(value);
-									} else if (value.viewCd == 'U') {
-										gridUpdateData.push(value);
-									} else if (value.viewCd == 'D') {
-										gridDeleteData.push(value);
-									}
+				if (arg == 'PR20') {
+					
+					apprArg.dlvReqDt = dlvReqDt;
+					apprArg.itemcnt = itemcnt;
+					apprArg.dlvReqAmt = dlvReqAmt;
+					
+					console.log("-----------------------");
+					console.log(dlvReqAmt, apprArg.dlvReqAmt);
+					
+					if (apprTypeCd == "Y") {  // 여신 구분, 여신금액
+						
+						var prIngFn =  {
+							callBack: function(args) {
+									modifyObj.button.saveLastReq(arg);
 								}
-							});
-			
-							let param = $(formId).serializeObject();
-							param.gridInsertData = gridInsertData;
-							param.gridUpdateData = gridUpdateData;
-							param.gridDeleteData = gridDeleteData;
-							console.log(JSON.stringify(param));
-							var searhFn = function() {
-								ITP_FORM_POMNG02010_DETAIL_IS_WRITING = false;
-								modifyObj.button.clear();
-								//listObj.grid.search();
 							};
-							fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');				
-						}
-				};
-				if (arg == 'PR20') {
-					reqMsg = ' 납품요청일 : ' + dlvReqDt + '<br> 품목수 : ' + itemcnt + '<br> 구매요청금액 : ' + dlvReqAmt + '<br><br>' + ITP_MSG_LOCALE.message.ajax.reqSave ;
-					itp_fn_modal_confirm(reqMsg, saveReq, null);
-				} else {
-					itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, saveReq, null);
+						itp_fn_modal_confirm_req1(apprArg, prIngFn, arg);
+							
+					} else // 금액 부족시 
+						modifyObj.button.saveApprReq(apprArg,apprTypeCd, arg);
+					} else {
+					modifyObj.button.saveReq(arg);
 				}
 			}
 		},
+		saveReq: function(arg) {
+			const formId = '#ITP_FORM_POMNG02010_DETAIL';
+			var saveFn = {
+				callBack: function(args) {
+						$(formId).val(arg);
+						let gridInsertData = [];
+						let gridUpdateData = [];
+						let gridDeleteData = [];
+						
+						const rowData = $(POMNG02010_DETAIL_GRID_ID).getRowData();
+						
+						$.each(rowData, function(key, value) {
+							if (value.viewCd !== 'R') {
+								if (value.viewCd === 'C') {
+									gridInsertData.push(value);
+								} else if (value.viewCd === 'U') {
+									gridUpdateData.push(value);
+								} else if (value.viewCd === 'D') {
+									gridDeleteData.push(value);
+								}
+							}
+						});
+						
+						let param = $(formId).serializeObject();
+						param.gridInsertData = gridInsertData;
+						param.gridUpdateData = gridUpdateData;
+						param.gridDeleteData = gridDeleteData;
+						console.log(JSON.stringify(param));
+						var searhFn = function() {
+							ITP_FORM_POMNG02010_DETAIL_IS_WRITING = false;
+							modifyObj.button.clear();
+						};
+						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');				
+					}
+				};
+			itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, saveFn, null);
+		},
+		saveApprReq: function(param, apprTypeCd, arg) {
+			var apprFn =  {
+				callBack: function(args) {
+						// 결재금액이 부족하여 결재란으로 이동처리
+						var popFn = function(rowDataPop) {
+							// 결재 성공시 승인처리함 
+							console.log(rowDataPop);
+							modifyObj.button.saveLastReq(arg);
+						};			
+						// 결제 팝업 : LD01(선불(충전)), LD02(후불(신용))
+						// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))		
+						// 구매요청 번호 전달 - 
+						//var loanDvsn = $('#ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN').val();
+						var pchActAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG02010_DETAIL .fnPchActAmt').text(),"","");
+						var pchReqAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG02010_DETAIL .fnPchReqTotalAmt').text(),"","");
+						
+						
+						var args = {'payTpCd': '40',
+						'brandId':   fn_make_user_info.get('brandId'), 
+						'storeId':   fn_make_user_info.get('storeId'),
+						'prchReqUnqNo': $('ITP_FORM_POMNG02010_DETAIL_PCH_REQ_UNQ_NO').val(),
+						'goodsAmt':  pchReqAtm-pchActAtm}; 
+						
+						fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
+					}
+				};
+			
+			if (apprTypeCd == 'NP') {  // 선불
+				itp_fn_modal_confirm_req2(param, apprFn, arg);
+			} else { //후불
+				itp_fn_modal_confirm_req3(param, apprFn, arg);
+			}
+		},
+		saveLastReq: function(arg) {
+			const formId = '#ITP_FORM_POMNG02010_DETAIL';
+			
+			$(formId).val(arg);
+			let gridInsertData = [];
+			let gridUpdateData = [];
+			let gridDeleteData = [];
+			
+			const rowData = $(POMNG02010_DETAIL_GRID_ID).getRowData();
+			
+			$.each(rowData, function(key, value) {
+				if (value.viewCd !== 'R') {
+					if (value.viewCd === 'C') {
+						gridInsertData.push(value);
+					} else if (value.viewCd === 'U') {
+						gridUpdateData.push(value);
+					} else if (value.viewCd === 'D') {
+						gridDeleteData.push(value);
+					}
+				}
+			});
+			
+			//if (chkQtyYn == "Y") return;
+			
+			let param = $(formId).serializeObject();
+			param.gridInsertData = gridInsertData;
+			param.gridUpdateData = gridUpdateData;
+			param.gridDeleteData = gridDeleteData;
+			console.log(JSON.stringify(param));
+			var searhFn = function() {
+				ITP_FORM_POMNG02010_DETAIL_IS_WRITING = false;
+				modifyObj.button.clear();
+			};
+			fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');				
+				
+		},	
 		clear: function () {
 			document.getElementById('ITP_FORM_POMNG02010_DETAIL').reset();
 			listObj.grid.search();

src/main/webapp/js/app/rtnmng/ITP_RTNMNG01010.js

@@ -11,9 +11,6 @@ require(['config'], function() {
  --------------------------------------------------------
  * const gridColModel = {}	: 화면 Grid Object			*
  * let pageObj = {}			: 화면공통 Object			*
- * let listObj = {}			: 목록화면 Object			*
- * let viewObj = {}			: 상세화면 Object			*
- * let modifyObj = {}		: 수정화면 Object			*
  * let createObj = {}		: 신규화면 Object			*
  *******************************************************/
 
@@ -83,7 +80,7 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_QTY', name: 'rtnQty',
-			label: '반품수량', //수량
+			label: '반품수량', classes: 'input_color',
 			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: { number:true }, 
@@ -98,7 +95,7 @@ const gridColModel = {
 		},		
 		{
 			index: 'RTN_DVSN', name: 'rtnDvsn',
-			label: '반품구분',
+			label: '반품구분', classes: 'input_color',
 			width: '9', fixed: false, align: 'left',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_RTN_DVSN},
@@ -106,7 +103,7 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_RSN_DVSN', name: 'rtnRsnDvsn',
-			label: '사유구분',
+			label: '사유구분', classes: 'input_color',
 			width: '9', fixed: false, align: 'left',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_RTN_RSN_DVSN},
@@ -114,7 +111,7 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_RSN', name: 'rtnRsn',
-			label: '반품사유', 
+			label: '반품사유', classes: 'input_color',
 			width: '12', fixed: false, align: 'left',
 			sortable: false, editable: true, edittype: 'text'
 		},
@@ -361,6 +358,7 @@ let createObj = {
 	init: function() {
 		$('#ITP_FORM_RTNMNG01010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
 		$('#ITP_FORM_RTNMNG01010_DETAIL_STORE_ID').val(fn_make_user_info.get('storeId'));
+		$('#ITP_FORM_RTNMNG01010_DELETE_WHS_NM').show();
 		//let param = 'brandId=' + LOGIN_USER_INFO.brandId + "&spplyId=" + LOGIN_USER_INFO.spplyId;
 		this.load();
 	},

src/main/webapp/js/app/rtnmng/ITP_RTNMNG02010.js

@@ -74,6 +74,7 @@ const gridColModel = {
 			index: 'RTN_REQ_UNQ_NO', name: 'rtnReqUnqNo',
 			label: '반품요청번호', 
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -92,6 +93,7 @@ const gridColModel = {
 			index: 'rtn_Whs_Nm', name: 'rtnWhsNm',
 			label: '반품장소', 
 			width: '10', fixed: false, align: 'left',
+			minwidth: 220,
 			sortable: false, hidden: false
 		}, 
 		{
@@ -190,6 +192,7 @@ const gridColModel = {
 			label: '반품수량', 
 			width: '10', fixed: false, align: 'right',
 			sortable: true, editable: true, edittype: 'text',
+			classes: 'input_color',
 			editrules: {required: true, number:true},
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -216,6 +219,7 @@ const gridColModel = {
 			index: 'RTN_DVSN', name: 'rtnDvsn',
 			label: '반품구분',
 			width: '10', fixed: false, align: 'left',
+			classes: 'input_color',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_RTN_DVSN},
 			editrules: {required: true}
@@ -223,6 +227,7 @@ const gridColModel = {
 		{
 			index: 'RTN_RSN_DVSN', name: 'rtnRsnDvsn',
 			label: '사유구분',
+			classes: 'input_color',
 			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_RTN_RSN_DVSN},
@@ -231,6 +236,7 @@ const gridColModel = {
 		{
 			index: 'RTN_RSN', name: 'rtnRsn',
 			label: '반품사유', 
+			classes: 'input_color',
 			width: '15', fixed: false, align: 'left',
 			sortable: false, editable: true, edittype: 'text'
 		},

src/main/webapp/js/app/rtnmng/ITP_RTNMNG03010.js

@@ -82,7 +82,7 @@ const gridColModel = {
 			sortable: false, hidden: true
 		},
 		{
-			index: 'BRAND_NM', name: 'bra ndNm',
+			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: false
@@ -108,6 +108,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
+			minwidth: 100,
 			width: '7', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
@@ -146,7 +147,8 @@ const gridColModel = {
 		{
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
 			label: '반품사유', 
-			width: '7', fixed: false, align: 'left',
+			minwidth: 130,
+			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		}
 	],
@@ -210,7 +212,7 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_QTY', name: 'rtnQty',
-			label: '반품발주수량', 
+			label: '반품발주수량', classes: 'input_color',
 			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: true}, hidden: false,
@@ -284,7 +286,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, // 품목아이디
-			width: '10', fixed: false, align: 'center',
+			width: '14', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false
 		},
@@ -298,7 +300,7 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
-			width: '10', fixed: false, align: 'right',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false,
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -306,7 +308,7 @@ const gridColModel = {
 		{
 			index: 'UNIT', name: 'unit',
 			label: ITP_MSG_LOCALE.label.unit, //단위
-			width: '10', fixed: false, align: 'center',
+			width: '12', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false
 		},
@@ -320,7 +322,7 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_QTY', name: 'rtnQty',
-			label: '반품발주수량', 
+			label: '반품발주수량', classes: 'input_color',
 			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: true}, hidden: false,
@@ -336,7 +338,7 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_DVSN', name: 'rtnDvsn',
-			label: '반품구분',
+			label: '반품구분', classes: 'input_color',
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_RTN_DVSN},
@@ -344,7 +346,7 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_RSN_DVSN', name: 'rtnRsnDvsn',
-			label: '사유구분',
+			label: '사유구분', classes: 'input_color',
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_RTN_RSN_DVSN},
@@ -352,7 +354,7 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_RSN', name: 'rtnRsn',
-			label: '반품사유', 
+			label: '반품사유', classes: 'input_color',
 			width: '15', fixed: false, align: 'left',
 			sortable: false, editable: true, edittype: 'text'
 		},
@@ -641,6 +643,8 @@ let pageObj = {
 		});
 		if(mode == 'LIST') { // 목록
 			$('#ITP_AJAX_RTNMNG03010_LIST_CONTAINER').show();
+			$('#ITP_FORM_RTNMNG03010_SDELETE_SSPPLY_NM').show();
+			$('#ITP_FORM_RTNMNG03010_SDELETE_SWHS_NM').show();
 			fn_show_btn_auth_array(['#ITP_BTN_RTNMNG03010_SRH', '#ITP_BTN_RTNMNG03010_NEWCREATE','#ITP_BTN_RTNMNG03010_POCREATE', '#ITP_BTN_RTNMNG03010_POREJECT']);
 			// $('#ITP_FORM_RTNMNG03010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
 			// $('#ITP_FORM_RTNMNG03010_DETAIL_SSTORE_ID').val(fn_make_user_info.get('storeId'));
@@ -648,6 +652,8 @@ let pageObj = {
 			
 		} else if(mode == 'NPC') { // 신규발주등록
 			$('#ITP_AJAX_RTNMNG03010_NDETAIL_CONTAINER').show();
+			$('#ITP_BTN_RTNMNG03010_SDELETE_SPPLY_NM').show();
+			$('#ITP_BTN_RTNMNG03010_NDETAIL_MODIFY').show();
 			fn_show_btn_auth_array(['#ITP_BTN_RTNMNG03010_RTNPO', '#ITP_BTN_RTNMNG03010_CANCELLIST', '#ITP_BTN_RTNMNG03010_NDETAIL_ADDROW','#ITP_BTN_RTNMNG03010_NDETAIL_DELROW']);
 			$('#ITP_FORM_RTNMNG03010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
 			SCREEN_MODE = 'NPC' ;
@@ -655,6 +661,7 @@ let pageObj = {
 			
 		} else if(mode == 'POC') { // 구매요청 발주
 			$('#ITP_AJAX_RTNMNG03010_DETAIL_CONTAINER').show();
+			$('#ITP_BTN_RTNMNG03010_DETAIL_MODIFY').show();
 			fn_show_btn_auth_array(['#ITP_BTN_RTNMNG03010_RTNPO', '#ITP_BTN_RTNMNG03010_CANCELLIST']);
 			
 			$('#ITP_FORM_RTNMNG03010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));

src/main/webapp/js/app/rtnmng/ITP_RTNMNG04010.js

@@ -237,7 +237,9 @@ let pageObj = {
             $('#ITP_BTN_RTNMNG04010_SEARCH_SPPLY_ID').show();
             $('#ITP_BTN_RTNMNG04010_DELETE_SPPLY_ID').show();
             $('#ITP_BTN_RTNMNG04010_SEARCH_WHS_ID').show();
-            $('#ITP_BTN_RTNMNG04010_DELETE_WHS_ID').show();
+            $('#ITP_BTN_RTNMNG04010_SEARCH_DEL_SWHS_NM').show();
+            $('#ITP_BTN_RTNMNG04010_SEARCH_DEL_SRTN_WHS_NM').show();
+            $('#ITP_BTN_RTNMNG04010_SEARCH_DEL_SSPPLY_NM').show();
             
         } else if(mode == 'MODIFY') { // 수정
             $('#ITP_AJAX_RTNMNG04010_DETAIL_CONTAINER').show();

src/main/webapp/js/app/rtnmng/ITP_RTNMNG05010.js

@@ -50,6 +50,7 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -68,6 +69,7 @@ const gridColModel = {
 			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
 			label: '반품발주번호', 
 			width: '12', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
@@ -80,17 +82,19 @@ const gridColModel = {
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
 			width: '13', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '7', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'COL_QTY', name: 'colQty',
-			label: '수거수량', 
+			label: '수거수량', classes: 'input_color',
 			width: '8', fixed: false, align: 'right',
 			sortable: true, editable: true, edittype: 'text',
 			editrules: { required: false, number: true },
@@ -99,6 +103,7 @@ const gridColModel = {
 		{
 			index: 'COL_REQ_QTY', name: 'colReqQty',
 			label: '수거요청수량', 
+			minwidth: 100,
 			width: '9', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -132,6 +137,7 @@ const gridColModel = {
 		{
 			index: 'WHS_NM', name: 'whsNm',
 			label: '반품입고창고', 
+			minwidth: 120,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
@@ -150,12 +156,14 @@ const gridColModel = {
 		{
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
 			label: '수거창고명', 
+			minwidth: 140,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'COL_SCH_DT', name: 'colSchDt',
 			label: '수거예정일', 
+			minwidth: 140,
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
@@ -168,6 +176,7 @@ const gridColModel = {
 		{
 			index: 'PICK_MGR_TEL_NO', name: 'pickMgrTelNo',
 			label: '수거담당자연락처', 
+			minwidth: 140,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
@@ -212,6 +221,10 @@ let listObj = {
 		$('#ITP_FORM_RTNMNG05010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 30)));
 		
 		$('#ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_ID').val('xxx'); // 임시
+		
+		$('#ITP_BTN_RTNMNG05010_SEARCH_DEL_SRTN_WHS_NM').show();
+		$('#ITP_BTN_RTNMNG05010_SEARCH_DEL_SSPPLY_NM').show();
+		$('#ITP_BTN_RTNMNG05010_SEARCH_DEL_SWHS_NM').show();
 	},
 	itp_RTNMNG05010_search: false,
 	button: {

src/main/webapp/js/app/rtnmng/ITP_RTNMNG06010.js

@@ -31,7 +31,7 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
-			label: '반품발주번호', 
+			label: '반품발주번호', minwidth:140,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
@@ -44,18 +44,21 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, 			// 품목번호
+			minwidth:140,
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
+			minwidth:120,
 			width: '8', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'RODR_QTY', name: 'rodrQty',
 			label: '반품발주수량', 
+			minwidth:140,
 			width: '5', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
@@ -63,6 +66,7 @@ const gridColModel = {
 		{
 			index: 'COL_REQ_QTY', name: 'colReqQty',
 			label: '수거요청수량', 
+			minwidth:140,
 			width: '5', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
@@ -70,6 +74,7 @@ const gridColModel = {
 		{
 			index: 'COL_QTY', name: 'colQty',
 			label: '수거수량', 
+			minwidth:100,
 			width: '5', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
@@ -102,6 +107,7 @@ const gridColModel = {
 		{
 			index: 'PICK_MGR_TEL_NO', name: 'pickMgrTelNo',
 			label: '수거담당자전화번호', 
+			minwidth:140,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		}		
@@ -139,6 +145,10 @@ let pageObj = {
 			$('#ITP_TAB_RTNMNG06010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
 			$('#ITP_FORM_RTNMNG06010_SEARCH_FROM_DT').datepicker('setDate', now);
 			$('#ITP_FORM_RTNMNG06010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
+			
+			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM').show();
+			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM').show();
+			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SWHS_NM').show();
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(RTNMNG06010_GRID_ID, RTNMNG06010_GRID_LIST, 'lg');

src/main/webapp/main.html

@@ -312,7 +312,24 @@
 				<div class="modal-dialog modal-xs">
 					<div class="modal-content">
 						<div class="modal-body">
-							<div class="text-center itp_alert_txt"></div>
+							<div class="text-center" style="margin-top:10px;">
+								<div class="itp_alt_box">
+									<label>납품요청일</label>
+									<span>:</span>
+									<div class="fnDlvReqDt"></div>
+								</div>
+								<div class="itp_alt_box">
+									<label>품목수</label>
+									<span>:</span>
+									<div class="fnItemcnt"></div>
+								</div>
+								<div class="itp_alt_box">
+									<label>구매금액</label>
+									<span>:</span>
+									<div class="fnPchReqAmt"></div>
+								</div>
+								<label style="margin:10px 0;">구매요청 하시겠습니까?</label>
+							</div>
 						</div>
 						<div class="modal-bottom">
 							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_PR_ALERT_CANCEL" data-dismiss="modal">취소</button>
@@ -326,7 +343,24 @@
 				<div class="modal-dialog modal-sm">
 					<div class="modal-content">		
 						<div class="modal-body">
-							<div class="text-center itp_alert_txt"></div>
+							<div class="text-center">
+								<div class="itp_alt_box">
+									<label>납품요청일</label>
+									<span>:</span>
+									<div class="fnDlvReqDt"></div>
+								</div>
+								<div class="itp_alt_box">
+									<label>품목수</label>
+									<span>:</span>
+									<div class="fnItemcnt"></div>
+								</div>
+								<div class="itp_alt_box">
+									<label>추가결재금액</label>
+									<span>:</span>
+									<div class="fnDlvReqAmt"></div>
+								</div>
+								<label style="margin:10px 0;">선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다.<br>결재를 하시겠습니까?</label>
+							</div>
 						</div>
 						<div class="modal-bottom">
 							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_ADV_CANCEL" data-dismiss="modal">취소</button>
@@ -340,7 +374,24 @@
 				<div class="modal-dialog modal-sm">
 					<div class="modal-content">
 						<div class="modal-body">
-							<div class="text-center itp_alert_txt"></div>
+							<div class="text-center">
+								<div class="itp_alt_box">
+									<label>납품요청일</label>
+									<span>:</span>
+									<div class="fnDlvReqDt"></div>
+								</div>
+								<div class="itp_alt_box">
+									<label>품목수</label>
+									<span>:</span>
+									<div class="fnItemcnt"></div>
+								</div>
+								<div class="itp_alt_box">
+									<label>추가결재금액</label>
+									<span>:</span>
+									<div class="fnDlvReqAmt"></div>
+								</div>
+								<label style="margin:10px 0; line-height: 1.5;">구매한도가 부족합니다.<br>선결재를 하신 후에 구매요청을 하시기 바랍니다. 결재 버튼을 누르시면 임시 저장 후 결재가 진행이 됩니다. <br>결재를 하시겠습니까?</label>
+							</div>						
 						</div>
 						<div class="modal-bottom">
 							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_LM_CANCEL" data-dismiss="modal">취소</button>