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

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

@@ -195,7 +195,7 @@ const gridColModel = {
 			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.pchPodrUnqNo, //구매발주번호
 			width: '10', fixed: false, align: 'center',
-			minwidth: 140,
+			minwidth: 130,
 			sortable: false, hidden: false
 		},
 		{
@@ -228,34 +228,32 @@ const gridColModel = {
 			index: 'WHS_NM', name: 'whsNm',
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
 			width: '15', fixed: false, align: 'left',
-			minwidth: 220,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'LOCATION', name: 'location',
 			label: ITP_MSG_LOCALE.label.location, //납품LOCATION
-			width: '15', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: true
 		},
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
-			width: '6', fixed: false, align: 'right',
-			minwidth: 80,
+			width: '15', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',
 			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
-			width: '10', fixed: false, align: 'right',
+			width: '15', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'SHMT_QTY', name: 'shmtQty',
 			label: ITP_MSG_LOCALE.label.shmtQty, //출고수량
-			width: '10', fixed: false, align: 'right',
+			width: '15', fixed: false, align: 'right',
 			sortable: true, editable: true, edittype: 'text',
 			editrules: { required: true, number: true },
 			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');"}, 
@@ -264,14 +262,14 @@ const gridColModel = {
 		{
 			index: 'STCK_QTY', name: 'stckQty',
 			label: ITP_MSG_LOCALE.label.stckQty, //현 재고
-			width: '10', fixed: false, align: 'right',
+			width: '15', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'EXPRY_YN', name: 'expryYn',
 			label: ITP_MSG_LOCALE.label.expryYn, //유통기한여부
-			width: '10', fixed: false, align: 'center',
+			width: '14', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -291,14 +289,14 @@ const gridColModel = {
 		{
 			index: 'PODR_AMT', name: 'podrAmt',
 			label: ITP_MSG_LOCALE.label.podrAmt, //발주금액
-			width: '10', fixed: false, align: 'right',
+			width: '15', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
 			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
-			width: '10', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -316,8 +314,7 @@ const gridColModel = {
 		{
 			index: 'SHMT_WHS_NM', name: 'shmtWhsNm',
 			label: ITP_MSG_LOCALE.label.shmtWhsNm, //출고창고명
-			width: '10', fixed: false, align: 'left',
-			minwidth: 220,
+			width: '12', fixed: false, align: 'left',
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		}
 	]
@@ -362,8 +359,7 @@ let pageObj = {
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(INOUTMNG01010_GRID_ID, INOUTMNG01010_GRID_LIST, 'lg');
-			//listObj.empty.init();
-			
+			listObj.empty.init();
 		},
 		ready: function() {
 			listObj.init();
@@ -500,7 +496,8 @@ let pageObj = {
 			this.gridRows = param.recordData;
 			this.unload();
 			this.load(param.recordData);
-			
+			itp_fn_jqgrid_resize(INOUTMNG01010_DETAIL_GRID_ID, INOUTMNG01010_DETAIL_GRID_LIST, 'lg');
+
 		},
 		gridId: '',
 		button: {},

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

@@ -218,9 +218,6 @@
 					<button id="ITP_BTN_MLOANMNG01010_POP_STORE_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MLOANMNG01010_POP_SOTRE_NM" class="btn_red">매 장 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MLOANMNG01010_POP_STORE_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MLOANMNG01010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MLOANMNG01010_POP_STORE_ROWCOPY" style="display: none;">

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

@@ -234,9 +234,6 @@
 					<button id="ITP_BTN_MLOANMNG02010_POP_STORE_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MLOANMNG02010_POP_SOTRE_NM" class="btn_red">매 장 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MLOANMNG02010_POP_STORE_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MLOANMNG02010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MLOANMNG02010_POP_STORE_ROWCOPY" style="display: none;">

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

@@ -309,9 +309,6 @@
 					<button id="ITP_BTN_MLOANMNG03010_POP_STORE_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MLOANMNG02010_POP_SOTRE_NM" class="btn_red">매 장 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MLOANMNG03010_POP_STORE_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MLOANMNG03010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MLOANMNG03010_POP_STORE_ROWCOPY" style="display: none;">

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

@@ -343,9 +343,6 @@
           <button id="ITP_BTN_MPOMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
         </form>
       </div>
-      <div class="select_btn">
-        <button id="ITP_BTN_MPOMNG02010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
-      </div>
       <div id="ITP_LIST_MPOMNG02010_POP_WHS_AREA" class="popup_scroll">
         <ul id="ITP_LIST_MPOMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
         <div id="ITP_LIST_MPOMNG02010_POP_WHS_ROWCOPY" style="display: none;">
@@ -381,7 +378,6 @@
         </div>
         <div class="select_btn">
 		  <button id="ITP_BTN_MPOMNG02010_POP_ITEM_ADD" class="btn_blue">추가</button>
-          <button id="ITP_BTN_MPOMNG02010_POP_ITEM_NM" class="btn_red">품목명 <img src="../img/arrow_down.png"></button>
         </div>
       </form>
       <div id="ITP_LIST_MPOMNG02010_POP_ITEM_AREA" class="popup_scroll">
@@ -399,7 +395,7 @@
            	 <div class="itp_num_set">
                 <div class="right">
 				    <button id="ITP_BTN_MPOMNG02010_POP_ITEM_MINUS">-</button>
-					<input type="number" id="ITP_MPOMNG02010_POP_NUM" class="" value="1" maxlength="5">
+					<input type="number" id="ITP_BTN_MPOMNG02010_POP_NUM" class="" value="1" maxlength="5">
 				    <button id="ITP_BTN_MPOMNG02010_POP_ITEM_PLUS">+</button>
 			    </div>
 		    </div>

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

@@ -205,9 +205,6 @@
 					<button id="ITP_BTN_MPOMNG04010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG04010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_POP_MPOMNG04010_SPPLY_LIST_AREA" class="popup_scroll">
 				<ul id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWCOPY" style="display: none;">
@@ -242,9 +239,6 @@
 					<button id="ITP_BTN_MPOMNG04010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG04010_POP_WHS_NM" class="btn_red">납품장소<img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MPOMNG04010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MPOMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MPOMNG04010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -34,7 +34,7 @@
 					<div class="line">
 						<label>공급업체</label>
 						<div class="float_left">
-							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="" readonly>
+							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" readonly>
 							<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
 	           				<div class="itp_input_btn">
 								<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
@@ -47,7 +47,7 @@
 					<div class="line">
 						<label>납품장소</label>
 						<div class="float_left">
-							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
+							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" readonly />
 							<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
 	           				<div class="itp_input_btn">
 								<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -60,7 +60,7 @@
 					<div class="line">
 						<label>품목명</label>
 						<div class="float_left name">
-							<input id="ITP_FORM_MPOMNG05010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="">
+							<input id="ITP_FORM_MPOMNG05010_LIST_ITEM_NM" name="sitemNm" type="text">
 						</div>
 					</div>
 					<div class="line">
@@ -162,9 +162,6 @@
 					<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
 				<ul id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWCOPY" style="display: none;">
@@ -199,9 +196,6 @@
 					<button id="ITP_BTN_MPOMNG05010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG05010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MPOMNG05010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MPOMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MPOMNG05010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -143,9 +143,6 @@
 					<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_AREA" class="popup_scroll">
 				<ul id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWCOPY" style="display: none;;">
@@ -180,9 +177,6 @@
 					<button id="ITP_BTN_MPOMNG06010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG06010_POP_WHS_NM" class="btn_red">수거창고 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MPOMNG06010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MPOMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MPOMNG06010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -140,9 +140,6 @@
 					<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_AREA" class="popup_scroll">
 				<ul id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWCOPY" style="display: none;">
@@ -177,9 +174,6 @@
 					<button id="ITP_BTN_MPOMNG07010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG07010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MPOMNG07010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MPOMNG07010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MPOMNG07010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -130,9 +130,6 @@
 					<button id="ITP_BTN_MRTNMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_red">반품장소 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MRTNMNG01010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWCOPY" style="display: none;">
@@ -168,7 +165,6 @@
 				</div>
 				<div class="select_btn">
 					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" class="btn_blue ">추가</button>
-					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_red">품목명 <img src="../img/arrow_down.png"></button>
 				</div>
 			</form>
 			<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_AREA" class="popup_scroll">

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

@@ -285,9 +285,6 @@
 					<button id="ITP_BTN_MRTNMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_red">반품장소 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MRTNMNG02010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display: none;">
@@ -323,7 +320,6 @@
 				</div>
 				<div class="select_btn">
 					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_ADD" class="btn_blue ">추가</button>
-					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_red">품목명 <img src="../img/arrow_down.png"></button>
 				</div>
 			</form>
 			<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_AREA" class="popup_scroll">

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

@@ -220,9 +220,6 @@
 					<button id="ITP_BTN_MRTNMNG04010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_red">창 고 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MRTNMNG04010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display:none;">

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

@@ -142,9 +142,6 @@
 					<button id="ITP_BTN_MRTNMNG05010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG05010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_POP_MRTNMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
 				<ul id="ITP_POP_MRTNMNG05010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_POP_MRTNMNG05010_LIST_SPPLY_ROWCOPY" style="display: none;">
@@ -179,9 +176,6 @@
 					<button id="ITP_BTN_MRTNMNG05010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_red">수거장소 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MRTNMNG05010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -133,9 +133,6 @@
 					<button id="ITP_BTN_MRTNMNG06010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG06010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_POP_MRTNMNG06010_LIST_SPPLY_AREA" class="popup_scroll">
 				<ul id="ITP_POP_MRTNMNG06010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_POP_MRTNMNG06010_LIST_SPPLY_ROWCOPY" style="display: none;">
@@ -170,9 +167,6 @@
 					<button id="ITP_BTN_MRTNMNG06010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_red">수거장소 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MRTNMNG06010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display: none;">