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

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

@@ -22,11 +22,15 @@
 									<input type="hidden" id="ITP_FORM_OPER01010_SEARCH_AFFL_BRAND_ID" name="brandId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" />
+											<div class="input-group">
+												<input readonly type="text" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" readonly="readonly">
+												<span class="input-group-btn">
+													<button id="ITP_FORM_OPER01010_DELETE_AFFL_SHOP" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
 											<button type="button" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP" class="btn btn-orange btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_OPER01010_DELETE_AFFL_SHOP" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_OPER01010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId">
@@ -84,11 +88,15 @@
 											<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" name="afflShopNm" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" placeholder="브랜드그룹명" readonly>
+													<div class="input-group">
+														<input type="text" name="afflShopNm" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" placeholder="브랜드그룹명" readonly>
+														<span class="input-group-btn">
+															<button id="ITP_FORM_OPER01010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-default btn-sm itp_btn SHOW" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+														</span>
+													</div>
 												</div>
 												<div class="col-xs-3 itp_in">
 													<button type="button" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_FORM_OPER01010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm SEB"><i class="glyphicon glyphicon-erase"></i></button>
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">브랜드</label>

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

@@ -21,11 +21,15 @@
 									<input type="hidden" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_ID" name="safflShopId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" readonly/>
+												<span class="input-group-btn">
+													<button id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>										
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
 											<button type="button" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_BTN" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_OPER02010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId">
@@ -76,11 +80,15 @@
 											<label class="col-xs-2 itp_lb">브랜드그룹</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in" style="width:65%;">
-													<input type="text" name="afflShopNm" id="ITP_FORM_OPER02010_DETAIL_AFFL_SHOP_NM" class="form-control itp_input" placeholder="브랜드그룹명" readonly>
+													<div class="input-group">
+														<input type="text" name="afflShopNm" id="ITP_FORM_OPER02010_DETAIL_AFFL_SHOP_NM" class="form-control itp_input" placeholder="브랜드그룹명" readonly>
+														<span class="input-group-btn">
+															<button id="ITP_FORM_OPER02010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+														</span>
+													</div>
 												</div>
 												<div class="col-xs-3 itp_in">
 													<button type="button" id="ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_FORM_OPER02010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm SEB"><i class="glyphicon glyphicon-erase"></i></button>
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">브랜드</label>

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

@@ -20,11 +20,15 @@
 									<input type="hidden" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID" name="safflShopId" />
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" readonly="readonly" />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_OPER06010_DELETE_AFFL_SHOP" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
 											<button type="button" id="ITP_BTN_OPER06010_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_OPER06010_DELETE_AFFL_SHOP" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_OPER06010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId">

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

@@ -393,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">

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

@@ -30,12 +30,16 @@
 											<select id="ITP_FORM_STINFO05010_SEARCH_ST_CD" data-select-code="UNIT_ST_CD" class="form-control itp_input" name="sunitStCd"></select>
 										</div>
 										<div class="col-xs-7 itp_ip itp_noMar">
-											<div class="col-xs-6 itp_in itp_noMar">
-												<input type="text" id="ITP_FORM_STINFO05010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" />
+											<div class="col-xs-6 itp_in">
+												<div class="input-group">
+													<input type="text" id="ITP_FORM_STINFO05010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" maxlength="20">
+													<span class="input-group-btn">
+														<button id="ITP_BTN_STINFO05010_SEARCH_DELETE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-search"></i></button>
+													</span>
+												</div>
 											</div>
 											<div class="col-xs-2 itp_ip itp_noMar">
 												<button type="button" id="ITP_BTN_STINFO05010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-												<button type="button" id="ITP_BTN_STINFO05010_SEARCH_DELETE" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 											</div>
 										</div>
 									</div>
@@ -92,8 +96,7 @@
 								<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">
@@ -212,20 +215,9 @@
 											<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>
-											</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 +241,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 +266,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

@@ -89,7 +89,7 @@ a, button {outline:none !important; text-decoration:none !important;}
 
 /* ITP_LOGIN */
 #ITP_LOGIN {width:100%; height:100%; font-family: 'GmarketSansMedium'}
