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

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

@@ -48,6 +48,7 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'left',
+			minwidth: 200,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -74,7 +75,7 @@ const gridColModel = {
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '10', fixed: false, align: 'left',
-			minwidth: 100,
+			minwidth: 200,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -101,6 +102,7 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
 			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: false,
+			minwidth: 120,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
@@ -108,6 +110,7 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
 			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: false,
+			minwidth: 120,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
@@ -122,6 +125,7 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.stckQty, //현 재고
 			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: false,
+			minwidth: 120,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
@@ -150,6 +154,7 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.podrAmt, //발주금액
 			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: false,
+			minwidth: 120,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{

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

@@ -44,7 +44,7 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'left',
-			minwidth: 130,
+			minwidth: 180,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -71,32 +71,32 @@ const gridColModel = {
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '10', fixed: false, align: 'left',
-			minwidth: 130,
+			minwidth: 180,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',
 			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
-			width: '17', fixed: false, align: 'right',
+			width: '18', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'DLV_QTY', name: 'dlvQty',
 			label: ITP_MSG_LOCALE.label.dlvQty, //납품/수주 수량
-			width: '17', fixed: false, align: 'right',
+			width: '18', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'WHS_QTY', name: 'whsQty',	
 			label: ITP_MSG_LOCALE.label.whsQty, //입고수량
-			width: '17', fixed: false, align: 'right',
+			width: '18', fixed: false, align: 'right',
 			sortable: true, editable: true, edittype: 'text',
 			editrules: { required: false, number: true },
 			classes: 'input_color',
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' },
-			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');"}
+			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');", maxlength: 10}
 		},
 		{
 			index: 'WHS_AMT', name: 'whsAmt',
@@ -107,7 +107,7 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
-			width: '17', fixed: false, align: 'right',
+			width: '18', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},

src/main/webapp/js/app/rtnmng/ITP_RTNMNG03010.js

@@ -163,7 +163,8 @@ const gridColModel = {
 		{
 			index: 'RTN_REQ_UNQ_NO', name: 'rtnReqUnqNo',
 			label: '반품요청번호', 
-			width: '9', fixed: false, align: 'center',
+			width: '14', fixed: false, align: 'center',
+			minwidth: 120,
 			sortable: false, hidden: false, edittype: 'text',
 			editable: false
 		},
@@ -177,29 +178,31 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, // 품목아이디
-			width: '10', fixed: false, align: 'center',
+			width: '14', fixed: false, align: 'center',
+			minwidth: 120,
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
-			width: '6', fixed: false, align: 'left',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 140,
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false
 		},
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
-			width: '5', fixed: false, align: 'right',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text',
-			hidden: false,
+			minwidth: 120, hidden: false,
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: ITP_MSG_LOCALE.label.unit, //단위
-			width: '5', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false
 		},
@@ -208,6 +211,7 @@ const gridColModel = {
 			label: '반품요청수량', 
 			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text',
+			minwidth: 120,
 			hidden: false,
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -216,6 +220,7 @@ const gridColModel = {
 			label: '반품발주수량', classes: 'input_color',
 			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
+			minwidth: 120,
 			editrules: {required: true}, hidden: false,
 			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');", maxlength: 10}, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -223,8 +228,9 @@ const gridColModel = {
 		{
 			index: 'RTN_AMT', name: 'rtnAmt',
 			label: '발주금액', 
-			width: '6', fixed: false, align: 'right',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text',
+			minwidth: 120,
 			hidden: false,
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},

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

@@ -32,7 +32,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',  			//서버로 전송시 데이터 명 , 데이터명
 			label: ITP_MSG_LOCALE.label.itemId, 		//품목번호
-			width: '12', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
+			width: '14', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
 			sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
 		},
 		{
@@ -45,7 +45,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_TYPE_NM', name: 'itemTypeNm',	//서버로 전송시 데이터 명 , 데이터명
 			label: ITP_MSG_LOCALE.label.itemTypeNm, 	//품목유형
-			width: '10', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
+			width: '8', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
 			sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
 		},
 		{