瀏覽代碼

Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

yhl88 2 年之前
父節點
當前提交
f2db22a8a0

+ 50 - 11
bin/src/main/webapp/app/pomng/POMNG01010.html

@@ -20,31 +20,70 @@
20 20
 									<div class="itp_form_in">	
21 21
 										<div class="form-group">
22 22
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
23
-											<div class="col-xs-4 itp_ip fnBrandNm"></div>
23
+											<div class="col-xs-4 itp_ip">
24
+												<div class="col-xs-4 itp_in fnBrandNm"></div>
25
+											</div>
24 26
 											<label class="col-xs-2 itp_lb">구매요청번호</label>
25
-											<div class="col-xs-4 itp_ip fnPchReqUnqNo"></div>
27
+											<div class="col-xs-4 itp_ip ">
28
+												<div class="col-xs-4 itp_in fnPchReqUnqNo"></div>
29
+											</div>
26 30
 										</div>
27 31
 									</div>
28 32
 									<div class="itp_form_in">
29 33
 										<div class="form-group">
30 34
 											<label class="col-xs-2 itp_lb">구매요청명</label>
31
-											<div class="col-xs-10 itp_ip fnPchReqNm">(미 입력시 매장명 + 날짜 + 품목수 표시함)</div>
35
+											<div class="col-xs-10 itp_ip">
36
+												<input type="text" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_NM" class="form-control itp_input" name="pchReqNm" value="" />
37
+											</div>
38
+										</div>
39
+									</div>
40
+									<div class="itp_form_in">	
41
+										<div class="form-group">
42
+											<label class="col-xs-2 itp_lb">구매 요청자</label>
43
+												<div class="col-xs-4 itp_ip">
44
+													<div class="col-xs-a itp_in fnPchReqDept"></div>
45
+													<div class="col-xs-a itp_in ">/</div>
46
+													<div class="col-xs-4 itp_in fnPchReqMgrNm"></div>
47
+												</div>
48
+											<label class="col-xs-2 itp_lb">구매요청금액</label>
49
+											<div class="col-xs-4 itp_ip fnPchReqAmt"></div>
32 50
 										</div>
33 51
 									</div>
34 52
 									<div class="itp_form_in">	
35 53
 										<div class="form-group">
36
-											<label class="col-xs-2 itp_lb">요청부서(매장/부서)</label>
54
+											<label class="col-xs-2 itp_lb">납기요청일</label>
37 55
 												<div class="col-xs-4 itp_ip">
38
-													<div class="col-xs-2 itp_in">
39
-														<div class="input-group fnPchReqDept" style="padding:5px;">asdf</div>
56
+													<div class="col-xs-4 itp_in itp_noMar">
57
+														<div class="input-daterange input-group date">
58
+															<input type="text" id="ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT" class="form-control itp_input" name="dlvReqDt" value="">
59
+														</div>
40 60
 													</div>
41
-													<label class="col-xs-1" style="top:7px;">/</label>
42
-													<div class="col-xs-4 itp_in">
43
-														<div class="input-group fnPchReqDept" style="padding:5px;">asdf</div>
61
+												</div>
62
+											<label class="col-xs-2 itp_lb">납품장소</label>
63
+											<div class="col-xs-4 itp_ip">
64
+												<div class="col-xs-4 itp_in">
65
+													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="" />
66
+												</div>
67
+												<div class="col-xs-4 itp_in">
68
+													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_DTL_LCN" class="form-control itp_input" name="dtlLcn" value="" />
69
+												</div>
70
+												<div class="col-xs-1 itp_in" style="width:23%; padding:0px;">
71
+													<button type="button" id="ITP_FORM_POMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
72
+													<button type="button" id="ITP_FORM_POMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
73
+								                </div>		
74
+											</div>
75
+										</div>
76
+									</div>
77
+									<div class="itp_form_in">	
78
+										<div class="form-group">
79
+											<label class="col-xs-2 itp_lb">정산타입</label>
80
+												<div class="col-xs-4 itp_ip">
81
+													<div class="col-xs-12 itp_in">
82
+														<div class="input-group fnSttlType" style="padding:5px;"></div>
44 83
 													</div>
45 84
 												</div>
46
-											<label class="col-xs-2 itp_lb">구매요청일</label>
47
-											<div class="col-xs-4 itp_ip fnPchReqDt"></div>
85
+											<label class="col-xs-2 itp_lb">구매가능금액</label>
86
+											<div class="col-xs-4 itp_ip fnPchActAmt">10,000,000원 </div>
48 87
 										</div>
49 88
 									</div>
50 89
 									<div class="itp_form_in">

+ 115 - 54
bin/src/main/webapp/app/pomng/POMNG02010.html

@@ -72,67 +72,100 @@
72 72
 								<input type="hidden" id="ITP_FORM_POMNG02010_DETAIL_VIEW_CD" name="viewCd" value="C">
73 73
 					
74 74
 								<section class="itp_form_sec">
