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

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

@@ -40,9 +40,7 @@
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
 										<div class="col-xs-1 itp_ip" style="width:11%;">
-											<select id="ITP_FORM_OPER01010_SERVICE_ST_DT" class="form-control itp_input" name="serviceStDt">
-												<option value="">가입일</option>											
-											</select>
+											<label>가입일</label>
 										</div>
 										<div class="col-xs-3 itp_ip">
 											<div class="input-daterange input-group date">

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

@@ -316,15 +316,13 @@
 											<div class="col-xs-4 itp_ip fnBsnsRegNo"></div>
 											<label class="col-xs-2 itp_lb">법인번호</label>
 											<div class="col-xs-4 itp_ip fnCorpRegNo"></div>
-										</div>
-										
+										</div>										
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">대표자명* </label>
 											<div class="col-xs-4 itp_ip fnOwnerNm"></div>
 											<label class="col-xs-2 itp_lb">오더퀸 브랜드코드</label>
 											<div class="col-xs-4 itp_ip fnOqBrandId"></div>
-										</div>
-										
+										</div>										
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">전화번호</label>
 											<div class="col-xs-4 itp_ip fnTelNo"></div>

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

@@ -0,0 +1,70 @@
+<div id="ITP_DSPT_INFO_REG_POPUP" class="modal itp_modal">
+	<div class="modal-dialog">
+		<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+					<h5 class="modal-title">수발주 입금 정보 등록 화면</h5>
+				</div>
+				<div class="modal-body">
+					<label>수발주 현금 입금 정보를 확인 하시고 입금요청 버튼을 클릭하여 입금등록을 진행해 주시기 바랍니다.</label>
+					<div class="itp_form itp_type1 fix">
+						<div class="col-xs-12">
+							<div class="form-horizontal">
+								<form id="ITP_FORM_DSPT_INFO_REG_POPUP">
+								<input type="hidden" id="ITP_FORM_DSPT_INFO_REG_POPUP_" name="viewCd" value="">
+							
+								<div class="form-group">
+									<label class="col-xs-4 itp_lb">브랜드 *</label>
+									<div class="col-xs-7 itp_ip fnBrandNm"></div>
+								</div>
+								<div class="form-group">
+									<label class="col-xs-4 itp_lb">매장 *</label>
+									<div class="col-xs-7 itp_ip fnStoreNm"></div>
+								</div>						
+								<div class="form-group">
+									<label class="col-xs-4 itp_lb">입금금액 *</label>
+									<div class="col-xs-8 itp_ip">
+										<input type="text" name="dsptAmt" id="ITP_FORM_DSPT_INFO_REG_POPUP_DSPT_AMT" class="form-control itp_input">
+									</div>
+								</div>
+								<div class="form-group border" style="padding-bottom: 8px;">
+									<label class="col-xs-4 itp_lb">입금일자 *</label>
+									<div class="col-xs-8 itp_ip">
+										<div class="input-daterange input-group date">
+											<input type="text" id="ITP_FORM_DSPT_INFO_REG_SEARCH_DSPT_DT" class="form-control itp_input" name="dsptDt" value="" readonly>
+										</div>
+									</div>
+								</div>
+								</form>
+								<form id="ITP_FORM_DSPT_INFO_REG_PW">								
+								<div class="form-group">
+									<label class="col-xs-4 itp_lb">입금자명</label>
+									<div class="col-xs-8 itp_ip">
+										<input type="text" name="dsptNm" id="ITP_FORM_DSPT_INFO_REG_DSPT_NM" class="form-control itp_input">
+									</div>
+								</div>
+								<div class="form-group">
+									<label class="col-xs-4 itp_lb">입금은행</label>
+									<div class="col-xs-8 itp_ip">
+										<select id="ITP_FORM_DSPT_INFO_REG_SEARCH_DSPT_BNK_CD" data-select-code="DPST_BNK_CD" class="form-control itp_input" name="dpstBnkCd"></select>
+									</div>
+								</div>
+								<div class="form-group">
+									<label class="col-xs-4 itp_lb">입금계좌번호</label>
+									<div class="col-xs-8 itp_ip">
+										<input type="text" id="ITP_FORM_DSPT_INFO_REG_DSPT_ACCT_NO" class="form-control itp_input" name="">
+									</div>
+								</div>
+								</form>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-primary" id="ITP_DSPT_INFO_REG_POPUP_BTN_DSPT_REQ">입금요청</button>
+					<button type="button" class="btn btn-default" data-dismiss="modal">닫기</button>
+				</div>			
+		</div>
+	</div>
+	<div id="ITP_POPUP_JS"></div>
+</div>

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

