浏览代码

오류 수정중

whakdo963 2 年之前
父节点
当前提交
ce2d6ff90b

+ 3 - 2
bin/src/main/webapp/js/app/config.js

@@ -1700,7 +1700,7 @@ function itp_fn_grid_make_not_paging(option) {
1700
 	});
1700
 	});
1701
 }
1701
 }
1702
 
1702
 
1703
-function itp_fn_grid_make_local(option) { //예를 원격으로 호출하면 됨     처음url 안주던지     빈 그리드 시용
1703
+function itp_fn_grid_make_local(option) {
1704
 	var options = $.extend({
1704
 	var options = $.extend({
1705
 		multiselect: false,
1705
 		multiselect: false,
1706
 		rownumbers: false
1706
 		rownumbers: false
@@ -3038,4 +3038,5 @@ let itp_fn_attach_file = {
3038
 			$('#' + id).append(text);
3038
 			$('#' + id).append(text);
3039
 		});
3039
 		});
3040
 	}
3040
 	}
3041
-};
3041
+};
3042
+

+ 2 - 2
bin/src/main/webapp/js/app/popup/biz/ITP_BIZPOP_STORE_SPPLY.js

@@ -6,8 +6,8 @@ require(['config'], function() {
6
 	});
6
 	});
7
 });
7
 });
8
 
8
 
9
-//let API_POP_GRID_LIST = '/api/spply/pop-grid-list';
10
-let API_POP_GRID_LIST = '/api/spply/detail-grid-list';
9
+let API_POP_GRID_LIST = '/api/spply/pop-grid-list';
10
+//let API_POP_GRID_LIST = '/api/spply/detail-grid-list';
11
 
11
 
12
 
12
 