75
-									<h4 class="itp_form_tit">구매요청정보-상세</h4>
75
+									<h4 class="itp_form_tit">구매요청정보</h4>
76 76
 									<div class="itp_form_in">	
77 77
 										<div class="form-group">
78 78
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
79
-											<div class="col-xs-4 itp_ip fnBrandNm"></div>
79
+											<div class="col-xs-4 itp_ip">
80
+												<div class="col-xs-4 itp_in fnBrandNm"></div>
81
+											</div>
80 82
 											<label class="col-xs-2 itp_lb">구매요청번호</label>
81
-											<div class="col-xs-4 itp_ip fnPchReqUnqNo"></div>
83
+											<div class="col-xs-4 itp_ip ">
84
+												<div class="col-xs-4 itp_in fnPchReqUnqNo"></div>
85
+											</div>
82 86
 										</div>
83 87
 									</div>
84 88
 									<div class="itp_form_in">
85 89
 										<div class="form-group">
86 90
 											<label class="col-xs-2 itp_lb">구매요청명</label>
87
-											<div class="col-xs-4 itp_ip fnPchReqNm"></div>
88
-											<label class="col-xs-2 itp_lb">상태</label>
89
-											<div class="col-xs-4 itp_ip fnStCd"></div>
91
+											<div class="col-xs-10 itp_ip">
92
+												<input type="text" id="ITP_FORM_POMNG02010_DETAIL_PCH_REQ_NM" class="form-control itp_input" name="pchReqNm" value="" />
93
+											</div>
90 94
 										</div>
91 95
 									</div>
92 96
 									<div class="itp_form_in">	
93 97
 										<div class="form-group">
94
-											<label class="col-xs-2 itp_lb">요청부서(매장/부서)</label>
95
-											<div class="col-xs-4 itp_ip">
96
-												<div class="col-xs-3 itp_in">
97
-													<div class="input-group fnPchReqDept" style="padding:5px;"></div>
98
+											<label class="col-xs-2 itp_lb">구매 요청자</label>
99
+												<div class="col-xs-4 itp_ip">
100
+													<div class="col-xs-2 itp_in">
101
+														<div class="input-group fnPchReqDept" style="padding:5px;">asdf</div>
102
+													</div>
103
+													<label class="col-xs-1" style="top:7px;">/</label>
104
+													<div class="col-xs-4 itp_in">
105
+														<div class="input-group fnPchReqDept" style="padding:5px;">asdf</div>
106
+													</div>
98 107
 												</div>
99
-												<!-- <label class="col-xs-1" style="top:7px;">/</label>
100
-												<div class="col-xs-4 itp_in">
101
-													<div class="input-group fnPchReqDept" style="padding:5px;"></div>
102
-												</div> -->
103
-											</div>
104
-											<label class="col-xs-2 itp_lb">구매요청일</label>
105
-											<div class="col-xs-4 itp_ip fnPchReqDt"></div>
108
+											<label class="col-xs-2 itp_lb">구매요청금액</label>
109
+											<div class="col-xs-4 itp_ip fnPchReqDt">asfdsdsa</div>
106 110
 										</div>
107 111
 									</div>
108
-									<div class="itp_form_in">
112
+									<div class="itp_form_in">	
109 113
 										<div class="form-group">
110
-											<label class="col-xs-2 itp_lb">비고</label>
111
-											<div class="col-xs-10 itp_ip fnNote"></div>
114
+											<label class="col-xs-2 itp_lb">납기요청일</label>
115
+												<div class="col-xs-4 itp_ip">
116
+													<div class="col-xs-4 itp_in itp_noMar">
117
+														<div class="input-daterange input-group date">
118
+															<input type="text" id="ITP_FORM_POMNG02010_DETAIL_DLV_REQ_DT" class="form-control itp_input" name="dlvReqDt" value="">
119
+														</div>
120
+													</div>
121
+												</div>
122
+											<label class="col-xs-2 itp_lb">납품장소</label>
123
+											<div class="col-xs-4 itp_ip">
124
+												<div class="col-xs-4 itp_in">
125
+													<input type="text" id="ITP_FORM_POMNG02010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="" />
126
+												</div>
127
+												<div class="col-xs-4 itp_in">
128
+													<input type="text" id="ITP_FORM_POMNG02010_DETAIL_DTL_LCN" class="form-control itp_input" name="dtlLcn" value="" />
129
+												</div>
130
+												<div class="col-xs-1 itp_in" style="width:23%; padding:0px;">
131
+													<button type="button" id="ITP_FORM_POMNG02010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
132
+													<button type="button" id="ITP_FORM_POMNG02010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
133
+								                </div>		
134
+											</div>
112 135
 										</div>
113 136
 									</div>
114 137
 									<div class="itp_form_in">	
115 138
 										<div class="form-group">
