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

src/main/webapp/app/loanmng/LOANMNG01010.html

@@ -20,11 +20,15 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_STORE_NM" class="form-control itp_input" placeholder="매장선택" readonly="readonly" />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_STORE_NM" class="form-control itp_input" placeholder="매장선택" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_LOANMNG01010_STORE_ERASE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-remove"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_ip itp_noMar">
 											<button type="button" id="ITP_BTN_LOANMNG01010_STORE_SEARCH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_LOANMNG01010_STORE_ERASE" 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_LOANMNG01010_SEARCH_LOAN_DVSN" data-select-code="LOAN_DVSN" class="form-control itp_input" name="sloanDvsn">
@@ -60,8 +64,7 @@
 								<input type="hidden" id="ITP_FORM_LOANMNG01010_VIEW_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" 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">
@@ -124,15 +127,16 @@
 										<div class="col-xs-12">
 											<form id="ITP_FORM_LOANMNG01010_VIEW_SEARCH" class="form-horizontal">
 												<input type="hidden" id="ITP_FORM_LOANMNG01010_VIEW_SEARCH_LOAN_MGNT_UNQ_NO" name="sloanMgntUnqNo" value="">
-											
-												<div class="col-xs-1 itp_ip itp_noMar" style="top:2px">
-													<label class="itp_in">거래일자</label>
+												<div class="col-xs-1 itp_ip itp_noMar" style="left:15px">
+													<select id="ITP_AJAX_LOANMNG01010_VIEW_SEARCH" class="form-control itp_input" name="servicePchReqDt">
+														<option value="A">거래일자</option>											
+													</select>
 												</div>
-												<div class="col-xs-2 itp_ip itp_noMar">
+												<div class="col-xs-4 itp_ip itp_noMar">
 													<div class="input-daterange input-group date">
-														<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_FROM" class="form-control itp_input" name="fromDt" value="">
+														<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_FROM" class="form-control itp_input" name="fromDt" value="" readonly>
 														<span class="input-group-addon itp_date_to">~</span>
-														<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_TO" class="form-control itp_input" name="toDt" value="">
+														<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_TO" class="form-control itp_input" name="toDt" value="" readonly>
 													</div>
 												</div>
 												<div class="col-xs-2 itp_in itp_noMar">

src/main/webapp/app/loanmng/LOANMNG02010.html

@@ -26,21 +26,27 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_STORE_NM" class="form-control itp_input" placeholder="매장선택" readonly="readonly" value="" />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_STORE_NM" class="form-control itp_input" placeholder="매장선택" readonly="readonly" value="" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_LOANMNG02010_STORE_ERASE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-remove"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_ip itp_noMar">
 											<button type="button" id="ITP_BTN_LOANMNG02010_STORE_SEARCH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_LOANMNG02010_STORE_ERASE" 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">
-											<div class="col-xs-3 itp_ip itp_noMar" style="top:2px">
-												<label>입금일자</label>
+										<div class="col-xs-5 itp_ip itp_noMar">
+											<div class="col-xs-3 itp_ip itp_noMar">
+												<select id="ITP_FORM_LOANMNG02010_SEARCH_" class="form-control itp_input" >
+													<option value="">입금상태</option>
+												</select>	
 											</div>
 											<div class="col-xs-8 itp_ip itp_noMar">
 												<div class="input-daterange input-group date">
-													<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+													<input type="text" id="ITP_FORM_LOANMNG02010_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_LOANMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+													<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 												</div>
 											</div>
 										</div>
@@ -72,8 +78,7 @@
 								<input type="hidden" id="ITP_FORM_LOANMNG02010_DETAIL_STORE_ID" name="storeId" value="">
 					
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">입금정보</h4>
-									<div class="itp_form_in">
+									<div class="itp_form_in border-top">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 												<div class="col-xs-4 itp_ip">
@@ -95,7 +100,7 @@
 											</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="col-xs-7 itp_in">
 													<div class="input-group date">
 													<input type="text" id="ITP_FORM_LOANMNG02010_DETAIL_DPST_DT" class="form-control itp_input" name="dpstDt" readonly="readonly">
 													<span class="input-group-addon itp_input itp_date_to">
@@ -105,7 +110,7 @@
 												</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-8 itp_in">
