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

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

@@ -114,7 +114,7 @@
 											</div>
 										</div>
 										<div id="ITP_POMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
-										    <div id="ITP_POMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
+										    <!-- <div id="ITP_POMNG01010_DETAIL_jqGridView" class="itp_views fix"></div> -->
 										    <table id="ITP_POMNG01010_DETAIL_jqGrid"></table>
 										    <div id="ITP_POMNG01010_DETAIL_jqGridPager"></div>
 										    <div id="ITP_POMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

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

@@ -272,7 +272,7 @@
 											<h4 class="itp_table_tit">요청 품목</h4>
 										</div>
 										<div id="ITP_POMNG02010_VIEW_jqGrid_list" class="itp_tb_list">
-										    <div id="ITP_POMNG02010_VIEW_jqGridView" class="itp_views fix"></div>
+										    <!-- <div id="ITP_POMNG02010_VIEW_jqGridView" class="itp_views fix"></div> -->
 										    <table id="ITP_POMNG02010_VIEW_jqGrid"></table>
 									     	<div id="ITP_POMNG02010_VIEW_jqGridPager"></div>
 										    <div id="ITP_POMNG02010_VIEW_jqGridEmpty" class="itp_no_data"></div>

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

@@ -204,12 +204,16 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">공급업체명*</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_POMNG03010_NDETAIL_SPPLY_NM" data-check-required="empty" class="form-control itp_input" name="spplyNm" readonly="readonly" />
+												<div class="col-xs-8 itp_in">
+													<div class="input-group">
+														<input type="text" id="ITP_FORM_POMNG03010_NDETAIL_SPPLY_NM" data-check-required="empty" class="form-control itp_input" name="spplyNm" readonly="readonly" />
+														<span class="input-group-btn">
+															<button id="ITP_BTN_POMNG03010_NDETAIL_DELETE_SPPLY_NM" class="btn btn-default btn-sm itp_btn UPB SHOW" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+														</span>
+													</div>
 												</div>
-												<div class="col-xs-4 itp_in" style="padding-left: 3px;">
+												<div class="col-xs-a itp_in" style="padding-left: 3px;">
 													<button type="button" id="ITP_BTN_POMNG03010_NDETAIL_SEARCH_SPPLY_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_BTN_POMNG03010_NDETAIL_DELETE_SPPLY_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 								                </div>
 											</div>
 											<label class="col-xs-2 itp_lb">발주일자</label>
@@ -220,12 +224,16 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">납품장소 *</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_POMNG03010_NDETAIL_WHS_NM" data-check-required="empty" class="form-control itp_input" name="whsNm" readonly="readonly" />
+												<div class="col-xs-8 itp_in">
+													<div class="input-group">
+														<input type="text" id="ITP_FORM_POMNG03010_NDETAIL_WHS_NM" data-check-required="empty" class="form-control itp_input" name="whsNm" readonly="readonly" />
+														<span class="input-group-btn">
+															<button id="ITP_BTN_POMNG03010_DELETE_WHS_NM" class="btn btn-default btn-sm itp_btn UPB SHOW" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+														</span>
+													</div>
 												</div>
-												<div class="col-xs-4 itp_in" style="padding-left: 3px;">
+												<div class="col-xs-a itp_in" style="padding-left: 3px;">
 													<button type="button" id="ITP_BTN_POMNG03010_SEARCH_WHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_BTN_POMNG03010_DELETE_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 								                </div>
 											</div>
 											<label class="col-xs-2 itp_lb">발주 총 금액</label>
@@ -263,7 +271,7 @@
 											</div>
 										</div>
 										<div id="ITP_POMNG03010_NDETAIL_jqGrid_list" class="itp_tb_list">
-										  <div id="ITP_POMNG03010_NDETAIL_jqGridView" class="itp_views fix"></div>
+										  <!-- <div id="ITP_POMNG03010_NDETAIL_jqGridView" class="itp_views fix"></div> -->
 										  <table id="ITP_POMNG03010_NDETAIL_jqGrid"></table>
 										  <div id="ITP_POMNG03010_NDETAIL_jqGridPager"></div>
 										  <div id="ITP_POMNG03010_NDETAIL_jqGridEmpty" class="itp_no_data"></div>

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

@@ -23,9 +23,9 @@
 										</div>										
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_POMNG04010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+												<input type="text" id="ITP_FORM_POMNG04010_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_POMNG04010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+												<input type="text" id="ITP_FORM_POMNG04010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">

src/main/webapp/js/app/pomng/ITP_POMNG01010.js

@@ -48,7 +48,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm,
-			width: '30', fixed: false, align: 'center',
+			width: '30', fixed: false, align: 'left',
 			sortable: true, editable: false, edittype: 'text',
 			editrules: { required: true }
 		},
@@ -61,7 +61,7 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt,
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},

src/main/webapp/js/app/pomng/ITP_POMNG02010.js