116
-											<label class="col-xs-2 itp_lb">반려일자</label>
117
-											<div class="col-xs-4 itp_ip fnBrandNm"></div>
118
-											<label class="col-xs-2 itp_lb">반려담당자명</label>
119
-											<div class="col-xs-4 itp_ip fnPchReqUnqNo"></div>
139
+											<label class="col-xs-2 itp_lb">정산타입</label>
140
+												<div class="col-xs-4 itp_ip">
141
+													<div class="col-xs-12 itp_in">
142
+														<div class="input-group fnPchReqDept" style="padding:5px;">asdf</div>
143
+													</div>
144
+												</div>
145
+											<label class="col-xs-2 itp_lb">구매가능금액</label>
146
+											<div class="col-xs-4 itp_ip fnPchReqDt">10,000,000원 </div>
120 147
 										</div>
121 148
 									</div>
122 149
 									<div class="itp_form_in">
123 150
 										<div class="form-group">
124
-											<label class="col-xs-2 itp_lb">반려사유</label>
125
-											<div class="col-xs-10 itp_ip fnRjctRsn"></div>
151
+											<label class="col-xs-2 itp_lb">비고</label>
152
+											<div class="col-xs-10 itp_ip">
153
+												<input type="text" id="ITP_FORM_POMNG02010_DETAIL_NOTE" class="form-control itp_input" name="fnNote" value="" />
154
+											</div>
126 155
 										</div>
127 156
 									</div>
128 157
 									<div class="itp_form_in">
129 158
 										<div class="itp_table_head fix" style="background:#f5f5f5;">
130 159
 											<h4 class="itp_table_tit">요청 품목</h4>
160
+											<div class="pull-right itp_cicon">
161
+												<button type="button" id="ITP_BTN_POMNG02010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
162
+												<button type="button" id="ITP_BTN_POMNG02010_DETAIL_DELROW" class="btn btn-danger btn-sm DRB"><i class="glyphicon "></i>&nbsp;&nbsp;품목삭제&nbsp;&nbsp;</button>
163
+											</div>
131 164
 										</div>
132 165
 										<div id="ITP_POMNG02010_DETAIL_jqGrid_list" class="itp_tb_list">
133 166
 										    <div id="ITP_POMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>
134 167
 										    <table id="ITP_POMNG02010_DETAIL_jqGrid"></table>
135
-									     	<div id="ITP_POMNG02010_DETAIL_jqGridPager"></div>
168
+										    <div id="ITP_POMNG02010_DETAIL_jqGridPager"></div>
136 169
 										    <div id="ITP_POMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
137 170
 										</div>
138 171
 									</div>
@@ -140,69 +173,97 @@
140 173
 							</form>
141 174
 						</div>
142 175
 					</div>
143
-				</div>
176
+				</div>			
144 177
 				<div id="ITP_AJAX_POMNG02010_VIEW_CONTAINER">
145 178
 					<div class="itp_form itp_type1 fix">
146 179
 						<div class="col-xs-12">
147 180
 							<form id="ITP_FORM_POMNG02010_VIEW" class="form-horizontal">
148
-								<input type="hidden" id="ITP_FORM_POMNG02010_DETAIL_VIEW_CD" name="viewCd" value="C">
181
+								<input type="hidden" id="ITP_FORM_POMNG02010_VIEW_VIEW_CD" name="viewCd" value="C">
149 182
 					
150 183
 								<section class="itp_form_sec">
151
-									<h4 class="itp_form_tit">구매요청정보-상세수정</h4>
184
+									<h4 class="itp_form_tit">구매요청정보-상세</h4>
152 185
 									<div class="itp_form_in">	
153 186
 										<div class="form-group">
154 187
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
155
-												<div class="col-xs-4 itp_ip fnBrandNm"></div>
188
+											<div class="col-xs-4 itp_ip fnBrandNm"></div>
156 189
 											<label class="col-xs-2 itp_lb">구매요청번호</label>
157
-												<div class="col-xs-4 itp_ip fnPchReqUnqNo"></div>
190
+											<div class="col-xs-4 itp_ip fnPchReqUnqNo"></div>
158 191
 										</div>
159 192
 									</div>
160 193
 									<div class="itp_form_in">
161 194
 										<div class="form-group">
162 195
 											<label class="col-xs-2 itp_lb">구매요청명</label>
163
-											<div class="col-xs-10 itp_ip">
164
-												<div class="col-xs-5 itp_in">
165
-													<input type="text" id="ITP_FORM_POMNG02010_VIEW_PCH_REQ_NM" class="form-control itp_input" name="pchReqNm" value="" />
166
-												</div>
167
-											</div>										
196
+											<div class="col-xs-4 itp_ip fnPchReqNm"></div>
197
+											<label class="col-xs-2 itp_lb">상태</label>
198
+											<div class="col-xs-4 itp_ip fnStCd"></div>
168 199
 										</div>
169 200
 									</div>
170 201
 									<div class="itp_form_in">	
171 202
 										<div class="form-group">
172 203
 											<label class="col-xs-2 itp_lb">요청부서(매장/부서)</label>