@@ -114,7 +119,7 @@
 											</div>
 											<label class="col-xs-2 itp_lb">입금은행</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in">
+												<div class="col-xs-7 itp_in">
 													<select id="ITP_FORM_LOANMNG02010_DETAIL_DPST_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="dpstBnkCd">
 														<option value="">입금은행</option>
 													</select>												
@@ -125,10 +130,15 @@
 									<div class="itp_form_in">
 										<div class="form-group border">
 											<label class="col-xs-2 itp_lb">입금계좌번호</label>
-											<div class="col-xs-10 itp_ip">
-												<div class="col-xs-4 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in">
 													<input type="text" id="ITP_FORM_LOANMNG02010_DETAIL_RCV_ACCT_NO" class="form-control itp_input" name="rcvAcctNo">
 												</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>
 											</div>											
 										</div>
 									</div>
@@ -149,8 +159,7 @@
 								<input type="hidden" id="ITP_FORM_LOANMNG02010_VIEW_DPST_ST_CD" name="dpstStCd" 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">
@@ -182,7 +191,9 @@
 									<div class="itp_form_in">
 										<div class="form-group border">
 											<label class="col-xs-2 itp_lb">입금계좌번호</label>
-											<div class="col-xs-10 itp_ip fnRcvAcctNo"></div>											
+											<div class="col-xs-4 itp_ip fnRcvAcctNo"></div>		
+											<label class="col-xs-2 itp_lb"></label>
+											<div class="col-xs-4 itp_ip "></div>										
 										</div>
 									</div>
 								</section>								

src/main/webapp/app/loanmng/LOANMNG03010.html

@@ -20,21 +20,27 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_STORE_NM" class="form-control itp_input" name="sstoreNm" placeholder="매장선택" readonly="readonly" value="" />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_STORE_NM" class="form-control itp_input" name="sstoreNm" placeholder="매장선택" readonly="readonly" value="" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_LOANMNG03010_STORE_ERASE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-remove"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_ip itp_noMar">
 											<button type="button" id="ITP_BTN_LOANMNG03010_STORE_SEARCH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_LOANMNG03010_STORE_ERASE" 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">
-											<div class="col-xs-3 itp_ip itp_noMar" style="top:2px">
-												<label>정산요청일</label>
+										<div class="col-xs-6 itp_ip itp_noMar">
+											<div class="col-xs-3 itp_ip itp_noMar">
+												<select id="ITP_FORM_LOANMNG03010_SEARCH_" class="form-control itp_input" >
+													<option value="">정산요청일</option>
+												</select>	
 											</div>
 											<div class="col-xs-8 itp_ip itp_noMar">
 												<div class="input-daterange input-group date">
-													<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+													<input type="text" id="ITP_FORM_LOANMNG03010_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_LOANMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+													<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 												</div>
 											</div>
 										</div>										
@@ -64,8 +70,7 @@
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT" 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">
@@ -120,11 +125,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_LOANMNG03010_VIEW_jqGrid_list" class="itp_tb_list">
-					        <div id="ITP_LOANMNG03010_VIEW_jqGridView" class="itp_views fix"></div>
 					        <table id="ITP_LOANMNG03010_VIEW_jqGrid"></table>
 					        <div id="ITP_LOANMNG03010_VIEW_jqGridPager"></div>
 					        <div id="ITP_LOANMNG03010_VIEW_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/popup/biz/BIZPOP_ITEM_CLASS_MANAGE.html

@@ -1,5 +1,5 @@
 <div id="ITP_BIZPOP_ITEM_CLASS_MANAGE" class="modal itp_modal">
-	<div class="modal-dialog">
+	<div class="modal-dialog" style="width: 750px">
 		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -7,9 +7,8 @@
 			</div>
 			<div class="modal-body">
 				<div class="itp_form itp_type1 fix">
-							<div class="itp_madal_header">
-								<h4 class="itp_form_tit">분류 정보</h4>
-							</div>
+					<div class="itp_madal_header">
+					</div>
 					<div class="col-xs-12">
 						<div class="form-horizontal">
 							<form id="ITP_FORM_NOTICE_INFO_POPUP">
@@ -44,18 +43,11 @@
 											</div>
 										</div>
 									</div>
