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

src/main/webapp/app/pomng/POMNG03011.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_POMNG03011_PO" class="btn btn-primary btn-sm SEB"><i class="glyphicon "></i> &nbsp;&nbsp;발주전송&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_POMNG03011_SEB" class="btn btn-primary btn-sm PO"><i class="glyphicon "></i> &nbsp;&nbsp;조회&nbsp;&nbsp;</button>

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

@@ -28,7 +28,7 @@
 								<div class="form-group">
 									<label class="col-xs-4 itp_lb long">사업자번호</label>
 									<div class="col-xs-7 itp_ip">
-										<input type="text" name="bizNo" id="ITP_FORM_BIZPOP_STINFO_BACK_OFFICE_BIZ_NO" class="form-control itp_input">
+										<input type="text" name="bizNo" id="ITP_FORM_BIZPOP_STINFO_BACK_OFFICE_BIZ_NO" data-key-up="regNo" onKeyup='this.value = this.value.replace(/[^0-9]/g, "").replace(/(^[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{5})$/,"$1-$2-$3");' class="form-control itp_input" maxlength="12">
 									</div>
 								</div>
 								<div class="form-group border" style="padding-bottom: 8px;">

src/main/webapp/app/rtnmng/RTNMNG03011.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_RTNMNG03011_RPO" class="btn btn-primary btn-sm RPO"><i class="glyphicon "></i> &nbsp;&nbsp;발주전송&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_RTNMNG03011_SEB" class="btn btn-primary btn-sm SEB"><i class="glyphicon "></i> &nbsp;&nbsp;조회&nbsp;&nbsp;</button>

src/main/webapp/js/app/pomng/ITP_POMNG03011.js

@@ -352,7 +352,7 @@ let listObj = {
 						$(POMNG03011_GRID_ID).jqGrid('setCell', rowId, 'dlvReqDt', '', css);
 						$(POMNG03011_GRID_ID).jqGrid('setCell', rowId, 'whsNm', '', css);
 					});
-					$('.cbox.checkbox').each(function(idx) {
+					$('#ITP_POMNG03011_jqGrid_list .cbox.checkbox').each(function(idx) {
 						var tds=$(this).closest('tr').children('td'), td=tds.eq(2);
 						var rs=td.attr('rowspan'), ds=td.css('display'); 
 						if(rs) $(this).closest('td').attr('rowspan', rs);

src/main/webapp/js/app/rtnmng/ITP_RTNMNG03011.js

@@ -567,7 +567,7 @@ let listObj = {
 						$(RTNMNG03011_GRID_ID).jqGrid('setCell', rowId, 'whsNm', '', css);
 					});
 					// $(RTNMNG03011_GRID_ID).setSelection(1, true);
-					$('.cbox.checkbox').each(function(idx) {
+					$('#ITP_RTNMNG03011_jqGrid_list .cbox.checkbox').each(function(idx) {
 						var tds=$(this).closest('tr').children('td'), td=tds.eq(2);
 						var rs=td.attr('rowspan'), ds=td.css('display'); 
 						if(rs) $(this).closest('td').attr('rowspan', rs);