204
+											<div class="col-xs-4 itp_ip">
205
+												<div class="col-xs-3 itp_in">
206
+													<div class="input-group fnPchReqDept" style="padding:5px;"></div>
207
+												</div>
208
+											</div>
209
+											<label class="col-xs-2 itp_lb">구매요청금액</label>
210
+											<div class="col-xs-4 itp_ip fnPchReqAmt"></div>
211
+										</div>
212
+									</div>
213
+									<div class="itp_form_in">	
214
+										<div class="form-group">
215
+											<label class="col-xs-2 itp_lb">납기요청일</label>
173 216
 												<div class="col-xs-4 itp_ip">
174
-													<div class="col-xs-3 itp_in">
175
-														<div class="input-group PCH_REQ_DEPT" style="padding:5px;"></div>
176
-													</div>
177
-													<label class="col-xs-1" style="top:7px;">/</label>
178
-													<div class="col-xs-4 itp_in">
179
-														<div class="input-group PCH_REQ_DEPT" style="padding:5px;"></div>
217
+													<div class="col-xs-4 itp_in fnDlvReqDt"></div>
218
+												</div>
219
+											<label class="col-xs-2 itp_lb">납품장소</label>
220
+											<div class="col-xs-4 itp_ip">
221
+												<div class="col-xs-a itp_in fnWhsNm"></div>
222
+												<div class="col-xs-a itp_in ">-</div>
223
+												<div class="col-xs-4 itp_in fnDtlLcn"></div>
224
+											</div>
225
+										</div>
226
+									</div>
227
+									<div class="itp_form_in">	
228
+										<div class="form-group">
229
+											<label class="col-xs-2 itp_lb">정산타입</label>
230
+												<div class="col-xs-4 itp_ip">
231
+													<div class="col-xs-12 itp_in">
232
+														<div class="input-group fnPchReqDept" style="padding:5px;"></div>
180 233
 													</div>
181 234
 												</div>
182
-											<label class="col-xs-2 itp_lb">구매요청일</label>
183
-											<div class="col-xs-4 itp_ip PCH_REQ_DT"></div>
235
+											<label class="col-xs-2 itp_lb">구매가능금액</label>
236
+											<div class="col-xs-4 itp_ip fnPchReqDt"></div>
184 237
 										</div>
185 238
 									</div>
186 239
 									<div class="itp_form_in">
187 240
 										<div class="form-group">
188 241
 											<label class="col-xs-2 itp_lb">비고</label>
189
-											<div class="col-xs-10 itp_ip">
190
-												<input type="text" id="ITP_FORM_POMNG02010_VIEW_NOTE" class="form-control itp_input" name="NOTE" value="" />
191
-											</div>
242
+											<div class="col-xs-10 itp_ip fnNote"></div>
243
+										</div>
244
+									</div>
245
+									<div class="itp_form_in">	
246
+										<div class="form-group">
247
+											<label class="col-xs-2 itp_lb">반려일자</label>
248
+											<div class="col-xs-4 itp_ip fnBrandNm"></div>
249
+											<label class="col-xs-2 itp_lb">반려담당자명</label>
250
+											<div class="col-xs-4 itp_ip fnPchReqUnqNo"></div>
251
+										</div>
252
+									</div>
253
+									<div class="itp_form_in">
254
+										<div class="form-group">
255
+											<label class="col-xs-2 itp_lb">반려사유</label>
256
+											<div class="col-xs-10 itp_ip fnRjctRsn"></div>
192 257
 										</div>
193 258
 									</div>
194 259
 									<div class="itp_form_in">
195 260
 										<div class="itp_table_head fix" style="background:#f5f5f5;">
196 261
 											<h4 class="itp_table_tit">요청 품목</h4>
197
-											<div class="pull-right itp_cicon">
198
-												<button type="button" id="ITP_BTN_POMNG02010_VIEW_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
199
-												<button type="button" id="ITP_BTN_POMNG02010_VIEW_DELROW" class="btn btn-danger btn-sm DRB"><i class="glyphicon "></i>&nbsp;&nbsp;품목삭제&nbsp;&nbsp;</button>
200
-											</div>
201 262
 										</div>
202 263
 										<div id="ITP_POMNG02010_VIEW_jqGrid_list" class="itp_tb_list">
203 264
 										    <div id="ITP_POMNG02010_VIEW_jqGridView" class="itp_views fix"></div>
204 265
 										    <table id="ITP_POMNG02010_VIEW_jqGrid"></table>
205
-										    <div id="ITP_POMNG02010_VIEW_jqGridPager"></div>
266
+									     	<div id="ITP_POMNG02010_VIEW_jqGridPager"></div>
206 267
 										    <div id="ITP_POMNG02010_VIEW_jqGridEmpty" class="itp_no_data"></div>
207 268
 										</div>
208 269
 									</div>
@@ -210,7 +271,7 @@
210 271
 							</form>
211 272
 						</div>
212 273
 					</div>
213
-				</div>			
274
+				</div>
214 275
 			</div>
