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

src/main/webapp/app/pomng/POMNG03011.html

@@ -0,0 +1,50 @@
+<section id="ITP_TAB_POMNG03011" class="tab-pane active itp_sec">
+	<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>
+				<div class="pull-right itp_cicon">
+					<button type="button" id="ITP_BTN_POMNG03011_PO" class="btn btn-primary btn-sm PO"><i class="glyphicon "></i> &nbsp;&nbsp;발주전송&nbsp;&nbsp;</button>
+				</div>
+			</div>
+			<div class="itp_det_in">
+				<div id="ITP_AJAX_POMNG03011_LIST_CONTAINER">
+					<div class="itp_lg_form itp_type1 fix">
+						<div class="itp_srh_border fix">
+							<div class="col-xs-12">
+								<form id="ITP_FORM_POMNG03011_SEARCH" class="form-horizontal">
+									<input type="hidden" id="ITP_FORM_POMNG03011_DETAIL_SBRAND_ID" name="sbrandId" value="">
+									<input type="hidden" id="ITP_FORM_POMNG03011_DETAIL_SSTORE_ID" name="sstoreId" value="">
+									<div class="form-group">
+										<div class="col-xs-1 itp_ip" style="width:80px; padding-top: 5px; padding-right: 5px;">
+											<label>납기요청일 *</label>
+										</div>											
+										<div class="col-xs-3 itp_ip itp_noMar" style="width: 280px;">
+											<div class="input-daterange input-group date">
+												<input type="text" id="ITP_FORM_POMNG03011_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
+												<span class="input-group-addon itp_date_to">~</span>
+												<input type="text" id="ITP_FORM_POMNG03011_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
+											</div>
+										</div>
+										<div class="col-xs-4 itp_ip itp_noMar" style="width: 360px;">
+											<input type="text" id="ITP_FORM_POMNG03011_SEARCH_PCH_REQ_NO" class="form-control itp_input" name="pchReqNo" placeholder="구매요청번호" />
+										</div>
+									</div>
+								</form>
+							</div>
+						</div>
+					</div>
+					<div class="itp_table fix">
+						<div id="ITP_POMNG03011_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
+							<div id="ITP_POMNG03011_jqGridView" class="itp_views fix"></div>
+							<table id="ITP_POMNG03011_jqGrid"></table>
+							<div id="ITP_POMNG03011_jqGridPager"></div>
+							<div id="ITP_POMNG03011_jqGridEmpty" class="itp_no_data"></div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</article>
+	</div>
+	<div id="ITP_TAP_JS"></div>
+</section>

src/main/webapp/app/rtnmng/RTNMNG03011.html

@@ -0,0 +1,50 @@
+<section id="ITP_TAB_RTNMNG03011" class="tab-pane active itp_sec">
+	<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>
+				<div class="pull-right itp_cicon">
+					<button type="button" id="ITP_BTN_RTNMNG03011_PO" class="btn btn-primary btn-sm PO"><i class="glyphicon "></i> &nbsp;&nbsp;발주전송&nbsp;&nbsp;</button>
+				</div>
+			</div>
+			<div class="itp_det_in">
+				<div id="ITP_AJAX_RTNMNG03011_LIST_CONTAINER">
+					<div class="itp_lg_form itp_type1 fix">
+						<div class="itp_srh_border fix">
+							<div class="col-xs-12">
+								<form id="ITP_FORM_RTNMNG03011_SEARCH" class="form-horizontal">
+									<input type="hidden" id="ITP_FORM_RTNMNG03011_DETAIL_SBRAND_ID" name="sbrandId" value="">
+									<input type="hidden" id="ITP_FORM_RTNMNG03011_DETAIL_SSTORE_ID" name="sstoreId" value="">
+									<div class="form-group">
+										<div class="col-xs-1 itp_ip" style="width:80px; padding-top: 5px; padding-right: 5px;">
+											<label>반품요청일 *</label>
+										</div>											
+										<div class="col-xs-3 itp_ip itp_noMar" style="width: 280px;">
+											<div class="input-daterange input-group date">
+												<input type="text" id="ITP_FORM_RTNMNG03011_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
+												<span class="input-group-addon itp_date_to">~</span>
+												<input type="text" id="ITP_FORM_RTNMNG03011_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
+											</div>
+										</div>
+										<div class="col-xs-4 itp_ip itp_noMar" style="width: 360px;">
+											<input type="text" id="ITP_FORM_RTNMNG03011_SEARCH_RTN_REQ_NO" class="form-control itp_input" name="pchReqNo" placeholder="반품요청번호" />
+										</div>
+									</div>
+								</form>
+							</div>
+						</div>
+					</div>
+					<div class="itp_table fix">
+						<div id="ITP_RTNMNG03011_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
+							<div id="ITP_RTNMNG03011_jqGridView" class="itp_views fix"></div>
+							<table id="ITP_RTNMNG03011_jqGrid"></table>
+							<div id="ITP_RTNMNG03011_jqGridPager"></div>
+							<div id="ITP_RTNMNG03011_jqGridEmpty" class="itp_no_data"></div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</article>
+	</div>
+	<div id="ITP_TAP_JS"></div>
+</section>

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