-									<div class="itp_form_in">
-										<div class="form-group">
-                                            <label class="col-xs-3 itp_lb">분류 코드 </label>
-                                            <div class="col-xs-9 itp_ip fnItemClassCd">
-                                            </div>
-                                        </div>
-									</div>
 									<div class="itp_form_in">
 										<div class="form-group colspan">
 											<label class="col-xs-2 itp_lb">분류명</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-6 itp_in">
+												<div class="col-xs-9 itp_in">
 													<input type="email" id="ITP_FORM_SITP_TAB_STINFO07010_POP_ITEM_CLASS_NM" data-check-required="empty" class="form-control itp_input" name="itemClassNm" placeholder="분류 3 Level">
 												</div>
 											</div>
@@ -83,6 +75,5 @@
 			</div>
 		</div>
 	</div>
-
 	<div id="ITP_POPUP_JS"></div>
 </div>

src/main/webapp/app/popup/biz/BIZPOP_PO_REJECT_REASON.html

@@ -12,7 +12,7 @@
 							<form id="ITP_FORM_PO_REJECT_REASON_POPUP">
 								<div class="form-group">
 									<label class="col-xs-2 itp_lb">반려사유</label>
-									<div class="col-xs-10 itp_ip">
+									<div class="col-xs-9 itp_ip">
 									<input type="text" id="ITP_FORM_PO_REJECT_REASON_POPUP_DSPT_RJCT_RSN" class="form-control itp_input" name="dsptRjctRsn" />
 									</div>									
 								</div>								

src/main/webapp/app/popup/biz/BIZPOP_PO_STOCK_PROC.html

@@ -18,35 +18,35 @@
 							
 								<div class="form-group">
 									<label class="col-xs-2 itp_lb">창고명</label>
-									<div class="col-xs-4 itp_ip fnWhsNm"></div>
+									<div class="col-xs-3 col_3 itp_ip fnWhsNm"></div>
 									<label class="col-xs-2 itp_lb">로케이션</label>
-									<div class="col-xs-4 itp_ip fnLocationNm"></div>
+									<div class="col-xs-3 col_3 itp_ip fnLocationNm"></div>
 								</div>
 								<div class="form-group">
 									<label class="col-xs-2 itp_lb">품목번호</label>
-									<div class="col-xs-4 itp_ip fnItemId"></div>
+									<div class="col-xs-4 col_3 itp_ip fnItemId"></div>
 									<label class="col-xs-2 itp_lb">품목명</label>
-									<div class="col-xs-4 itp_ip fnItemNm"></div>
+									<div class="col-xs-4 col_3 itp_ip fnItemNm"></div>
 								</div>
 								<div class="form-group border">
 									<label class="col-xs-2 itp_lb">현재고</label>
-									<div class="col-xs-4 itp_ip fnStckQty"></div>
+									<div class="col-xs-4 col_3 itp_ip fnStckQty"></div>
 									<label class="col-xs-2 itp_lb">관리등급</label>
-									<div class="col-xs-4 itp_ip"></div>
+									<div class="col-xs-4 col_3 itp_ip"></div>
 								</div>
 								<div class="form-group">
 									<label class="col-xs-2 itp_lb">창고선택</label>
-									<div class="col-xs-4 itp_ip">
+									<div class="col-xs-4 col_3 itp_ip">
 									<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID" class="form-control itp_input" name="targetWhsId"></select>
 									</div>
 									<label class="col-xs-2 itp_lb">Location</label>
-									<div class="col-xs-4 itp_ip">
+									<div class="col-xs-4 col_3 itp_ip">
 									<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_LOCATION" class="form-control itp_input" name="targetLocation"></select>
 									</div>
 								</div>
 								<div class="form-group colspan">
-									<label class="col-xs-2 itp_lb">이동수량</label>
-									<div class="col-xs-4 itp_ip">
+									<label class="col-xs-2 itp_lb colspan">이동수량</label>
+									<div class="col-xs-4 col_3 itp_ip">
 									<input type="text" id="ITP_FORM_PO_STOCK_PROC_POPUP_MOVE_QTY" class="form-control itp_input" name="moveQty" />
 									</div>									
 								</div>								