215 276
 		</article>
216 277
 	</div>

+ 50 - 11
src/main/webapp/app/pomng/POMNG01010.html

@@ -20,31 +20,70 @@
20 20
 									<div class="itp_form_in">	
21 21
 										<div class="form-group">
22 22
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
23
-											<div class="col-xs-4 itp_ip fnBrandNm"></div>
23
+											<div class="col-xs-4 itp_ip">
24
+												<div class="col-xs-4 itp_in fnBrandNm"></div>
25
+											</div>
24 26
 											<label class="col-xs-2 itp_lb">구매요청번호</label>
25
-											<div class="col-xs-4 itp_ip fnPchReqUnqNo"></div>
27
+											<div class="col-xs-4 itp_ip ">
28
+												<div class="col-xs-4 itp_in fnPchReqUnqNo"></div>
29
+											</div>
26 30
 										</div>
27 31
 									</div>
28 32
 									<div class="itp_form_in">
29 33
 										<div class="form-group">
30 34
 											<label class="col-xs-2 itp_lb">구매요청명</label>
31
-											<div class="col-xs-10 itp_ip fnPchReqNm">(미 입력시 매장명 + 날짜 + 품목수 표시함)</div>
35
+											<div class="col-xs-10 itp_ip">
36
+												<input type="text" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_NM" class="form-control itp_input" name="pchReqNm" value="" />
37
+											</div>
38
+										</div>
39
+									</div>
40
+									<div class="itp_form_in">	
41
+										<div class="form-group">
42
+											<label class="col-xs-2 itp_lb">구매 요청자</label>
43
+												<div class="col-xs-4 itp_ip">
44
+													<div class="col-xs-a itp_in fnPchReqDept"></div>
45
+													<div class="col-xs-a itp_in ">/</div>
46
+													<div class="col-xs-4 itp_in fnPchReqMgrNm"></div>
47
+												</div>
48
+											<label class="col-xs-2 itp_lb">구매요청금액</label>
49
+											<div class="col-xs-4 itp_ip fnPchReqAmt"></div>
32 50
 										</div>
33 51
 									</div>
34 52
 									<div class="itp_form_in">	
35 53
 										<div class="form-group">
36
-											<label class="col-xs-2 itp_lb">요청부서(매장/부서)</label>
54
+											<label class="col-xs-2 itp_lb">납기요청일</label>
37 55
 												<div class="col-xs-4 itp_ip">
38
-													<div class="col-xs-2 itp_in">
39
-														<div class="input-group fnPchReqDept" style="padding:5px;">asdf</div>
56
+													<div class="col-xs-4 itp_in itp_noMar">
57
+														<div class="input-daterange input-group date">
58
+															<input type="text" id="ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT" class="form-control itp_input" name="dlvReqDt" value="">
59
+														</div>
40 60
 													</div>
41
-													<label class="col-xs-1" style="top:7px;">/</label>
42
-													<div class="col-xs-4 itp_in">
43
-														<div class="input-group fnPchReqDept" style="padding:5px;">asdf</div>
61
+												</div>
62
+											<label class="col-xs-2 itp_lb">납품장소</label>
63
+											<div class="col-xs-4 itp_ip">
64
+												<div class="col-xs-4 itp_in">
65
+													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="" />
66
+												</div>
67
+												<div class="col-xs-4 itp_in">
68
+													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_DTL_LCN" class="form-control itp_input" name="dtlLcn" value="" />
69
+												</div>
70
+												<div class="col-xs-1 itp_in" style="width:23%; padding:0px;">
71
+													<button type="button" id="ITP_FORM_POMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
72
+													<button type="button" id="ITP_FORM_POMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
73
+								                </div>		
74
+											</div>
75
+										</div>
76
+									</div>
77
+									<div class="itp_form_in">	
78
+										<div class="form-group">
79
+											<label class="col-xs-2 itp_lb">정산타입</label>
80
+												<div class="col-xs-4 itp_ip">
81
+													<div class="col-xs-12 itp_in">
82
+														<div class="input-group fnSttlType" style="padding:5px;"></div>
44 83
 													</div>
45 84
 												</div>
46
-											<label class="col-xs-2 itp_lb">구매요청일</label>
47
-											<div class="col-xs-4 itp_ip fnPchReqDt"></div>
85
+											<label class="col-xs-2 itp_lb">구매가능금액</label>
86
+											<div class="col-xs-4 itp_ip fnPchActAmt">10,000,000원 </div>
48 87
 										</div>
49 88
 									</div>
50 89
 									<div class="itp_form_in">

+ 115 - 54
src/main/webapp/app/pomng/POMNG02010.html

@@ -72,67 +72,100 @@
72 72
 								<input type="hidden" id="ITP_FORM_POMNG02010_DETAIL_VIEW_CD" name="viewCd" value="C">
73 73
 					
74 74
 								<section class="itp_form_sec">