@@ -35,12 +35,6 @@
 						<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>
@@ -86,6 +80,12 @@
 				       	<div id="ITP_STINFO06010_DETAIL_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 				          <div id="ITP_STINFO06010_DETAIL_jqGridView" class="itp_views fix" style="min-height:26px;"></div>
 				          <button type="button" id="ITP_BTN_STINFO06010_DETAIL_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_DETAIL_jqGrid"></table>
 				          <div id="ITP_STINFO06010_DETAIL_jqGridPager"></div>
 				          <div id="ITP_STINFO06010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG03010.js

@@ -54,7 +54,7 @@ const gridColModel = {
 			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.rtnPodrUnqNo, //반품발주번호
 			width: '10', fixed: false, align: 'center',
-			minwidth: 140,
+			minwidth: 200,
 			sortable: false, hidden: false
 		},
 		{
@@ -79,7 +79,7 @@ const gridColModel = {
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, 	//품목아이디
 			width: '10', fixed: false, align: 'center',
-			minwidth: 140,
+			minwidth: 200,
 			sortable: false, hidden: false
 		},
 		{

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

@@ -62,6 +62,7 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'left',
+			minwidth: 190,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -74,7 +75,7 @@ const gridColModel = {
 			index: 'RTN_REQ_UNQ_NO', name: 'rtnReqUnqNo',
 			label: '반품요청번호', 
 			width: '10', fixed: false, align: 'center',
-			minwidth: 100,
+			minwidth: 190,
 			sortable: false, hidden: false
 		},
 		{
@@ -112,7 +113,7 @@ const gridColModel = {
 		{
 			index: 'RTN_REQ_ITEM_QTY', name: 'rtnReqItemQty',
 			label: '요청품목수', 
-			width: '8', fixed: false, align: 'right',
+			width: '9', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},

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

@@ -82,19 +82,19 @@ const gridColModel = {
         {
             index: 'ITEM_ID', name: 'itemId',
             label: ITP_MSG_LOCALE.label.itemId, //품목번호
-            width: '14', fixed: false, align: 'center',
+            width: '15', fixed: false, align: 'center',
             sortable: false, hidden: false
         },
         {
             index: 'ITEM_NM', name: 'itemNm',
             label: ITP_MSG_LOCALE.label.itemNm, //품목명
-            width: '13', fixed: false, align: 'left',
+            width: '15', fixed: false, align: 'left',
             sortable: false, hidden: false, classes: 'ui-ellipsis'
         },
         {
             index: 'ITEM_TYPE_NM', name: 'itemTypeNm',
             label: ITP_MSG_LOCALE.label.itemTypeNm, //품목유형
-            width: '10', fixed: false, align: 'center',
+            width: '8', fixed: false, align: 'center',
             sortable: false, hidden: false
         },
         {

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

@@ -380,115 +380,6 @@
 				</div> -->
 			</div>
 		</div>
-<section id="ITP_MOBILE_MRTNMNG04011">
-	<div id="ITP_AJAX_MRTNMNG04011_VIEW_CONTAINER">
-	  <form id="ITP_FORM_MRTNMNG04011_DETAIL" class="put_btn form-horizontal" onsubmit="return false;">
-		<input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_VIEW_CD" name="viewCd" value="C">
-		<input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_BRAND_ID" name="brandId" value="">
-		<input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_STORE_ID" name="storeId" value="">
-		<input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_LOAN_DVSN" name="loanDvsn" value="">
-		<input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
-		<input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
-		<input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
-		<input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
-		<input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_MALL_ID" name="mallId" value="">
-		<div class="content">
-			<div class="content_fix">
-				<div class="line header">
-				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품발주처리</div>
-				</div>
-			  <div class="line">
-				<label>수거요청일</label>
-				<input type="text" id="ITP_FORM_MRTNMNG04011_DETAIL_COL_REQ_DT" name="colReqDt" class="itp_input date" data-check-required="empty" readonly>
-			  </div>
-			  <div class="line">
-				<label>수거장소</label>
-				  <div class="float_left">
-					  <input type="text" id="ITP_FORM_MRTNMNG04011_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="납품장소" placeholder="" readonly />
-					  <input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
-					  <input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
-					  <div class="itp_input_btn">
-						   <button id="ITP_BTN_MRTNMNG04011_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG04011_WHS_AREA"><img src="../img/search.png" alt=""></button>
-						 </div>
-				  </div>
-				  <div class="float_right_btn">
-					<!-- <button id="ITP_BTN_MRTNMNG04011_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG04011_WHS_AREA"><img src="../img/search.png" alt=""></button> -->
-					<button id="ITP_BTN_MRTNMNG04011_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
-				  </div>
-			  </div>
-			  <div class="line">
-				  <label>구매요청번호</label>
-				  <div class="float_left name">
-					<input id="ITP_FORM_MRTNMNG04011_PCH_REQ_UNQ_NO" name="pchReqUnqNo" type="text">
-				  </div>
-			  </div>
-			  <div class="line">
-				  <div class="search">
-					<button id="ITP_BTN_MRTNMNG04011_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
-				  </div>
-				</div>
-				<div class="table_header">
-				<h1><발주 대상 내역></h1>
-			  </div>
-		  </div>
-		</div>
-		<div id="ITP_LIST_MRTNMNG04011_ITEM_AREA" class="scroll_area row-1">
-		  <ul id="ITP_LIST_MRTNMNG04011_DETAIL_ROWS" class="mb_0 panel-group"></ul>
-		   <!--   검색된 데이터가 없습니다  -->
-		   <div class="itp_non_data" style="display:none;">
-			  <div>검색된 데이터가 없습니다.</div>
-		   </div>
-		  <div id="ITP_LIST_MRTNMNG04011_DETAIL_ROWCOPY" style="display: none;">
-			<li class="item-row" style="padding-top:5px; height:auto;">
-				<div class="left">
-				  <div class="nomal">
-					<label class="col_6">구매요청번호</label>
-					<span>:</span>
-					<div class="btn fnPodrDt"></div>
-						<button style="margin-right: 5px;width: 90px;font-size: 12pt;height: 45px;" id="ITP_BTN_MRTNMNG04011_DETAIL_REQ_ORDER" class="btn-primary REQ">발주처리</button>
-				  </div>
-				</div>
-				<div class="left">
-				  <div class="nomal">
-					<label class="col_6">납품장소</label>
-					<span>:</span>
-					<div class="non_btn fnLocationNm"></div>
-				  </div>
-				</div>
-				<div class="podr_list"> <!-- 반복되는 부분 -->
-					<div class="left">
-					  <div class="nomal">
-						<label>품목명</label>
-						<span>:</span>
-						<div style="min-width:110px;" class="fnItemNm"></div>
-						<label class="col_4">구매수량</label>
-						<span>:</span>
-						<div class="fnPchQty"></div>
-					  </div>
-					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label>단가</label>
-						<span>:</span>
-						<div style="min-width:110px;" class="fnUnit"></div>
-						<label class="col_4">구매금액</label>
-						<span>:</span>
-						<div class="fnPchAmt"></div>
-					  </div>
-					</div>
-				</div>
-			  </li>
-		  </div>
-		</div>
-		<div class="button_bar">
-		  <button id="ITP_BTN_MRTNMNG04011_DETAIL_REQ_ORDER" data-call-popup="ITP_POP_MRTNMNG04011_REQ_AREA" class="col_3 btn-m-orange REQ">구매요청</button>
-		  <button id="ITP_BTN_MRTNMNG04011_DETAIL_TEMP_SAVE" data-call-popup="ITP_POP_MRTNMNG04011_REQ_AREA" class="col_3 btn-w-gray TSA">임시저장</button>
-		  <button id="ITP_BTN_MRTNMNG04011_DETAIL_CANCEL" class="col_3 btn-gray CLB">취소</button>
-		</div>
-	  </form>
-	</div>
-	<div id="ITP_MOBILE_JS"></div>
-  </section>
 		<script src="../js/app/main.js"></script>
 	</div>
 	<footer id="ITP_FOOTER">

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

@@ -73,8 +73,6 @@
 	                <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
 	              </div>
 	              <div class="thick">
-	              	<label>품목명</label>
-	                <span>:</span>
 	                <div class="itp_item fnItemNm"></div>
 	              </div>
 	              <div class="thick">

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

@@ -254,7 +254,7 @@ body.eee {height: 700px; background: #eee;}
 .main .wicon .icon_left {float: left;}
 
 
-input {font-size:14px; margin-top: 3px; border: 1px solid #aaa; border-radius:4px; height: 26px;text-align: left; padding:0 10px;}
+input {font-size:14px; margin-top: 3px; border: 1px solid #ccc; border-radius:4px; height: 26px;text-align: left; padding:0 10px;}
 input[type="date"]::-webkit-calendar-picker-indicator {display:none;}
 
 select {border: 1px solid #aaa; border-radius:5px; height: 35px; font-size: 12px; text-align: left; padding:0 10px;}
@@ -350,7 +350,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .pop_right div {float:right; margin-right:10px; padding-top:8px; text-align:right; font-size:16px;}
 .content .line .search_wrap input {float:right; width:50%; margin-right:10px;}
 .content .line .search_wrap select {float:right; width:50%; height:27px; margin-right:10px;}
-.content .line div.itp_search_header {height:32px; font-weight:100;padding:5px 10px 5px 10px; text-align: left; color:#b88278;border-bottom: 1px solid #aaa;font-size:12pt;}
+.content .line div.itp_search_header {height:32px; font-weight:100;padding:5px 10px 5px 10px; text-align: left; color:#b88278; font-size:12pt;}
 .content .line div.itp_search_header img{width:14px; top:-2px; position:relative;}
 .content .line label {min-width:125px; color:#898989; font-size: 12pt; float: left; text-align: left; margin-top: 7px; font-weight:100;}
 .content .line label.pay_label {margin:20px 1%; width:98%;}
@@ -365,12 +365,12 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .float_left.note {width: 100%; padding: 10px;}
 .content .line .float_left.note textarea {width: 100%; height: 100px; border: 1px solid #aaa; text-align: left; font-size:14px;}
 .content .line .float_left div {font-size: 12pt; margin-top: 4px; margin-right:8px; text-align:right; font-weight:100;}
-.content .line .float_left .input_text {background: #fff; width: 100%; height: 26px; border: 1px solid #aaa; margin-top: 3px; border-radius: 4px;}
+.content .line .float_left .input_text {background: #fff; width: 100%; height: 26px; border: 1px solid #ccc; margin-top: 3px; border-radius: 4px;}
 .content .line .float_left .itp_input_btn {top:5px; margin:0; position:absolute; width:168px;}
 .content .line .float_right_btn {float: left; margin-top: 3px; margin-left: 5px;}
-.content .line .float_right_btn button {padding:0; width:26px; height:26px; border-radius:5px; border:1px solid #aaa;}
+.content .line .float_right_btn button {padding:0; width:26px; height:26px; border-radius:5px; border:1px solid #ccc;}
 .content .line .float_right_btn button img {width:16px; height:16px;}
-.content .line .float_left select {float: left; width: 100%; height: 26px; margin-top:3px; border: 1px solid #aaa; border-radius:5px; font-size: 12pt; font-weight:100;}
+.content .line .float_left select {float: left; width: 100%; height: 26px; margin-top:3px; border: 1px solid #ccc; border-radius:5px; font-size: 12pt; font-weight:100;}
 .content .line .line_right {float: right; margin-right: 0%; width:200px;}
 .content .line .line_right div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:100%; text-align:right; float: right; font-size: 12pt; margin-top: 7px; margin-right:0%; color:#555;padding-right:5px;}
 .content .line .line_right input {position: relative; text-align: center; font-size:12pt; width:100%;}