Browse Source

공급사-수주관리, 수거관리 팝업 수정

yhl88 2 years ago
parent
commit
a2daa42bf4

+ 1 - 1
src/main/webapp/app/popup/biz/BIZPOP_COL_STTMT_PRN.html

@@ -11,7 +11,7 @@
11
 				<div id="ITP_POPUP_CONTAINER">
11
 				<div id="ITP_POPUP_CONTAINER">
12
 					<div class="modal-header">
12
 					<div class="modal-header">
13
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
13
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
14
-						<h5 class="modal-title">브랜드그룹 검색</h5>
14
+						<h5 class="modal-title">수거서출력</h5>
15
 					</div>
15
 					</div>
16
 					<div id="ITP_BIZPOP_COL_STTMT_PRN_PRINT_AREA" class="modal-body">
16
 					<div id="ITP_BIZPOP_COL_STTMT_PRN_PRINT_AREA" class="modal-body">
17
 						<div class="itp_form fix">
17
 						<div class="itp_form fix">

+ 1 - 1
src/main/webapp/app/popup/biz/BIZPOP_DLV_STTMT_PRN.html

@@ -11,7 +11,7 @@
11
 				<div id="ITP_POPUP_CONTAINER">
11
 				<div id="ITP_POPUP_CONTAINER">
12
 					<div class="modal-header">
12
 					<div class="modal-header">
13
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
13
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
14
-						<h5 class="modal-title">브랜드그룹 검색</h5>
14
+						<h5 class="modal-title">납품서 출력</h5>
15
 					</div>
15
 					</div>
16
 					<div id="ITP_BIZPOP_DLV_STTMT_PRN_PRINT_AREA" class="modal-body">
16
 					<div id="ITP_BIZPOP_DLV_STTMT_PRN_PRINT_AREA" class="modal-body">
17
 						<div class="itp_form fix">
17
 						<div class="itp_form fix">

+ 1 - 1
src/main/webapp/js/app/collmng/ITP_COLLMNG01010.js

@@ -435,7 +435,7 @@ let viewObj = {
435
 		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnOdrRegDt').text(result.rtnOdrRegDt);					// 수거일자
435
 		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnOdrRegDt').text(result.rtnOdrRegDt);					// 수거일자
436
 		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnOdrStNm').text(result.rtnOdrStNm);					// 수거상태
436
 		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnOdrStNm').text(result.rtnOdrStNm);					// 수거상태
437
 		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnWhsNm').text(result.rtnWhsNm);						// 수거장소
437
 		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnWhsNm').text(result.rtnWhsNm);						// 수거장소
438
-		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnDodrTotalAmt').text(result.rtnDodrTotalAmt);			// 수거 총 금액
438
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnDodrTotalAmt').text(itp_fn_number_comma(result.rtnDodrTotalAmt));			// 수거 총 금액
439
 		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnMgrNm').text(result.rtnMgrNm);						// 발주담당자
439
 		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnMgrNm').text(result.rtnMgrNm);						// 발주담당자
440
 		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnMgrTelNo').text(result.rtnMgrTelNo);					// 발주담당자연락처
440
 		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnMgrTelNo').text(result.rtnMgrTelNo);					// 발주담당자연락처
441
 		
441
 		

+ 3 - 46
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_COL_STTMT_PRN.js

@@ -62,50 +62,7 @@ function itp_fn_BIZPOP_COL_STTMT_PRN(parentPopFn, args, returnType) {
62
 	itp_fn_BIZPOP_COL_STTMT_PRN_empty.push();
62
 	itp_fn_BIZPOP_COL_STTMT_PRN_empty.push();
63
 	let param = {brandId: $('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_BRAND_ID').val(), colPickUnqNo: $('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_COL_STTMT_UNQ_NO').val() };
63
 	let param = {brandId: $('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_BRAND_ID').val(), colPickUnqNo: $('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_COL_STTMT_UNQ_NO').val() };
64
 	console.log(JSON.stringify(param));
64
 	console.log(JSON.stringify(param));
65
-	
66
-	const gridColModel = {
67
-		detail: [
68
-			{
69
-					index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
70
-					label: '발주번호', //
71
-					width: '10', fixed: false, align: 'center',
72
-					sortable: false, hidden: false
73
-				},
74
-				{
75
-					index: 'ITEM_ID', name: 'itemId',
76
-					label: '품목번호', //
77
-					width: '10', fixed: false, align: 'center',
78
-					sortable: false, hidden: false
79
-				},
80
-				{
81
-					index: 'ITEM_NM', name: 'itemNm',
82
-					label: '품목명', //
83
-					width: '10', fixed: false, align: 'center',
84
-					sortable: false, hidden: false
85
-				},
86
-				{
87
-					index: 'PODR_QTY', name: 'podrQty',
88
-					label: '발주수량', //
89
-					width: '5', fixed: false, align: 'center',
90
-					sortable: false, hidden: false,
91
-					formatter: 'integer', formatoptions: {thousandsSeparator: ','}
92
-				},
93
-				{
94
-					index: 'COL_QTY', name: 'dlvQty',
95
-					label: '납품서수량', //
96
-					width: '5', fixed: false, align: 'center',
97
-					sortable: false, hidden: false,
98
-					formatter: 'integer', formatoptions: {thousandsSeparator: ','}
99
-				},
100
-				{
101
-					index: 'EXPRY_DATE', name: 'expryDate',
102
-					label: '유통기한', //
103
-					width: '10', fixed: false, align: 'center',
104
-					sortable: false, hidden: false
105
-				}
106
-		]
107
-	};
108
-	
65
+
109
 	pageObj.call(param);
66
 	pageObj.call(param);
110
 	pageObj.button();
67
 	pageObj.button();
111
 };
68
 };
@@ -201,14 +158,14 @@ let pageObj = {
201
 							{
158
 							{
202
 								index: 'COL_REQ_QTY', name: 'colReqQty',
159
 								index: 'COL_REQ_QTY', name: 'colReqQty',
203
 								label: '수거요청수량', //
160
 								label: '수거요청수량', //
204
-								width: '6', fixed: false, align: 'center',
161
+								width: '6', fixed: false, align: 'right',
205
 								sortable: false, hidden: false,
162
 								sortable: false, hidden: false,
206
 								formatter: 'integer', formatoptions: {thousandsSeparator: ','}
163
 								formatter: 'integer', formatoptions: {thousandsSeparator: ','}
207
 							},
164
 							},
208
 							{
165
 							{
209
 								index: 'RODR_QTY', name: 'rodrQty',
166
 								index: 'RODR_QTY', name: 'rodrQty',
210
 								label: '수거수량', //
167
 								label: '수거수량', //
211
-								width: '5', fixed: false, align: 'center',
168
+								width: '5', fixed: false, align: 'right',
212
 								sortable: false, hidden: false,
169
 								sortable: false, hidden: false,
213
 								formatter: 'integer', formatoptions: {thousandsSeparator: ','}
170
 								formatter: 'integer', formatoptions: {thousandsSeparator: ','}
214
 							},
171
 							},