75
-									<h4 class="itp_form_tit">구매요청정보-상세</h4>
75
+									<h4 class="itp_form_tit">구매요청정보</h4>
76 76
 									<div class="itp_form_in">	
77 77
 										<div class="form-group">
78 78
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
79
-											<div class="col-xs-4 itp_ip fnBrandNm"></div>
79
+											<div class="col-xs-4 itp_ip">
80
+												<div class="col-xs-4 itp_in fnBrandNm"></div>
81
+											</div>
80 82
 											<label class="col-xs-2 itp_lb">구매요청번호</label>
81
-											<div class="col-xs-4 itp_ip fnPchReqUnqNo"></div>
83
+											<div class="col-xs-4 itp_ip ">
84
+												<div class="col-xs-4 itp_in fnPchReqUnqNo"></div>
85
+											</div>
82 86
 										</div>
83 87
 									</div>
84 88
 									<div class="itp_form_in">
85 89
 										<div class="form-group">
86 90
 											<label class="col-xs-2 itp_lb">구매요청명</label>
87
-											<div class="col-xs-4 itp_ip fnPchReqNm"></div>
88
-											<label class="col-xs-2 itp_lb">상태</label>
89
-											<div class="col-xs-4 itp_ip fnStCd"></div>
91
+											<div class="col-xs-10 itp_ip">
92
+												<input type="text" id="ITP_FORM_POMNG02010_DETAIL_PCH_REQ_NM" class="form-control itp_input" name="pchReqNm" value="" />
93
+											</div>
90 94
 										</div>
91 95
 									</div>
92 96
 									<div class="itp_form_in">	
93 97
 										<div class="form-group">
94
-											<label class="col-xs-2 itp_lb">요청부서(매장/부서)</label>
95
-											<div class="col-xs-4 itp_ip">
96
-												<div class="col-xs-3 itp_in">
97
-													<div class="input-group fnPchReqDept" style="padding:5px;"></div>
98
+											<label class="col-xs-2 itp_lb">구매 요청자</label>
99
+												<div class="col-xs-4 itp_ip">
100
+													<div class="col-xs-2 itp_in">
101
+														<div class="input-group fnPchReqDept" style="padding:5px;">asdf</div>
102
+													</div>
103
+													<label class="col-xs-1" style="top:7px;">/</label>
104
+													<div class="col-xs-4 itp_in">
105
+														<div class="input-group fnPchReqDept" style="padding:5px;">asdf</div>
106
+													</div>
98 107
 												</div>
99
-												<!-- <label class="col-xs-1" style="top:7px;">/</label>
100
-												<div class="col-xs-4 itp_in">
101
-													<div class="input-group fnPchReqDept" style="padding:5px;"></div>
102
-												</div> -->
103
-											</div>
104
-											<label class="col-xs-2 itp_lb">구매요청일</label>
105
-											<div class="col-xs-4 itp_ip fnPchReqDt"></div>
108
+											<label class="col-xs-2 itp_lb">구매요청금액</label>
109
+											<div class="col-xs-4 itp_ip fnPchReqDt">asfdsdsa</div>
106 110
 										</div>
107 111
 									</div>
108
-									<div class="itp_form_in">
112
+									<div class="itp_form_in">	
109 113
 										<div class="form-group">
110
-											<label class="col-xs-2 itp_lb">비고</label>
111
-											<div class="col-xs-10 itp_ip fnNote"></div>
114
+											<label class="col-xs-2 itp_lb">납기요청일</label>
115
+												<div class="col-xs-4 itp_ip">
116
+													<div class="col-xs-4 itp_in itp_noMar">
117
+														<div class="input-daterange input-group date">
118
+															<input type="text" id="ITP_FORM_POMNG02010_DETAIL_DLV_REQ_DT" class="form-control itp_input" name="dlvReqDt" value="">
119
+														</div>
120
+													</div>
121
+												</div>
122
+											<label class="col-xs-2 itp_lb">납품장소</label>
123
+											<div class="col-xs-4 itp_ip">
124
+												<div class="col-xs-4 itp_in">
125
+													<input type="text" id="ITP_FORM_POMNG02010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="" />
126
+												</div>
127
+												<div class="col-xs-4 itp_in">
128
+													<input type="text" id="ITP_FORM_POMNG02010_DETAIL_DTL_LCN" class="form-control itp_input" name="dtlLcn" value="" />
129
+												</div>
130
+												<div class="col-xs-1 itp_in" style="width:23%; padding:0px;">
131
+													<button type="button" id="ITP_FORM_POMNG02010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
132
+													<button type="button" id="ITP_FORM_POMNG02010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
133
+								                </div>		
134
+											</div>
112 135
 										</div>
113 136
 									</div>
114 137
 									<div class="itp_form_in">	
115 138
 										<div class="form-group">
