소스 검색

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

yhl88 2 년 전
부모
커밋
daac1bb648
2개의 변경된 파일22개의 추가작업 그리고 23개의 파일을 삭제
  1. 14 15
      src/main/webapp/js/app/pomng/ITP_POMNG06010.js
  2. 8 8
      src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DLV_STTMT_PRN.js

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

@@ -44,8 +44,8 @@ const gridColModel = {
44 44
 			index: 'BRAND_NM', name: 'brandNm',
45 45
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
46 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 51
 			index: 'DLV_STTMT_UNQ_NO', name: 'dlvSttmtUnqNo',
@@ -57,7 +57,7 @@ const gridColModel = {
57 57
 		{
58 58
 			index: 'DLV_STTMT_DTL_NO', name: 'dlvSttmtDtlNo',
59 59
 			label: ITP_MSG_LOCALE.label.dlvSttmtDtlNo, //납품서항번
60
-			width: '10', fixed: false, align: 'right',
60
+			width: '10', fixed: false, align: 'center',
61 61
 			sortable: false, hidden: false
62 62
 		},
63 63
 		{
@@ -72,26 +72,26 @@ const gridColModel = {
72 72
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
73 73
 			width: '10', fixed: false, align: 'left',
74 74
 			minwidth: 120,
75
-			sortable: false, hidden: false
75
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
76 76
 		},
77 77
 		{
78 78
 			index: 'PODR_QTY', name: 'podrQty',
79 79
 			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
80
-			width: '10', fixed: false, align: 'right',
80
+			width: '17', fixed: false, align: 'right',
81 81
 			sortable: false, hidden: false,
82 82
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
83 83
 		},
84 84
 		{
85 85
 			index: 'DLV_QTY', name: 'dlvQty',
86 86
 			label: ITP_MSG_LOCALE.label.dlvQty, //납품/수주 수량
87
-			width: '10', fixed: false, align: 'right',
87
+			width: '17', fixed: false, align: 'right',
88 88
 			sortable: false, hidden: false,
89 89
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
90 90
 		},
91 91
 		{
92 92
 			index: 'WHS_QTY', name: 'whsQty',	
93 93
 			label: ITP_MSG_LOCALE.label.whsQty, //입고수량
94
-			width: '10', fixed: false, align: 'right',
94
+			width: '17', fixed: false, align: 'right',
95 95
 			sortable: true, editable: true, edittype: 'text',
96 96
 			editrules: { required: false, number: true },
97 97
 			classes: 'input_color',
@@ -107,8 +107,7 @@ const gridColModel = {
107 107
 		{
108 108
 			index: 'UNIT_AMT', name: 'unitAmt',
109 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 111
 			sortable: false, hidden: false,
113 112
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
114 113
 		},
@@ -130,31 +129,31 @@ const gridColModel = {
130 129
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
131 130
 			width: '15', fixed: false, align: 'left',
132 131
 			minwidth: 200,
133
-			sortable: false, hidden: false
132
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
134 133
 		},
135 134
 		{
136 135
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
137 136
 			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
138
-			width: '15', fixed: false, align: 'center',
137
+			width: '14', fixed: false, align: 'center',
139 138
 			sortable: false, hidden: false
140 139
 		},		
141 140
 		{
142 141
 			index: 'DLV_SCH_DT', name: 'dlvSchDt',
143 142
 			label: ITP_MSG_LOCALE.label.dlvSchDt, //납품예정일
144
-			width: '15', fixed: false, align: 'center',
143
+			width: '14', fixed: false, align: 'center',
145 144
 			sortable: false, hidden: false
146 145
 		},
147 146
 		{
148 147
 			index: 'DLV_MGR_NM', name: 'dlvMgrNm',
149 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 153
 			index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',
155 154
 			label: ITP_MSG_LOCALE.label.dlvMgrTelNo, //납품담당자연락처
156 155
 			width: '15', fixed: false, align: 'center',
157
-			minwidth: 120,
156
+			minwidth: 110,
158 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 87
 					index: 'PODR_QTY', name: 'podrQty',
88 88
 					label: '발주수량', //
89
-					width: '5', fixed: false, align: 'center',
89
+					width: '7', fixed: false, align: 'right',
90 90
 					sortable: false, hidden: false,
91 91
 					formatter: 'integer', formatoptions: {thousandsSeparator: ','}
92 92
 				},
93 93
 				{
94 94
 					index: 'DLV_QTY', name: 'dlvQty',
95 95
 					label: '납품서수량', //
96
-					width: '5', fixed: false, align: 'center',
96
+					width: '7', fixed: false, align: 'right',
97 97
 					sortable: false, hidden: false,
98 98
 					formatter: 'integer', formatoptions: {thousandsSeparator: ','}
99 99
 				},
100 100
 				{
101 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 104
 					sortable: false, hidden: false
105 105
 				}
106 106
 		]
@@ -199,21 +199,21 @@ let pageObj = {
199 199
 							{
200 200
 								index: 'PODR_QTY', name: 'podrQty',
201 201
 								label: '발주수량', //
202
-								width: '5', fixed: false, align: 'center',
202
+								width: '7', fixed: false, align: 'right',
203 203
 								sortable: false, hidden: false,
204 204
 								formatter: 'integer', formatoptions: {thousandsSeparator: ','}
205 205
 							},
206 206
 							{
207 207
 								index: 'DLV_QTY', name: 'dlvQty',
208 208
 								label: '납품서수량', //
209
-								width: '5', fixed: false, align: 'center',
209
+								width: '7', fixed: false, align: 'right',
210 210
 								sortable: false, hidden: false,
211 211
 								formatter: 'integer', formatoptions: {thousandsSeparator: ','}
212 212
 							},
213 213
 							{
214 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 217
 								sortable: false, hidden: false
218 218
 							}
219 219
 					],