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

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

@@ -150,7 +150,7 @@
 									<div class="itp_form_info">	
 										<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-10 itp_ip">
 													<div class="col-xs-a itp_in fnItemId"></div>
 													<label class="col-xs-1" style="width:2%;">/</label>
@@ -283,7 +283,7 @@
 									</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-10 itp_ip">
 												<div class="col-xs-a itp_in fnItemId"></div>
 												<label class="col-xs-1" style="width:2%;">/</label>

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

@@ -507,7 +507,6 @@ let modifyObj = {
 			this.gridEmpty = ORDMNG02010_DETAIL_GRID_EMPTY;
 			this.unload();
 			this.load(gridData);
-			$(ORDMNG02010_DETAIL_GRID_ID).jqGrid('hideCol', 'cb');
 		},
 		mode: '',
 		colModel: gridColModel.detail,
@@ -611,8 +610,10 @@ let modifyObj = {
 				],
 				data: gridData,
 				multiselect: true,
+				multiboxonly: true,
 				loadComplete: function(data) {
 					itp_fn_grid_load_complete(data, ORDMNG02010_DETAIL_GRID_ID, true, 'number', 'ORDMNG02010', modifyObj.itp_ORDMNG02010_search, modifyObj.empty, true, data.gridRecords, true);
+					$(ORDMNG02010_DETAIL_GRID_ID).jqGrid('hideCol', 'cb');
 				},
 				onCellSelect: function(rowId, cellIdx, cellValue) {
 					ORDMNG02010_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowId, cellIdx, ORDMNG02010_GRID_LAST_ROW_ID, ORDMNG02010_DETAIL_GRID_ID, ['actionId']);

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