116
-											<label class="col-xs-2 itp_lb">반려일자</label>
117
-											<div class="col-xs-4 itp_ip fnBrandNm"></div>
118
-											<label class="col-xs-2 itp_lb">반려담당자명</label>
119
-											<div class="col-xs-4 itp_ip fnPchReqUnqNo"></div>
139
+											<label class="col-xs-2 itp_lb">정산타입</label>
140
+												<div class="col-xs-4 itp_ip">
141
+													<div class="col-xs-12 itp_in">
142
+														<div class="input-group fnPchReqDept" style="padding:5px;">asdf</div>
143
+													</div>
144
+												</div>
145
+											<label class="col-xs-2 itp_lb">구매가능금액</label>
146
+											<div class="col-xs-4 itp_ip fnPchReqDt">10,000,000원 </div>
120 147
 										</div>
121 148
 									</div>
122 149
 									<div class="itp_form_in">
123 150
 										<div class="form-group">
124
-											<label class="col-xs-2 itp_lb">반려사유</label>
125
-											<div class="col-xs-10 itp_ip fnRjctRsn"></div>
151
+											<label class="col-xs-2 itp_lb">비고</label>
152
+											<div class="col-xs-10 itp_ip">
153
+												<input type="text" id="ITP_FORM_POMNG02010_DETAIL_NOTE" class="form-control itp_input" name="fnNote" value="" />
154
+											</div>
126 155
 										</div>
127 156
 									</div>
128 157
 									<div class="itp_form_in">
129 158
 										<div class="itp_table_head fix" style="background:#f5f5f5;">
130 159
 											<h4 class="itp_table_tit">요청 품목</h4>
160
+											<div class="pull-right itp_cicon">
161
+												<button type="button" id="ITP_BTN_POMNG02010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
162
+												<button type="button" id="ITP_BTN_POMNG02010_DETAIL_DELROW" class="btn btn-danger btn-sm DRB"><i class="glyphicon "></i>&nbsp;&nbsp;품목삭제&nbsp;&nbsp;</button>
163
+											</div>
131 164
 										</div>
132 165
 										<div id="ITP_POMNG02010_DETAIL_jqGrid_list" class="itp_tb_list">
133 166
 										    <div id="ITP_POMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>
134 167
 										    <table id="ITP_POMNG02010_DETAIL_jqGrid"></table>
135
-									     	<div id="ITP_POMNG02010_DETAIL_jqGridPager"></div>
168
+										    <div id="ITP_POMNG02010_DETAIL_jqGridPager"></div>
136 169
 										    <div id="ITP_POMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
137 170
 										</div>
138 171
 									</div>
@@ -140,69 +173,97 @@
140 173
 							</form>
141 174
 						</div>
142 175
 					</div>
143
-				</div>
176
+				</div>			
144 177
 				<div id="ITP_AJAX_POMNG02010_VIEW_CONTAINER">
145 178
 					<div class="itp_form itp_type1 fix">
146 179
 						<div class="col-xs-12">
147 180
 							<form id="ITP_FORM_POMNG02010_VIEW" class="form-horizontal">
148
-								<input type="hidden" id="ITP_FORM_POMNG02010_DETAIL_VIEW_CD" name="viewCd" value="C">
181
+								<input type="hidden" id="ITP_FORM_POMNG02010_VIEW_VIEW_CD" name="viewCd" value="C">
149 182
 					
150 183
 								<section class="itp_form_sec">
151
-									<h4 class="itp_form_tit">구매요청정보-상세수정</h4>
184
+									<h4 class="itp_form_tit">구매요청정보-상세</h4>
152 185
 									<div class="itp_form_in">	
153 186
 										<div class="form-group">
154 187
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
155
-												<div class="col-xs-4 itp_ip fnBrandNm"></div>
188
+											<div class="col-xs-4 itp_ip fnBrandNm"></div>
156 189
 											<label class="col-xs-2 itp_lb">구매요청번호</label>
157
-												<div class="col-xs-4 itp_ip fnPchReqUnqNo"></div>
190
+											<div class="col-xs-4 itp_ip fnPchReqUnqNo"></div>
158 191
 										</div>
159 192
 									</div>
160 193
 									<div class="itp_form_in">
161 194
 										<div class="form-group">
162 195
 											<label class="col-xs-2 itp_lb">구매요청명</label>
163
-											<div class="col-xs-10 itp_ip">
164
-												<div class="col-xs-5 itp_in">
165
-													<input type="text" id="ITP_FORM_POMNG02010_VIEW_PCH_REQ_NM" class="form-control itp_input" name="pchReqNm" value="" />
166
-												</div>
167
-											</div>										
196
+											<div class="col-xs-4 itp_ip fnPchReqNm"></div>
197
+											<label class="col-xs-2 itp_lb">상태</label>
198
+											<div class="col-xs-4 itp_ip fnStCd"></div>
168 199
 										</div>
169 200
 									</div>
170 201
 									<div class="itp_form_in">	
171 202
 										<div class="form-group">
172 203
 											<label class="col-xs-2 itp_lb">요청부서(매장/부서)</label>
