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

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

@@ -7,9 +7,9 @@
 			</div>
 			<div class="modal-body">
 				<div class="itp_form itp_type1 fix">
-					<div class="col-xs-12">
+					<div class="col-xs-12" style="border:1px solid #ccc;">
 						<div class="form-horizontal">
-							<h4 class="itp_form_tit">분류 정보</h4>
+							<h4 class="itp_header_title">분류 정보</h4>
 							<form id="ITP_FORM_NOTICE_INFO_POPUP">
 								<input type="hidden" id="ITP_FORM_STINFO07010_POP_VIEW_CD" name="viewCd" value="C">
 								<input type="hidden" id="ITP_FORM_STINFO07010_POP_BRAND_ID" name="brandId" value="">
@@ -53,7 +53,7 @@
 										<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-7 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>

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

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

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

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

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

@@ -92,15 +92,14 @@
 								<input type="hidden" id="ITP_FORM_STINFO05010_DETAIL_FILE_NO" name="shortContFileNo" value="">
 					
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">단가정보-신규</h4>
-									<div class="itp_form_in">
+									<div class="itp_form_in border-top">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 												<div class="col-xs-4 itp_ip fnBrandNm">
 												</div>
 											<label class="col-xs-2 itp_lb">상태 *</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-10 itp_in">
+												<div class="col-xs-4 itp_in">
 									                <select id="ITP_FORM_STINFO05010_DETAIL_UNIT_ST_CD" data-select-code="UNIT_ST_CD" data-check-required="empty" class="form-control itp_input" name="unitStCd"></select>
 								                </div>
 											</div>
@@ -132,11 +131,11 @@
 													<div class="col-xs-3 itp_in" style="padding-left: 5px;">
 														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SCH_SPPLY_NM" class="form-control itp_input" value="공급업체명" maxlength="100" readonly>
 									                </div>
-													<div class="col-xs-2 itp_in" style="padding-left: 5px;">
+													<div class="col-xs-a itp_in" style="padding-left: 5px;">
 														<button type="button" id="ITP_BTN_STINFO05010_DETAIL_SPPLY_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
 														<button type="button" id="ITP_BTN_STINFO05010_DETAIL_SPPLY_DELETE" 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_in" style="padding-left: 5px; left:-40px;">
+									                <div class="col-xs-3 itp_in" style="padding-left: 5px;">
 														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SPPLY_ITEM_ID" class="form-control itp_input" name="spplyItemId" value="" placeholder="공급업체 품번" maxlength="100">
 									                </div>
 												</div>
@@ -165,67 +164,58 @@
 											</div>
 										</div>
 									</div>
-									<div class="itp_form_ip">	
+									<div class="itp_form_in">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">계약기간 *</label>
-											<div class="col-xs-3 itp_ip itp_noMar">
-												<div class="input-daterange input-group date">
-													<input type="text" id="ITP_FORM_STINFO05010_DETAIL_CONT_STT_DT" data-check-required="empty" class="form-control itp_input" name="contSttDt" value="" readonly>
-													<span class="input-group-addon itp_date_to">~</span>
-													<input type="text" id="ITP_FORM_STINFO05010_DETAIL_CONT_END_DT" data-check-required="empty" class="form-control itp_input" name="contEndDt" value="" readonly>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in itp_noMar">
+													<div class="input-daterange input-group date">
+														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_CONT_STT_DT" data-check-required="empty" class="form-control itp_input" name="contSttDt" value="" readonly>
+														<span class="input-group-addon itp_date_to">~</span>
+														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_CONT_END_DT" data-check-required="empty" class="form-control itp_input" name="contEndDt" value="" readonly>
+													</div>
 												</div>
 											</div>
-											<div class="col-xs-1 itp_ip"></div>
 											<label class="col-xs-2 itp_lb">리드타임</label>
-											<div class="col-xs-2 itp_ip noMar">
-												<input type="text" id="ITP_FORM_STINFO05010_DETAIL_LEAD_TIME" class="form-control itp_input" name="leadTime" value="" maxlength="100">
+											<div class="col-xs-4 itp_ip ">
+												<div class="col-xs-4 itp_in ">
+													<input type="text" id="ITP_FORM_STINFO05010_DETAIL_LEAD_TIME" class="form-control itp_input" name="leadTime" value="" maxlength="100">
+												</div>
+											<label>(Day)</label>
 											</div>