@@ -2,7 +2,7 @@
 	<div class="itp_cont">
 		<article class="itp_detail">
 			<div class="itp_det_head fix">
-				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>브랜드관리</strong></h2>
+				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>브랜드정보</strong></h2>
 				<div class="pull-right itp_cicon">
 					<button type="button" id="ITP_BTN_STINFO01011_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_STINFO01011_MODIFY" class="btn btn-success btn-sm UPB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;수정&nbsp;&nbsp;</button>
@@ -99,31 +99,32 @@
 											<label class="col-xs-2 itp_lb">사업자번호 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_BSNS_REG_NO" data-check-required="empty" class="form-control itp_input" name="bsnsRegNo" value="" maxlength="20">
+													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_BSNS_REG_NO" data-check-required="empty" data-key-up="regNo" class="form-control itp_input" name="bsnsRegNo" value="" maxlength="20">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">법인번호</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
-													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_CORP_REG_NO" class="form-control itp_input" name="corpRegNo" value="" maxlength="20">
+													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_CORP_REG_NO" data-key-up="corpNo" class="form-control itp_input" name="corpRegNo" value="" maxlength="20">
 												</div>
 											</div>
 										</div>
-									</div>
-									<div class="itp_form_info">
-										<div class="itp_form_in">
-											<div class="form-group">
-												<label class="col-xs-2 itp_lb">대표자명</label>
-												<div class="col-xs-10 itp_ip">
-													<div class="col-xs-2 itp_in" style="margin-left:5px;">
-														<input type="text" id="ITP_FORM_STINFO01011_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm">
-													</div>
-													<div class="col-xs-5 itp_in" style="margin-top:5px;">
-													</div>
+										<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">
+													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm" value="" maxlength="20">
+												</div>
+											</div>
+											<label class="col-xs-2 itp_lb">오더퀸 브랜드코드</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in">
+													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_OQ_BRAND_ID" class="form-control itp_input" name="oqBrandId" value="" >
 												</div>
 											</div>
 										</div>
 									</div>
+									
 									<!--<div class="itp_form_info">
 										<div class="itp_form_in">
 											<div class="form-group">
@@ -144,19 +145,20 @@
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_TEL_NO" data-check-required="empty" class="form-control itp_input" name="telNo" value="">
+													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="telNo" value="">
 												</div>
 												<!-- <button type="button" id="ITP_BTN_STINFO01011_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button> -->
 											</div>
 											<label class="col-xs-2 itp_lb"></label>
-											<div id="ITP_STINFO01011_DETAIL_LOGO_FILE" class="col-xs-1 itp_in">
+												<div class="col-xs-2 itp_in"></div>
+												<div id="ITP_STINFO01011_DETAIL_LOGO_FILE" class="col-xs-1 itp_in">
 											</div>
 										</div>
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">FAX</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_FAX_NO" class="form-control itp_input" name="faxNo" value="">
+													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_FAX_NO" data-key-up="tel" class="form-control itp_input" name="faxNo" value="">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb" style="border-top:none;">로고</label>
@@ -200,34 +202,62 @@
 											<label class="col-xs-2 itp_lb">PG사</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
-													<select id="ITP_FORM_STINFO01011_DETAIL_PG_ID" data-select-code="PG_ID" data-check-required="empty" class="form-control itp_input" name="pgId">
+													<select id="ITP_FORM_STINFO01011_DETAIL_PG_ID" data-select-code="PG_ID" class="form-control itp_input" name="pgId">
 													</select>
 												</div>
 											</div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">PG 브랜드그룹 아이디 </label>
+											<label class="col-xs-2 itp_lb">PG가맹점 아이디 </label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_PG_AFFL_ID" data-check-required="empty" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 브랜드그룹 id">
+													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_PG_AFFL_ID" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 브랜드그룹 id">
 												</div>
 											</div>