204
+											<div class="col-xs-4 itp_ip">
205
+												<div class="col-xs-3 itp_in">
206
+													<div class="input-group fnPchReqDept" style="padding:5px;"></div>
207
+												</div>
208
+											</div>
209
+											<label class="col-xs-2 itp_lb">구매요청금액</label>
210
+											<div class="col-xs-4 itp_ip fnPchReqAmt"></div>
211
+										</div>
212
+									</div>
213
+									<div class="itp_form_in">	
214
+										<div class="form-group">
215
+											<label class="col-xs-2 itp_lb">납기요청일</label>
173 216
 												<div class="col-xs-4 itp_ip">
174
-													<div class="col-xs-3 itp_in">
175
-														<div class="input-group PCH_REQ_DEPT" style="padding:5px;"></div>
176
-													</div>
177
-													<label class="col-xs-1" style="top:7px;">/</label>
178
-													<div class="col-xs-4 itp_in">
179
-														<div class="input-group PCH_REQ_DEPT" style="padding:5px;"></div>
217
+													<div class="col-xs-4 itp_in fnDlvReqDt"></div>
218
+												</div>
219
+											<label class="col-xs-2 itp_lb">납품장소</label>
220
+											<div class="col-xs-4 itp_ip">
221
+												<div class="col-xs-a itp_in fnWhsNm"></div>
222
+												<div class="col-xs-a itp_in ">-</div>
223
+												<div class="col-xs-4 itp_in fnDtlLcn"></div>
224
+											</div>
225
+										</div>
226
+									</div>
227
+									<div class="itp_form_in">	
228
+										<div class="form-group">
229
+											<label class="col-xs-2 itp_lb">정산타입</label>
230
+												<div class="col-xs-4 itp_ip">
231
+													<div class="col-xs-12 itp_in">
232
+														<div class="input-group fnPchReqDept" style="padding:5px;"></div>
180 233
 													</div>
181 234
 												</div>
182
-											<label class="col-xs-2 itp_lb">구매요청일</label>
183
-											<div class="col-xs-4 itp_ip PCH_REQ_DT"></div>
235
+											<label class="col-xs-2 itp_lb">구매가능금액</label>
236
+											<div class="col-xs-4 itp_ip fnPchReqDt"></div>
184 237
 										</div>
185 238
 									</div>
186 239
 									<div class="itp_form_in">
187 240
 										<div class="form-group">
188 241
 											<label class="col-xs-2 itp_lb">비고</label>
189
-											<div class="col-xs-10 itp_ip">
190
-												<input type="text" id="ITP_FORM_POMNG02010_VIEW_NOTE" class="form-control itp_input" name="NOTE" value="" />
191
-											</div>
242
+											<div class="col-xs-10 itp_ip fnNote"></div>
243
+										</div>
244
+									</div>
245
+									<div class="itp_form_in">	
246
+										<div class="form-group">
247
+											<label class="col-xs-2 itp_lb">반려일자</label>
248
+											<div class="col-xs-4 itp_ip fnBrandNm"></div>
249
+											<label class="col-xs-2 itp_lb">반려담당자명</label>
250
+											<div class="col-xs-4 itp_ip fnPchReqUnqNo"></div>
251
+										</div>
252
+									</div>
253
+									<div class="itp_form_in">
254
+										<div class="form-group">
255
+											<label class="col-xs-2 itp_lb">반려사유</label>
256
+											<div class="col-xs-10 itp_ip fnRjctRsn"></div>
192 257
 										</div>
193 258
 									</div>
194 259
 									<div class="itp_form_in">
195 260
 										<div class="itp_table_head fix" style="background:#f5f5f5;">
196 261
 											<h4 class="itp_table_tit">요청 품목</h4>
197
-											<div class="pull-right itp_cicon">
198
-												<button type="button" id="ITP_BTN_POMNG02010_VIEW_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
199
-												<button type="button" id="ITP_BTN_POMNG02010_VIEW_DELROW" class="btn btn-danger btn-sm DRB"><i class="glyphicon "></i>&nbsp;&nbsp;품목삭제&nbsp;&nbsp;</button>
200
-											</div>
201 262
 										</div>
202 263
 										<div id="ITP_POMNG02010_VIEW_jqGrid_list" class="itp_tb_list">
203 264
 										    <div id="ITP_POMNG02010_VIEW_jqGridView" class="itp_views fix"></div>
204 265
 										    <table id="ITP_POMNG02010_VIEW_jqGrid"></table>
205
-										    <div id="ITP_POMNG02010_VIEW_jqGridPager"></div>
266
+									     	<div id="ITP_POMNG02010_VIEW_jqGridPager"></div>
206 267
 										    <div id="ITP_POMNG02010_VIEW_jqGridEmpty" class="itp_no_data"></div>
207 268
 										</div>
208 269
 									</div>
@@ -210,7 +271,7 @@
210 271
 							</form>
211 272
 						</div>
212 273
 					</div>
213
-				</div>			
274
+				</div>
214 275
 			</div>
215 276
 		</article>
216 277
 	</div>