13
 function itp_fn_BIZPOP_STORE_SPPLY(parentPopFn, args, returnType) {
13
 function itp_fn_BIZPOP_STORE_SPPLY(parentPopFn, args, returnType) {

+ 14 - 7
bin/src/main/webapp/js/app/vendinfo/ITP_VENDINFO02010.js

@@ -53,6 +53,12 @@ const gridColModel = {
53
 					width: '12', fixed: false, align: 'center',
53
 					width: '12', fixed: false, align: 'center',
54
 					sortable: false, hidden: false
54
 					sortable: false, hidden: false
55
 			},
55
 			},
56
+			{
57
+					index: 'ITEM_ID', name: 'itemId',
58
+					label: ITP_MSG_LOCALE.label.itemId, //품목번호
59
+					width: '12', fixed: false, align: 'center',
60
+					sortable: false, hidden: true
61
+			},
56
 			{
62
 			{
57
 					index: 'ITEM_NM', name: 'itemNm',
63
 					index: 'ITEM_NM', name: 'itemNm',
58
 					label: ITP_MSG_LOCALE.label.itemNm, //품목명
64
 					label: ITP_MSG_LOCALE.label.itemNm, //품목명
@@ -68,7 +74,7 @@ const gridColModel = {
68
 			{
74
 			{
69
 					index: 'ITEM_CLASS_NM', name: 'itemClassNm',
75
 					index: 'ITEM_CLASS_NM', name: 'itemClassNm',
70
 					label: ITP_MSG_LOCALE.label.itemClassNm, //품목분류
76
 					label: ITP_MSG_LOCALE.label.itemClassNm, //품목분류
71
-					width: '15', fixed: false, align: 'center',
77
+					width: '12', fixed: false, align: 'center',
72
 					sortable: false, hidden: false
78
 					sortable: false, hidden: false
73
 			},
79
 			},
74
 			{
80
 			{
@@ -92,13 +98,13 @@ const gridColModel = {
92
 			{
98
 			{
93
 					index: 'PCH_ITEM_YN', name: 'pchItemYn',
99
 					index: 'PCH_ITEM_YN', name: 'pchItemYn',
94
 					label: ITP_MSG_LOCALE.label.pchItemYn, //구매품목여부
100
 					label: ITP_MSG_LOCALE.label.pchItemYn, //구매품목여부
95
-					width: '6', fixed: false, align: 'center',
101
+					width: '8', fixed: false, align: 'center',
96
 					sortable: false, hidden: false
102
 					sortable: false, hidden: false
97
 			},
103
 			},
98
 			{
104
 			{
99
 					index: 'SALE_ITEM_YN', name: 'saleItemYn',
105
 					index: 'SALE_ITEM_YN', name: 'saleItemYn',
100
 					label: ITP_MSG_LOCALE.label.saleItemYn, //판매품목여부
106
 					label: ITP_MSG_LOCALE.label.saleItemYn, //판매품목여부
101
-					width: '10', fixed: false, align: 'center',
107
+					width: '8', fixed: false, align: 'center',
102
 					sortable: false, hidden: false
108
 					sortable: false, hidden: false
103
 			},
109
 			},
104
 	],
110
 	],
@@ -145,6 +151,7 @@ let pageObj = {
145
 			this.event.init();
151
 			this.event.init();
146
 			this.fileUpload();
152
 			this.fileUpload();
147
 			storeSpplyObj.init();
153
 			storeSpplyObj.init();
154
+			$('#ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID').val("SPY221000002");
148
 	},
155
 	},
149
 	ui: {
156
 	ui: {
150
 			init: function () {
157
 			init: function () {
@@ -364,7 +371,7 @@ let listObj = {
364
 					let param = $('#ITP_FORM_VENDINFO02010_SEARCH').serializeObject();
371
 					let param = $('#ITP_FORM_VENDINFO02010_SEARCH').serializeObject();
365
 					param.gridSize = $.jgrid.defaults.rowNum;
372
 					param.gridSize = $.jgrid.defaults.rowNum;
366
 					param.gridPage = $.jgrid.defaults.page;
373
 					param.gridPage = $.jgrid.defaults.page;
367
-					$(VENDINFO02010_GRID_ID).setGridParam({'url': url,'data': JSON.stringify(param)}).trigger('reloadGrid');
374
+					$(VENDINFO02010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
368
 			},
375
 			},
369
 			create: function() {
376
 			create: function() {
370
 					if(!fn_make_user_info.isEmpty()) {
377
 					if(!fn_make_user_info.isEmpty()) {
@@ -414,9 +421,9 @@ let listObj = {
414
 			colModel: gridColModel.list,
421
 			colModel: gridColModel.list,
415
 			search: function() {
422
 			search: function() {
416
 					pageObj.switchScreen('LIST');
423
 					pageObj.switchScreen('LIST');
417
-					this.unload();
418
-					this.localLoad();
419
-//					this.load();
424
+//					this.unload();
425
+//					this.localLoad();
426
+					this.load();
420
 			},
427
 			},
421
 			localLoad: function() {
428
 			localLoad: function() {
422
 				var option = {
429
 				var option = {

+ 3 - 2
src/main/webapp/js/app/config.js

@@ -1700,7 +1700,7 @@ function itp_fn_grid_make_not_paging(option) {
1700
 	});
1700
 	});
1701
 }
1701
 }
1702
 
1702
 
1703
-function itp_fn_grid_make_local(option) { //예를 원격으로 호출하면 됨     처음url 안주던지     빈 그리드 시용
1703
+function itp_fn_grid_make_local(option) {
1704
 	var options = $.extend({
1704
 	var options = $.extend({
1705
 		multiselect: false,
1705
 		multiselect: false,
1706
 		rownumbers: false
1706
 		rownumbers: false
@@ -3038,4 +3038,5 @@ let itp_fn_attach_file = {
3038
 			$('#' + id).append(text);
3038
 			$('#' + id).append(text);
3039
 		});
3039
 		});
3040
 	}
3040
 	}
3041
-};
3041
+};
3042
+

+ 2 - 2
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_STORE_SPPLY.js

@@ -6,8 +6,8 @@ require(['config'], function() {
6
 	});
6
 	});
7
 });
7
 });
8
 
8
 
9
-//let API_POP_GRID_LIST = '/api/spply/pop-grid-list';
10
-let API_POP_GRID_LIST = '/api/spply/detail-grid-list';
9
+let API_POP_GRID_LIST = '/api/spply/pop-grid-list';
10
+//let API_POP_GRID_LIST = '/api/spply/detail-grid-list';
11
 
11
 
12
 
12
 
13
 function itp_fn_BIZPOP_STORE_SPPLY(parentPopFn, args, returnType) {
13
 function itp_fn_BIZPOP_STORE_SPPLY(parentPopFn, args, returnType) {

+ 14 - 7
src/main/webapp/js/app/vendinfo/ITP_VENDINFO02010.js

@@ -53,6 +53,12 @@ const gridColModel = {
53
 					width: '12', fixed: false, align: 'center',
53
 					width: '12', fixed: false, align: 'center',
54
 					sortable: false, hidden: false
54
 					sortable: false, hidden: false
55
 			},
55
 			},
56
+			{
57
+					index: 'ITEM_ID', name: 'itemId',
58
+					label: ITP_MSG_LOCALE.label.itemId, //품목번호
59
+					width: '12', fixed: false, align: 'center',
60
+					sortable: false, hidden: true
61
+			},
56
 			{
62
 			{
57
 					index: 'ITEM_NM', name: 'itemNm',
63
 					index: 'ITEM_NM', name: 'itemNm',
58
 					label: ITP_MSG_LOCALE.label.itemNm, //품목명
64
 					label: ITP_MSG_LOCALE.label.itemNm, //품목명
@@ -68,7 +74,7 @@ const gridColModel = {
68
 			{
74
 			{
69
 					index: 'ITEM_CLASS_NM', name: 'itemClassNm',
75
 					index: 'ITEM_CLASS_NM', name: 'itemClassNm',
70
 					label: ITP_MSG_LOCALE.label.itemClassNm, //품목분류
76
 					label: ITP_MSG_LOCALE.label.itemClassNm, //품목분류
71
-					width: '15', fixed: false, align: 'center',
77
+					width: '12', fixed: false, align: 'center',
72
 					sortable: false, hidden: false
78
 					sortable: false, hidden: false
73
 			},
79
 			},
74
 			{
80
 			{
@@ -92,13 +98,13 @@ const gridColModel = {
92
 			{
98
 			{
93
 					index: 'PCH_ITEM_YN', name: 'pchItemYn',
99
 					index: 'PCH_ITEM_YN', name: 'pchItemYn',
94
 					label: ITP_MSG_LOCALE.label.pchItemYn, //구매품목여부
100
 					label: ITP_MSG_LOCALE.label.pchItemYn, //구매품목여부
95
-					width: '6', fixed: false, align: 'center',
101
+					width: '8', fixed: false, align: 'center',
96
 					sortable: false, hidden: false
102
 					sortable: false, hidden: false
97
 			},
103
 			},
98
 			{
104
 			{
99
 					index: 'SALE_ITEM_YN', name: 'saleItemYn',
105
 					index: 'SALE_ITEM_YN', name: 'saleItemYn',
100
 					label: ITP_MSG_LOCALE.label.saleItemYn, //판매품목여부
106
 					label: ITP_MSG_LOCALE.label.saleItemYn, //판매품목여부
101
-					width: '10', fixed: false, align: 'center',
107
+					width: '8', fixed: false, align: 'center',
102
 					sortable: false, hidden: false
108
 					sortable: false, hidden: false
103
 			},
109
 			},
104
 	],
110
 	],
@@ -145,6 +151,7 @@ let pageObj = {
145
 			this.event.init();
151
 			this.event.init();
146
 			this.fileUpload();
152
 			this.fileUpload();
147
 			storeSpplyObj.init();
153
 			storeSpplyObj.init();
154
+			$('#ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID').val("SPY221000002");
148
 	},
155
 	},
149
 	ui: {
156
 	ui: {
150
 			init: function () {
157
 			init: function () {
@@ -364,7 +371,7 @@ let listObj = {
364
 					let param = $('#ITP_FORM_VENDINFO02010_SEARCH').serializeObject();
371
 					let param = $('#ITP_FORM_VENDINFO02010_SEARCH').serializeObject();
365
 					param.gridSize = $.jgrid.defaults.rowNum;
372
 					param.gridSize = $.jgrid.defaults.rowNum;
366
 					param.gridPage = $.jgrid.defaults.page;
373
 					param.gridPage = $.jgrid.defaults.page;
367
-					$(VENDINFO02010_GRID_ID).setGridParam({'url': url,'data': JSON.stringify(param)}).trigger('reloadGrid');
374
+					$(VENDINFO02010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
368
 			},
375
 			},
369
 			create: function() {
376
 			create: function() {
370
 					if(!fn_make_user_info.isEmpty()) {
377
 					if(!fn_make_user_info.isEmpty()) {
@@ -414,9 +421,9 @@ let listObj = {
414
 			colModel: gridColModel.list,
421
 			colModel: gridColModel.list,
415
 			search: function() {
422
 			search: function() {
416
 					pageObj.switchScreen('LIST');
423
 					pageObj.switchScreen('LIST');
417
-					this.unload();
418
-					this.localLoad();
419
-//					this.load();
424
+//					this.unload();
425
+//					this.localLoad();
426
+					this.load();
420
 			},
427
 			},
421
 			localLoad: function() {
428
 			localLoad: function() {
422
 				var option = {
429
 				var option = {