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

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

@@ -480,12 +480,12 @@
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">유통기한여부 *</label>
+											<label class="col-xs-2 itp_lb">사용(유통)기한여부 *</label>
 											<div class="col-xs-5 itp_ip fnExpryYn"></div>
-											<label class="col-xs-2 itp_lb">유통가능기간</label>
+											<label class="col-xs-2 itp_lb">사용(유통)가능기간</label>
 											<div class="col-xs-3 itp_ip">
 												<div class="col-xs-5 itp_in fnExpryPeriod" style="width:auto;"></div>
-												<label class="col-xs-2 itp_in">day</label>
+												<label class="col-xs-2 itp_in">day(s)</label>
 											</div>
 										</div>
 									</div>

src/main/webapp/app/vendinfo/VENDINFO02010.html

@@ -156,12 +156,12 @@
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">유통기한여부 *</label>
+											<label class="col-xs-2 itp_lb">사용(유통)기한여부 *</label>
 											<div class="col-xs-4 itp_ip fnExpryYn"></div>
-											<label class="col-xs-2 itp_lb">유통가능기간</label>
+											<label class="col-xs-2 itp_lb">사용(유통)가능기간</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in fnExpryPeriod" style="width:auto;"></div>
-												<label class="col-xs-2 itp_in">day</label>
+												<label class="col-xs-2 itp_in">day(s)</label>
 											</div>
 										</div>
 									</div>

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

@@ -325,6 +325,7 @@ div.tablediv > .table-bordered {
 .ui-jqgrid .ui-pager-control .ui-pager-table td {
 	border-top : 0px none !important;
 	min-height : 20px !important;
+	width: 80px;
 }
 .ui-jqgrid .ui-pg-button  {
 	height:auto;
@@ -419,6 +420,7 @@ div.tablediv > .table-bordered {
 {
 	table-layout:auto;
 	height:100%;
+	width: 160px;
 }
 .ui-jqgrid .ui-jqgrid-pager .navtable,
 .ui-jqgrid .ui-jqgrid-toppager .navtable

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

@@ -47,14 +47,6 @@ let API_CHECK_DUPLICATE 	= '/api/user/check-duplicate';
 let API_INTI_USERPW 		= '/api/user/inti-userpw';
 let API_POP_GRID_LIST 		= '/api/brand/pop-grid-list';
  
-$(window).on('resize', function(e) {
-	setTimeout(()=>{
-		const left=$(OPER01010_GRID_PAGER+'_left'), pageing=$(OPER01010_GRID_PAGER+'_center').find('table');
-		left.width(60);
-		pageing.width(150);
-	}, 100);
-});
- 
 /*화면 Grid ColModel*/
 const gridColModel = {
 	list: [

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_WHS_LOCATION.js

@@ -96,7 +96,7 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
 			{
 				index: 'WHS_NM', name: 'whsNm',
 				label: '창고명', //
-				width: '12', fixed: false, align: 'right',
+				width: '12', fixed: false, align: 'center',
 				sortable: false, hidden: false, classes: 'ui-ellipsis'
 			},
 			{