src/main/webapp/app/stockmng/STOCKMNG02010.html

@@ -27,7 +27,7 @@
 													<option value="">실사기준일</option>											
 												</select>
 											</div>
-											<div class="col-xs-3 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="input-daterange input-group date">
 													<input type="text" id="ITP_FORM_STOCKMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
 													<span class="input-group-addon itp_date_to">~</span>
@@ -77,14 +77,16 @@
 											<div class="col-xs-2 itp_ip itp_noMar">
 												<select id="ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" disabled="disabled"></select>	
 											</div>
-											<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="col-xs-2 itp_ip itp_noMar">
 												<select id="ITP_FORM_STOCKMNG02010_DETAIL_LOCATION" class="form-control itp_input" name="location" disabled="disabled"></select>										
 											</div>
 											<div class="col-xs-2 itp_ip itp_noMar">
 												<select id="ITP_FORM_STOCKMNG02010_DETAIL_CDD_DVSN" data-select-code="CDD_DVSN" class="form-control itp_input" name="cddDvsn"></select>										
 											</div>
-											<div class="col-xs-3 itp_ip itp_noMar">
+											<div class="col-xs-a itp_ip itp_noMar">
 												<input id="ITP_FORM_STOCKMNG02010_DETAIL_EXCEL_UPLOAD_SELECT_FILE" type="file" style="display:none;" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
+											</div>
+											<div class="col-xs-4 itp_ip itp_noMar">
 												<button type="button" id="ITP_BTN_STOCKMNG02010_DETAIL_EXCEL_UPLOAD" class="btn btn-warning btn-sm FFB"><i class="glyphicon "></i>&nbsp;&nbsp;엑셀업로드&nbsp;&nbsp;</button>
 												<button type="button" id="ITP_BTN_STOCKMNG02010_DETAIL_TEMPLATE_DOWNLOAD" class="btn btn-primary btn-sm FFB"><i class="glyphicon "></i>&nbsp;&nbsp;템플릿다운로드&nbsp;&nbsp;</button>
 											</div>
@@ -116,8 +118,7 @@
 				                <input type="hidden" id="ITP_FORM_STOCKMNG02010_VIEW_CDD_ID" name="cddId" value="">
 				    
 				                <section class="itp_form_sec">
-				                    <h4 class="itp_form_tit">재고실사 정보</h4>
-				                    <div class="itp_form_in">
+				                    <div class="itp_form_in border-top">
 				                        <div class="form-group">
 				                            <label class="col-xs-2 itp_lb">브랜드명</label>
 				                                <div class="col-xs-4 itp_ip">

src/main/webapp/app/stockmng/STOCKMNG04010.html

@@ -55,8 +55,7 @@
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_ID" name="whsId" 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">
@@ -98,12 +97,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_STOCKMNG04010_DETAIL_STORE_NM" class="form-control itp_input" name="storeNm" value="" readonly="readonly" />
+												<div class="col-xs-6 itp_in">
+													<div class="input-group">
+														<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_STORE_NM" class="form-control itp_input" name="storeNm" value="" readonly="readonly" />
+														<span class="input-group-btn">
+															<button id="ITP_BTN_STOCKMNG04010_SEARCH_MODIFY" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-search"></i></button>
+														</span>
+													</div>
 												</div>
 												<div class="col-xs-3 itp_in" style="padding:0px; margin-left: 3px;">
 													<button type="button" id="ITP_BTN_STOCKMNG04010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_BTN_STOCKMNG04010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 								                </div>
 				                            </div>
 				                            <label class="col-xs-2 itp_lb">등록일시</label>
@@ -143,7 +146,7 @@
 				        </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">Location 정보</h4>
 					        <div class="pull-right itp_cicon">
 					            <button type="button" id="ITP_BTN_STOCKMNG04010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;행추가&nbsp;&nbsp;</button>
@@ -151,7 +154,6 @@
 					        </div>
 					    </div>
 					    <div id="ITP_STOCKMNG04010_DETAIL_jqGrid_list" class="itp_tb_list">
-					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridView" class="itp_views fix"></div>
 					        <table id="ITP_STOCKMNG04010_DETAIL_jqGrid"></table>
 					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridPager"></div>
 					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
