공급사 수주현황 오류 처리

src/main/webapp/app/ordmng/ORDMNG01010.html

@@ -19,6 +19,7 @@
 							<div class="col-xs-12">
 								<form id="ITP_FORM_ORDMNG01010_SEARCH" class="form-horizontal">
 								<input type="hidden" id="ITP_FORM_ORDMNG01010_SEARCH_BRAND_ID" name="sbrandId" value="">
+								<input type="hidden" id="ITP_FORM_ORDMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<label>수주일지</label>

src/main/webapp/app/vendinfo/VENDINFO03010.html

@@ -17,6 +17,8 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_VENDINFO03010_SEARCH" class="form-horizontal">
+								<input type="hidden" id="ITP_FORM_VENDINFO03010_SEARCH_BRAND_ID" name="sbrandId" value="">
+								<input type="hidden" id="ITP_FORM_VENDINFO03010_SEARCH_SPPLY_ID" name="sspplyId" value="">
 									<div class="form-group">
 										<div class="col-xs-1 itp_ip itp_noMar" style="width:9%; top:3px;" >
 											<label>계약기간</label>

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

@@ -19,13 +19,6 @@ const ORDMNG01010_VIEW_GRID_EMPTY = '#ITP_ORDMNG01010_VIEW_jqGridEmpty';
 
 let ITP_COMMON_PCH_ODR_ST_CD = fn_make_common_cd_list(CODE_LIST, 'PCH_ODR_ST_CD', true, '발주상태코드');
 