-											<label class="col-xs-2 itp_lb">PG 브랜드그룹 Key</label>
+											<!-- 
+											<label class="col-xs-2 itp_lb">PG가맹점 Key</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
 													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_PG_KEY" class="form-control itp_input" name="pgKey" value="" placeholder="PG 브랜드그룹 key">
 												</div>
 											</div>
+											 -->
+										</div>
+									</div>
+									<div class="itp_form_info">
+										<div class="itp_form_in">
+											<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;">
+														<div class="input-group fnRegId" style="padding:5px;"></div>
+													</div>
+													<label class="col-xs-a" style="margin-top:4px;">/</label>
+													<div class="col-xs-a itp_in">
+														<div class="input-group fnRegDt" style="padding:5px;"></div>
+													</div>
+												</div>
+												<label class="col-xs-2 itp_lb">최종  수정자/수정일</label>
+												<div class="col-xs-4 itp_ip">
+													<div class="col-xs-a itp_in">
+														<div class="input-group fnChgId" style="padding:5px;"></div>
+													</div>
+													<label class="col-xs-a" style="margin-top:4px;">/</label>
+													<div class="col-xs-a itp_in">
+														<div class="input-group fnChgDt" style="padding:5px;"></div>
+													</div>
+												</div>
+											</div>
 										</div>
 									</div>
 									<div class="itp_form_in">
-										<div class="form-group">
+										<div class="form-group border">
 											<label class="col-xs-2 itp_lb">주소</label>
 											<div class="col-xs-10 itp_ip">
 												<div class="col-xs-1 itp_in">
 													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_ZIPNO" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
 												</div>
-												<div class="col-xs-1 itp_in">
+												<div class="col-xs-a itp_in">
 													<button type="button" id="ITP_FORM_STINFO01011_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-right: 5px; margin-left:20px;">
@@ -248,32 +278,6 @@
 											</div>
 										</div>
 									</div>
-									<div class="itp_form_info">
-										<div class="itp_form_in">
-											<div class="form-group border">
-												<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;">
-														<div class="input-group fnRegId" style="padding:5px;"></div>
-													</div>
-													<label class="col-xs-a" style="margin-top:4px;">/</label>
-													<div class="col-xs-a itp_in">
-														<div class="input-group fnRegDt" style="padding:5px;"></div>
-													</div>
-												</div>
-												<label class="col-xs-2 itp_lb">최종  수정자/수정일</label>
-												<div class="col-xs-4 itp_ip">
-													<div class="col-xs-a itp_in">
-														<div class="input-group fnChgId" style="padding:5px;"></div>
-													</div>
-													<label class="col-xs-a" style="margin-top:4px;">/</label>
-													<div class="col-xs-a itp_in">
-														<div class="input-group fnChgDt" style="padding:5px;"></div>
-													</div>
-												</div>
-											</div>
-										</div>
-									</div>
 								</section>
 							</form>
 						</div>
@@ -301,6 +305,18 @@
 											<label class="col-xs-2 itp_lb">브랜드 타입*</label>
 											<div class="col-xs-4 itp_ip fnBrandType"></div>
 										</div>
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">사업자번호* </label>
+											<div class="col-xs-4 itp_ip fnBsnsRegNo"></div>
+											<label class="col-xs-2 itp_lb">법인번호</label>
+											<div class="col-xs-4 itp_ip fnCorpRegNo"></div>
+										</div>
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">대표자명* </label>
+											<div class="col-xs-4 itp_ip fnOwnerNm"></div>
+											<label class="col-xs-2 itp_lb">오더퀸 브랜드코드</label>
+											<div class="col-xs-4 itp_ip fnOqBrandId"></div>
+										</div>	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">전화번호</label>
 											<div class="col-xs-4 itp_ip fnTelNo"></div>
@@ -336,10 +352,14 @@
 											</div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">브랜드그룹 아이디 </label>
-											<div class="col-xs-4 itp_ip fnPgAfflId"></div>
-											<label class="col-xs-2 itp_lb">브랜드그룹 Key</label>
-											<div class="col-xs-4 itp_ip fnPgKey"></div>
+											<label class="col-xs-2 itp_lb">PG가맹점 아이디 </label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-12 itp_in fn fnPgAfflId"></div>
+											</div>
+											<label class="col-xs-2 itp_lb">PG가맹점 Key</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-12 itp_in fn fnPgKey"></div>
+											</div>
 										</div>
 									</div>
 									<div class="itp_form_in">