@@ -168,8 +170,7 @@
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_VIEW_WHS_ID" name="whsId" 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">
@@ -220,11 +221,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">Location 정보</h4>
 					    </div>
 					    <div id="ITP_STOCKMNG04010_VIEW_jqGrid_list" class="itp_tb_list">
-					        <div id="ITP_STOCKMNG04010_VIEW_jqGridView" class="itp_views fix"></div>
 					        <table id="ITP_STOCKMNG04010_VIEW_jqGrid"></table>
 					        <div id="ITP_STOCKMNG04010_VIEW_jqGridPager"></div>
 					        <div id="ITP_STOCKMNG04010_VIEW_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/css/style.css

@@ -587,13 +587,14 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 #ITP_ASIDE .itp_modal .modal-title {font-size:16px; color:#fff;}
 #ITP_ASIDE .itp_modal .itp_alert_txt {font-size:15px; padding:15px 0 10px 0;}
 #ITP_ASIDE .itp_modal .itp_form {padding:0 15px 0 15px;}
-#ITP_ASIDE .itp_modal .itp_form .form-group {margin-bottom:0px; height:60px; border-bottom:1px solid #aaa;}
+#ITP_ASIDE .itp_modal .itp_form .form-group {margin-bottom:0px; height:45px; border-bottom:1px solid #aaa;}
+#ITP_ASIDE .itp_modal .itp_form .colspan {height:60px !important;}
 #ITP_ASIDE .itp_modal .itp_form .shot{height:43px !important; border-bottom:1px solid #aaa;}
 #ITP_ASIDE .itp_modal .itp_form .form-group.border {border-bottom:1px solid #ddd;}
 #ITP_ASIDE .itp_modal .itp_form .form-control {font-size:13px; color:#333;}
-#ITP_ASIDE .itp_modal .itp_form .itp_lb {top:0; font-size:13px; margin:0; padding:13px 12px; height:58px; background:#eee; width:100px; min-width:100px; border-right:1px solid #aaa;}
+#ITP_ASIDE .itp_modal .itp_form .itp_lb {top:0; font-size:13px; margin:0; padding:13px 12px; height:44px; background:#eee; width:100px; min-width:100px; border-right:1px solid #aaa; border-left:1px solid #ccc;}
 #ITP_ASIDE .itp_modal .itp_form .itp_lb.itp_normal {font-weight:normal; padding-left:19px;}
-#ITP_ASIDE .itp_modal .itp_form .itp_ip {padding:9px 0 0 10px;;}
+#ITP_ASIDE .itp_modal .itp_form .itp_ip {padding:9px 10px 0 10px;;}
 #ITP_ASIDE .itp_modal .itp_form .itp_ip.itp_pr {margin-right:0; padding-right:10px;}
 #ITP_ASIDE .itp_modal .itp_form .itp_ip.itp_noMar {margin-right:0; padding-right:0px;}
 #ITP_ASIDE .itp_modal .itp_form .itp_ip_offset {padding-left:15px;}
@@ -650,7 +651,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
     -o-transform:translate(0, calc(50vh - 50%));
     transform:translate(0, 50vh) translate(0, -50%);
 }
-#ITP_ASIDE .itp_modal .itp_form.itp_type1 {padding:0; border:1px solid #aaa;}
+#ITP_ASIDE .itp_modal .itp_form.itp_type1 {padding:0; border:1px solid #aaa; border-left:none;}
 #ITP_ASIDE .itp_modal .itp_madal_header {padding-left:15px; border-bottom:1px solid #aaa;}
 #ITP_ASIDE .itp_modal .itp_form.itp_type1 .itp_help {font-size:12px; padding-top:6px;}
 #ITP_ASIDE .itp_modal .itp_form.itp_type1 .itp_txt {font-size:13px; width:auto; padding:5px 10px 0 0;}
@@ -704,6 +705,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 #ITP_ASIDE .itp_modal .modal-bottom {border-top:1px solid #aaa; height:50px; display:flex;}
 #ITP_ASIDE .itp_modal .modal-bottom .col_3 {width:40%; hegith:50px;}
 #ITP_ASIDE .itp_modal .modal-bottom .col_7 {width:60%; height:50px;}