@@ -63,6 +63,7 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'center',
+			minwidth: 120,
 			sortable: false, hidden: false
 		},
 		{
@@ -73,33 +74,37 @@ const gridColModel = {
 		},
 		{
 			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
-			label: ITP_MSG_LOCALE.label.pchReqUnqNo
-			, //구매요청번호
+			label: ITP_MSG_LOCALE.label.pchReqUnqNo, //구매요청번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 120,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_REQ_NM', name: 'pchReqNm',
 			label: ITP_MSG_LOCALE.label.pchReqNm, //구매요청명
 			width: '13', fixed: false, align: 'left',
+			minwidth: 160,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_REQ_ST_CD', name: 'pchReqStCd',
 			label: ITP_MSG_LOCALE.label.pchReqStCd, //구매요청상태
 			width: '15', fixed: false, align: 'center',
+			minwidth: 10,
 			sortable: false, hidden: true
 		},
 		{
 			index: 'PCH_REQ_ST_NM', name: 'pchReqStNm',
 			label: ITP_MSG_LOCALE.label.pchReqStNm, //구매요청상태명
 			width: '6', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_REQ_DT', name: 'pchReqDt',
 			label: ITP_MSG_LOCALE.label.pchReqDt, //구매요청일
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -131,19 +136,22 @@ const gridColModel = {
 		{
 			index: 'PCH_REQ_MGR_NM', name: 'pchReqMgrNm',
 			label: ITP_MSG_LOCALE.label.pchReqMgrNm, //구매요청자명
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
 			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
 			width: '10', fixed: false, align: 'center',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_LOCATION_NM', name: 'whsLocationNm',
 			label: ITP_MSG_LOCALE.label.whsLocationNm, //납품창고
 			width: '10', fixed: false, align: 'left',
+			minwidth: 200,
 			sortable: false, hidden: false
 		}
 	],
@@ -178,7 +186,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm,
-			width: '30', fixed: false, align: 'center',
+			width: '30', fixed: false, align: 'left',
 			sortable: true, editable: false, edittype: 'text',
 			editrules: { required: true }
 		},
@@ -191,7 +199,7 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt,
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', hidden: false,
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},

src/main/webapp/js/app/pomng/ITP_POMNG03010.js

@@ -66,7 +66,8 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 120,
 			sortable: false, hidden: false
 		},
 		{
@@ -79,6 +80,7 @@ const gridColModel = {
 			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
 			label: ITP_MSG_LOCALE.label.pchReqUnqNo, //구매요청고유번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
@@ -109,6 +111,7 @@ const gridColModel = {
 			index: 'SPPLY_NM', name: 'spplyNm',
 			label: ITP_MSG_LOCALE.label.spplyNm, //공급사명
 			width: '6', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -121,6 +124,7 @@ const gridColModel = {
 			index: 'WHS_NM', name: 'whsNm',
 			label: ITP_MSG_LOCALE.label.whsNm, //창고명
 			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -139,12 +143,14 @@ const gridColModel = {
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -192,6 +198,7 @@ const gridColModel = {
 			index: 'LEAD_TIME', name: 'leadTime',
 			label: ITP_MSG_LOCALE.label.leadTime, //리드타임
 			width: '10', fixed: false, align: 'right',
+			minwidth: 100,
 			sortable: false, hidden: false
 		}
 	],
@@ -205,7 +212,7 @@ const gridColModel = {
 		{
 			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
 			label: ITP_MSG_LOCALE.label.pchReqUnqNo,  //구매요청번호
-			width: '20', fixed: false, align: 'center',
+			width: '16', fixed: false, align: 'center',
 			sortable: false, hidden: false, edittype: 'text',
 			 editable: false
 		},
@@ -219,7 +226,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, // 품목아이디
-			width: '10', fixed: false, align: 'center',
+			width: '12', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false
 		},
@@ -233,7 +240,7 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
-			width: '10', fixed: false, align: 'right',
+			width: '7', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false,
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -241,7 +248,7 @@ const gridColModel = {
 		{
 			index: 'UNIT', name: 'unit',
 			label: ITP_MSG_LOCALE.label.unit, //단위
-			width: '10', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false
 		},

src/main/webapp/js/app/pomng/ITP_POMNG04010.js

@@ -38,7 +38,7 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm,			// 브랜드명
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -68,13 +68,13 @@ const gridColModel = {
 		{
 			index: 'SPPLY_NM', name: 'spplyNm',
 			label: ITP_MSG_LOCALE.label.spplyNm, 			// 공급업체명
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PODR_TOTAL_AMT', name: 'podrTotalAmt',
 			label: ITP_MSG_LOCALE.label.podrTotalAmt, 		// 총 발주금액
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
@@ -87,7 +87,7 @@ const gridColModel = {
 		{
 			index: 'PODR_MGR_NM', name: 'podrMgrNm',
 			label: ITP_MSG_LOCALE.label.podrMgrNm, 			// 발주담당자
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		}
 	],