@@ -114,6 +114,7 @@ function itp_fn_BIZPOP_STORE_SPPLY(parentPopFn, args, returnType) {
 		loadComplete: function(data) {
 			console.log(data);
 			itp_fn_grid_load_complete(data, THIS_GIRD_ID, true, undefined, 'BIZPOP_STORE_SPPLY', itp_BIZPOP_STORE_SPPLY_search, itp_fn_BIZPOP_STORE_SPPLY_empty, true, data.gridRecords, false);
+			$(THIS_GIRD_ID).jqGrid('hideCol', 'cb');
 	    },
 	    loadError: function(jqXHR, textStatus, errorThrown) {
 	    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);

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

@@ -344,6 +344,7 @@ let listObj = {
 				url: DOMAIN + API_DETAIL_GRID_LIST,
 				pager: STINFO05010_GRID_PAGER,
 				multiselect: true,
+				multiboxonly: true,
 				rownumbers: false,
 				onCellSelect: function(rowId, cellIdx, cellValue) {
 					var cm = $(this).jqGrid('getGridParam', 'colModel');
@@ -362,6 +363,7 @@ let listObj = {
 					$.each(ids, function(idx, rowId) {
 						$(STINFO05010_GRID_ID).jqGrid('setCell', rowId, 'itemId', '', ITP_GRID_COL_STYLE.link);
 					});
+					$(STINFO05010_GRID_ID).jqGrid('hideCol', 'cb');
 				},
 				onPaging: function(action) {
 					itp_fn_grid_paging(STINFO05010_GRID_ID, action, param);
@@ -413,7 +415,13 @@ let viewObj = {
 		$('#ITP_FORM_STINFO05010_VIEW .fnItemNm').text(result.itemNm);
 		$('#ITP_FORM_STINFO05010_VIEW .fnSpplyId').text(result.spplyId);
 		$('#ITP_FORM_STINFO05010_VIEW .fnSpplyNm').text(result.spplyNm);
-		$('#ITP_FORM_STINFO05010_VIEW .fnSpplyItemId').text(result.spplyItemId);
+		let spplyItemId;
+		if (result.spplyItemId == null || result.spplyItemId == '') {
+			spplyItemId = '(미등록)';
+		} else {
+			spplyItemId = result.spplyItemId;
+		}
+		$('#ITP_FORM_STINFO05010_VIEW .fnSpplyItemId').text(spplyItemId);
 		$('#ITP_FORM_STINFO05010_VIEW .fnContSttDt').text(result.contSttDt);
 		$('#ITP_FORM_STINFO05010_VIEW .fnContEndDt').text(result.contEndDt);
 		$('#ITP_FORM_STINFO05010_VIEW .fnLeadTime').text(itp_fn_number_comma(result.leadTime) + ' Day(s)');

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

@@ -121,31 +121,31 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목번호
-			width: '12', fixed: false, align: 'center',
+			width: '14', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '11', fixed: false, align: 'left',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'CONT_STT_DT', name: 'contSttDt',
 			label: ITP_MSG_LOCALE.label.contSttDt, //계약시작일
-			width: '10', fixed: false, align: 'center',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'CONT_END_DT', name: 'contEndDt',
 			label: ITP_MSG_LOCALE.label.contEndDt, //계약종료일
-			width: '10', fixed: false, align: 'center',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: ITP_MSG_LOCALE.label.unit, //기본단위
-			width: '8', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, editable: false, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_DSTRBT_COST_UNIT}
 		},
@@ -161,7 +161,7 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
-			width: '10', fixed: false, align: 'right',
+			width: '9', fixed: false, align: 'right',
 			sortable: true, editable: true, edittype: 'text',
 			classes: 'input_color',
 			editrules: {required: true},
@@ -180,7 +180,7 @@ const gridColModel = {
 		{
 			index: 'SPPLY_UNIT_AMT', name: 'spplyUnitAmt',
 			label: ITP_MSG_LOCALE.label.spplyUnitAmt, //공급단가
-			width: '6', fixed: false, align: 'right',
+			width: '9', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 			
@@ -188,9 +188,9 @@ const gridColModel = {
 		{
 			index: 'SPPLY_NM', name: 'spplyNm',
 			label: ITP_MSG_LOCALE.label.spplyNm, //공급업체명
-			width: '6', fixed: false, align: 'left',
+			width: '8', fixed: false, align: 'left',
 			minwidth: 240,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		}
 	],
 	sdetail: [
@@ -228,38 +228,38 @@ const gridColModel = {
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목번호
 			minwidth: 160,
-			width: '10', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '13', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'CONT_STT_DT', name: 'contSttDt',
 			label: ITP_MSG_LOCALE.label.contSttDt, //계약시작일
-			width: '10', fixed: false, align: 'center',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'CONT_END_DT', name: 'contEndDt',
 			label: ITP_MSG_LOCALE.label.contEndDt, //계약종료일
-			width: '10', fixed: false, align: 'center',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: ITP_MSG_LOCALE.label.unit, //기본단위
-			width: '9', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'center',
 			sortable: false, editable: false, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_DSTRBT_COST_UNIT}
 		},
 		{
 			index: 'CURR', name: 'curr',
 			label: ITP_MSG_LOCALE.label.curr, //통화
-			width: '9', fixed: false, align: 'center',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, editable: false, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_CURR}
 		},

src/main/webapp/js/app/vendinfo/ITP_VENDINFO03010.js

@@ -65,9 +65,10 @@ const gridColModel = {
 		},
 		{
 			index: 'LEAD_TIME', name: 'leadTime',
-			label: ITP_MSG_LOCALE.label.leadTime, 	//리드타임 (Day)
+			label: '리드타임 Day(s)', 	//리드타임 (Day)
 			width: '7', fixed: false, align: 'right',
-			sortable: false, hidden: false
+			sortable: false, hidden: false,
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'UNIT_ST_NM', name: 'unitStNm',

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

@@ -151,59 +151,41 @@
 					<h1>> 운영정보</h1>
 				</div>
 				<div id="ITP_MAIN_HEADER_BRAND" class="itp_oper_info_area" style="display: none;">
-					<div class="itp_oper_info">
-						<label>구매요청건수</label>
-						<span>:</span>
-						<div class="fnPr20Count">2 건</div>
-					</div>
 					<div class="itp_oper_info">
 						<label>입금액</label>
-						<span>:</span>
 						<div class="fnDp02Amt">12,000,000원</div>
-					</div>
-					<div class="itp_oper_info">
 						<label>미납금</label>
-						<span>:</span>
 						<div class="fnUnpaidAmt">1,000원</div>
 					</div>
-				</div>
-				<div id="ITP_MAIN_HEADER_STORE" class="itp_oper_info_area" style="display: none;">
 					<div class="itp_oper_info">
-						<label>구매요청</label>
-						<span>:</span>
-						<div class="fnPr20Count">2 건</div>
+						<label class="col_6">구매요청건수</label>
+						<div class="full fnPr20Count">2 건</div>
 					</div>
+				</div>
+				<div id="ITP_MAIN_HEADER_STORE" class="itp_oper_info_area" style="display: none;">
 					<div class="itp_oper_info">
+						<label class="col_6">구매요청</label>
+						<div class="col_6 fnPr20Count">2 건</div>
 						<label>발주진행</label>
-						<span>:</span>
 						<div class="fnPo30Count">12,000,000원</div>
 					</div>
 					<div class="itp_oper_info">
+						<label class="col_6">구매가능금액</label>
+						<div class="col_6 fnPoPsblAmt">1,000원</div>
 						<label>발주완료</label>
-						<span>:</span>
 						<div class="fnPoEndCount">1,000원</div>
 					</div>
-					<div class="itp_oper_info">
-						<label>구매가능금액</label>
-						<span>:</span>
-						<div class="fnPoPsblAmt">1,000원</div>
-					</div>
 				</div>
 				<div id="ITP_MAIN_HEADER_SPPLY" class="itp_oper_info_area" style="display: none;">
 					<div class="itp_oper_info">
 						<label>수주건수</label>
-						<span>:</span>
 						<div class="fnOrdersCount">2 건</div>
-					</div>
-					<div class="itp_oper_info">
 						<label>수주금액</label>
-						<span>:</span>
 						<div class="fnOrdersAmt">12,000,000원</div>
 					</div>
 					<div class="itp_oper_info">
-						<label>정산요청금액</label>
-						<span>:</span>
-						<div class="fnSttlReqAmt">1,000원</div>
+						<label class="col_6">정산요청금액</label>
+						<div class="full fnSttlReqAmt">1,000원</div>
 					</div>
 				</div>
 				<div id="ITP_MAIN_DRAW_CHART_REQ" class="itp_graph_area">

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

@@ -84,7 +84,8 @@
 	            </div>
 				<div class="right" style="width:125px;">
 					<button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS" class="DETAIL_ITEM_MINUS">-</button>
-					<div class="num fnPchReqQty">1</div>
+					<input id="ITP_MPOMNG01010_DETAIL_NUM" class="">
+					<!-- <div class="num fnPchReqQty">1</div> -->
 					<button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS" class="DETAIL_ITEM_PLUS">+</button>
 				</div>
 			</li>
@@ -222,7 +223,7 @@
                         </div>
                         <div class="right">
 			              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_MINUS">-</button>
-			              <div class="num fnPchReqQty">1</div>
+			              <input id="ITP_MPOMNG01010_POP_NUM" class="">
 			              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_PLUS">+</button>
 			            </div>
                          <div class="scroll_right">

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

@@ -262,7 +262,7 @@
             </div>
             <div class="right">
               <button id="ITP_BTN_MPOMNG02010_MODIFY_MINUS">-</button>
-              <div class="num fnPchReqQty">1</div>
+			  <input id="ITP_MPOMNG02010_MODIFY_NUM" class="">
               <button id="ITP_BTN_MPOMNG02010_MODIFY_PLUS">+</button>
             </div>
           </li>
@@ -399,7 +399,7 @@
            	 <div class="itp_num_set">
                 <div class="right">
 				    <button id="ITP_BTN_MPOMNG02010_POP_ITEM_MINUS">-</button>
-				    <div class="num fnPchReqQty">1</div>
+    			    <input id="ITP_BTN_MPOMNG02010_POP_NUM" class="">
 				    <button id="ITP_BTN_MPOMNG02010_POP_ITEM_PLUS">+</button>
 			    </div>
 		    </div>

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

@@ -65,7 +65,7 @@
 			            </div>
 						<div class="right" style="width:125px;">
 							<button id="ITP_BTN_MRTNMNG01010_DETAIL_MINUS" class="DETAIL_ITEM_MINUS">-</button>
-							<div class="num fnPchReqQty">1</div>
+							<input id="ITP_MRTNMNG01010_DETAIL_NUM" class="">
 							<button id="ITP_BTN_MRTNMNG01010_DETAIL_PLUS" class="DETAIL_ITEM_PLUS">+</button>
 						</div>
 					</li>
@@ -185,7 +185,7 @@
                         </div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
-							<div class="num fnPchReqQty">1</div>
+							<input id="ITP_MRTNMNG01010_POP_NUM" class="">
 							<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
 						</div>
                        <div class="scroll_right">

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

@@ -221,7 +221,7 @@
 						</div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_MINUS" class="DETAIL_ITEM_MINUS">-</button>
-							<div class="num fnRtnQty">1</div>
+							<input id="ITP_MRTNMNG02010_MODIFY_NUM" class="">
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_PLUS" class="DETAIL_ITEM_PLUS">+</button>
 						</div>
 					</li>
@@ -340,7 +340,7 @@
 						</div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
-							<div class="num fnRtnQty">1</div>
+							<input id="ITP_MRTNMNG02010_POP_NUM" class="">
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
 						</div>
 						<div class="scroll_right">

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

@@ -118,6 +118,8 @@ section .popup2 .pop .popup_scroll li .scroll_right button:hover {background:#70
 section .popup2 .pop .popup_scroll li .right {position: relative; display: flex; font-size: 1.6rem; font-weight: 700; float: right; top:21px; width:91px; height:27px;}
 section .popup2 .pop .popup_scroll li .right button {padding: 0px; font-size: 17px; width:24px;}
 section .popup2 .pop .popup_scroll li .add button{float: right; width: 60px; height: 55px; margin: 12px 9px; border-radius: 10px; font-size: 1rem; background: rgb(198, 170, 250);}
+section .popup2 .pop .popup_scroll li .right input {width:43px; height:27px; margin:0; text-align:center; border-radius:0px; border:1px solid #E0B8AB;}
+section .popup2 .pop .popup_scroll li .right input:focus {outline:none;}
 section .popup2 .pop .content .line button {width: 35%; height: 35px;font-size: 14px; font-weight:100; padding-top: 7px; margin: 0 10px;}
 section .popup2	.list_line {width:98%; float:left; height:40px;display: inline-flex; margin:0 1%; font-size:12px;}
 section .popup2 .border {border-bottom: 1px solid #000 !important;}
@@ -576,6 +578,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .right {margin: 22px 10px 22px 0; position: relative; display: flex; width:110px; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
 .scroll_area li .right .num {padding:2px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB; background:#fff; font-size:14pt;}
 .scroll_area li .right .fnnum {margin:5px 30px; font-size:14pt;}
+.scroll_area li .right input {width:43px; height:30px; margin:0; text-align:center; border-radius:0px; border:1px solid #E0B8AB;}
+.scroll_area li .right input:focus {outline:none;}
 .scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 16px; border-radius: 0px;}
 .scroll_area li .right button:hover {background:#FCD5C1;}
 
@@ -672,8 +676,8 @@ button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background:
 
 /* 메인화면 공지사항 추가 */
 #ITP_MAIN_CONTAINER.itp_main_box{position:relative; height:calc(100vh - 49px); overflow:auto;}
-#ITP_MAIN_CONTAINER .itp_note_header {width:100%; height:46px; padding:10px; border-bottom:1px solid #aaa; background:#dce6f2;}
-#ITP_MAIN_CONTAINER .itp_note_header h1 {font-size:16pt; text-align:left; margin:0;}
+#ITP_MAIN_CONTAINER .itp_note_header {width:100%; height:37spx; padding:9px; border-bottom:1px solid #aaa; background:#dce6f2;}
+#ITP_MAIN_CONTAINER .itp_note_header h1 {font-size:12pt; text-align:left; margin:0;}
 #ITP_MAIN_CONTAINER .itp_note_bar {height: auto; max-height:180px;}
 #ITP_MAIN_CONTAINER .itp_note_bar h1 {position:relative; font-weight:700; font-size:14pt; margin:0; height:60px; padding-top:20px; border-bottom:1px solid #aaa;}
 #ITP_MAIN_CONTAINER .itp_note_bar li {border-bottom:1px solid #aaa; padding:5px; height:60px;}
@@ -685,9 +689,12 @@ button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background:
 #ITP_MAIN_CONTAINER .itp_note_bar li .itp_note_info .under {text-decoration: underline;}
 #ITP_MAIN_CONTAINER .itp_oper_info_area {border-bottom:1px solid #aaa; padding:5px;}
 #ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info {display:flex; height:24px;}
-#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info label{font-size:12pt; text-align:left; width:90px;}
+#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info label{font-size:12pt; text-align:left; width:65px; padding-left:10px;}
+#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info label.col_6{width:95px;}
 #ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info span{width:14px;}
-#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align: right; width:calc(50% - 114px);}
+#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align: right; width:calc(50% - 74px);}
+#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info div.col_6{width:calc(50% - 95px);}
+#ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info div.full{width:calc(100% - 113px);}
 #ITP_MAIN_CONTAINER .itp_graph_area {width:98%; height:300px; border:1px solid #aaa; margin:5px 1%;}
 #ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header {width:160px; margin:5px;}
 #ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header label {width:80px; font-size:14pt; text-align:left; float:left;}