Browse Source

공급사 수주현황 오류 처리

yhl88 2 years ago
parent
commit
00cb06372c

+ 1 - 0
src/main/webapp/app/ordmng/ORDMNG01010.html

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

+ 2 - 0
src/main/webapp/app/vendinfo/VENDINFO03010.html

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

+ 17 - 12
src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js

@@ -19,13 +19,6 @@ const ORDMNG01010_VIEW_GRID_EMPTY = '#ITP_ORDMNG01010_VIEW_jqGridEmpty';
19
 
19
 
20
 let ITP_COMMON_PCH_ODR_ST_CD = fn_make_common_cd_list(CODE_LIST, 'PCH_ODR_ST_CD', true, '발주상태코드');
20
 let ITP_COMMON_PCH_ODR_ST_CD = fn_make_common_cd_list(CODE_LIST, 'PCH_ODR_ST_CD', true, '발주상태코드');
21
 
21
 
22
-// 그리드 전화번호 '-' 함수
23
-function convertTel(value){
24
-	answer = (value.startsWith('0')) ? value.replace(/[^0-9]/g, "")
25
-			.replace(/(^02|^0505|^1[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{4})$/,"$1-$2-$3")
26
-			.replace("--", "-") : '';
27
-	return answer;
28
-}
29
 
22
 
30
 //API URL
23
 //API URL
31
 let API_POMNG_PO_SPPLY_PO_GRID_LIST = '/api/pomng/po/spply-po-grid-list';
24
 let API_POMNG_PO_SPPLY_PO_GRID_LIST = '/api/pomng/po/spply-po-grid-list';
@@ -234,6 +227,7 @@ let pageObj = {
234
             fn_show_btn_auth_array(['#ITP_BTN_ORDMNG01010_SRH', '#ITP_BTN_ORDMNG01010_NEWREG']);
227
             fn_show_btn_auth_array(['#ITP_BTN_ORDMNG01010_SRH', '#ITP_BTN_ORDMNG01010_NEWREG']);
235
             $('#ITP_AJAX_ORDMNG01010_LIST_CONTAINER').show();
228
             $('#ITP_AJAX_ORDMNG01010_LIST_CONTAINER').show();
236
             $('#ITP_FORM_ORDMNG01010_SEARCH #ITP_FORM_ORDMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
229
             $('#ITP_FORM_ORDMNG01010_SEARCH #ITP_FORM_ORDMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
230
+            $('#ITP_FORM_ORDMNG01010_SEARCH #ITP_FORM_ORDMNG01010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
237
             $('#ITP_BTN_ORDMNG01010_SEARCH_WHS_NM').show();
231
             $('#ITP_BTN_ORDMNG01010_SEARCH_WHS_NM').show();
238
             $('#ITP_BTN_ORDMNG01010_DELETE_WHS_NM').show();
232
             $('#ITP_BTN_ORDMNG01010_DELETE_WHS_NM').show();
239
         } else if(mode == 'ADD') { // 등록
233
         } else if(mode == 'ADD') { // 등록
@@ -300,7 +294,7 @@ let listObj = {
300
 			let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
294
 			let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
301
 			param.gridSize = $.jgrid.defaults.rowNum;
295
 			param.gridSize = $.jgrid.defaults.rowNum;
302
             param.gridPage = $.jgrid.defaults.page;
296
             param.gridPage = $.jgrid.defaults.page;
303
-            param.sspplyId = LOGIN_USER_INFO.spplyId;
297
+            //param.sspplyId = LOGIN_USER_INFO.spplyId;
304
             param.sidx = '0';
298
             param.sidx = '0';
305
             console.log(JSON.stringify(param));
299
             console.log(JSON.stringify(param));
306
             $(ORDMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
300
             $(ORDMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
@@ -319,8 +313,8 @@ let listObj = {
319
         push: function() {
313
         push: function() {
320
             let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
314
             let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
321
             listObj.itp_ORDMNG01010_param = param;
315
             listObj.itp_ORDMNG01010_param = param;
322
-            listObj.itp_ORDMNG01010_param.sbrandId = LOGIN_USER_INFO.brandId;
323
-            listObj.itp_ORDMNG01010_param.sspplyId = LOGIN_USER_INFO.spplyId;
316
+            //listObj.itp_ORDMNG01010_param.sbrandId = LOGIN_USER_INFO.brandId;
317
+            //listObj.itp_ORDMNG01010_param.sspplyId = LOGIN_USER_INFO.spplyId;
324
             listObj.itp_ORDMNG01010_param.sidx = '0';
318
             listObj.itp_ORDMNG01010_param.sidx = '0';
325
         },
319
         },
326
         back: function() {
320
         back: function() {
@@ -346,8 +340,10 @@ let listObj = {
346
 		load: function() {
340
 		load: function() {
347
             let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
341
             let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
348
             param.gridSize = $.jgrid.defaults.rowNum;
342
             param.gridSize = $.jgrid.defaults.rowNum;
349
-            param.sspplyId = LOGIN_USER_INFO.spplyId;
343
+            //param.sspplyId = LOGIN_USER_INFO.spplyId;
350
             param.sidx = '0';
344
             param.sidx = '0';
345
+            console.log(LOGIN_USER_INFO.spplyId);
346
+            console.log(fn_make_user_info.get('spplyId'));
351
             console.log(JSON.stringify(param));
347
             console.log(JSON.stringify(param));
352
             var option = {
348
             var option = {
353
             	gridId: ORDMNG01010_GRID_ID,
349
             	gridId: ORDMNG01010_GRID_ID,
@@ -361,7 +357,7 @@ let listObj = {
361
                     if (colNm === 'pchPodrUnqNo') {
357
                     if (colNm === 'pchPodrUnqNo') {
362
                         const pchPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'pchPodrUnqNo');
358
                         const pchPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'pchPodrUnqNo');
363
                         const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
359
                         const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
364
-                        const spplyIdVal = LOGIN_USER_INFO.spplyId;
360
+                        const spplyIdVal = fn_make_user_info.get('spplyId'); 
365
                         const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal, spplyId: spplyIdVal};
361
                         const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal, spplyId: spplyIdVal};
366
                         var param = $.param(key);
362
                         var param = $.param(key);
367
                         viewObj.init(param);
363
                         viewObj.init(param);
@@ -456,9 +452,18 @@ let viewObj = {
456
 	},
452
 	},
457
 	callback: function(result) {
453
 	callback: function(result) {
458
 		console.log(result);
454
 		console.log(result);
455
+
456
+		// 그리드 전화번호 '-' 함수
457
+		function convertTel(value){
458
+			answer = (value.startsWith('0')) ? value.replace(/[^0-9]/g, "")
459
+					.replace(/(^02|^0505|^1[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{4})$/,"$1-$2-$3")
460
+					.replace("--", "-") : '';
461
+			return answer;
462
+		}
459
 		
463
 		
460
 		let telNo = convertTel(result.podrMgrTelNo);
464
 		let telNo = convertTel(result.podrMgrTelNo);
461
 		
465
 		
466
+		
462
 		pageObj.switchScreen('VIEW');
467
 		pageObj.switchScreen('VIEW');
463
 		$('#ITP_FORM_ORDMNG01010_VIEW #ITP_FORM_ORDMNG01010_VIEW_AFFL_SHOP_ID').val(result.afflShopId);
468
 		$('#ITP_FORM_ORDMNG01010_VIEW #ITP_FORM_ORDMNG01010_VIEW_AFFL_SHOP_ID').val(result.afflShopId);
464
 		$('#ITP_FORM_ORDMNG01010_VIEW .fnBrandNm').text(result.brandNm);				// 브랜드명
469
 		$('#ITP_FORM_ORDMNG01010_VIEW .fnBrandNm').text(result.brandNm);				// 브랜드명

+ 2 - 6
src/main/webapp/js/app/vendinfo/ITP_VENDINFO03010.js

@@ -154,6 +154,8 @@ let pageObj = {
154
 		if(mode === 'LIST') { // 목록
154
 		if(mode === 'LIST') { // 목록
155
 			$('#ITP_AJAX_VENDINFO03010_LIST_CONTAINER').show();
155
 			$('#ITP_AJAX_VENDINFO03010_LIST_CONTAINER').show();
156
 			fn_show_btn_auth_array(['#ITP_BTN_VENDINFO03010_SRH', '#ITP_BTN_VENDINFO03010_NEWREG']);
156
 			fn_show_btn_auth_array(['#ITP_BTN_VENDINFO03010_SRH', '#ITP_BTN_VENDINFO03010_NEWREG']);
157
+			$('#ITP_FORM_VENDINFO03010_SEARCH #ITP_FORM_VENDINFO03010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
158
+            $('#ITP_FORM_VENDINFO03010_SEARCH #ITP_FORM_VENDINFO03010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
157
 		}/* else if(mode == 'ADD') { // 등록
159
 		}/* else if(mode == 'ADD') { // 등록
158
 			$('#ITP_AJAX_VENDINFO03010_DETAIL_CONTAINER').show();
160
 			$('#ITP_AJAX_VENDINFO03010_DETAIL_CONTAINER').show();
159
 			fn_show_btn_auth_array(['#ITP_BTN_VENDINFO03010_CANCELLIST', '#ITP_BTN_VENDINFO03010_SAVE']);
161
 			fn_show_btn_auth_array(['#ITP_BTN_VENDINFO03010_CANCELLIST', '#ITP_BTN_VENDINFO03010_SAVE']);
@@ -201,8 +203,6 @@ let listObj = {
201
             let param = $('#ITP_FORM_VENDINFO03010_SEARCH').serializeObject();
203
             let param = $('#ITP_FORM_VENDINFO03010_SEARCH').serializeObject();
202
             param.gridSize = $.jgrid.defaults.rowNum;
204
             param.gridSize = $.jgrid.defaults.rowNum;
203
             param.gridPage = $.jgrid.defaults.page;
205
             param.gridPage = $.jgrid.defaults.page;
204
-            param.sbrandId = LOGIN_USER_INFO.brandId;
205
-            param.sspplyId = LOGIN_USER_INFO.spplyId;
206
             $(VENDINFO03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
206
             $(VENDINFO03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
207
         }/*,
207
         }/*,
208
         create: function() {
208
         create: function() {
@@ -224,8 +224,6 @@ let listObj = {
224
         },
224
         },
225
         push: function() {
225
         push: function() {
226
             let param = $('#ITP_FORM_VENDINFO03010_SEARCH').serializeObject();
226
             let param = $('#ITP_FORM_VENDINFO03010_SEARCH').serializeObject();
227
-            param.sbrandId = LOGIN_USER_INFO.brandId;
228
-            param.sspplyId = LOGIN_USER_INFO.spplyId;
229
             listObj.itp_VENDINFO03010_param = param;
227
             listObj.itp_VENDINFO03010_param = param;
230
 
228
 
231
         },
229
         },
@@ -253,8 +251,6 @@ let listObj = {
253
         load: function() {
251
         load: function() {
254
             let param = $('#ITP_FORM_VENDINFO03010_SEARCH').serializeObject();
252
             let param = $('#ITP_FORM_VENDINFO03010_SEARCH').serializeObject();
255
             param.gridSize = $.jgrid.defaults.rowNum;            
253
             param.gridSize = $.jgrid.defaults.rowNum;            
256
-            param.sbrandId = LOGIN_USER_INFO.brandId;
257
-            param.sspplyId = LOGIN_USER_INFO.spplyId;
258
             var option = {
254
             var option = {
259
                 gridId: VENDINFO03010_GRID_ID,
255
                 gridId: VENDINFO03010_GRID_ID,
260
                 colModel: gridColModel.list,
256
                 colModel: gridColModel.list,