+#ITP_ASIDE .form-group .col_3 {width:32%;}
 #ITP_NOT_FOUND {width:100%; height:100%;}
 #ITP_NOT_FOUND .itp_head {margin-bottom:8px; letter-spacing:-1px;}
 #ITP_NOT_FOUND .itp_bar {margin:0; padding:0; float:left; margin:0 15px 0 15px; font-size:22px;}

src/main/webapp/js/app/loanmng/ITP_LOANMNG01010.js

@@ -57,12 +57,13 @@ const gridColModel = {
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: "매장명", 
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'LOAN_MGNT_UNQ_NO', name: 'loanMgntUnqNo',
 			label: "여신관리번호", 
+			minwidth: 120,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
@@ -75,28 +76,28 @@ const gridColModel = {
 		{
 			index: 'LIMIT_AMT', name: 'limitAmt',
 			label: "한도금액", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'ACCT_BAL', name: 'acctBal',
 			label: "입금금액", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},		
 		{
 			index: 'POSB_LIMIT_AMT', name: 'posbLimitAmt',
 			label: "사용가능금액", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'USE_AMT_TOTAL', name: 'useAmtTotal',
 			label: '사용한금액', 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -141,21 +142,21 @@ const gridColModel = {
 		{
 			index: 'DPST_AMT', name: 'dpstAmt',
 			label: "입금",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PAYM_AMT', name: 'paymAmt',
 			label: "지급",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'TRSC_AF_BAL', name: 'trscAfBal',
 			label: "잔액",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},

src/main/webapp/js/app/loanmng/ITP_LOANMNG02010.js

@@ -66,7 +66,7 @@ const gridColModel = {
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: "매장명", 
-			width: '12', fixed: false, align: 'center',
+			width: '12', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -84,7 +84,7 @@ const gridColModel = {
 		{
 			index: 'DPST_AMT', name: 'dpstAmt',
 			label: "입금금액", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -104,6 +104,7 @@ const gridColModel = {
 			index: 'DPST_ST_NM', name: 'dpstStNm',
 			label: "입금상태", 
 			width: '6', fixed: false, align: 'center',
+			minwidth: 80,
 			sortable: false, hidden: false
 		},
 		{
@@ -115,24 +116,28 @@ const gridColModel = {
 		{
 			index: 'RCV_ACCT_NO', name: 'rcvAcctNo',
 			label: "입금계좌번호", 
+			minwidth: 140,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'REQ_DT', name: 'reqDt',
 			label: "요청일", 
+			minwidth: 120,
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'DPST_AUTH_DT', name: 'dpstAuthDt',
 			label: "승인일", 
+			minwidth: 120,
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'DSPT_RJCT_DT', name: 'dsptRjctDt',
 			label: "반려일", 
+			minwidth: 120,
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},

src/main/webapp/js/app/loanmng/ITP_LOANMNG03010.js

@@ -65,7 +65,7 @@ const gridColModel = {
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: "매장명", 
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -95,7 +95,7 @@ const gridColModel = {
 		{
 			index: 'STTL_REQ_AMT', name: 'sttlReqAmt',
 			label: '정산요청금액', 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -106,7 +106,7 @@ const gridColModel = {
 			sortable: false, hidden: false
 		},	
 		{
-			index: 'UNPAId_AMT', name: 'unpaidAmt',
+			index: 'UNPAId_AMT', name: 'right',
 			label: '미납금액', 
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false, 
@@ -115,7 +115,7 @@ const gridColModel = {
 		{
 			index: 'USE_AMT_TOTAL', name: 'useAmtTotal',
 			label: '사용가능한도', 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		}		

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_NEW_ITEM.js

@@ -22,8 +22,8 @@ function itp_fn_BIZPOP_NEW_ITEM(parentPopFn, args, returnType) {
 
 	// 공통코드 표시
 	$('select').each(function() {
-		if($(this).data('select-code')) {
-			fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
+		if($('#ITP_FORM_BIZPOP_STORE_PODR_PSSBL_DVSN').data('select-code')) {
+			fn_make_select(CODE_LIST, $('#ITP_FORM_BIZPOP_STORE_PODR_PSSBL_DVSN').data('select-code'), $('#ITP_FORM_BIZPOP_STORE_PODR_PSSBL_DVSN').attr('id'));
 		}
 	});
 

src/main/webapp/js/app/stockmng/ITP_STOCKMNG01010.js

@@ -44,42 +44,49 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
 			width: '10', fixed: false, align: 'center',
+			minwidth: 120,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: "매장명", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_ID', name: 'whsId',
 			label: "창고번호", 
 			width: '8', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_NM', name: 'whsNm',
 			label: "창고명", 
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
+			minwidth: 120,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
 			label: "Location명", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: "품목번호", 
 			width: '11', fixed: false, align: 'center',
+			minwidth: 180,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: "품목명", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 110,
 			sortable: false, hidden: false
 		},
 		{
@@ -91,25 +98,29 @@ const gridColModel = {
 		{
 			index: 'STCK_QTY', name: 'stckQty',
 			label: "현재고수량", 
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PRP_STCK_QTY', name: 'prpStckQty',
 			label: "적정재고수량", 
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'SFT_STCK_RT', name: 'sftStckRt',
 			label: "안전재고비율(%)", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
+			minwidth: 120,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'CUR_STCK_RT', name: 'curStckRt',
 			label: "현재고비율(%)", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
+			minwidth: 100,
 			sortable: false, hidden: false
 		}		
 	]

src/main/webapp/js/app/stockmng/ITP_STOCKMNG02010.js

@@ -204,6 +204,7 @@ const gridColModel = {
 			label: "정상여부",
 			width: '5', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
+			minwidth: 100,
 			editrules: {required: false}
 		},
 		{
@@ -216,7 +217,7 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: "브랜드",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text',
 			editrules: {required: false}
 		},
@@ -230,15 +231,16 @@ const gridColModel = {
 		{
 			index: 'WHS_NM', name: 'whsNm',
 			label: "창고명",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text',
 			editrules: {required: false}
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
 			label: "Location",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text',
+			minwidth: 100,
 			editrules: {required: false}
 		},
 		{

src/main/webapp/js/app/stockmng/ITP_STOCKMNG03010.js

@@ -50,7 +50,7 @@ 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',
 			sortable: false, hidden: false
 		},
 		{
@@ -68,44 +68,46 @@ const gridColModel = {
 		{
 			index: 'WHS_NM', name: 'whsNm',
 			label: "창고명", 
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
 			label: "Location명", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: "품목번호", 
-			width: '11', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: "품목명", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: "단위", 
-			width: '7', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PRP_STCK_QTY', name: 'prpStckQty',
 			label: "적정재고수량", 
-			width: '8', fixed: false, align: 'center',
+			classes: 'input_color',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: false}
 		},
 		{
 			index: 'SFT_STCK_RT', name: 'sftStckRt',
 			label: "안전재고비율(%)", 
-			width: '10', fixed: false, align: 'center',
+			classes: 'input_color',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: false}
 		}		

src/main/webapp/js/app/stockmng/ITP_STOCKMNG04010.js

@@ -61,13 +61,13 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: "매장명", 
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -79,7 +79,7 @@ const gridColModel = {
 		{
 			index: 'WHS_NM', name: 'whsNm',
 			label: "창고명", 
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -111,14 +111,14 @@ const gridColModel = {
 		{
 			index: 'LOCATION', name: 'location',
 			label: "로케이션",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text',
 			editrules: {required: true}
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
 			label: "로케이션명",
-			width: '12', fixed: false, align: 'center',
+			width: '12', fixed: false, align: 'left',
 			sortable: true, editable: false, edittype: 'text',
 			editrules: {required: true}
 		},
@@ -145,14 +145,15 @@ const gridColModel = {
 		{
 			index: 'LOCATION', name: 'location',
 			label: "로케이션",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: false}
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
 			label: "로케이션명",
-			width: '12', fixed: false, align: 'center',
+			width: '12', fixed: false, align: 'left',
+			classes: 'input_color',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: true}
 		},
@@ -162,6 +163,7 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_STCK_DVSN},
+			classes: 'input_color',
 			editrules: {required: true}
 		},
 		{
@@ -170,6 +172,7 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_LOC_ST_CD},
+			classes: 'input_color',
 			editrules: {required: true}
 		}
 	]