-#ITP_LOGIN .itp_head {margin:0 5%; letter-spacing:-1px; width:90%; height:40px; margin-bottom:50px;}
+#ITP_LOGIN .itp_head {margin:0 5%; letter-spacing:-3px; width:90%; height:40px; margin-bottom:50px; padding-left:18px;}
 #ITP_LOGIN .itp_bar {width:4px; height:26px; padding:0; float:left; margin:8px 7px 0 7px; font-size:27px; font-weight:100; background:#ccc;}
 #ITP_LOGIN .itp_logo {margin:0; padding:0; color:#000; font-size:39px; float:left; font-weight:700;}
 #ITP_LOGIN .itp_tit {margin:0; padding:7px 0 0 0; float:left; font-size:27px;}
@@ -317,7 +317,7 @@ html:lang(en) #ITP_CONTAINER .itp_detail .itp_form .itp_thumb_inline .itp_thumb_
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_ip.itp_dual_ipL .itp_btn {border-right:0; border-top-right-radius:0; border-bottom-right-radius:0;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_ip.itp_dual_ipR {margin-left:-15px;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_ip.itp_dual_ipR .itp_input {border-top-left-radius:0; border-bottom-left-radius:0;}
-#ITP_CONTAINER .itp_detail .itp_lg_form .itp_btn {padding:4px 10px; background:#fff;}
+#ITP_CONTAINER .itp_detail .itp_lg_form .itp_btn {padding:3.8px 11px; background:#fff;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_btn_dark {padding:3px 10px; margin-top:1px; color:#fff; background-color:rgb(109, 110, 114); border-color:rgb(109, 110, 114);}
 #ITP_CONTAINER .itp_detail .itp_lg_form .input-daterange .input-group-addon {padding:3px 5px;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_date_to {background:#fff;}

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

@@ -232,7 +232,7 @@ div.tablediv > .table-bordered {
 .ui-jqgrid tr.jqfoot td {
 	white-space: nowrap;
 }
-.ui-jqgrid tr.ui-row-ltr td {font-size:13px;color:#333; font-weight:bold;}
+.ui-jqgrid tr.ui-row-ltr td {font-size:13px;color:#333;}
 .ui-jqgrid tr.ui-row-rtl td {font-size:13px;color:#333;}
 .ui-jqgrid .ui-jqgrid-resize-mark {
 	width:2px;
@@ -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:#FDFDF5 !important;}
+.table>tbody>tr.success .jqgrid-rownum {background:#E3FEE4 !important;}

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

@@ -403,16 +403,25 @@ var fn_make_user_info = {
 	},
 	view: function() {
 		// 사용자명
-		console.log("====================");
-		console.log(this.get('authTpCd'));
 		$('#ITP_LOGIN_USER').text(this.get('userNm'));
-		let authTypeNm = (this.get('authTpNm') === undefined) ? '오더퀸' : this.get('authTpNm');
+		
+		let authTypeNm = '오더퀸' ;
+		
+		if (this.get('authTpCd') == "10" || this.get('authTpCd') == "20") {
+			authTypeNm ='오더퀸';
+		} else if (this.get('authTpCd') == "30" ) {
+			authTypeNm = this.get('afflShopNm');
+		} else { 
+			authTypeNm = this.get('brandNm');
+		}
+		
 		
 		if (this.get('authTpCd') == "10" || this.get('authTpCd') == "20" || this.get('authTpCd') == "30") {
 			$('#ITP_TXT_MAIN_SHR_AFFL').text(authTypeNm);
 			var brandNm = (this.get('brandNm')) ? '(' + this.get('brandNm') + ')' : '';
 			$('#ITP_TXT_MAIN_SHR_BRAND').text(brandNm);
 		} else {
+			$('#ITP_TXT_MAIN_SHR_AFFL').text(authTypeNm);
 			$('.itp_sch_brand').css('display','none');
 			$('#ITP_TXT_MAIN_SHR_BRAND').css('display','none');
 		}

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

@@ -51,7 +51,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목번호
-			width: '100', fixed: false, align: 'center',
+			width: '20', fixed: false, align: 'center',
 			sortable: false, hidden: false ,frozen:true
 		},
 		{
@@ -99,7 +99,7 @@ const gridColModel = {
 		{
 			index: 'LEAD_TIME', name: 'leadTime',
 			label: ITP_MSG_LOCALE.label.leadTime, //리드타임 (Day)
-			width: '16', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{