-// 그리드 전화번호 '-' 함수
-function convertTel(value){
-	answer = (value.startsWith('0')) ? value.replace(/[^0-9]/g, "")
-			.replace(/(^02|^0505|^1[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{4})$/,"$1-$2-$3")
-			.replace("--", "-") : '';
-	return answer;
-}
 
 //API URL
 let API_POMNG_PO_SPPLY_PO_GRID_LIST = '/api/pomng/po/spply-po-grid-list';
@@ -234,6 +227,7 @@ let pageObj = {
             fn_show_btn_auth_array(['#ITP_BTN_ORDMNG01010_SRH', '#ITP_BTN_ORDMNG01010_NEWREG']);
             $('#ITP_AJAX_ORDMNG01010_LIST_CONTAINER').show();
             $('#ITP_FORM_ORDMNG01010_SEARCH #ITP_FORM_ORDMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
+            $('#ITP_FORM_ORDMNG01010_SEARCH #ITP_FORM_ORDMNG01010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
             $('#ITP_BTN_ORDMNG01010_SEARCH_WHS_NM').show();
             $('#ITP_BTN_ORDMNG01010_DELETE_WHS_NM').show();
         } else if(mode == 'ADD') { // 등록
@@ -300,7 +294,7 @@ let listObj = {
 			let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
             param.gridPage = $.jgrid.defaults.page;
-            param.sspplyId = LOGIN_USER_INFO.spplyId;
+            //param.sspplyId = LOGIN_USER_INFO.spplyId;
             param.sidx = '0';
             console.log(JSON.stringify(param));
             $(ORDMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
@@ -319,8 +313,8 @@ let listObj = {
         push: function() {
             let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
             listObj.itp_ORDMNG01010_param = param;
-            listObj.itp_ORDMNG01010_param.sbrandId = LOGIN_USER_INFO.brandId;
-            listObj.itp_ORDMNG01010_param.sspplyId = LOGIN_USER_INFO.spplyId;
+            //listObj.itp_ORDMNG01010_param.sbrandId = LOGIN_USER_INFO.brandId;
+            //listObj.itp_ORDMNG01010_param.sspplyId = LOGIN_USER_INFO.spplyId;
             listObj.itp_ORDMNG01010_param.sidx = '0';
         },
         back: function() {
@@ -346,8 +340,10 @@ let listObj = {
 		load: function() {
             let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
             param.gridSize = $.jgrid.defaults.rowNum;
-            param.sspplyId = LOGIN_USER_INFO.spplyId;
+            //param.sspplyId = LOGIN_USER_INFO.spplyId;
             param.sidx = '0';
+            console.log(LOGIN_USER_INFO.spplyId);
+            console.log(fn_make_user_info.get('spplyId'));
             console.log(JSON.stringify(param));
             var option = {
             	gridId: ORDMNG01010_GRID_ID,
@@ -361,7 +357,7 @@ let listObj = {
                     if (colNm === 'pchPodrUnqNo') {
                         const pchPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'pchPodrUnqNo');
                         const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
-                        const spplyIdVal = LOGIN_USER_INFO.spplyId;
+                        const spplyIdVal = fn_make_user_info.get('spplyId'); 
                         const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal, spplyId: spplyIdVal};
                         var param = $.param(key);
                         viewObj.init(param);
@@ -456,9 +452,18 @@ let viewObj = {
 	},
 	callback: function(result) {
 		console.log(result);
+
+		// 그리드 전화번호 '-' 함수
+		function convertTel(value){
+			answer = (value.startsWith('0')) ? value.replace(/[^0-9]/g, "")
+					.replace(/(^02|^0505|^1[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{4})$/,"$1-$2-$3")
+					.replace("--", "-") : '';
+			return answer;
+		}
 		
 		let telNo = convertTel(result.podrMgrTelNo);
 		
+		
 		pageObj.switchScreen('VIEW');
 		$('#ITP_FORM_ORDMNG01010_VIEW #ITP_FORM_ORDMNG01010_VIEW_AFFL_SHOP_ID').val(result.afflShopId);
 		$('#ITP_FORM_ORDMNG01010_VIEW .fnBrandNm').text(result.brandNm);				// 브랜드명

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

@@ -154,6 +154,8 @@ let pageObj = {
 		if(mode === 'LIST') { // 목록
 			$('#ITP_AJAX_VENDINFO03010_LIST_CONTAINER').show();
 			fn_show_btn_auth_array(['#ITP_BTN_VENDINFO03010_SRH', '#ITP_BTN_VENDINFO03010_NEWREG']);
+			$('#ITP_FORM_VENDINFO03010_SEARCH #ITP_FORM_VENDINFO03010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
+            $('#ITP_FORM_VENDINFO03010_SEARCH #ITP_FORM_VENDINFO03010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
 		}/* else if(mode == 'ADD') { // 등록
 			$('#ITP_AJAX_VENDINFO03010_DETAIL_CONTAINER').show();
 			fn_show_btn_auth_array(['#ITP_BTN_VENDINFO03010_CANCELLIST', '#ITP_BTN_VENDINFO03010_SAVE']);
@@ -201,8 +203,6 @@ let listObj = {
             let param = $('#ITP_FORM_VENDINFO03010_SEARCH').serializeObject();
             param.gridSize = $.jgrid.defaults.rowNum;
             param.gridPage = $.jgrid.defaults.page;
-            param.sbrandId = LOGIN_USER_INFO.brandId;
-            param.sspplyId = LOGIN_USER_INFO.spplyId;
             $(VENDINFO03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
         }/*,
         create: function() {
@@ -224,8 +224,6 @@ let listObj = {
         },
         push: function() {
             let param = $('#ITP_FORM_VENDINFO03010_SEARCH').serializeObject();
-            param.sbrandId = LOGIN_USER_INFO.brandId;
-            param.sspplyId = LOGIN_USER_INFO.spplyId;
             listObj.itp_VENDINFO03010_param = param;
 
         },
@@ -253,8 +251,6 @@ let listObj = {
         load: function() {
             let param = $('#ITP_FORM_VENDINFO03010_SEARCH').serializeObject();
             param.gridSize = $.jgrid.defaults.rowNum;            
-            param.sbrandId = LOGIN_USER_INFO.brandId;
-            param.sspplyId = LOGIN_USER_INFO.spplyId;
             var option = {
                 gridId: VENDINFO03010_GRID_ID,
                 colModel: gridColModel.list,