浏览代码

발주관리-납품서출력 팝업, 입고처리 세부수정

yhl88 2 年之前
父节点
当前提交
daac1bb648

+ 14 - 15
src/main/webapp/js/app/pomng/ITP_POMNG06010.js

@@ -44,8 +44,8 @@ const gridColModel = {
44
 			index: 'BRAND_NM', name: 'brandNm',
44
 			index: 'BRAND_NM', name: 'brandNm',
45
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
45
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
46
 			width: '10', fixed: false, align: 'left',
46
 			width: '10', fixed: false, align: 'left',
47
-			minwidth: 120,
48
-			sortable: false, hidden: false
47
+			minwidth: 110,
48
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
49
 		},
49
 		},
50
 		{
50
 		{
51
 			index: 'DLV_STTMT_UNQ_NO', name: 'dlvSttmtUnqNo',
51
 			index: 'DLV_STTMT_UNQ_NO', name: 'dlvSttmtUnqNo',
@@ -57,7 +57,7 @@ const gridColModel = {
57
 		{
57
 		{
58
 			index: 'DLV_STTMT_DTL_NO', name: 'dlvSttmtDtlNo',
58
 			index: 'DLV_STTMT_DTL_NO', name: 'dlvSttmtDtlNo',
59
 			label: ITP_MSG_LOCALE.label.dlvSttmtDtlNo, //납품서항번
59
 			label: ITP_MSG_LOCALE.label.dlvSttmtDtlNo, //납품서항번
60
-			width: '10', fixed: false, align: 'right',
60
+			width: '10', fixed: false, align: 'center',
61
 			sortable: false, hidden: false
61
 			sortable: false, hidden: false
62
 		},
62
 		},
63
 		{
63
 		{
@@ -72,26 +72,26 @@ const gridColModel = {
72
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
72
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
73
 			width: '10', fixed: false, align: 'left',
73
 			width: '10', fixed: false, align: 'left',
74
 			minwidth: 120,
74
 			minwidth: 120,
75
-			sortable: false, hidden: false
75
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
76
 		},
76
 		},
77
 		{
77
 		{
78
 			index: 'PODR_QTY', name: 'podrQty',
78
 			index: 'PODR_QTY', name: 'podrQty',
79
 			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
79
 			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
80
-			width: '10', fixed: false, align: 'right',
80
+			width: '17', fixed: false, align: 'right',
81
 			sortable: false, hidden: false,
81
 			sortable: false, hidden: false,
82
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
82
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
83
 		},
83
 		},
84
 		{
84
 		{
85
 			index: 'DLV_QTY', name: 'dlvQty',
85
 			index: 'DLV_QTY', name: 'dlvQty',
86
 			label: ITP_MSG_LOCALE.label.dlvQty, //납품/수주 수량
86
 			label: ITP_MSG_LOCALE.label.dlvQty, //납품/수주 수량
87
-			width: '10', fixed: false, align: 'right',
87
+			width: '17', fixed: false, align: 'right',
88
 			sortable: false, hidden: false,
88
 			sortable: false, hidden: false,
89
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
89
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
90
 		},
90
 		},
91
 		{
91
 		{
92
 			index: 'WHS_QTY', name: 'whsQty',	
92
 			index: 'WHS_QTY', name: 'whsQty',	
93
 			label: ITP_MSG_LOCALE.label.whsQty, //입고수량
93
 			label: ITP_MSG_LOCALE.label.whsQty, //입고수량
94
-			width: '10', fixed: false, align: 'right',
94
+			width: '17', fixed: false, align: 'right',
95
 			sortable: true, editable: true, edittype: 'text',
95
 			sortable: true, editable: true, edittype: 'text',
96
 			editrules: { required: false, number: true },
96
 			editrules: { required: false, number: true },
97
 			classes: 'input_color',
97
 			classes: 'input_color',
@@ -107,8 +107,7 @@ const gridColModel = {
107
 		{
107
 		{
108
 			index: 'UNIT_AMT', name: 'unitAmt',
108
 			index: 'UNIT_AMT', name: 'unitAmt',
109
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
109
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
110
-			width: '6', fixed: false, align: 'right',
111
-			minwidth: 70,
110
+			width: '17', fixed: false, align: 'right',
112
 			sortable: false, hidden: false,
111
 			sortable: false, hidden: false,
113
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
112
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
114
 		},
113
 		},
@@ -130,31 +129,31 @@ const gridColModel = {
130
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
129
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
131
 			width: '15', fixed: false, align: 'left',
130
 			width: '15', fixed: false, align: 'left',
132
 			minwidth: 200,
131
 			minwidth: 200,
133
-			sortable: false, hidden: false
132
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
134
 		},
133
 		},
135
 		{
134
 		{
136
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
135
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
137
 			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
136
 			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
138
-			width: '15', fixed: false, align: 'center',
137
+			width: '14', fixed: false, align: 'center',
139
 			sortable: false, hidden: false
138
 			sortable: false, hidden: false
140
 		},		
139
 		},		
141
 		{
140
 		{
142
 			index: 'DLV_SCH_DT', name: 'dlvSchDt',
141
 			index: 'DLV_SCH_DT', name: 'dlvSchDt',
143
 			label: ITP_MSG_LOCALE.label.dlvSchDt, //납품예정일
142
 			label: ITP_MSG_LOCALE.label.dlvSchDt, //납품예정일
144
-			width: '15', fixed: false, align: 'center',
143
+			width: '14', fixed: false, align: 'center',
145
 			sortable: false, hidden: false
144
 			sortable: false, hidden: false
146
 		},
145
 		},
147
 		{
146
 		{
148
 			index: 'DLV_MGR_NM', name: 'dlvMgrNm',
147
 			index: 'DLV_MGR_NM', name: 'dlvMgrNm',
149
 			label: ITP_MSG_LOCALE.label.dlvMgrNm, //납품담당자명
148
 			label: ITP_MSG_LOCALE.label.dlvMgrNm, //납품담당자명
150
-			width: '15', fixed: false, align: 'left',
151
-			sortable: false, hidden: false
149
+			width: '12', fixed: false, align: 'left',
150
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
152
 		},		
151
 		},		
153
 		{
152
 		{
154
 			index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',
153
 			index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',
155
 			label: ITP_MSG_LOCALE.label.dlvMgrTelNo, //납품담당자연락처
154
 			label: ITP_MSG_LOCALE.label.dlvMgrTelNo, //납품담당자연락처
156
 			width: '15', fixed: false, align: 'center',
155
 			width: '15', fixed: false, align: 'center',
157
-			minwidth: 120,
156
+			minwidth: 110,
158
 			sortable: false, hidden: false
157
 			sortable: false, hidden: false
159
 		},
158
 		},
160
 		{
159
 		{

+ 8 - 8
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) {
86
 				{
86
 				{
87
 					index: 'PODR_QTY', name: 'podrQty',
87
 					index: 'PODR_QTY', name: 'podrQty',
88
 					label: '발주수량', //
88
 					label: '발주수량', //
89
-					width: '5', fixed: false, align: 'center',
89
+					width: '7', fixed: false, align: 'right',
90
 					sortable: false, hidden: false,
90
 					sortable: false, hidden: false,
91
 					formatter: 'integer', formatoptions: {thousandsSeparator: ','}
91
 					formatter: 'integer', formatoptions: {thousandsSeparator: ','}
92
 				},
92
 				},
93
 				{
93
 				{
94
 					index: 'DLV_QTY', name: 'dlvQty',
94
 					index: 'DLV_QTY', name: 'dlvQty',
95
 					label: '납품서수량', //
95
 					label: '납품서수량', //
96
-					width: '5', fixed: false, align: 'center',
96
+					width: '7', fixed: false, align: 'right',
97
 					sortable: false, hidden: false,
97
 					sortable: false, hidden: false,
98
 					formatter: 'integer', formatoptions: {thousandsSeparator: ','}
98
 					formatter: 'integer', formatoptions: {thousandsSeparator: ','}
99
 				},
99
 				},
100
 				{
100
 				{
101
 					index: 'EXPRY_DATE', name: 'expryDate',
101
 					index: 'EXPRY_DATE', name: 'expryDate',
102
-					label: '유통기한', //
103
-					width: '10', fixed: false, align: 'center',
102
+					label: '사용(유통)기한', //
103
+					width: '7', fixed: false, align: 'center',
104
 					sortable: false, hidden: false
104
 					sortable: false, hidden: false
105
 				}
105
 				}
106
 		]
106
 		]
@@ -199,21 +199,21 @@ let pageObj = {
199
 							{
199
 							{
200
 								index: 'PODR_QTY', name: 'podrQty',
200
 								index: 'PODR_QTY', name: 'podrQty',
201
 								label: '발주수량', //
201
 								label: '발주수량', //
202
-								width: '5', fixed: false, align: 'center',
202
+								width: '7', fixed: false, align: 'right',
203
 								sortable: false, hidden: false,
203
 								sortable: false, hidden: false,
204
 								formatter: 'integer', formatoptions: {thousandsSeparator: ','}
204
 								formatter: 'integer', formatoptions: {thousandsSeparator: ','}
205
 							},
205
 							},
206
 							{
206
 							{
207
 								index: 'DLV_QTY', name: 'dlvQty',
207
 								index: 'DLV_QTY', name: 'dlvQty',
208
 								label: '납품서수량', //
208
 								label: '납품서수량', //
209
-								width: '5', fixed: false, align: 'center',
209
+								width: '7', fixed: false, align: 'right',
210
 								sortable: false, hidden: false,
210
 								sortable: false, hidden: false,
211
 								formatter: 'integer', formatoptions: {thousandsSeparator: ','}
211
 								formatter: 'integer', formatoptions: {thousandsSeparator: ','}
212
 							},
212
 							},
213
 							{
213
 							{
214
 								index: 'EXPRY_DATE', name: 'expryDate',
214
 								index: 'EXPRY_DATE', name: 'expryDate',
215
-								label: '유통기한', //
216
-								width: '10', fixed: false, align: 'center',
215
+								label: '사용(유통)기한', //
216
+								width: '7', fixed: false, align: 'center',
217
 								sortable: false, hidden: false
217
 								sortable: false, hidden: false
218
 							}
218
 							}
219
 					],
219
 					],