-											<label class="itp_ip">(Day)</label>
-											<div class="col-xs-1 itp_ip"></div>
 										</div>								
-									</div>
-									<div class="itp_form_in">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">단위 *</label>
-											<div class="col-xs-2 itp_ip itp_noMar">
-								                <select id="ITP_FORM_STINFO05010_DETAIL_UNIT" data-select-code="DSTRBT_COST_UNIT" data-check-required="empty" class="form-control itp_input" name="unit" disabled></select>
+											<div class="col-xs-4 itp_ip ">
+												<div class="col-xs-5 itp_in">
+								                	<select id="ITP_FORM_STINFO05010_DETAIL_UNIT" data-select-code="DSTRBT_COST_UNIT" data-check-required="empty" class="form-control itp_input" name="unit" disabled></select>
+												</div>
 											</div>
-											<div class="col-xs-2 itp_ip"></div>
 											<label class="col-xs-2 itp_lb">단가</label>
-											<div class="col-xs-3 itp_ip noMar">
-												<input type="text" id="ITP_FORM_STINFO05010_DETAIL_UNIT_AMT" class="form-control itp_input" name="unitAmt" value="" maxlength="100">
+											<div class="col-xs-4 itp_ip ">
+												<div class="col-xs-4 itp_in">
+													<input type="text" id="ITP_FORM_STINFO05010_DETAIL_UNIT_AMT" class="form-control itp_input" name="unitAmt" value="" maxlength="100">
+												</div>
 											</div>
-											<label class="itp_in">&nbsp;</label>
 										</div>								
-									</div>
-									<div class="itp_form_in">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">통화 *</label>
-											<div class="col-xs-2 itp_ip itp_noMar">
-						                		<select id="ITP_FORM_STINFO05010_DETAIL_CURR" data-select-code="CURR" data-check-required="empty" class="form-control itp_input" name="curr"></select>
+											<div class="col-xs-4 itp_ip">
+						                		<div class="col-xs-5 itp_in">
+						                			<select id="ITP_FORM_STINFO05010_DETAIL_CURR" data-select-code="CURR" data-check-required="empty" class="form-control itp_input" name="curr"></select>
+					                			</div>
 					                		</div>
-											<div class="col-xs-2 itp_ip"></div>
 											<label class="col-xs-2 itp_lb">매장판매단가</label>
-											<div class="col-xs-2 itp_ip noMar">
-												<input type="text" id="ITP_FORM_STINFO05010_DETAIL_STORE_SALE_UNIT_AMT" class="form-control itp_input" name="storeSaleUnitAmt" value="" maxlength="100">
-											</div>
-											<label class="col-xs-3 itp_in">&nbsp;</label>
-										</div>								
-									</div>
-									<div class="itp_form_in">	
-										<div class="form-group border">
-											<label class="col-xs-2 itp_lb">계약문서</label>
-											<div class="col-xs-10 itp_ip colspan">
-												<div class="fileupload-wrapper">
-													<!-- data-show-yn: 파일업로드를 할 수 있는 권한이 있는지 없는지.. -->
-													<div id="ITP_STINFO05010_DETAIL_UPLOAD" data-show-yn="Y"></div>
+											<div class="col-xs-4 itp_ip noMar">
+												<div class="col-xs-4 itp_in">
+													<input type="text" id="ITP_FORM_STINFO05010_DETAIL_STORE_SALE_UNIT_AMT" class="form-control itp_input" name="storeSaleUnitAmt" value="" maxlength="100">
 												</div>
 											</div>
-										</div>	
+										</div>								
 									</div>
 									<div class="itp_form_info">	
 										<div class="itp_form_in">
-											<div class="form-group border">
+											<div class="form-group">
 												<label class="col-xs-2 itp_lb">등록자/등록일 </label>
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-a itp_in">
@@ -249,6 +239,17 @@
 											</div>	
 										</div>		
 									</div>
