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

src/main/webapp/app/settmng/SETTMNG01010.html

@@ -32,7 +32,7 @@
 										<div class="col-xs-5 itp_ip itp_noMar">
 											<div class="col-xs-4 itp_ip itp_noMar">
 												<select id="ITP_FORM_SETTMNG01010_SEARCH_" class="form-control itp_input" >
-													<option value="">입고/수거일자</option>
+													<option value="">입고일자</option>
 												</select>
 											</div>
 											<div class="col-xs-8 itp_ip itp_noMar">

src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js

@@ -4,7 +4,7 @@ require(['config'], function() {
         pageObj.init();
     });
 });
-console.log(CONN_KEY);
+
 
 // 화면변수
 const ORDMNG01010_GRID_ID = '#ITP_ORDMNG01010_jqGrid';
@@ -478,6 +478,7 @@ let viewObj = {
 			this.unload();
 			this.load(mode, gridData);
 			$(ORDMNG01010_VIEW_GRID_ID).jqGrid('hideCol', 'cb');
+			itp_fn_jqgrid_resize(ORDMNG01010_VIEW_GRID_ID, ORDMNG01010_VIEW_GRID_LIST, 'lg');
 		},
 		mode: '',
 		colModel: gridColModel.view,

src/main/webapp/js/app/settmng/ITP_SETTMNG01010.js

@@ -144,7 +144,7 @@ const gridColModel = {
 		},
 		{
 			index: 'WHS_COL_QTY', name: 'whsColQty',
-			label: "입고/수거수량",
+			label: "입고수량",
 			width: '13', fixed: false, align: 'right',
 			minwidth: 120,
 			sortable: false, editable: false, edittype: 'text', 
@@ -152,14 +152,14 @@ const gridColModel = {
 		}, 
 		{
 			index: 'WHS_COL_DT', name: 'whsColDt',
-			label: "입고/수거일자",
+			label: "입고일자",
 			width: '10', fixed: false, align: 'center',
 			minwidth: 100,
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
-			label: "입고/수거금액",
+			label: "입고금액",
 			width: '13', fixed: false, align: 'right',
 			minwidth: 120,
 			sortable: false, editable: false, edittype: 'text', 
@@ -221,12 +221,14 @@ const gridColModel = {
 			index: 'ITEM_ID', name: 'itemId',
 			label: "품목코드",
 			width: '10', fixed: false, align: 'center',
+			minwidth: 180,
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: "품목명",
 			width: '12', fixed: false, align: 'left',
+			minwidth: 180,
 			sortable: false, edittype: 'text', classes: 'ui-ellipsis'
 		},
 		{
@@ -258,20 +260,20 @@ const gridColModel = {
 		},
 		{
 			index: 'WHS_COL_QTY', name: 'whsColQty',
-			label: "입고/수거수량",
+			label: "입고수량",
 			width: '13', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		}, 
 		{
 			index: 'WHS_COL_DT', name: 'whsColDt',
-			label: "입고/수거일자",
+			label: "입고일자",
 			width: '13', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
-			label: "입고/수거금액",
+			label: "입고금액",
 			width: '13', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -279,19 +281,20 @@ const gridColModel = {
 		{
 			index: 'STTL_DVSN_NM', name: 'sttlDvsnNm',
 			label: "정산구분",
-			width: '6', fixed: false, align: 'center',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
 			label: "발주번호",
 			width: '10', fixed: false, align: 'center',
+			minwidth: 180,
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'PODR_DTL_NO', name: 'podrDtlNo',
 			label: "발주항번",
-			width: '6', fixed: false, align: 'center',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		}
 	]
@@ -672,6 +675,7 @@ let modifyObj = {
 		init: function() {
 			this.unload();
 			this.load();
+			itp_fn_jqgrid_resize(SETTMNG01010_DETAIL_GRID_ID, SETTMNG01010_DETAIL_GRID_LIST, 'lg');
 		},
 		load : function() {
 			let param = $('#ITP_FORM_SETTMNG01010_DETAIL').serializeObject();

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

@@ -39,7 +39,7 @@
 						  <div class="fnUseAmtTotal">0원</div>
 					  </div>
 				  </div>
-				<div class="line top6">
+				<div class="line">
 				  <label>거래일자</label>
 				  <div class="date_to">
 					  <input type="text" id="ITP_FORM_MLOANMNG01011_VIEW_SEARCH_FROM_DT" name="fromDt" class="itp_input date" readonly>
@@ -60,7 +60,7 @@
 			<div id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_AREA" class="scroll_area row-11">
 			 <ul id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
 			  <div id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_ROWCOPY" style="display: none;">
-				<li class="history_list6 item-row">
+				<li class="history_list15 item-row">
 				  <div>
 					<div class="detail_line">
 					  <div class="detail_left">

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

@@ -150,14 +150,14 @@
 					  <div>
 						<div class="left">
 						  <div class="nomal">
-							<label class="col_4">품목명</label>
+							<label class="col_7">품목명</label>
 							<span>:</span>
 						    <div class="full fnItemNm"></div>
 						  </div>
 						</div>
 						<div class="left">
 						  <div class="nomal">
-							<label class="col_4">단가금액</label>
+							<label class="col_7">단가금액</label>
 							<span>:</span>
 						    <div class="col_82 lit fnUnitAmt"></div>
 							<label class="col_7">정산구분</label>
@@ -167,7 +167,7 @@
 						</div>
 						<div class="left">
 						  <div class="nomal">
-							<label class="col_4">발주수량</label>
+							<label class="col_7">발주수량</label>
 							<span>:</span>
 						    <div class="col_82 lit fnPodrQyt"></div>
 							<label class="col_7">입고(수거)일자</label>

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

@@ -382,7 +382,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line div.date_to {display:flex; width:62%; height:26px; float: left; margin-right:0px; margin-top:3px;}
 .content .line div.date_to input {font-weight:100; width:47%; height:26px; font-size:11pt; padding:0 24px 0 3px; margin:0;}
 
-.content .line div.date_to div.at {width: 6%;  font-size: 16px; padding-top:12px; float: right;}
+.content .line div.date_to div.at {width: 6%;  font-size: 16px; padding-top:2px; float: right;}
 .content .line .search {width: 100%; height: 50px; padding-top:6px;}
 .content .line .search button {width: 40%; height: 26px; font-size: 12pt; font-weight:100; padding: 0;}
 .content .line .search button.col_3 {width: 25%; height:26px; margin:0 10px;}
@@ -507,6 +507,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li.history_list12 {height: 170px; padding-top:4px;}
 .scroll_area li.history_list13 {height: 200px; padding-top:4px;}
 .scroll_area li.history_list14 {height: 175px; padding-top:4px;}
+.scroll_area li.history_list15 {height: 75px; padding-top:0px;}
 
 .scroll_area li .history_info {width: auto;}
 .scroll_area li .left {width:100%; height:28px; margin-top:0px;}
@@ -517,7 +518,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
 .scroll_area li .left .history input{width: 150px;}
 
-.scroll_area li .detail_line {width: 100%; height:25px; display: inline-block;}
+.scroll_area li .detail_line {width: 100%; height:16px; display: inline-block;}
 .scroll_area li .detail_left {float: left;}
 .scroll_area li .detail_left .detail_info {margin: 5px 10px;}
 .scroll_area li .detail_left .detail_info div {width: auto; font-size: 14px; font-weight: 700;}