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

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

@@ -218,14 +218,15 @@
 													<input type="text" id="ITP_FORM_OPER06010_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">배송/수거 처리구분</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
-													<input type="text" id="ITP_FORM_OPER06010_DETAIL_PG_KEY" class="form-control itp_input" name="pgKey" value="" placeholder="PG 브랜드그룹 key">
+													<select id="ITP_FORM_OPER06010_DETAIL_PROC_DVSN" class="form-control itp_input" name="">
+														<option>배송</option>
+														<option>수거</option>
+													</select>
 												</div>
 											</div>
-											 -->
 										</div>
 									</div>
 									<div class="itp_form_info">

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

@@ -356,12 +356,21 @@
 									<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="col-xs-4 itp_ip colspan">
 												<div class="fileupload-wrapper">
 													<!-- data-show-yn: 파일업로드를 할 수 있는 권한이 있는지 없는지.. -->
 													<div id="ITP_STINFO04010_DETAIL_UPLOAD" data-show-yn="Y"></div>
 												</div>
 											</div>
+											<label class="col-xs-2 itp_lb">매장 배송구분</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in">
+													<select id="ITP_FORM_OPER06010_DETAIL_PROC_DVSN" class="form-control itp_input" name="">
+														<option>공급사배송</option>
+														<option>본사배송</option>
+													</select>
+												</div>
+											</div>
 										</div>
 									</div>
 								</section>		

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

@@ -35,6 +35,12 @@
 						<div id="ITP_STINFO06010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_STINFO06010_jqGridView" class="itp_views fix"></div>
 							<button type="button" id="ITP_BTN_STINFO06010_EXCEL" class="btn btn-success btn-sm Excel" style="float:right;"><i class="glyphicon "></i>Excel</button>
+							<div style="display:initial; float:right; position:relative; top:0px; margin-right:70px;">
+								<label>공급사단가기준</label>
+								<input id="ITP_STINFO06010_UNIT_STDD" style="width:100px;">
+								<span>%</span>
+								<button type="button" id="ITP_BTN_STINFO06010_EXCEL" class="btn btn-warning  btn-sm Excel"><i class="glyphicon "></i>일괄적용</button>
+							</div>
 							<table id="ITP_STINFO06010_jqGrid"></table>
 							<div id="ITP_STINFO06010_jqGridPager"></div>
 							<div id="ITP_STINFO06010_jqGridEmpty" class="itp_no_data"></div>