+									<div class="itp_form_in">	
+										<div class="form-group border">
+											<label class="col-xs-2 itp_lb">계약문서</label>
+											<div class="col-xs-10 itp_ip colspan">
+												<div class="fileupload-wrapper">
+													<!-- data-show-yn: 파일업로드를 할 수 있는 권한이 있는지 없는지.. -->
+													<div id="ITP_STINFO05010_DETAIL_UPLOAD" data-show-yn="Y"></div>
+												</div>
+											</div>
+										</div>	
+									</div>
 								</section>								
 							</form>
 						</div>
@@ -263,8 +264,7 @@
 								<input type="hidden" id="ITP_FORM_STINFO05010_VIEW_BRAND_UNIT_UNQ_NO" name="brandUnitUnqNo" value="">
 					
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">단가정보-상세</h4>
-									<div class="itp_form_in">
+									<div class="itp_form_in border-top">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 												<div class="col-xs-4 itp_ip fnBrandNm">

src/main/webapp/css/style.css

@@ -552,17 +552,20 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 }
 
 /* ITP_ASIDE */
-#ITP_ASIDE .itp_modal .modal-header {padding:12px 15px 12px 15px; background:#337ab7; cursor:move;}
+#ITP_ASIDE .itp_modal .modal-header {padding:12px 15px 12px 15px; background:#F0831E; cursor:move;}
 #ITP_ASIDE .itp_modal .modal-header .close {color:#fff; opacity:1;}
 #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:10px;}
+#ITP_ASIDE .itp_modal .itp_form .form-group {margin-bottom:0px; border-bottom:1px solid #bbb;}
 #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 {font-size:13px; padding-top:5px; padding-right:0; color:#333; position:relative;}
+
+#ITP_ASIDE .itp_modal .itp_form .itp_lb {text-align:center; width:0px; min-width:120px; padding:0; padding-top:20px; margin:0 -10px 0 0px; height:60px; background:#eee; border-right:1px solid #ccc;}
+
+#ITP_ASIDE .itp_modal .itp_header_title {border-bottom:1px solid #ccc; margin:0px -15px; padding:15px;}
 #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-left:0; padding-right:0;}
+#ITP_ASIDE .itp_modal .itp_form .itp_ip {padding-left:20px; padding-right:0; padding-top: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;}

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

