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

src/main/webapp/app/oper/OPER03010.html

@@ -73,7 +73,7 @@
 											</div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">브랜드그룹 명 *</label>
+											<label class="col-xs-2 itp_lb">브랜드그룹명 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
 													<input type="text" id="ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_NM" data-check-required="empty" class="form-control itp_input" name="afflShopNm" value="" maxlength="40">

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

@@ -46,7 +46,7 @@
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-a itp_in fnPchReqDept"></div>
 													<div class="col-xs-a itp_in ">/</div>
-													<div class="col-xs-4 itp_in fnPchReqMgrNm"></div>
+													<div class="col-xs-9 itp_in fnPchReqMgrNm"></div>
 												</div>
 											<label class="col-xs-2 itp_lb">구매요청금액</label>
 											<div class="col-xs-4 itp_ip fnPchReqAmt"></div>

src/main/webapp/js/app/config.js

@@ -3107,6 +3107,25 @@ var itp_fn_s2ab = function(s) {
 };
 
 /*
+var itp_fn_remote_to_excel = function(param) {
+	param.param['pagingYn'] = false;
+	var options = {
+		url: param.url,
+		param: param.param,
+		gridColumns: param.gridColumns,
+		fileName: 'data1.xlsx',
+		sheetName: 'sheet1'
+	};
+	$.extend(options, param);
+	var callbackFn = function(result) {
+		console.log(result);
+		itp_fn_export_excel(itp_fn_excel_data(options.gridColumns, result.gridRows), options.fileName, options.sheetName);
+		// itp_fn_export_excel(result.gridRows, options.fileName, options.sheetName);
+	};
+	fn_ajax_call(options.url, JSON.stringify(options.param), callbackFn, 'POST');
+};
+*/
+
 let itp_fn_excel_data = function(gridColumns, excelData) {
 	var rtnData = [];
 	var cols = [];
@@ -3145,26 +3164,6 @@ var itp_fn_export_excel = function(excelData, fileName, sheetName) {
     // 엑셀 파일 내보내기 
     saveAs(new Blob([itp_fn_s2ab(wbout)],{type:"application/octet-stream"}), fileName);
 };
-
-var itp_fn_remote_to_excel = function(param) {
-	param.param['pagingYn'] = false;
-	var options = {
-		url: param.url,
-		param: param.param,
-		gridColumns: param.gridColumns,
-		fileName: 'data1.xlsx',
-		sheetName: 'sheet1'
-	};
-	$.extend(options, param);
-	var callbackFn = function(result) {
-		console.log(result);
-		itp_fn_export_excel(itp_fn_excel_data(options.gridColumns, result.gridRows), options.fileName, options.sheetName);
-		// itp_fn_export_excel(result.gridRows, options.fileName, options.sheetName);
-	};
-	fn_ajax_call(options.url, JSON.stringify(options.param), callbackFn, 'POST');
-};
-*/
-
 var itp_fn_remote_to_excel = function(options) { 
 	options.param['pagingYn'] = false; 
 	var callbackFn = function(result) { 

src/main/webapp/js/app/locales/locale-ko.js

@@ -280,6 +280,7 @@ const ITP_MSG_LOCALE = (function() {
 			"rtnRsn": "반품사유",
 			"reqTypeNm":"요청구분",
 			"dlvAmt":"납품금액",
+			"whsDvsnNm":"창고구분",
 		},
 		"table": {
 			"brandId": "브랜드ID",

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

@@ -68,7 +68,7 @@ const gridColModel = {
 			index: 'DLV_ST_CD', name: 'dlvStNm',		
 			label: '납품상태', 								//납품서상태
 			width: '12', fixed: false, align: 'center',	
-			minwidth:50,
+			minwidth:70,
 			sortable: false, hidden: false				
 		},
 		{
@@ -168,6 +168,13 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',	
 			minwidth:120,
 			sortable: false, hidden: false				
+		},
+		{
+			index: 'WHS_DVSN_NM', name: 'whsDvsnNm',	
+			label: ITP_MSG_LOCALE.label.whsDvsnNm, 	//창고구분
+			width: '10', fixed: false, align: 'center',	
+			minwidth:100,
+			sortable: false, hidden: false				
 		}
 	]
 };

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

@@ -44,8 +44,8 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'left',
-			minwidth: 120,
-			sortable: false, hidden: false
+			minwidth: 110,
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'DLV_STTMT_UNQ_NO', name: 'dlvSttmtUnqNo',
@@ -57,7 +57,7 @@ const gridColModel = {
 		{
 			index: 'DLV_STTMT_DTL_NO', name: 'dlvSttmtDtlNo',
 			label: ITP_MSG_LOCALE.label.dlvSttmtDtlNo, //납품서항번
-			width: '10', fixed: false, align: 'right',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -72,26 +72,26 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '10', fixed: false, align: 'left',
 			minwidth: 120,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',
 			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
-			width: '10', fixed: false, align: 'right',
+			width: '17', 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: '10', fixed: false, align: 'right',
+			width: '17', 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: '10', fixed: false, align: 'right',
+			width: '17', fixed: false, align: 'right',
 			sortable: true, editable: true, edittype: 'text',
 			editrules: { required: false, number: true },
 			classes: 'input_color',
@@ -107,8 +107,7 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
-			width: '6', fixed: false, align: 'right',
-			minwidth: 70,
+			width: '17', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -130,31 +129,31 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
 			width: '15', fixed: false, align: 'left',
 			minwidth: 200,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
 			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
-			width: '15', fixed: false, align: 'center',
+			width: '14', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},		
 		{
 			index: 'DLV_SCH_DT', name: 'dlvSchDt',
 			label: ITP_MSG_LOCALE.label.dlvSchDt, //납품예정일
-			width: '15', fixed: false, align: 'center',
+			width: '14', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'DLV_MGR_NM', name: 'dlvMgrNm',
 			label: ITP_MSG_LOCALE.label.dlvMgrNm, //납품담당자명
-			width: '15', fixed: false, align: 'left',
-			sortable: false, hidden: false
+			width: '12', fixed: false, align: 'left',
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},		
 		{
 			index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',
 			label: ITP_MSG_LOCALE.label.dlvMgrTelNo, //납품담당자연락처
 			width: '15', fixed: false, align: 'center',
-			minwidth: 120,
+			minwidth: 110,
 			sortable: false, hidden: false
 		},
 		{

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

@@ -86,21 +86,21 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 				{
 					index: 'PODR_QTY', name: 'podrQty',
 					label: '발주수량', //
-					width: '5', fixed: false, align: 'center',
+					width: '7', fixed: false, align: 'right',
 					sortable: false, hidden: false,
 					formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 				},
 				{
 					index: 'DLV_QTY', name: 'dlvQty',
 					label: '납품서수량', //
-					width: '5', fixed: false, align: 'center',
+					width: '7', fixed: false, align: 'right',
 					sortable: false, hidden: false,
 					formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 				},
 				{
 					index: 'EXPRY_DATE', name: 'expryDate',
-					label: '유통기한', //
-					width: '10', fixed: false, align: 'center',
+					label: '사용(유통)기한', //
+					width: '7', fixed: false, align: 'center',
 					sortable: false, hidden: false
 				}
 		]
@@ -199,21 +199,21 @@ let pageObj = {
 							{
 								index: 'PODR_QTY', name: 'podrQty',
 								label: '발주수량', //
-								width: '5', fixed: false, align: 'center',
+								width: '7', fixed: false, align: 'right',
 								sortable: false, hidden: false,
 								formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 							},
 							{
 								index: 'DLV_QTY', name: 'dlvQty',
 								label: '납품서수량', //
-								width: '5', fixed: false, align: 'center',
+								width: '7', fixed: false, align: 'right',
 								sortable: false, hidden: false,
 								formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 							},
 							{
 								index: 'EXPRY_DATE', name: 'expryDate',
-								label: '유통기한', //
-								width: '10', fixed: false, align: 'center',
+								label: '사용(유통)기한', //
+								width: '7', fixed: false, align: 'center',
 								sortable: false, hidden: false
 							}
 					],

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

@@ -395,9 +395,6 @@
 	                 <div class="type_hide">/</div>
 	                 <div class="amt fnOrdAmt"></div>
                  </div>
-             </div>
-             <div class="scroll_right">
-           		<input id="ITP_FORM_MPOMNG02010_POP_ITEM_ADD" type="checkbox">
              </div>
            	 <div class="itp_num_set">
                 <div class="right">
@@ -406,6 +403,9 @@
 				    <button id="ITP_BTN_MPOMNG02010_POP_ITEM_PLUS">+</button>
 			    </div>
 		    </div>
+             <div class="scroll_right">
+           		<input id="ITP_FORM_MPOMNG02010_POP_ITEM_ADD" type="checkbox">
+             </div>
          </li>
         </div>
       </div>