src/main/webapp/css/style.css

@@ -589,6 +589,7 @@ _:-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 .close {color:#fff; opacity:1;}
+#ITP_ASIDE .itp_modal .modal-body label {padding:12px 20px;}
 #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;}

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

@@ -421,9 +421,6 @@ let viewObj = {
 		$('#ITP_FORM_OPER06010_VIEW .fnCorpRegNo').text(result.corpRegNo);
 		$('#ITP_FORM_OPER06010_VIEW .fnOqBrandId').text(result.oqBrandId);
 		
-
-
-
         // $('#ITP_FORM_OPER06010_VIEW .fnBrandLogo').text(result.lastLoginDt);
 
         $('#ITP_FORM_OPER06010_VIEW .fnPgId').text(result.pgId);
@@ -517,8 +514,15 @@ let createObj = {
     },
 	callback: function (result) {
 		$('.fnBrandId').text(result.keyData);		
-		$('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRAND_ID').val(result.keyData);
-		
+		$('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRAND_ID ').val(result.keyData);
+		$('#ITP_FORM_OPER06010_DETAIL_PG_ID').on('change', function() {
+			console.log(this.value == 'KICC');
+			if (this.value == 'KICC') {
+				$('#ITP_FORM_OPER06010_DETAIL_PG_AFFL_ID').attr('readonly', true);
+			} else {
+				$('#ITP_FORM_OPER06010_DETAIL_PG_AFFL_ID').attr('readonly', false);
+			}
+		})
 	},
     button: {
         init: function() {

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

@@ -188,6 +188,11 @@ let viewObj = {
         $('#ITP_FORM_STINFO01011_VIEW .fnRegDt').text(result.sysRegDttm);
         $('#ITP_FORM_STINFO01011_VIEW .fnChgId').text(result.sysChgId);
         $('#ITP_FORM_STINFO01011_VIEW .fnChgDt').text(result.sysChgDttm);
+        
+        $('#ITP_FORM_STINFO01011_VIEW .fnBsnsRegNo').text(result.bsnsRegNo);
+		$('#ITP_FORM_STINFO01011_VIEW .fnCorpRegNo').text(result.corpRegNo);
+		$('#ITP_FORM_STINFO01011_VIEW .fnOqBrandId').text(result.oqBrandId);
+
         // $('#ITP_FORM_STINFO01011_VIEW .fnBrandLogo').text(result.lastLoginDt);
 
         $('#ITP_FORM_STINFO01011_VIEW .fnPgId').text(result.pgId);
@@ -271,9 +276,13 @@ let modifyObj = {
         $('#ITP_FORM_STINFO01011_DETAIL #ITP_FORM_STINFO01011_DETAIL_PG_AFFL_ID').val(result.pgAfflId);
         $('#ITP_FORM_STINFO01011_DETAIL #ITP_FORM_STINFO01011_DETAIL_PG_KEY').val(result.pgKey);
 
+        $('#ITP_FORM_STINFO01011_DETAIL #ITP_FORM_STINFO01011_DETAIL_OQ_BRAND_ID').val(result.oqBrandId);
+        
         $('#ITP_FORM_STINFO01011_DETAIL .fnAddDt').text(result.sysRegDttm);
         $('#ITP_FORM_STINFO01011_DETAIL .fnChgDt').text(result.sysChgDttm);
 
+        $('#ITP_FORM_STINFO01011_DETAIL #ITP_FORM_STINFO01011_DETAIL_PG_ID').trigger('change');
+        
         $('#ITP_FORM_STINFO01011_DETAIL #ITP_FORM_STINFO01011_DETAIL_FILE_NO').val(result.brandLogoFileNo);
         pageObj.fileUpload();
         itp_fn_attach_file.view('ITP_STINFO01011_DETAIL_LOGO_FILE', result.fileLogNoList

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

@@ -489,6 +489,11 @@ let modifyObj = {
 		$('#ITP_FORM_STINFO02010_DETAIL .fnSysChgDttm').text(result.sysChgDttm);
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_OQ_BRAND_ID').val(result.oqBrandId);
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_OQ_STORE_ID').val(result.oqStoreId);
+		
+		if (fn_make_user_info.get('storeId') == null || fn_make_user_info.get('storeId') == '') {
+			$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_LOAN_DVSN').attr('disabled', true);
+			$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_LIMIT_AMT').attr('readonly', true);
+		}
 	}
 };
 

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

@@ -275,5 +275,10 @@ let modifyObj = {
 		$('#ITP_FORM_STINFO02011_DETAIL .fnAcctBal').text(result.acctBal);
 		$('#ITP_FORM_STINFO02011_DETAIL .fnTmpRcvAcctTotal').text(result.tmpRcvAcctTotal);
 		$('#ITP_FORM_STINFO02011_DETAIL .fnSysChgDttm').text(result.sysChgDttm);
+		
+		if (fn_make_user_info.get('storeId') == null || fn_make_user_info.get('storeId') == '') {
+			$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_LOAN_DVSN').attr('disabled', true);
+			$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_LIMIT_AMT').attr('readonly', true);
+		}
 	}
 };

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

@@ -120,11 +120,11 @@
             </div>
         </div>
     </div>
-    <div id="ITP_POP_MPOMNG01010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
+    <div id="ITP_POP_MPOMNG01010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
         <div class="pop">
             <div class="header">
                 <div class="header_left">
-                    <label>> 납품장소</label>
+                    <label>납품장소</label>
                 </div>
                 <div class="header_right">
                     <button type="button" id="ITP_BTN_MPOMNG01010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -138,16 +138,27 @@
                     <button id="ITP_BTN_MPOMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
                 </form>
             </div>
-            <div class="search_bar">
-                <button id="ITP_BTN_MPOMNG01010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
-            </div>
+            <div class="select_btn">
+                <button id="ITP_BTN_MPOMNG01010_POP_WHS_NM" class="btn_blue">납품장소 V</button>
+            </div>    
             <div id="ITP_LIST_MPOMNG01010_POP_WHS_AREA" class="popup_scroll">
-                <ul id="ITP_LIST_MPOMNG01010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
+                <ul id="ITP_LIST_MPOMNG01010_POP_WHS_ROWS" class="mb_0 itp_nav"></ul>
                 <div id="ITP_LIST_MPOMNG01010_POP_WHS_ROWCOPY" style="display: block;">
                     <li class="row_2">
                         <div class="scroll_left">
                             <div class="fnWhsNm">브랜드 창고 명A</div>
-                            <div class="fnLocationNm">(상세위치내용)</div>
+                            <div class="sub fnLocationNm">서울특별시 동대문구 서울 시립대로 12길</div>
+                            <div class="sub fnLocationNm">누리자 B/D</div>
+                        </div>
+                        <div class="scroll_right">
+                            <button id="ITP_BTN_MPOMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+                        </div>
+                    </li>
+                     <li class="row_2">
+                        <div class="scroll_left">
+                            <div class="fnWhsNm">브랜드 창고 명A</div>
+                            <div class="sub fnLocationNm">서울특별시 동대문구 서울 시립대로 12길</div>
+                            <div class="sub fnLocationNm">누리자 B/D</div>
                         </div>
                         <div class="scroll_right">
                             <button id="ITP_BTN_MPOMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -161,7 +172,7 @@
         <div class="pop">
             <div class="header">
                 <div class="header_left">
-                    <label>> 품목 검색</label>
+                    <label>품목 검색</label>
                 </div>
                 <div class="header_right">
                     <button type="button" id="ITP_BTN_MPOMNG01010_POP_ITEM_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -174,36 +185,46 @@
                     <input id="ITP_FORM_MPOMNG01010_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
                     <button id="ITP_BTN_MPOMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
                 </div>
-                <div class="search_bar">
-                    <button id="ITP_BTN_MPOMNG01010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
+                <div class="select_btn">
+                    <button id="ITP_BTN_MPOMNG01010_POP_ITEM_NM" class="btn_blue">품목명 V</button>
                 </div>
             </form>
             <div id="ITP_LIST_MPOMNG01010_POP_ITEM_AREA" class="popup_scroll">
-                <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="panel-group"></ul>
-                <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display:none;">
-                    <li class="row_2">
-                        <div class="left" style="width:180px;">
-                            <!--<div class="check_box">
-                                <input type="checkbox" id="ITP_FORM_MPOMNG01010_POP_ITEM_CHECKBOX" name="itemId" />
-                            </div>-->
-                            <div class="thick">
-                                <div class="fnItemNm">품목명</div>
-                                <div>-</div>
-                                <div class="fnUnit">EA</div>
-                            </div>
-                            <div class="thick" style="font-weight:100;">
-                                <div class="space">구매가 :</div>
-                                <div class="fnUnitAmt">0</div>
-                            </div>
+                <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="mb_0"></ul>
+                <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display: block;">
+                     <li class="row_2">
+                        <div class="scroll_left">
+                            <div class="fnItemNm">품목명 001</div>
+                            <div class="sub fnKg">700g</div>
+                            <div class="amt fnItemAmt">30,500원</div>
                         </div>
-                        <div class="right">
-                            <button id="ITP_BTN_MPOMNG01010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
-                            <div class="num fnPchReqQty">1</div>
-                            <button id="ITP_BTN_MPOMNG01010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
+                        <div class="scroll_right">
+                            <button id="ITP_BTN_MPOMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
                         </div>
-                        <div class="add">
+                      	<div class="itp_num_set">
+		                      <div class="right">
+				              <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
+				              <div class="num fnPchReqQty">1</div>
+				              <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
+				            </div>
+			            </div>
+                    </li>
+                     <li class="row_2">
+                        <div class="scroll_left">
+                            <div class="fnItemNm">품목명 001</div>
+                            <div class="sub fnKg">700g</div>
+                            <div class="amt fnItemAmt">30,500원</div>
+                        </div>
+                        <div class="scroll_right">
                             <button id="ITP_BTN_MPOMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
                         </div>
+                      	<div class="itp_num_set">
+		                      <div class="right">
+				              <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
+				              <div class="num fnPchReqQty">1</div>
+				              <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
+				            </div>
+			            </div>
                     </li>
                 </div>
             </div>

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

@@ -12,10 +12,10 @@ body{background: #fff; position: relative; width: 100%; height: auto; font-famil
 section .popup { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
 section .popup .pop { position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 70%; height: 250px; padding-top: 30px; background: #fff; border: 2px solid #000; border-top-left-radius: 10px; border-top-right-radius: 10px;}
 section .popup .pop label.pop_label {position:relative; top:10px; font-size: 1.2rem;}
-section .popup .pop div.pop_msg {position:relative; top:10px; font-size: 1.2rem;}
+section .popup .pop div.pop_msg {position:relative; top:10px; font-size: 18px;}
 section .popup .pop .pop_line { width: 100%; height: 30px;}
-section .popup .pop .pop_line label { font-size: 1.2rem; margin-left: 20px; float: left; width: auto; text-align: left;}
-section .popup .pop .pop_line div {text-align: right; float: right; font-size: 1.2rem; margin-right: 20px; width: auto;}
+section .popup .pop .pop_line label { font-size: 16px; margin-left: 20px; float: left; width: auto; text-align: left;}
+section .popup .pop .pop_line div {text-align: right; float: right; font-size: 16px; margin-right: 20px; width: auto;}
 section .popup .pop .popup_btn { position: absolute; background-color: #ccc; bottom: 0; width: 100%; height: 51px; border-top: 2px solid #000;}
 section .popup .pop .popup_btn button { position: relative; float: left; width: 100%; height: 50px; font-size: 1rem; font-weight: 700; border-radius: 0px; border: none;}
 section .popup .pop .popup_btn button.ok { width: 64%; border-left: 2px solid #000;}
@@ -29,19 +29,20 @@ section .popup2 .barcode_area {width: 300px; height: 300px; margin: auto; backgr
 section .popup2 .barcode h1{text-align: left; width: 85%; font-size: 1.1rem; margin:auto; margin-top: 20%;}
 section .popup2 .btn_barcode {margin-top: 20%;}
 section .popup2 .btn_barcode button {width: 35%; height: 50px; font-size: 1rem;}
-section .popup2 .pop { position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 95%; height: 85%; background: #fff; border: 2px solid #000;}
-section .popup2 .pop .header {position: relative; height: 50px; background: #f0831e; color:#eee; border-bottom: 1px solid #000;}
-section .popup2 .pop .header .header_left {float: left; padding-top: 5px; padding-left: 15px;}
-section .popup2 .pop .header .header_left label {font-size: 1.4rem;} 
-section .popup2 .pop .header .header_right {float: right; padding-right: 10px;}
+section .popup2 .pop { position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 95%; height: 85%; background: #fff; border: 1px solid #000; border-radius:10px;}
+section .popup2 .pop .header {position: relative; height: 50px; background: #f0831e; color:#eee; border-bottom: 1px solid #000; border-top-right-radius: 10px; border-top-left-radius: 10px;}
+section .popup2 .pop .header .header_left {padding-top: 12px;}
+section .popup2 .pop .header .header_left label {font-size: 18px; font-weight:100;} 
+section .popup2 .pop .header .header_right {float: right; padding-right: 10px; position:relative; top:-44px;}
 section .popup2 .pop .header .header_right button {border: none; background: transparent;}
-section .popup2 .pop .header .header_right button img {width:30px; height:30px;}
-section .popup2 .pop .search_bar {width: 100%; height: 50px; padding: 10px;}
-section .popup2 .pop .search_bar input {width: 80%; height: 40px; float: left;}
-section .popup2 .pop .search_bar button {float: right; border: none; padding-top:3px;}
-section .popup2 .pop .search_bar button img {width: 30px; height: 30px;}
+section .popup2 .pop .header .header_right button img {width:22px;}
+section .popup2 .pop .select_btn button.btn_blue {float: right; width: 100px; height: 30px; background:#d9baaf; color: #fff; font-size: 13px; padding-top:6px; border: 1px solid #cca597;}
+section .popup2 .pop .select_btn {position:relative; top:-25px; left:55px; width:100%; height: 20px;}
+section .popup2 .pop .search_bar {width: 100%; height: 60px; padding:10px;}
+section .popup2 .pop .search_bar input {width: 90%; margin:0 5%; height: 40px; position:relative; top:-37px; font-size:14px;}
+section .popup2 .pop .search_bar button {position:relative; top:-74px; background:transparent; margin-right:5%; float: right; border: none; padding-top:3px;}
+section .popup2 .pop .search_bar button img {width: 22px;}
 section .popup2 .pop .search_bar button.search {float: none; width: 50%; height: 35px; background:rgb(46, 46, 248); color: #fff; font-size: 1rem; padding: 0; border: 1px solid #000; margin: 0 auto;}
-section .popup2 .pop .search_bar button.btn_blue {float: right; width: 100px; height: 35px; background:#d9baaf; color: #fff; font-size: 13px; padding: 0; border: 1px solid #000;}
 section .popup2 .pop .search_item_bar {width:100%; margin-top:10px;}
 section .popup2 .pop .search_item_bar input {width:22%; border-radius:2px;}
 section .popup2 .pop .search_item_bar select {width:22%;border-radius:2px;}
@@ -52,9 +53,10 @@ section .popup2 .pop .search_btn_bar .btn_right button {height:35px; padding:5px
 section .popup2 .pop table{width:98%; margin:0 1%;}
 section .popup2 .pop table tbody th {height:50px; font-size:16px;}
 section .popup2 .pop table tbody input{width:15px;}
-section .popup2 .pop .popup_scroll {position: relative; width: 100%;height: 720px; overflow: auto;}
-section .popup2 .pop .popup_scroll li {list-style: none; width: 99%; height: 50px; border: 1px solid #000; margin: 0 auto;}
-section .popup2 .pop .popup_scroll li.row_2 {height: 80px;}
+section .popup2 .pop .popup_scroll ul.mb_0 {margin-bottom:0 !important;}
+section .popup2 .pop .popup_scroll {position: relative; top:-25px; width: 100%;height: 540px; overflow: auto; border-top:1px solid #E0B8AB;}
+section .popup2 .pop .popup_scroll li {list-style: none; width: 100%; height: 50px; border-bottom: 1px solid #E0B8AB;}
+section .popup2 .pop .popup_scroll li.row_2 {height: 90px;}
 
 section .popup2 .pop .popup_scroll li .left {position: relative; float: left;}
 section .popup2 .pop .popup_scroll li .left .check_box {width:30px; float:left; height:80px; padding-left:5px; padding-top:20px;}
@@ -64,13 +66,14 @@ section .popup2 .pop .popup_scroll li .left .thick {float: left; margin: 12px 0
 section .popup2 .pop .popup_scroll li .left .nomal {float: left; margin: 15px 0px 0px 15px; font-size: 1.2rem; text-align: left; width: 100%;}
 section .popup2 .pop .popup_scroll li .left .history {font-weight: 700; font-size: 2.4rem; margin-left: 20px;}
 section .popup2 .pop .popup_scroll li .left .history input{width: 150px;}
-section .popup2 .pop .popup_scroll li .scroll_left {float: left;}
-section .popup2 .pop .popup_scroll li .scroll_left div {float: left; font-size: 0.8rem; font-weight: 700; width: auto; margin: 15px 10px;}
+section .popup2 .pop .popup_scroll li .scroll_left {float: left; display:grid;}
+section .popup2 .pop .popup_scroll li .scroll_left div {text-align:left; float: left; font-size: 18px; font-weight: 100; width: auto; margin:8px 6px -6px 10px;}
+section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14px; color:gray;}
+section .popup2 .pop .popup_scroll li .scroll_left .amt{font-size:16px; color:#b88278;}
 section .popup2 .pop .popup_scroll li .scroll_right {float: right;}
-section .popup2 .pop .popup_scroll li .scroll_right button {width: 60px; height: 40px; padding: 0; background: rgb(198, 170, 250); border-radius: 10px; font-size: 0.8rem; margin:4px 10px;}
-section .popup2 .pop .popup_scroll li .right {position: relative; display: flex; font-size: 1.6rem; font-weight: 700; float: left; top:20px;}
-section .popup2 .pop .popup_scroll li .right .num {margin: 0 20px; width: auto;}
-section .popup2 .pop .popup_scroll li .right button {padding: 5px; font-size: 1rem; border-radius: 0px;}
+section .popup2 .pop .popup_scroll li .scroll_right button {width: 50px; height: 38px; padding: 0; background:#8f9fc6; border:1px solid #cacfe3; color:#eee; border-radius: 10px; font-size: 14px; margin:25px 10px;}
+section .popup2 .pop .popup_scroll li .right {position: relative; display: flex; font-size: 1.6rem; font-weight: 700; float: right; top:24px; height:38px;}
+section .popup2 .pop .popup_scroll li .right button {padding: 5px; font-size: 22px; width:30px;}
 section .popup2 .pop .popup_scroll li .add button{float: right; width: 60px; height: 55px; margin: 12px 9px; border-radius: 10px; font-size: 1rem; background: rgb(198, 170, 250);}
 section .popup2 .pop .content .line button {width: 40%; height: 35px;font-size: 1rem; padding: 0; margin: 0 10px;}
 section .popup2	.list_line {width:98%; float:left; height:50px;display: inline-flex; margin:0 1%; font-size:12px;}
@@ -81,7 +84,8 @@ section .popup2 .list_line .list_info input{width:90%;}
 section .popup2 .list_line .mail input {width:30%;}
 section .popup2 .list_line .mail select {width:30%;}
 section .popup2 .list_line .list_info .pay_info {text-align:left; padding-left:17px;}
-
+section .popup_scroll li .right .num {padding:8px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
+section .popup_scroll li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
 section .popup2 .list_line .line_right {float:right; width:70%;}
 section .popup2 .list_line .line_right select {width:200px; float:right;}
 section .popup2 .list_line .line_right input {width:200px; float:right;}
@@ -364,7 +368,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .col-4{width:40% !important;}
 .col-6{width:60% !important;}
 
-.scroll_area ul.mb_0 {margin-bottom:0;}
+.scroll_area ul.mb_0 {margin-bottom:0 !important;}
 .scroll_area .itp_non_data {margin:35% auto;}
 .scroll_area li {margin:0; list-style: none; width: 100%; height: 85px; border: 1px solid #ccc; background-color: #fff;}
 .scroll_area li.list-row {height:110px;}