@@ -1039,4 +1039,4 @@ td.menu_text {
 
 .ui-jqgrid .jqgrid-rownum {background-color: transparent !important;}
 .table>tbody>tr.active .jqgrid-rownum {background:#e8e8e8 !important; z-index:1}
-.table>tbody>tr.success .jqgrid-rownum {background:#dff0d8 !important;}
+.table>tbody>tr.success .jqgrid-rownum {background:#ECFEE4 !important;}

src/main/webapp/js/app/locales/locale-ko.js

@@ -395,7 +395,7 @@ const ITP_MSG_LOCALE = (function() {
 			},
 			"grid": {
 				"noData": "등록된 게시물이 없습니다.",
-				"noSrh": "검색 결과가 없습니다.<br><u>이전 검색 결과로 돌아가기</u>",
+				"noSrh": "검색 결과가 없습니다.",
 				"noStore": "연결된 매장이 없습니다.",
 				"noOrder": "주문이 발생한 매장이 없습니다.",
 				"noOrderSt": "발생된 주문이 없습니다."

src/main/webapp/js/app/oper/ITP_OPER03010.js

@@ -153,8 +153,6 @@ let pageObj = {
 		this.ui.init();
 		this.event.init();
 	},
-	itp_OPER03010_param: {},
-	itp_OPER03010_search: false,
 	ui: {
 		init: function () {
 			this.view();
@@ -191,7 +189,7 @@ let pageObj = {
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(OPER03010_GRID_ID, OPER03010_GRID_LIST, 'lg');
-			listObj.empty.init();
+			//listObj.empty.init();
 			itp_fn_fire_window_resize();
 		},
 		ready: function() {
@@ -372,35 +370,18 @@ let listObj = {
 	},
 	empty: {
 		init: function() {
-			// ==>dwkim var _this = this;
 			this.push();
-			/*  ==>dwkim 
-			$(OPER03010_GRID_EMPTY).on('click', function() {
-				_this.back();
-				_this.itp_OPER03010_param.gridSize = $.jgrid.defaults.rowNum;
-				$(OPER03010_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_OPER03010_param)}).trigger('reloadGrid');
-			});
-			*/
 		},
-		itp_OPER03010_param: {},
 		push: function() {
-			let param = $('#ITP_FORM_OPER03010_SEARCH').serializeObject();
-			pageObj.itp_OPER03010_param = param;
 		},
 		back: function() {
-			$('#ITP_FORM_OPER03010_SEARCH_FROM_DT').val(pageObj.itp_OPER03010_param.fromDt);
-			$('#ITP_FORM_OPER03010_SEARCH_TO_DT').val(pageObj.itp_OPER03010_param.toDt);
-			$('#ITP_FORM_OPER03010_SEARCH_AFFL_SHOP_NM').val(pageObj.itp_OPER03010_param.safflShopNm);
-			$('#ITP_FORM_OPER03010_SEARCH_ST_CD').val(pageObj.itp_OPER03010_param.sstCd);
 		}
 	},
 	grid: {
 		init: function () {
 			// 데이터 없을때
-			listObj.empty.push();
 			itp_fn_jqgrid_resize(OPER03010_GRID_ID, OPER03010_GRID_LIST, 'lg');
 			itp_fn_fire_window_resize();
-			// ==>dwkim this.reload();
 			this.search();
 		},
 		colModel: gridColModel.list,
@@ -430,8 +411,9 @@ let listObj = {
 					}
 				},
 				loadComplete: function(data) {
-					console.log(data);
-					itp_fn_grid_load_complete(data, OPER03010_GRID_ID, true, 'number', 'OPER03010', pageObj.itp_OPER03010_search, listObj.empty, true, data.gridRecords, true);
+					console.log("loadComplete=======================");
+					console.log(listObj.itp_OPER03010_search);
+					itp_fn_grid_load_complete(data, OPER03010_GRID_ID, true, 'number', 'OPER03010', listObj.itp_OPER03010_search, listObj.empty, true, data.gridRecords, true);
 					var ids = $(OPER03010_GRID_ID).getDataIDs();
 					$.each(ids, function(idx, rowId) {
 						$(OPER03010_GRID_ID).jqGrid('setCell', rowId, 'afflShopNm', '', ITP_GRID_COL_STYLE.link);
@@ -440,18 +422,10 @@ let listObj = {
 			};
 			itp_fn_grid_make_remote(option);
 		},
-		/* ==>dwkim
-		reload : function() {
-			var _this = this;
-			$(OPER03010_GRID_EMPTY).off('click').on('click', function() {
-				pageObj.itp_OPER03010_param.gridSize = $.jgrid.defaults.rowNum;
-				$(OPER03010_GRID_ID).setGridParam({'postData': JSON.stringify(pageObj.itp_OPER03010_param)}).trigger('reloadGrid');
-			});
-		}, */
 		clearData : function() {
 			$(OPER03010_GRID_ID).jqGrid('clearGridData', true);
 			$(OPER03010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
-			$(OPER03010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
+			$(OPER03010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noSrh);
 			$(OPER03010_GRID_EMPTY).show();
 		},
 		unload : function() {

src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js

@@ -184,7 +184,7 @@ let pageObj = {
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(ORDMNG01010_GRID_ID, ORDMNG01010_GRID_LIST, 'lg');
-			listObj.empty.init();
+			//listObj.empty.init();
 			itp_fn_fire_window_resize();
 		},
 		ready: function() {
@@ -302,6 +302,7 @@ let listObj = {
 	},
 	empty: {
 		init: function() {
+			/* 
             var _this = this;
             this.push();
             $(ORDMNG01010_GRID_EMPTY).on('click', function() {
@@ -309,24 +310,29 @@ let listObj = {
                 listObj.itp_ORDMNG01010_param.gridSize = $.jgrid.defaults.rowNum;
                 $(ORDMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(listObj.itp_ORDMNG01010_param)}).trigger('reloadGrid');
             });
+*/
         },
         push: function() {
+	/*
             let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
             listObj.itp_ORDMNG01010_param = param;
             //listObj.itp_ORDMNG01010_param.sbrandId = LOGIN_USER_INFO.brandId;
             //listObj.itp_ORDMNG01010_param.sspplyId = LOGIN_USER_INFO.spplyId;
             listObj.itp_ORDMNG01010_param.sidx = '0';
+*/
         },
         back: function() {
+	/*
             $('#ITP_FORM_ORDMNG01010_SERVICE_BRAND_TYPE').val(listObj.itp_ORDMNG01010_param.brandType);
             $('#ITP_FORM_ORDMNG01010_SERVICE_ST_CD').val(listObj.itp_ORDMNG01010_param.stCd);
             $('#ITP_FORM_ORDMNG01010_SEARCH_BRAND_NM').val(listObj.itp_ORDMNG01010_param.brandNm);
+*/
         }
 	},
 	grid: {
 		init: function() {
 			// 데이터 없을때
-            listObj.empty.push();
+            //listObj.empty.push();
             this.search();
 		},
 		colModel: gridColModel.list,

src/main/webapp/js/app/ordmng/ITP_ORDMNG02010.js

@@ -172,8 +172,12 @@ let pageObj = {
 			});
 			
 			$('body').on('click', function(e) {
-				var gridId = ORDMNG02010_DETAIL_GRID_ID.replace('#', '');
-				itp_fn_grid_reset_selection(e, ORDMNG02010_GRID_LAST_ROW_ID, gridId, 'ORDMNG02010');
+				var gridId = (ORDMNG02010_DETAIL_GRID_ID).replace('#', '');
+				var rids = $(ORDMNG02010_DETAIL_GRID_ID).jqGrid('getDataIDs');
+				var last_row_id = rids[rids.length - 1];
+				
+				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'ORDMNG02010_DETAIL');
+				modifyObj.button.recal();
 			})
 		}
 	},
@@ -374,6 +378,27 @@ let modifyObj = {
 				}
 			};
 			itp_fn_modal_confirm('저장 하시겠습니까?', modalFn);
+		},
+		recal: function() {
+			var ids = $(ORDMNG02010_DETAIL_GRID_ID).getDataIDs();
+			$.each(ids, function(idx, rowId) {
+				var unitAmt = jQuery(ORDMNG02010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'unitAmt');
+				var shmtQty = jQuery(ORDMNG02010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'shmtQty');
+				if (!isNaN(unitAmt) && !isNaN(shmtQty)) {
+					if (unitAmt != null && unitAmt != '' && shmtQty != null && shmtQty != '') {
+						jQuery(ORDMNG02010_DETAIL_GRID_ID).jqGrid('setRowData', rowId, {podrAmt: parseInt(unitAmt) * parseInt(shmtQty)});
+					}
+				}				
+			});
+			
+			const rowData = $(ORDMNG02010_DETAIL_GRID_ID).getRowData();
+			var podrTotalAmt = 0;
+			$.each(rowData, function(key, value) {
+				if(value.podrAmt != null && value.podrAmt != "") {
+					podrTotalAmt = podrTotalAmt + parseInt(value.podrAmt);
+				}
+			});
+			$('#ITP_FORM_ORDMNG02010_DETAIL .fnPodrTotalAmt').text(itp_fn_number_comma(podrTotalAmt));
 		}
 	},
 	empty: {
@@ -405,7 +430,6 @@ let modifyObj = {
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnBrandNm').text(result.brandNm);										// 브랜드
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnPchPodrUnqNo').text(result.invPoInfoList[0].pchPodrUnqNo);			// 발주번호		
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품서생성일자
-		$('#ITP_FORM_ORDMNG02010_DETAIL .fnPodrTotalAmt').text(result.podrTotalAmt);							// 발주총금액
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnWhsNm').text(result.whsNm);											// 발주총금액
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDeliTelNo').text(result.deliTelNo);									// 납품장소연락처
 		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT').val(result.dlvSchDt);			// 납품예정일
@@ -421,7 +445,7 @@ let modifyObj = {
     			selRowData = $(ORDMNG02010_DETAIL_GRID_ID).jqGrid('getRowData', selectedIds[i]);		//cell 선택
     		}
     		let podrQty = selRowData.podrQty;
-    		if(Number(value) > Number(podrQty)) {
+    		if(Number(value) > Number(podrQty) || value == null || value == '') {
 				return [false, '발주수량 이하 값 입력'];
 			} else if (Number(value) < 0) {
 				return [false, '음수 입력 불가'];
@@ -464,62 +488,69 @@ let modifyObj = {
 					{
 						index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
 						label: ITP_MSG_LOCALE.label.pchPodrUnqNo,
-						width: '10', fixed: false, align: 'center',
+						width: '8', fixed: false, align: 'center',
 						sortable: false, hidden: true
 					},
 					{
 						index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
 						label: ITP_MSG_LOCALE.label.pchPodrDtlNo,  		//발주항번
-						width: '20', fixed: false, align: 'center',
+						width: '8', fixed: false, align: 'center',
 						sortable: false, hidden: false, edittype: 'text',
 						editable: false
 					},
 					{
 						index: 'ITEM_ID', name: 'itemId',
 						label: ITP_MSG_LOCALE.label.itemId, 			//품목번호
-						width: '20', fixed: false, align: 'center',
+						width: '10', fixed: false, align: 'center',
 						sortable: false, hidden: false, edittype: 'text',
 						editable: false
 					},
 					{
 						index: 'ITEM_NM', name: 'itemNm',
 						label: ITP_MSG_LOCALE.label.itemNm,  			//품목명
-						width: '20', fixed: false, align: 'center',
+						width: '10', fixed: false, align: 'center',
 						sortable: false, hidden: false, edittype: 'text',
 						editable: false
 					},
 					{
 						index: 'UNIT', name: 'unit',
 						label: ITP_MSG_LOCALE.label.unit,  				//기본단위
-						width: '20', fixed: false, align: 'center',
+						width: '8', fixed: false, align: 'center',
 						sortable: false, hidden: false, edittype: 'text',
 						editable: false
 					},
+					{
+						index: 'UNIT_AMT', name: 'unitAmt',
+						label: ITP_MSG_LOCALE.label.unitAmt,  			//단가
+						width: '20', fixed: false, align: 'center',
+						sortable: false, hidden: true, edittype: 'text',
+						editable: false
+					},
 					{
 						index: 'PODR_QTY', name: 'podrQty',
 						label: ITP_MSG_LOCALE.label.podrQty,  			//발주수량
-						width: '20', fixed: false, align: 'center',
+						width: '8', fixed: false, align: 'center',
 						sortable: false, hidden: false, edittype: 'text',
 						editable: false
 					},
 					{
 						index: 'SHMT_QTY', name: 'shmtQty',
 						label: ITP_MSG_LOCALE.label.shmtQty, 	 		//출하수량
-						width: '20', fixed: false, align: 'center',
+						width: '8', fixed: false, align: 'center',
 						sortable: false, hidden: false, edittype: 'text',
 						editable: true, editrules: {number: true, custom: true, custom_func: shmtQtyValue}
 					},
 					{
 						index: 'EXPRY_YN', name: 'expryYn',
 						label: ITP_MSG_LOCALE.label.expryYn,  			//유통기한여부
-						width: '20', fixed: false, align: 'center',
+						width: '10', fixed: false, align: 'center',
 						sortable: false, hidden: false, edittype: 'text',
 						editable: false
 					},
 					{
 						index: 'EXPRY_DATE', name: 'expryDate',
 						label: ITP_MSG_LOCALE.label.expryDate,  		//유통기한일자
-						width: '20', fixed: false, align: 'center',
+						width: '10', fixed: false, align: 'center',
 						sortable: false, hidden: false, 
 						editable: true, sorttype: 'date',
 				        editoptions: {dataInit: function(e) {$(e).datepicker(ITP_DATE_LANGUAGE);}},
@@ -528,10 +559,17 @@ let modifyObj = {
 					{
 						index: 'REMARK', name: 'deliDesc',				//API 비고 키
 						label: ITP_MSG_LOCALE.label.remark,  			//locale-ko 비고 값
-						width: '20', fixed: false, align: 'center',
+						width: '10', fixed: false, align: 'center',
 						sortable: false, hidden: false, edittype: 'text',
 						editable: true
-					}
+					},
+					{
+						index: 'PODR_AMT', name: 'podrAmt',
+						label: ITP_MSG_LOCALE.label.podrAmt,  		//발주금액
+						width: '20', fixed: false, align: 'center',
+						sortable: false, hidden: true, edittype: 'text',
+						editable: false
+					},
 				],
 				data: gridData,
 				multiselect: true,

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

@@ -54,19 +54,19 @@ const gridColModel = {
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: ITP_MSG_LOCALE.label.storeNm, //매장명
-			width: '13', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'BRAND_ID', name: 'brandId',
 			label: ITP_MSG_LOCALE.label.brandId, //브랜드ID
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: true
 		},
 		{
 			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
 		},
 		{
@@ -78,13 +78,13 @@ const gridColModel = {
 		{
 			index: 'STORE_DVSN', name: 'storeDvsn',
 			label: ITP_MSG_LOCALE.label.storeDvsn, //매장구분
-			width: '15', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: true
 		},
 		{
 			index: 'STORE_DVSN_NM', name: 'storeDvsnNm',
 			label: ITP_MSG_LOCALE.label.storeDvsn, //매장구분명
-			width: '15', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{

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

@@ -63,7 +63,7 @@ const gridColModel = {
 		{
 			index: 'SFFLY_NM', name: 'spplyNm',
 			label: ITP_MSG_LOCALE.label.spplyNm, //공급업체명
-			width: '13', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -75,13 +75,13 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
-			width: '10', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'BSNS_REG_NO', name: 'bsnsRegNo',
 			label: ITP_MSG_LOCALE.label.bsnsRegNo, //사업자등록번호
-			width: '13', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{

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

@@ -61,37 +61,37 @@ const gridColModel = {
         {
             index: 'ITEM_ID', name: 'itemId',
             label: ITP_MSG_LOCALE.label.itemId, //품목번호
-            width: '11', fixed: false, align: 'center',
+            width: '14', fixed: false, align: 'center',
             sortable: false, hidden: false
         },
         {
             index: 'ITEM_NM', name: 'itemNm',
             label: ITP_MSG_LOCALE.label.itemNm, //품목명
-            width: '13', fixed: false, align: 'center',
+            width: '10', fixed: false, align: 'left',
             sortable: false, hidden: false
         },
         {
             index: 'ITEM_TYPE_NM', name: 'itemTypeNm',
             label: ITP_MSG_LOCALE.label.itemTypeNm, //품목유형
-            width: '13', fixed: false, align: 'center',
+            width: '9', fixed: false, align: 'center',
             sortable: false, hidden: false
         },
         {
             index: 'ITEM_CLASS_NM', name: 'itemClassNm',
             label: ITP_MSG_LOCALE.label.itemClassNm, //품목분류
-            width: '15', fixed: false, align: 'center',
+            width: '9', fixed: false, align: 'center',
             sortable: false, hidden: false
         },
         {
             index: 'ST_CD', name: 'itemStNm',
             label: ITP_MSG_LOCALE.label.stNm, //상태
-            width: '6', fixed: false, align: 'center',
+            width: '7', fixed: false, align: 'center',
             sortable: false, hidden: false
         },
         {
             index: 'PODR_PSSBLDVSN_NM', name: 'podrPssblDvsnNm',
             label: ITP_MSG_LOCALE.label.podrPssblDvsnNm, //발주여부
-            width: '7', fixed: false, align: 'center',
+            width: '9', fixed: false, align: 'center',
             sortable: false, hidden: false
         },
         {
@@ -103,7 +103,7 @@ const gridColModel = {
         {
             index: 'PCH_ITEM_YN', name: 'pchItemYn',
             label: ITP_MSG_LOCALE.label.pchItemYn, //구매품목여부
-            width: '6', fixed: false, align: 'center',
+            width: '8', fixed: false, align: 'center',
             sortable: false, hidden: false
         },
         {
@@ -411,10 +411,30 @@ let viewObj = {
         pageObj.switchScreen('VIEW');
         $('#ITP_FORM_STINFO04010_VIEW #ITP_FORM_STINFO04010_VIEW_ITEM_ID').val(result.itemId);
         $('#ITP_FORM_STINFO04010_VIEW .fnStCd').text(result.itemStNm);
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass1').text(result.itemClass1Nm);
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass2').text(result.itemClass2Nm);
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass3').text(result.itemClass3Nm);
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass4').text(result.itemClass4Nm);
+        var itemClassNm = ""; //itemClassNm 값 없음
+        
+		if (result.itemClass1Nm != null && result.itemClass1Nm != "")//itemclass1Nm 값이 있을때
+		{
+			var itemClassNm = result.itemClass1Nm;  //itemClassNm 에 itemClass1Nm 값 넣음
+		}
+		
+		if (result.itemClass2Nm != null && result.itemClass2Nm != "")//itemclass2Nm 값이 있을때
+		{
+			var itemClassNm = itemClassNm + " " + ">" + " " + result.itemClass2Nm;	//itemClassNm 에 itemClassNm + > + itemClass2Nm 값 넣음
+		}
+		
+		if (result.itemClass3Nm != null && result.itemClass3Nm != "")//itemclass3Nm 값이 있을때
+		{
+			var itemClassNm = itemClassNm + " " + ">" + " " + result.itemClass3Nm;	//itemClassNm 에 itemClassNm + > + itemClass3Nm 값 넣음		
+		}
+		
+		if (result.itemClass4Nm != null && result.itemClass4Nm != "")//itemclass4Nm 값이 있을때
+		{
+			var itemClassNm = itemClassNm + " " + ">" + " " + result.itemClass4Nm;	//itemClassNm 에 itemClassNm + > + itemClass4Nm 값 넣음
+
+		}
+        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass1').text(result.itemClassNm);
+
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClassMgntNo').text(result.itemClassMgntNo);
         $('#ITP_FORM_STINFO04010_VIEW .fnItemType').text(result.itemType);
         

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

@@ -51,25 +51,25 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목번호
-			width: '13', fixed: false, align: 'center',
+			width: '16px', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
-			width: '15', fixed: false, align: 'center',
+			width: '12', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'SPPLY_ID_NM', name: 'spplyNm',
 			label: ITP_MSG_LOCALE.label.spplyNm, //공급업체명
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: ITP_MSG_LOCALE.label.unit, //기본단위
-			width: '6', fixed: false, align: 'center',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -81,7 +81,7 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
-			width: '6', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -99,7 +99,7 @@ const gridColModel = {
 		{
 			index: 'LEAD_TIME', name: 'leadTime',
 			label: ITP_MSG_LOCALE.label.leadTime, //리드타임 (Day)
-			width: '6', fixed: false, align: 'center',
+			width: '16', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -356,6 +356,8 @@ let listObj = {
 				gridId: STINFO05010_GRID_ID,
 				colModel: gridColModel.list,
 				param: param,
+				autowidth: true,
+				shrinkToFit :false,
 				url: DOMAIN + API_DETAIL_GRID_LIST,
 				pager: STINFO05010_GRID_PAGER,
 				onCellSelect: function(rowId, cellIdx, cellValue) {

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

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

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

@@ -43,9 +43,12 @@
 		  </div>
 		   <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
 			  <ul id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS" class="panel-group"></ul>
-			  <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
+			  <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list3 list-row">
-				  <div>
+				  <div class="scroll_btn">
+			  		<input type="checkbox">
+			  	  </div>
+				  <div class="btn_check">
 					<div class="left">
 					  <div class="nomal">
 						<label class="col_0">브랜드명 &nbsp;:</label>
@@ -104,9 +107,6 @@
 						<div>
 						  <div class="fnRtnDodrTotalAmt space0"></div>
 						</div>
-						<div class="scroll_btn">
-						  <button id="ITP_BTN_MCOLLMNG02010_LIST_CHOICE">선택</button>
-						</div>
 					  </div>
 					</div>
 				  </div>

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

@@ -46,7 +46,10 @@
 			  <ul id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS" class="panel-group"></ul>
 			  <div id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list3 list-row">
-				  <div>
+				  <div class="scroll_btn">
+			  		<input type="checkbox">
+			  	  </div>
+				  <div class="btn_check">
 					<div class="left">
 					  <div class="nomal">
 						<label class="col_0">브랜드명 &nbsp;:</label>

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

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

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

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

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

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

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

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