Browse Source

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

yhl88 2 years ago
parent
commit
5d44432c80

+ 1 - 1
src/main/webapp/app/inoutmng/INOUTMNG01010.html

@@ -51,7 +51,7 @@
51 51
 											<button type="button" id="ITP_FORM_INOUTMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
52 52
 						                </div>
53 53
 										<div class="col-xs-4 itp_ip itp_noMar">
54
-											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="품목번호 or 품목명" />
54
+											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
55 55
 										</div>
56 56
 									</div>
57 57
 								</form>

+ 31 - 26
src/main/webapp/app/inoutmng/INOUTMNG03010.html

@@ -4,7 +4,9 @@
4 4
 			<div class="itp_det_head fix">
5 5
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>수거지시</strong></h2>
6 6
 				<div class="pull-right itp_cicon">
7
-					<button type="button" id="ITP_BTN_INOUTMNG03010_SRH" class="btn btn-success btn-sm CUD" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수거지시&nbsp;&nbsp;</button>
7
+					<button type="button" id="ITP_BTN_INOUTMNG03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
8
+					<button type="button" id="ITP_BTN_INOUTMNG03010_CUC" class="btn btn-success btn-sm CUC" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수거생성&nbsp;&nbsp;</button>
9
+					<button type="button" id="ITP_BTN_INOUTMNG03010_CUD" class="btn btn-success btn-sm CUD" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수거지시&nbsp;&nbsp;</button>
8 10
 					<button type="button" id="ITP_BTN_INOUTMNG03010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
9 11
 				</div>
10 12
 			</div>
@@ -14,6 +16,7 @@
14 16
 						<div class="itp_srh_border fix">
15 17
 							<div class="col-xs-12">
16 18
 								<form id="ITP_FORM_INOUTMNG03010_SEARCH" class="form-horizontal">
19
+									<input type="hidden" id="ITP_FORM_INOUTMNG03010_DETAIL_SBRAND_ID" class="form-control itp_input" name="sbrandId" />
17 20
 									<div class="form-group">
18 21
 										<div class="col-xs-2 itp_ip itp_noMar">
19 22
 											<select id="ITP_FORM_INOUTMNG03010_SERVICE_COL_REQ_DT" class="form-control itp_input" name="servicecolReqDt">
@@ -22,32 +25,33 @@
22 25
 										</div>
23 26
 										<div class="col-xs-3 itp_ip itp_noMar">
24 27
 											<div class="input-daterange input-group date">
25
-												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_COL_REQ_DT" class="form-control itp_input" name="colReqDt" value="">
28
+												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
26 29
 												<span class="input-group-addon itp_date_to">~</span>
27
-												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_COL_DT" class="form-control itp_input" name="colDt" value="">
30
+												<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
28 31
 											</div>
29 32
 										</div>
30 33
 										<div class="col-xs-2 itp_ip itp_noMar">
31
-											<select id="ITP_FORM_INOUTMNG03010_SEARCH_COL_DVSN" class="form-control itp_input" name="sColDvsn">
32
-												<option value="A">수거구분</option>											
33
-											</select>
34
-										</div>
35
-										<div class="col-xs-2 itp_ip itp_noMar">
36
-											<select id="ITP_FORM_INOUTMNG03010_SEARCH_RTN_WHS_ID" class="form-control itp_input" name="sRtnWhsId">
37
-												<option value="A">반품입고창고</option>											
38
-											</select>
34
+											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="반품입고창고" />
35
+											<input type="hidden" id="ITP_FORM_INOUTMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
39 36
 										</div>
37
+										<div class="col-xs-1 itp_in" style="padding:0px; width:10%;">
38
+											<button type="button" id="ITP_FORM_INOUTMNG03010_SEARCH_WHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
39
+											<button type="button" id="ITP_FORM_INOUTMNG03010_DELETE_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
40
+						                </div>
41
+										
42
+										
40 43
 									</div>
41 44
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
42 45
 										<div class="col-xs-2 itp_ip itp_noMar">
43
-											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_COL_PLACE" class="form-control itp_input" name="sColPlace" placeholder="수거매장" />
46
+											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm" placeholder="수거창고" />
47
+											<input type="hidden" id="ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId"  />
44 48
 										</div>
45 49
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
46
-											<button type="button" id="ITP_BTN_INOUTMNG03010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
47
-											<button type="button" id="ITP_BTN_INOUTMNG03010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
50
+											<button type="button" id="ITP_FORM_INOUTMNG03010_SEARCH_RTN_WHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
51
+											<button type="button" id="ITP_FORM_INOUTMNG03010_DELETE_RTN_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
48 52
 						                </div>
49 53
 										<div class="col-xs-3 itp_ip itp_noMar">
50
-											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="품목번호 or 품목명" />
54
+											<input type="text" id="ITP_FORM_INOUTMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
51 55
 										</div>
52 56
 									</div>
53 57
 								</form>
@@ -63,11 +67,12 @@
63 67
 						</div>
64 68
 					</div>
65 69
 				</div>
66
-				<div id="ITP_AJAX_INOUTMNG03010_VIEW_CONTAINER" >
70
+				<div id="ITP_AJAX_INOUTMNG03010_DETAIL_CONTAINER" >
67 71
 					<div class="itp_form itp_type1 fix">
68 72
 						<div class="col-xs-12">
69
-							<form id="ITP_FORM_INOUTMNG03010_VIEW" class="form-horizontal">
70
-								<input type="hidden" id="ITP_FORM_INOUTMNG03010_VIEW_" name="" value="">
73
+							<form id="ITP_FORM_INOUTMNG03010_DETAIL" class="form-horizontal">
74
+								<input type="hidden" id="ITP_FORM_INOUTMNG03010_DETAIL_" name="" value="">
75
+								<input type="hidden" id="ITP_FORM_INOUTMNG03010_DETAIL_BRAND_ID" class="form-control itp_input" name="brandId" />
71 76
 								<section class="itp_form_sec">
72 77
 									<h4 class="itp_form_tit">수거지시 기본정보</h4>
73 78
 									<div class="itp_form_in">
@@ -82,7 +87,7 @@
82 87
 											<div class="col-xs-4 itp_ip">
83 88
 												<div class="col-xs-7 itp_in">
84 89
 													<div class="input-daterange input-group date">
85
-														<input type="text" id="ITP_FORM_INOUTMNG03010_VIEW_COL_CMD_DT" data-check-required="empty" class="form-control itp_input" name="colDt" value="">
90
+														<input type="text" id="ITP_FORM_INOUTMNG03010_DETAIL_COL_SCH_DT" data-check-required="empty" class="form-control itp_input" name="colSchDt" value="">
86 91
 													</div>
87 92
 												</div>
88 93
 											</div>
@@ -91,13 +96,13 @@
91 96
 											<label class="col-xs-2 itp_lb">수거담당자 *</label>
92 97
 											<div class="col-xs-4 itp_ip">
93 98
 												<div class="col-xs-7 itp_in">
94
-													<input type="text" id="ITP_FORM_INOUTMNG03010_VIEW_COL_REQ_MGR_NM" data-check-required="empty" class="form-control itp_input" name="colReqMgrNm" value="">
99
+													<input type="text" id="ITP_FORM_INOUTMNG03010_DETAIL_PICK_MGR_NM" data-check-required="empty" class="form-control itp_input" name="pickMgrNm" value="">
95 100
 												</div>
96 101
 											</div>
97 102
 											<label class="col-xs-2 itp_lb">수거담당자 전화번호*</label>
98 103
 											<div class="col-xs-4 itp_ip">
99 104
 												<div class="col-xs-7 itp_in">
100
-													<input type="text" id="ITP_FORM_INOUTMNG03010_VIEW_COL_REQ_MGR_TEL_NO" data-check-required="empty" class="form-control itp_input" name="colReqMgrTelNo" value="">
105
+													<input type="text" id="ITP_FORM_INOUTMNG03010_DETAIL_PICK_MGR_TEL_NO" data-check-required="empty" class="form-control itp_input" name="pickMgrTelNo" value="">
101 106
 												</div>
102 107
 											</div>
103 108
 										</div>
@@ -110,11 +115,11 @@
110 115
 						<div class="itp_table_head fix" style="background:#f5f5f5;">
111 116
 							<h4 class="itp_table_tit">수거지시 품목</h4>
112 117
 						</div>
113
-						<div id="ITP_INOUTMNG03010_VIEW_jqGrid_list" class="itp_tb_list">
114
-							<div id="ITP_INOUTMNG03010_VIEW_jqGridView" class="itp_views fix"></div>
115
-							<table id="ITP_INOUTMNG03010_VIEW_jqGrid"></table>
116
-							<div id="ITP_INOUTMNG03010_VIEW_jqGridPager"></div>
117
-							<div id="ITP_INOUTMNG03010_VIEW_jqGridEmpty" class="itp_no_data"></div>
118
+						<div id="ITP_INOUTMNG03010_DETAIL_jqGrid_list" class="itp_tb_list">
119
+							<div id="ITP_INOUTMNG03010_DETAIL_jqGridView" class="itp_views fix"></div>
120
+							<table id="ITP_INOUTMNG03010_DETAIL_jqGrid"></table>
121
+							<div id="ITP_INOUTMNG03010_DETAIL_jqGridPager"></div>
122
+							<div id="ITP_INOUTMNG03010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
118 123
 						</div>
119 124
 					</div>
120 125
 				</div>

+ 11 - 14
src/main/webapp/app/oper/OPER01010.html

@@ -77,12 +77,11 @@
77 77
 								<input type="hidden" id="ITP_FORM_OPER01010_DETAIL_VIEW_CD" name="viewCd" value="C">
78 78
 								<input type="hidden" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_ID" name="afflShopId" value="">
79 79
 								<section class="itp_form_sec">
80
-									<h4 class="itp_form_tit">사용자 정보</h4>
81
-									<div class="itp_form_in">
80
+									<div class="itp_form_in border-top">
82 81
 										<div class="form-group">
83 82
 											<label class="col-xs-2 itp_lb">가맹점</label>
84 83
 											<div class="col-xs-4 itp_ip">
85
-												<div class="col-xs-6 itp_in" style="padding-right:5px;">
84
+												<div class="col-xs-7 itp_in">
86 85
 													<input type="text" name="afflShopNm" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" placeholder="가맹점명" readonly>
87 86
 												</div>
88 87
 												<div class="col-xs-3 itp_in">
@@ -101,7 +100,7 @@
101 100
 										<div class="form-group">
102 101
 											<label class="col-xs-2 itp_lb">사용자명 *</label>
103 102
 											<div class="col-xs-4 itp_ip">
104
-												<div class="col-xs-12 itp_in">
103
+												<div class="col-xs-7 itp_in">
105 104
 													<input type="text" id="ITP_FORM_OPER01010_DETAIL_USER_NM" data-check-required="empty" class="form-control itp_input" name="userNm" value="" maxlength="40">
106 105
 												</div>
107 106
 											</div>
@@ -118,7 +117,7 @@
118 117
 											<label class="col-xs-2 itp_lb">사용자ID *</label>
119 118
 											<div class="col-xs-4 itp_ip">
120 119
 												<div class="col-xs-2 itp_in fnUserId" style="margin-top:5px;"></div>
121
-												<div class="col-xs-8 itp_in">
120
+												<div class="col-xs-7 itp_in">
122 121
 													<div class="input-group">
123 122
 														<input type="text" id="ITP_FORM_OPER01010_DETAIL_USER_ID" data-check-required="empty" class="form-control itp_input" name="userId" value="" maxlength="20">
124 123
 														<span class="input-group-btn">
@@ -146,7 +145,7 @@
146 145
 												</div>
147 146
 											</div>
148 147
 										</div>
149
-										<div class="form-group border">
148
+										<div class="form-group">
150 149
 											<label class="col-xs-2 itp_lb">비밀번호 확인</label>
151 150
 											<div class="col-xs-4 itp_ip">
152 151
 												<div class="col-xs-7 itp_in">
@@ -167,7 +166,7 @@
167 166
 					</div>
168 167
 
169 168
 					<div class="itp_table fix">
170
-						<div class="itp_table_head fix" style="background:#f5f5f5;">
169
+						<div class="itp_table_head fix" style="background:#fff;">
171 170
 							<h4 class="itp_table_tit">권한 정보</h4>
172 171
 							<div class="pull-right itp_cicon">
173 172
 								<button type="button" id="ITP_BTN_OPER01010_DETAIL_ADDROW" class="btn btn-primary btn-sm ADB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;추가&nbsp;&nbsp;</button>
@@ -191,8 +190,7 @@
191 190
 								<input type="hidden" id="ITP_FORM_OPER01010_VIEW_USER_ID" name="userId" value="">
192 191
 
193 192
 								<section class="itp_form_sec">
194
-									<h4 class="itp_form_tit">사용자 정보</h4>
195
-									<div class="itp_form_in">
193
+									<div class="itp_form_in border-top">
196 194
 										<div class="form-group">
197 195
 											<label class="col-xs-2 itp_lb">가맹점</label>
198 196
 											<div class="col-xs-4 itp_ip">
@@ -250,7 +248,7 @@
250 248
 					</div>
251 249
 
252 250
 					<div class="itp_table fix">
253
-						<div class="itp_table_head fix" style="background:#f5f5f5;">
251
+						<div class="itp_table_head fix" style="background:#fff;">
254 252
 							<h4 class="itp_table_tit">권한 정보</h4>
255 253
 						</div>
256 254
 
@@ -269,8 +267,7 @@
269 267
 								<input type="hidden" id="ITP_FORM_OPER01010_NEW_VIEW_CD" name="viewCd" value="U">
270 268
 								<input type="hidden" id="ITP_FORM_OPER01010_NEW_USER_ID" name="userId" value="">
271 269
 								<section class="itp_form_sec">
272
-									<h4 class="itp_form_tit">사용자 정보</h4>
273
-									<div class="itp_form_in">
270
+									<div class="itp_form_in border-top">
274 271
 										<div class="form-group">
275 272
 											<label class="col-xs-2 itp_lb">가맹점</label>
276 273
 											<div class="col-xs-4 itp_ip">
@@ -284,7 +281,7 @@
284 281
 										<div class="form-group">
285 282
 											<label class="col-xs-2 itp_lb">사용자명 *</label>
286 283
 											<div class="col-xs-4 itp_ip">
287
-												<div class="col-xs-12 itp_in">
284
+												<div class="col-xs-7 itp_in">
288 285
 													<input type="text" id="ITP_FORM_OPER01010_NEW_USER_NM" data-check-required="empty" class="form-control itp_input" name="userNm" value="">
289 286
 												</div>
290 287
 											</div>
@@ -342,7 +339,7 @@
342 339
 					</div>
343 340
 
344 341
 					<div class="itp_table fix">
345
-						<div class="itp_table_head fix" style="background:#f5f5f5;">
342
+						<div class="itp_table_head fix" style="background:#fff;">
346 343
 							<h4 class="itp_table_tit">권한 정보</h4>
347 344
 							<div class="pull-right itp_cicon">
348 345
 								<button type="button" id="ITP_BTN_OPER01010_NEW_ADDROW" class="btn btn-primary btn-sm ADB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;추가&nbsp;&nbsp;</button>

+ 7 - 9
src/main/webapp/app/oper/OPER02010.html

@@ -37,7 +37,7 @@
37 37
 												<option value="">노출일</option>
38 38
 											</select>
39 39
 										</div>
40
-										<div class="col-xs-3 itp_ip">
40
+										<div class="col-xs-2 itp_ip">
41 41
 											<div class="input-daterange input-group date">
42 42
 												<input type="text" id="ITP_FORM_OPER02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
43 43
 											</div>
@@ -69,12 +69,11 @@
69 69
 								<input type="hidden" id="ITP_FORM_OPER02010_DETAIL_AFFL_SHOP_ID" name="afflShopId" value="">
70 70
 
71 71
 								<section class="itp_form_sec">
72
-									<h4 class="itp_form_tit">공지정보</h4>
73
-									<div class="itp_form_in">
72
+									<div class="itp_form_in border-top">
74 73
 										<div class="form-group">
75 74
 											<label class="col-xs-2 itp_lb">가맹점</label>
76 75
 											<div class="col-xs-4 itp_ip">
77
-												<div class="col-xs-6 itp_in" style="padding-right:5px;">
76
+												<div class="col-xs-5 itp_in" style="width:65%;">
78 77
 													<input type="text" name="afflShopNm" id="ITP_FORM_OPER02010_DETAIL_AFFL_SHOP_NM" class="form-control itp_input" placeholder="가맹점명" readonly>
79 78
 												</div>
80 79
 												<div class="col-xs-3 itp_in">
@@ -84,7 +83,7 @@
84 83
 											</div>
85 84
 											<label class="col-xs-2 itp_lb">브랜드</label>
86 85
 											<div class="col-xs-4 itp_ip">
87
-												<div class="col-xs-7 itp_in">
86
+												<div class="col-xs-6 itp_in">
88 87
 													<select id="ITP_FORM_OPER02010_DETAIL_BRAND_ID" class="form-control itp_input" name="brandId">
89 88
 													</select>
90 89
 												</div>
@@ -107,7 +106,7 @@
107 106
 										<div class="form-group colspan">
108 107
 											<label class="col-xs-2 itp_lb">공지제목 *</label>
109 108
 											<div class="col-xs-10 itp_ip">
110
-												<div class="col-xs-8 itp_in">
109
+												<div class="col-xs-7 itp_in">
111 110
 													<input type="text" id="ITP_FORM_OPER02010_DETAIL_NTICE_TITL" data-check-required="empty" class="form-control itp_input" name="nticeTitl" value="">
112 111
 												</div>
113 112
 											</div>
@@ -146,7 +145,7 @@
146 145
 										<div class="form-group colspan border">
147 146
 											<label class="col-xs-2 itp_lb">공지대상 *</label>
148 147
 											<div class="col-xs-4 itp_ip">
149
-												<div class="col-xs-2 itp_in">
148
+												<div class="col-xs-3 itp_in">
150 149
 													<select id="ITP_FORM_OPER02010_DETAIL_TARGET_CD" data-select-code="TARGET_CD" data-check-required="empty" class="form-control itp_input" name="targetCd"></select>
151 150
 												</div>
152 151
 												<!--<div class="col-xs-7 itp_in" id="ITP_FORM_OPER02010_TARGET">
@@ -190,8 +189,7 @@
190 189
 								<input type="hidden" id="ITP_FORM_OPER02010_VIEW_FILE_NO" name="fileNo" value="">
191 190
 
192 191
 								<section class="itp_form_sec">
193
-									<h4 class="itp_form_tit">공지정보</h4>
194
-									<div class="itp_form_in">
192
+									<div class="itp_form_in border-top">
195 193
 										<div class="form-group colspan">
196 194
 											<label class="col-xs-2 itp_lb">공지제목</label>
197 195
 											<div class="col-xs-4 itp_ip fnNticeTitl"></div>

+ 10 - 10
src/main/webapp/app/oper/OPER03010.html

@@ -8,7 +8,7 @@
8 8
 					<button type="button" id="ITP_BTN_OPER03010_MODIFY" class="btn btn-success btn-sm UPB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수정&nbsp;&nbsp;</button>
9 9
 					<button type="button" id="ITP_BTN_OPER03010_NEWREG" class="btn btn-primary btn-sm NEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;신규등록&nbsp;&nbsp;</button>
10 10
 					<button type="button" id="ITP_BTN_OPER03010_DELETE" class="btn btn-danger btn-sm DEB"><i class="glyphicon "></i>&nbsp;&nbsp;삭제&nbsp;&nbsp;</button>
11
-					<button type="button" id="ITP_BTN_OPER03010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
11
+					<button type="button" id="ITP_BTN_OPER03010_SAVE" class="btn btn-primary  btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
12 12
 					<button type="button" id="ITP_BTN_OPER03010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
13 13
 				</div>				
14 14
 			</div>
@@ -61,8 +61,7 @@
61 61
 								<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_FILE_NO" name="cmpnyLogoFileNo" value="">
62 62
 					
63 63
 								<section class="itp_form_sec">
64
-									<h4 class="itp_form_tit">가맹점정보</h4>
65
-									<div class="itp_form_in">
64
+									<div class="itp_form_in border-top">
66 65
 										<div class="form-group">
67 66
 											<label class="col-xs-2 itp_lb">가맹점 아이디</label>
68 67
 											<div class="col-xs-4 itp_ip">
@@ -84,16 +83,15 @@
84 83
 											</div>
85 84
 											<label class="col-xs-2 itp_lb">가맹점 KEY *<br>사용자 계정 추가-3자리</label>
86 85
 											<div class="col-xs-4 itp_ip">
87
-												<div class="col-xs-12 itp_in">
86
+												<div class="col-xs-6 itp_in">
88 87
 													<div class="input-group">
89 88
 														<input type="text" id="ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_KEY" data-check-required="empty" class="form-control itp_input" name="afflAbbr" value="" maxlength="3" readonly>
90 89
 														<span class="input-group-btn">
91 90
 															<button id="ITP_BTN_OPER03010_DETAIL_AFFL_SHOP_KEY" class="btn btn-default btn-sm itp_btn SHOW" type="button" disabled><i class="glyphicon glyphicon-ok"></i></button>
92 91
 														</span>
93
-														<label class="col-xs-8 itp_in">(가맹점코드 중복체크를 해주세요)</label>
94
-
95 92
 													</div>
96 93
 												</div>
94
+												<label style="margin:0; width:47%;" class="col-xs-5 itp_in">(가맹점코드 중복체크를 해주세요)</label>
97 95
 											</div>
98 96
 										</div>
99 97
 									</div>
@@ -212,7 +210,7 @@
212 210
 											</div>
213 211
 											<label class="col-xs-2 itp_lb">계약기간 *</label>
214 212
 											<div class="col-xs-4 itp_ip">
215
-												<div class="col-xs-10 itp_in">
213
+												<div class="col-xs-6 itp_in">
216 214
 													<div class="input-daterange input-group date">
217 215
 														<input type="text" id="ITP_FORM_OPER03010_SEARCH_JOIN_STT_DT" data-check-required="empty" class="form-control itp_input" name="joinSttDt" value="" readonly>
218 216
 														<span class="input-group-addon itp_date_to">~</span>
@@ -229,7 +227,7 @@
229 227
 												<div class="col-xs-1 itp_in">
230 228
 													<input type="text" id="ITP_FORM_OPER03010_DETAIL_ZIPNO" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
231 229
 												</div>
232
-												<div class="col-xs-1 itp_in">
230
+												<div class="col-xs-a itp_in">
233 231
 													<button type="button" id="ITP_FORM_OPER03010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
234 232
 												</div>
235 233
 												<div class="col-xs-4 itp_in" style="margin-right: 5px; margin-left:20px;">
@@ -278,8 +276,7 @@
278 276
 								<input type="hidden" id="ITP_FORM_OPER03010_VIEW_AFFL_SHOP_ID" name="afflShopId" value="">
279 277
 					
280 278
 								<section class="itp_form_sec">
281
-									<h4 class="itp_form_tit">가맹점정보</h4>
282
-									<div class="itp_form_in">
279
+									<div class="itp_form_in border-top">
283 280
 										<div class="form-group">
284 281
 											<label class="col-xs-2 itp_lb">가맹점 아이디</label>
285 282
 											<div class="col-xs-4 itp_ip">
@@ -392,6 +389,9 @@
392 389
 						</div>
393 390
 					</div>
394 391
 					<div class="itp_table fix">
392
+						<div class="itp_table_head fix">
393
+							<h4 class="itp_table_tit">* 영업담당자정보</h4>
394
+						</div>
395 395
 						<div id="ITP_OPER03010_VIEW_jqGrid_list" class="itp_tb_list">
396 396
 							<div id="ITP_OPER03010_VIEW_jqGridView" class="itp_views fix"></div>
397 397
 							<table id="ITP_OPER03010_VIEW_jqGrid"></table>

+ 12 - 16
src/main/webapp/app/oper/OPER03011.html

@@ -2,10 +2,10 @@
2 2
 	<div class="itp_cont">
3 3
 		<article class="itp_detail">
4 4
 			<div class="itp_det_head fix">
5
-				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>가맹점관리</strong></h2>
5
+				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>가맹점정보</strong></h2>
6 6
 				<div class="pull-right itp_cicon">
7 7
 					<button type="button" id="ITP_BTN_OPER03011_MODIFY" class="btn btn-success btn-sm UPB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수정&nbsp;&nbsp;</button>
8
-					<button type="button" id="ITP_BTN_OPER03011_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
8
+					<button type="button" id="ITP_BTN_OPER03011_SAVE" class="btn btn-primary btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
9 9
 					<button type="button" id="ITP_BTN_OPER03011_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
10 10
 				</div>
11 11
 			</div>
@@ -58,16 +58,15 @@
58 58
 								<input type="hidden" id="ITP_FORM_OPER03011_DETAIL_FILE_NO" name="cmpnyLogoFileNo" value="">
59 59
 
60 60
 								<section class="itp_form_sec">
61
-									<h4 class="itp_form_tit">가맹점정보</h4>
62
-									<div class="itp_form_in">
61
+									<div class="itp_form_in border-top">
63 62
 										<div class="form-group">
64 63
 											<label class="col-xs-2 itp_lb">가맹점 아이디</label>
65 64
 											<div class="col-xs-4 itp_ip">
66
-												<div class="col-xs-6 itp_in fnAfflShopId">(자동부여)</div>
65
+												<div class="col-xs-7 itp_in fnAfflShopId">(자동부여)</div>
67 66
 											</div>
68 67
 											<label class="col-xs-2 itp_lb">상태(*)</label>
69 68
 											<div class="col-xs-4 itp_ip">
70
-												<div class="col-xs-6 itp_in">
69
+												<div class="col-xs-7 itp_in">
71 70
 													<select id="ITP_FORM_OPER03011_DETAIL_ST_CD" data-select-code="ST_CD" data-check-required="empty" class="form-control itp_input" name="stCd"></select>
72 71
 												</div>
73 72
 											</div>
@@ -81,7 +80,7 @@
81 80
 											</div>
82 81
 											<label class="col-xs-2 itp_lb">가맹점 KEY *<br>사용자 계정 추가-3자리</label>
83 82
 											<div class="col-xs-4 itp_ip">
84
-												<div class="col-xs-4 itp_in">
83
+												<div class="col-xs-7 itp_in">
85 84
 													<div class="input-group">
86 85
 														<input type="text" id="ITP_FORM_OPER03011_DETAIL_AFFL_SHOP_KEY" data-check-required="empty" class="form-control itp_input" name="afflAbbr" value="" maxlength="3" readonly>
87 86
 														<span class="input-group-btn">
@@ -118,12 +117,9 @@
118 117
 											</div>
119 118
 											<label class="col-xs-2 itp_lb">법인번호</label>
120 119
 											<div class="col-xs-4 itp_ip">
121
-												<div class="col-xs-6 itp_in">
120
+												<div class="col-xs-7 itp_in">
122 121
 													<input type="text" id="ITP_FORM_OPER03011_DETAIL_CORP_REG_NO" class="form-control itp_input" name="corpRegNo" value="">
123 122
 												</div>
124
-												<div class="col-xs-3 itp_in">
125
-
126
-												</div>
127 123
 											</div>
128 124
 										</div>
129 125
 										<div class="form-group">
@@ -177,7 +173,7 @@
177 173
 											</div>
178 174
 											<label class="col-xs-2 itp_lb">업태</label>
179 175
 											<div class="col-xs-4 itp_ip">
180
-												<div class="col-xs-6 itp_in">
176
+												<div class="col-xs-7 itp_in">
181 177
 													<input type="text" id="ITP_FORM_OPER03011_DETAIL_BSNS_CNDT" class="form-control itp_input" name="bsnsCndt" value="">
182 178
 												</div>
183 179
 											</div>
@@ -191,7 +187,7 @@
191 187
 											</div>
192 188
 											<label class="col-xs-2 itp_lb">업종</label>
193 189
 											<div class="col-xs-4 itp_ip">
194
-												<div class="col-xs-6 itp_in">
190
+												<div class="col-xs-7 itp_in">
195 191
 													<input type="text" id="ITP_FORM_OPER03011_DETAIL_CTGR_BSNS" class="form-control itp_input" name="ctgrBsns" value="">
196 192
 												</div>
197 193
 											</div>
@@ -205,7 +201,7 @@
205 201
 											</div>
206 202
 											<label class="col-xs-2 itp_lb">계약기간 *</label>
207 203
 											<div class="col-xs-4 itp_ip">
208
-												<div class="col-xs-10 itp_in">
204
+												<div class="col-xs-7 itp_in">
209 205
 													<div class="input-daterange input-group date">
210 206
 														<input type="text" id="ITP_FORM_OPER03011_SEARCH_JOIN_STT_DT" data-check-required="empty" class="form-control itp_input" name="joinSttDt" value="" readonly>
211 207
 														<span class="input-group-addon itp_date_to">~</span>
@@ -222,7 +218,7 @@
222 218
 												<div class="col-xs-1 itp_in">
223 219
 													<input type="text" id="ITP_FORM_OPER03011_DETAIL_ZIPNO" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
224 220
 												</div>
225
-												<div class="col-xs-1 itp_in">
221
+												<div class="col-xs-a itp_in">
226 222
 													<button type="button" id="ITP_FORM_OPER03011_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
227 223
 												</div>
228 224
 												<div class="col-xs-4 itp_in" style="margin-right: 5px; margin-left:20px;">
@@ -368,7 +364,7 @@
368 364
 											</div>
369 365
 										</div>
370 366
 									</div>
371
-									<div class="itp_form_in">
367
+									<div class="itp_form_in border">
372 368
 										<div class="form-group">
373 369
 											<label class="col-xs-2 itp_lb">주소 *</label>
374 370
 											<div class="col-xs-10 itp_ip">

+ 6 - 8
src/main/webapp/app/oper/OPER04010.html

@@ -59,13 +59,12 @@
59 59
 								<input type="hidden" id="ITP_FORM_OPER04010_DETAIL_LOCATION" name="location" value="">
60 60
 					
61 61
 								<section class="itp_form_sec">
62
-									<h4 class="itp_form_tit">영업담당자정보</h4>
63
-									<div class="itp_form_in">
62
+									<div class="itp_form_in border-top">
64 63
 										<div class="form-group">
65 64
 											<label class="col-xs-2 itp_lb">영업담당자ID</label>
66 65
 											<div class="col-xs-4 itp_ip">
67 66
 												<div class="itp_form_change">	
68
-													<div class="col-xs-9 itp_in">
67
+													<div class="col-xs-7 itp_in">
69 68
 														<div class="input-group">
70 69
 															<input type="text" id="ITP_FORM_OPER04010_DETAIL_TMP_SALE_MGR_ID" data-check-required="empty" class="form-control itp_input" value="" maxlength="10" >
71 70
 															<span class="input-group-btn">
@@ -88,7 +87,7 @@
88 87
 										<div class="form-group">
89 88
 											<label class="col-xs-2 itp_lb">영업담당자명(*)</label>
90 89
 											<div class="col-xs-4 itp_ip">
91
-												<div class="col-xs-8 itp_in">
90
+												<div class="col-xs-7 itp_in">
92 91
 													<input type="text" id="ITP_FORM_OPER04010_DETAIL_SALE_MGR_NM" data-check-required="empty" class="form-control itp_input" name="saleMgrNm" value="" maxlength="40">
93 92
 												</div>
94 93
 											</div>
@@ -168,8 +167,8 @@
168 167
 												<div class="col-xs-1 itp_in">
169 168
 													<input type="text" id="ITP_FORM_OPER04010_DETAIL_ZIPNO" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
170 169
 												</div>
171
-												<div class="col-xs-1 itp_in">
172
-													<button type="button" id="ITP_FORM_OPER04010_DETAIL_ADRES_SCH" class="btn btn-primary btn-xs SHOW" style="margin: 3px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
170
+												<div class="col-xs-a itp_in" style="margin-top:-3.5px;">
171
+													<button type="button" id="ITP_FORM_OPER04010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: 3px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
173 172
 												</div>
174 173
 												<div class="col-xs-4 itp_in" style="margin-right: 5px;">
175 174
 													<input type="text" id="ITP_FORM_OPER04010_DETAIL_ADRES" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="addr1" value="" readonly placeholder="기본주소">
@@ -214,8 +213,7 @@
214 213
 								<input type="hidden" id="ITP_FORM_OPER04010_VIEW_SALE_MGR_ID" name="saleMgrId" value="">
215 214
 					
216 215
 								<section class="itp_form_sec">
217
-									<h4 class="itp_form_tit">영업담당자정보</h4>
218
-									<div class="itp_form_in">
216
+									<div class="itp_form_in border-top">
219 217
 										<div class="form-group">
220 218
 											<label class="col-xs-2 itp_lb">영업담당자ID</label>
221 219
 											<div class="col-xs-4 itp_ip">

+ 6 - 7
src/main/webapp/app/oper/OPER06010.html

@@ -68,8 +68,7 @@
68 68
 								<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_FILE_NO" name="brandLogoFileNo" value="">
69 69
 					
70 70
 								<section class="itp_form_sec">
71
-									<h4 class="itp_form_tit">브랜드 정보-신규</h4>
72
-									<div class="itp_form_in">
71
+									<div class="itp_form_in border-top">
73 72
 										<div class="form-group">
74 73
 											<label class="col-xs-2 itp_lb">브랜드 아이디</label>
75 74
 											<div class="col-xs-4 itp_ip">
@@ -118,7 +117,7 @@
118 117
 											<div class="form-group">
119 118
 												<label class="col-xs-2 itp_lb">대표자명</label>
120 119
 												<div class="col-xs-10 itp_ip">
121
-													<div class="col-xs-2 itp_in" style="margin-left:5px;">
120
+													<div class="col-xs-3 itp_in" style="width:22.6%;">
122 121
 														<input type="text" id="ITP_FORM_OPER06010_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm">
123 122
 													</div>
124 123
 													<div class="col-xs-5 itp_in" style="margin-top:5px;">
@@ -152,7 +151,8 @@
152 151
 												<!-- <button type="button" id="ITP_BTN_OPER06010_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button> -->
153 152
 											</div>
154 153
 											<label class="col-xs-2 itp_lb"></label>
155
-											<div id="ITP_OPER06010_DETAIL_LOGO_FILE" class="col-xs-1 itp_in">
154
+												<div class="col-xs-2 itp_in"></div>
155
+												<div id="ITP_OPER06010_DETAIL_LOGO_FILE" class="col-xs-1 itp_in">
156 156
 											</div>
157 157
 										</div>
158 158
 										<div class="form-group">
@@ -230,7 +230,7 @@
230 230
 												<div class="col-xs-1 itp_in">
231 231
 													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ZIPNO" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
232 232
 												</div>
233
-												<div class="col-xs-1 itp_in">
233
+												<div class="col-xs-a itp_in">
234 234
 													<button type="button" id="ITP_FORM_OPER06010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
235 235
 												</div>
236 236
 												<div class="col-xs-4 itp_in" style="margin-right: 5px; margin-left:20px;">
@@ -291,8 +291,7 @@
291 291
 								<input type="hidden" id="ITP_FORM_OPER06010_VIEW_AFFL_SHOP_ID" name="afflShopId" value="">
292 292
 								
293 293
 								<section class="itp_form_sec">
294
-									<h4 class="itp_form_tit">브랜드 정보-상세</h4>
295
-									<div class="itp_form_in">
294
+									<div class="itp_form_in border-top">
296 295
 										<div class="form-group">
297 296
 											<label class="col-xs-2 itp_lb">브랜드 코드</label>
298 297
 												<div class="col-xs-4 itp_ip">

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/bootstrap/dist/css/bootstrap.min.css


+ 9 - 15
src/main/webapp/css/style.css

@@ -2,16 +2,9 @@
2 2
 @media print {
3 3
 	*{visibility: hidden; margin:0; paddig:0;}
4 4
 }
5
-@font-face {
6
-    font-family: 'GmarketSansMedium';
7
-    src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');
8
-    font-weight: normal;
9
-    font-style: normal;
10
-}
11
-
12 5
 /* COMMON */
13 6
 html, body {width:100%; height:100%; background:#eee; overflow-y:hidden;}
14
-* {word-break: break-word; font-family: 'GmarketSansMedium';}
7
+* {word-break: break-word; font-family: 'NanumBarunGothic';}
15 8
 textarea {resize:none;}
16 9
 a, button {outline:none !important; text-decoration:none !important;}
17 10
 .fix:after {content:"."; display:block; height:0; clear:both; visibility:hidden;}
@@ -155,7 +148,7 @@ a, button {outline:none !important; text-decoration:none !important;}
155 148
 /* #ITP_HEADER.itp_open_tab .itp_nav {visibility:visible;}
156 149
 #ITP_HEADER.itp_open_tab .itp_nav::-webkit-scrollbar{display:none;} */
157 150
 #ITP_HEADER .itp_tabs {position:relative; z-index:100; transition:all .25s ease; float:right; width:calc(100% - 238px);}
158
-#ITP_HEADER .itp_tabs .nav-tabs {padding:15px 4px 0 15px; background:#fff;}
151
+#ITP_HEADER .itp_tabs .nav-tabs {padding:9px 4px 0 15px; background:#fff;}
159 152
 #ITP_HEADER .itp_tabs .nav-tabs > li a {border:1px solid #ddd; background:#f5f5f5; font-size:12px; color:#666; padding:10px 13px 7px 15px; margin-right:6px; outline:none;}
160 153
 #ITP_HEADER .itp_tabs .nav-tabs > li a i.glyphicon-remove {font-size:10px; margin-left:4px; cursor:pointer;}
161 154
 #ITP_HEADER .itp_tabs .nav-tabs > li.active > a, .nav-tabs > li.active > a:focus, .nav-tabs > li.active > a:hover {background:#fff; color:#666; border:1px solid #ccc; border-bottom-color:transparent; font-weight:700;}
@@ -243,7 +236,7 @@ a, button {outline:none !important; text-decoration:none !important;}
243 236
 #ITP_CONTAINER .itp_adv_srh .form-group .date .form-control:last-child {border-top-left-radius:0px; border-bottom-left-radius:0px;}
244 237
 #ITP_CONTAINER .itp_adv_srh .form-group .itp_adv_chk {margin-top:5px;}
245 238
 #ITP_CONTAINER .itp_adv_srh .form-group .itp_adv_chk .itp_check {float:right; margin-left:10px;}
246
-#ITP_CONTAINER .itp_detail {display:table-cell; vertical-align:top; height:100%; padding-top:10px;}
239
+#ITP_CONTAINER .itp_detail {display:table-cell; vertical-align:top; height:100%;}
247 240
 
248 241
 #ITP_CONTAINER .itp_detail .itp_det_head {padding:0 50px 0 35px; height:42px; background:#fff;}
249 242
 #ITP_CONTAINER .itp_detail .itp_det_head .itp_det_tit {font-size:20px; margin:0; padding:0; line-height:42px;}
@@ -251,7 +244,7 @@ a, button {outline:none !important; text-decoration:none !important;}
251 244
 
252 245
 #ITP_CONTAINER .itp_detail .itp_det_in {padding:0px 20px 15px 20px; height:calc(100vh - 180px); overflow-y:scroll;}
253 246
 #ITP_CONTAINER .itp_detail .itp_det_in::-webkit-scrollbar{display:none;}
254
-#ITP_CONTAINER .itp_detail .itp_cicon {line-height:32px; height:32px;}
247
+#ITP_CONTAINER .itp_detail .itp_cicon {line-height:32px; height:32px; margin-top:4px;}
255 248
 #ITP_CONTAINER .itp_detail .itp_cicon .btn-default {color:#fff; background-color:rgb(109, 110, 114); border-color:rgb(109, 110, 114);}
256 249
 #ITP_CONTAINER .itp_detail .itp_cicon .itp_store {display:inline-block; vertical-align:middle; font-size:13px; margin-right:10px;}
257 250
 #ITP_CONTAINER .itp_detail .itp_cicon .itp_store span {color:#000;}
@@ -265,6 +258,7 @@ a, button {outline:none !important; text-decoration:none !important;}
265 258
 #ITP_CONTAINER .itp_detail .itp_form .itp_form_sec {margin-top:50px;}
266 259
 #ITP_CONTAINER .itp_detail .itp_form .itp_form_sec.noMar {margin-top:0;}
267 260
 #ITP_CONTAINER .itp_detail .itp_form .itp_form_in {margin-top:25px; padding-left:8px;}
261
+#ITP_CONTAINER .itp_detail .itp_form .border-top {border-top:1px solid #666;}
268 262
 #ITP_CONTAINER .itp_detail .itp_form .form-group {margin-bottom:10px;}
269 263
 #ITP_CONTAINER .itp_detail .itp_form .form-control {font-size:13px; color:#333;}
270 264
 #ITP_CONTAINER .itp_detail .itp_form .itp_lb {font-size:13px; padding-top:5px; font-weight:normal; padding-right:0; color:#333; position:relative;}
@@ -308,7 +302,7 @@ html:lang(en) #ITP_CONTAINER .itp_detail .itp_form .itp_thumb_inline .itp_thumb_
308 302
 
309 303
 #ITP_CONTAINER .itp_detail .itp_lg_form {padding-top:10px;}
310 304
 #ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 {padding-left:15px; padding-right:15px; padding-bottom:15px; }
311
-#ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 .itp_srh_border {border:1px solid #ddd; background:#fff; padding:20px 20px 10px 20px; border-radius:4px;box-shadow: 0px 0px 6px #ddd;}
305
+#ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 .itp_srh_border {border:1px solid #ddd; background:#fff; padding:15px 15px 5px 15px; border-radius:4px;box-shadow: 0px 0px 6px #ddd;}
312 306
 #ITP_CONTAINER .itp_detail .itp_lg_form .form-group {margin-bottom:10px;}
313 307
 #ITP_CONTAINER .itp_detail .itp_lg_form .form-control {font-size:13px; color:#333;}
314 308
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_lb {font-size:13px; padding-top:5px; padding-right:0; color:#333; position:relative;}
@@ -439,12 +433,12 @@ html:lang(en) #ITP_CONTAINER .itp_detail .itp_form .itp_thumb_inline .itp_thumb_
439 433
 #ITP_CONTAINER .itp_form.itp_type1 .itp_form_in {margin:0; padding:0; display:table; width:100%;}
440 434
 #ITP_CONTAINER .itp_form.itp_type1 .form-group {margin:0; padding:0; display:table-row;}
441 435
 #ITP_CONTAINER .itp_form.itp_type1 .form-group .itp_lb,
442
-#ITP_CONTAINER .itp_form.itp_type1 .form-group .itp_ip {display:table-cell; padding:6px 15px; border-top:1px solid #F2F2F2; float:none; vertical-align:middle; height:42px; }
436
+#ITP_CONTAINER .itp_form.itp_type1 .form-group .itp_ip {display:table-cell; padding:6px 15px; border-top:1px solid #ededed; float:none; vertical-align:middle; height:42px; }
443 437
 #ITP_CONTAINER .itp_form.itp_type1 .form-group.border .itp_lb,
444
-#ITP_CONTAINER .itp_form.itp_type1 .form-group.border .itp_ip {border-bottom:1px solid #ddd;}
438
+#ITP_CONTAINER .itp_form.itp_type1 .form-group.border .itp_ip {border-bottom:1px solid #666;}
445 439
 #ITP_CONTAINER .itp_form.itp_type1 .form-group.noBor .itp_lb,
446 440
 #ITP_CONTAINER .itp_form.itp_type1 .form-group.noBor .itp_ip {border-top:0; padding-top:0; height:auto;}
447
-#ITP_CONTAINER .itp_form.itp_type1 .form-group .itp_lb {border-right:1px solid #ddd; border-left:1px solid #ddd;background:#d6ecf5;}
441
+#ITP_CONTAINER .itp_form.itp_type1 .form-group .itp_lb {border-right:1px solid #ddd; border-left:1px solid #ddd;background:#f5f5f5;}
448 442
 #ITP_CONTAINER .itp_form.itp_type1 .form-group .itp_lb.bor {border-left:1px solid #ddd;}
449 443
 #ITP_CONTAINER .itp_form.itp_type1 .form-group .itp_in {padding:0; margin-right:8px;}
450 444
 #ITP_CONTAINER .itp_form.itp_type1 .form-group .itp_in.pad {padding-right:15px;}

+ 6 - 3
src/main/webapp/css/ui.jqgrid-bootstrap.css

@@ -1,7 +1,8 @@
1 1
 /*Grid*/
2 2
 .ui-jqgrid {
3 3
 	position: relative;
4
-	border: 1px solid #ddd;      /*default*/
4
+	border: 1px solid #ddd;   
5
+	border-top:1px solid #666;   /*default*/
5 6
 	-webkit-border-radius: 3px;
6 7
 	-moz-border-radius: 3px;
7 8
 	border-radius: 3px;
@@ -15,6 +16,7 @@
15 16
 	left:0;
16 17
 	top: 0;
17 18
 	padding: 0;
19
+	border-bottom:1px solid #666;
18 20
 }
19 21
 .ui-jqgrid .ui-common-table {}
20 22
 
@@ -94,7 +96,7 @@
94 96
 .ui-first-th-ltr { }
95 97
 .ui-first-th-rtl { }
96 98
 .ui-jqgrid tr.jqg-first-row-header th {
97
-	height:auto;
99
+	height:30px;
98 100
 	border-top:none;
99 101
 	padding-bottom: 0;
100 102
 	padding-top: 0;
@@ -190,6 +192,7 @@ div.tablediv > .table-bordered {
190 192
 }
191 193
 .ui-jqgrid tr.jqgrow {
192 194
 	outline-style: none;
195
+	height:32px;
193 196
 }
194 197
 .ui-jqgrid tr.jqgroup {
195 198
 	outline-style: none;
@@ -502,7 +505,7 @@ div.tablediv > .table-bordered {
502 505
 }
503 506
 .ui-jqdialog .ui-jqdialog-titlebar {
504 507
 	padding: .1em .1em;
505
-	min-height: 35px;
508
+	min-height: 32px;
506 509
 }
507 510
 .ui-jqdialog .ui-jqdialog-title {
508 511
 	margin: 7px 0 .2em 5px;

+ 702 - 0
src/main/webapp/js/app/inoutmng/ITP_INOUTMNG03010.js

@@ -0,0 +1,702 @@
1
+require(['config'], function() {
2
+	require([], function($) {
3
+		pageObj.init();
4
+	});
5
+});
6
+
7
+/********************************************************
8
+ --------------------------------------------------------
9
+ - Object 목록								            -
10
+ --------------------------------------------------------
11
+ * const gridColModel = {}	: 화면 Grid Object			*
12
+ * let pageObj = {}			: 화면공통 Object			*
13
+ * let listObj = {}			: 목록화면 Object			*
14
+ * let modifyObj = {}		: 수정화면 Object			*
15
+ 
16
+ *******************************************************/
17
+
18
+/*화면 변수*/
19
+const INOUTMNG03010_GRID_ID = '#ITP_INOUTMNG03010_jqGrid';
20
+const INOUTMNG03010_GRID_LIST = '#ITP_INOUTMNG03010_jqGrid_list';
21
+const INOUTMNG03010_GRID_PAGER = '#ITP_INOUTMNG03010_jqGridPager';
22
+const INOUTMNG03010_GRID_EMPTY = '#ITP_INOUTMNG03010_jqGridEmpty';
23
+
24
+const INOUTMNG03010_DETAIL_GRID_ID = '#ITP_INOUTMNG03010_DETAIL_jqGrid';
25
+const INOUTMNG03010_DETAIL_GRID_LIST = '#ITP_INOUTMNG03010_DETAIL_jqGrid_list';
26
+const INOUTMNG03010_DETAIL_GRID_PAGER = '#ITP_INOUTMNG03010_DETAIL_jqGridPager';
27
+const INOUTMNG03010_DETAIL_GRID_EMPTY = '#ITP_INOUTMNG03010_DETAIL_jqGridEmpty';
28
+
29
+
30
+let INOUTMNG03010_GRID_LAST_ROW_ID;
31
+
32
+
33
+/*API URL*/
34
+let API_DETAIL_GRID_LIST = '/api/rtnmng/inoutmng/col-target-grid-list';	// 목록
35
+let API_DETAIL_SAVE 	 = '/api/rtnmng/inoutmng/save-inst-col';			//수거지시
36
+
37
+/*화면 Grid ColModel*/
38
+const gridColModel = {
39
+	list: [
40
+		{
41
+			index: 'BRAND_ID', name: 'brandId',
42
+			label: ITP_MSG_LOCALE.label.brandId, //브랜드아이디
43
+			width: '13', fixed: false, align: 'center',
44
+			sortable: false, hidden: true
45
+		},
46
+		{
47
+			index: 'BRAND_NM', name: 'brandNm',
48
+			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
49
+			width: '10', fixed: false, align: 'center',
50
+			sortable: false, hidden: false
51
+		},
52
+		{
53
+			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
54
+			label: ITP_MSG_LOCALE.label.rtnPodrUnqNo, //반품발주번호
55
+			width: '10', fixed: false, align: 'center',
56
+			sortable: false, hidden: false
57
+		},
58
+		{
59
+			index: 'RTN_PODR_DTL_NO', name: 'rtnPodrDtlNo',
60
+			label: ITP_MSG_LOCALE.label.rtnPodrDtlNo, //반품발주항번
61
+			width: '10', fixed: false, align: 'center',
62
+			sortable: false, hidden: false
63
+		},
64
+		{
65
+			index: 'RTN_REQ_UNQ_NO', name: 'rtnReqUnqNo',
66
+			label: ITP_MSG_LOCALE.label.rtnReqUnqNo, //반품요청번호
67
+			width: '10', fixed: false, align: 'center',
68
+			sortable: false, hidden: true
69
+		},
70
+		{
71
+			index: 'RTN_REQ_DTL_NO', name: 'rtnReqDtlNo',
72
+			label: ITP_MSG_LOCALE.label.rtnReqDtlNo, //반품요청항번
73
+			width: '10', fixed: false, align: 'center',
74
+			sortable: false, hidden: true
75
+		},
76
+		{
77
+			index: 'ITEM_ID', name: 'itemId',
78
+			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
79
+			width: '10', fixed: false, align: 'center',
80
+			sortable: false, hidden: false
81
+		},
82
+		{
83
+			index: 'ITEM_NM', name: 'itemNm',
84
+			label: ITP_MSG_LOCALE.label.itemNm, //품목명
85
+			width: '10', fixed: false, align: 'left',
86
+			sortable: false, hidden: false
87
+		},
88
+		{
89
+			index: 'RTN_WHS_ID', name: 'rtnWhsId',
90
+			label: ITP_MSG_LOCALE.label.rtnWhsId, //수거창고아이디
91
+			width: '13', fixed: false, align: 'center',
92
+			sortable: false, hidden: true
93
+		},
94
+		{
95
+			index: 'RTN_LOCATION', name: 'rtnLocation',
96
+			label: ITP_MSG_LOCALE.label.rtnLocation, //수거LOCATION
97
+			width: '15', fixed: false, align: 'left',
98
+			sortable: false, hidden: true
99
+		},
100
+		{
101
+			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
102
+			label: ITP_MSG_LOCALE.label.rtnWhsNm, //수거창고명
103
+			width: '15', fixed: false, align: 'center',
104
+			sortable: false, hidden: false
105
+		},
106
+		{
107
+			index: 'UNIT_AMT', name: 'unitAmt',
108
+			label: ITP_MSG_LOCALE.label.unitAmt, //단가
109
+			width: '6', fixed: false, align: 'right',
110
+			sortable: false, hidden: false,
111
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
112
+		},
113
+		{
114
+			index: 'RTN_REQ_QTY', name: 'rtnReqQty',
115
+			label: ITP_MSG_LOCALE.label.rtnReqQty, //반품요청수량
116
+			width: '10', fixed: false, align: 'right',
117
+			sortable: false, hidden: true,
118
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
119
+		},
120
+		{
121
+			index: 'COL_QTY', name: 'colQty',
122
+			label: ITP_MSG_LOCALE.label.colQty, //반품요청수량
123
+			width: '10', fixed: false, align: 'right',
124
+			sortable: false, hidden: true,
125
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
126
+		},
127
+		{
128
+			index: 'RTN_ODR_QTY', name: 'rtnOdrQty',
129
+			label: ITP_MSG_LOCALE.label.rtnOdrQty, //반품발주수량
130
+			width: '10', fixed: false, align: 'right',
131
+			sortable: false, hidden: false,
132
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
133
+		},
134
+		{
135
+			index: 'RTN_AMT', name: 'rtnAmt',
136
+			label: ITP_MSG_LOCALE.label.rtnAmt, //반품발주금액
137
+			width: '10', fixed: false, align: 'right',
138
+			sortable: false, hidden: false,
139
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
140
+		},
141
+		{
142
+			index: 'COL_REQ_DT', name: 'colReqDt',
143
+			label: ITP_MSG_LOCALE.label.colReqDt, //수거요청일
144
+			width: '10', fixed: false, align: 'center',
145
+			sortable: false, hidden: false
146
+		},
147
+		{
148
+			index: 'STORE_ID', name: 'storeId',
149
+			label: ITP_MSG_LOCALE.label.storeId, //매장아이디
150
+			width: '10', fixed: false, align: 'right',
151
+			sortable: false, hidden: true
152
+		},
153
+		{
154
+			index: 'WHS_ID', name: 'whsId',
155
+			label: ITP_MSG_LOCALE.label.whsId, //입고창고아이디
156
+			width: '13', fixed: false, align: 'left',
157
+			sortable: false, hidden: true
158
+		},
159
+		{
160
+			index: 'LOCATION', name: 'location',
161
+			label: ITP_MSG_LOCALE.label.location, //입고LOCATION
162
+			width: '15', fixed: false, align: 'left',
163
+			sortable: false, hidden: true
164
+		},
165
+		{
166
+			index: 'WHS_NM', name: 'whsNm',
167
+			label: ITP_MSG_LOCALE.label.whsNm, //입고창고명
168
+			width: '15', fixed: false, align: 'left',
169
+			sortable: false, hidden: false
170
+		}
171
+	],
172
+	detail: [
173
+		{
174
+			index: 'BRAND_ID', name: 'brandId',
175
+			label: ITP_MSG_LOCALE.label.brandId, //브랜드아이디
176
+			width: '13', fixed: false, align: 'center',
177
+			sortable: false, hidden: true
178
+		},
179
+		{
180
+			index: 'BRAND_NM', name: 'brandNm',
181
+			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
182
+			width: '10', fixed: false, align: 'center',
183
+			sortable: false, hidden: false
184
+		},
185
+		{
186
+			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
187
+			label: ITP_MSG_LOCALE.label.rtnPodrUnqNo, //반품발주번호
188
+			width: '10', fixed: false, align: 'center',
189
+			sortable: false, hidden: false
190
+		},
191
+		{
192
+			index: 'RTN_PODR_DTL_NO', name: 'rtnPodrDtlNo',
193
+			label: ITP_MSG_LOCALE.label.rtnPodrDtlNo, //반품발주항번
194
+			width: '10', fixed: false, align: 'center',
195
+			sortable: false, hidden: false
196
+		},
197
+		{
198
+			index: 'RTN_REQ_UNQ_NO', name: 'rtnReqUnqNo',
199
+			label: ITP_MSG_LOCALE.label.rtnReqUnqNo, //반품요청번호
200
+			width: '10', fixed: false, align: 'center',
201
+			sortable: false, hidden: true
202
+		},
203
+		{
204
+			index: 'RTN_REQ_DTL_NO', name: 'rtnReqDtlNo',
205
+			label: ITP_MSG_LOCALE.label.rtnReqDtlNo, //반품요청항번
206
+			width: '10', fixed: false, align: 'center',
207
+			sortable: false, hidden: true
208
+		},
209
+		{
210
+			index: 'ITEM_ID', name: 'itemId',
211
+			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
212
+			width: '10', fixed: false, align: 'center',
213
+			sortable: false, hidden: false
214
+		},
215
+		{
216
+			index: 'ITEM_NM', name: 'itemNm',
217
+			label: ITP_MSG_LOCALE.label.itemNm, //품목명
218
+			width: '10', fixed: false, align: 'left',
219
+			sortable: false, hidden: false
220
+		},
221
+		{
222
+			index: 'RTN_WHS_ID', name: 'rtnWhsId',
223
+			label: ITP_MSG_LOCALE.label.rtnWhsId, //수거창고아이디
224
+			width: '13', fixed: false, align: 'center',
225
+			sortable: false, hidden: true
226
+		},
227
+		{
228
+			index: 'RTN_LOCATION', name: 'rtnLocation',
229
+			label: ITP_MSG_LOCALE.label.rtnLocation, //수거LOCATION
230
+			width: '15', fixed: false, align: 'left',
231
+			sortable: false, hidden: true
232
+		},
233
+		{
234
+			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
235
+			label: ITP_MSG_LOCALE.label.rtnWhsNm, //수거창고명
236
+			width: '15', fixed: false, align: 'center',
237
+			sortable: false, hidden: false
238
+		},
239
+		{
240
+			index: 'UNIT_AMT', name: 'unitAmt',
241
+			label: ITP_MSG_LOCALE.label.unitAmt, //단가
242
+			width: '6', fixed: false, align: 'right',
243
+			sortable: false, hidden: false,
244
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
245
+		},
246
+		{
247
+			index: 'RTN_REQ_QTY', name: 'rtnReqQty',
248
+			label: ITP_MSG_LOCALE.label.rtnReqQty, //반품요청수량
249
+			width: '10', fixed: false, align: 'right',
250
+			sortable: false, hidden: false,
251
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
252
+		},
253
+		{
254
+			index: 'RTN_ODR_QTY', name: 'rtnOdrQty',
255
+			label: ITP_MSG_LOCALE.label.rtnOdrQty, //반품발주수량
256
+			width: '10', fixed: false, align: 'right',
257
+			sortable: false, hidden: false,
258
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
259
+		},
260
+		{
261
+			index: 'COL_QTY', name: 'colQty',
262
+			label: ITP_MSG_LOCALE.label.colQty, //수거수량
263
+			width: '10', fixed: false, align: 'right',
264
+			sortable: true, editable: true, edittype: 'text',
265
+			editrules: { required: true, number: true },
266
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
267
+		},
268
+		{
269
+			index: 'RTN_AMT', name: 'rtnAmt',
270
+			label: ITP_MSG_LOCALE.label.rtnAmt, //수거발주금액
271
+			width: '10', fixed: false, align: 'right',
272
+			sortable: false, hidden: false,
273
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
274
+		},
275
+		{
276
+			index: 'COL_REQ_DT', name: 'colReqDt',
277
+			label: ITP_MSG_LOCALE.label.colReqDt, //수거요청일
278
+			width: '10', fixed: false, align: 'center',
279
+			sortable: false, hidden: false
280
+		},
281
+		{
282
+			index: 'STORE_ID', name: 'storeId',
283
+			label: ITP_MSG_LOCALE.label.storeId, //매장아이디
284
+			width: '10', fixed: false, align: 'right',
285
+			sortable: false, hidden: true
286
+		},
287
+		{
288
+			index: 'WHS_ID', name: 'whsId',
289
+			label: ITP_MSG_LOCALE.label.whsId, //입고창고아이디
290
+			width: '13', fixed: false, align: 'left',
291
+			sortable: false, hidden: true
292
+		},
293
+		{
294
+			index: 'LOCATION', name: 'location',
295
+			label: ITP_MSG_LOCALE.label.location, //입고LOCATION
296
+			width: '15', fixed: false, align: 'left',
297
+			sortable: false, hidden: true
298
+		},
299
+		{
300
+			index: 'WHS_NM', name: 'whsNm',
301
+			label: ITP_MSG_LOCALE.label.whsNm, //입고창고명
302
+			width: '15', fixed: false, align: 'left',
303
+			sortable: false, hidden: false
304
+		}
305
+	]
306
+};
307
+
308
+/*화면공통 Object*/
309
+let pageObj = {
310
+	init: function () {
311
+		this.ui.init();
312
+		this.event.init();
313
+		this.action();
314
+	},
315
+	ui: {
316
+		init: function () {
317
+			this.view();
318
+			this.grid();
319
+			this.ready();
320
+		},
321
+		view: function() {
322
+			// 버튼 권한설정
323
+			fn_proc_btn_auth('INOUTMNG03010');
324
+
325
+			// 공통코드 표시
326
+			$('select').each(function() {
327
+				if($(this).data('select-code')) {
328
+					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
329
+				}
330
+			});
331
+
332
+			// 조회일자 지정
333
+			var now = new Date();
334
+			$('#ITP_TAB_INOUTMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
335
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setDate(now.getDate())));
336
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 30)));
337
+		},
338
+		grid: function() {
339
+			itp_fn_jqgrid_resize(INOUTMNG03010_GRID_ID, INOUTMNG03010_GRID_LIST, 'lg');
340
+			listObj.empty.init();
341
+			itp_fn_fire_window_resize();
342
+		},
343
+		ready: function() {
344
+			listObj.init();
345
+		}
346
+	},
347
+	action: function () {
348
+		var _this = this;
349
+		// 반품입고창고 조회 버튼 클릭
350
+		$('#ITP_FORM_INOUTMNG03010_SEARCH_WHS_NM').on('click', function() {
351
+			_this.popup('R');
352
+		});
353
+		// 수거창고 텍스트 삭제 버튼 클릭
354
+		$('#ITP_FORM_INOUTMNG03010_DELETE_WHS_NM').on('click', function() {
355
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_SWHS_NM').val('');
356
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_SWHS_ID').val('');
357
+
358
+		});
359
+
360
+		// 수거장소 조회 버튼 클릭
361
+		$('#ITP_FORM_INOUTMNG03010_SEARCH_RTN_WHS_NM').on('click', function() {
362
+			_this.popup('W');
363
+		});
364
+		// 수거장소 텍스트 삭제 버튼 클릭
365
+		$('#ITP_FORM_INOUTMNG03010_DELETE_RTN_WHS_NM').on('click', function() {
366
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_NM').val('');
367
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_ID').val('');
368
+		});
369
+	},
370
+	popup: function (arg) {
371
+		var popFn;
372
+		// 팝업
373
+		if (arg == "R") {
374
+			popFn = this.callback.whs;
375
+		} else {
376
+			popFn = this.callback.rtnwhs;
377
+		}
378
+
379
+		var whsDvsn = "";
380
+
381
+		if (arg == "R") {
382
+			whsDvsn = "W01";
383
+		} else {
384
+			whsDvsn = "W02";
385
+		}
386
+
387
+		const key = { brandId: fn_make_user_info.get('brandId'), storeId: fn_make_user_info.get('storeId'), whsDvsn: whsDvsn };
388
+
389
+
390
+
391
+		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
392
+		
393
+		
394
+	},
395
+	callback: {
396
+		whs: function(rowDataPop) {
397
+			if (rowDataPop) {
398
+				$('#ITP_FORM_INOUTMNG03010_SEARCH_SWHS_NM').val(rowDataPop.whsNm);
399
+				$('#ITP_FORM_INOUTMNG03010_SEARCH_SWHS_ID').val(rowDataPop.whsId);
400
+			}
401
+
402
+		},
403
+		rtnwhs: function(rowDataPop) {
404
+			if (rowDataPop) {
405
+				$('#ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_NM').val(rowDataPop.whsNm);
406
+				$('#ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_ID').val(rowDataPop.whsId);
407
+			}
408
+
409
+		}
410
+	},
411
+	event: {
412
+		init: function () {
413
+			this.button();
414
+		},
415
+		button: function () {
416
+			// 버튼 클릭 이벤트
417
+			$('button').each(function() {
418
+				var id = $(this).attr('id');
419
+				$(this).on('click', function() {
420
+					switch (id) {
421
+						case 'ITP_BTN_INOUTMNG03010_SRH'				: listObj.button.search();			break;	// 조회 버튼 클릭
422
+						case 'ITP_BTN_INOUTMNG03010_CUC'				: listObj.button.colcreat();		break;	// 수거생성 버튼
423
+						case 'ITP_BTN_INOUTMNG03010_CUD'				: modifyObj.button.save(); 			break;	// 수거지시 버튼
424
+						case 'ITP_BTN_INOUTMNG03010_CANCELLIST'			: modifyObj.button.cancel(); 		break;	// 취소/목록 버튼
425
+					}
426
+				});
427
+			});
428
+			
429
+			$('body').on('click', function(e) {
430
+				
431
+				var gridId = (INOUTMNG03010_DETAIL_GRID_ID).replace('#', '');
432
+				var rids = $(INOUTMNG03010_DETAIL_GRID_ID).jqGrid('getDataIDs');
433
+				var last_row_id = rids[rids.length - 1];
434
+				
435
+				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'INOUTMNG03010_DETAIL');	
436
+			});
437
+
438
+		}
439
+	},
440
+	switchScreen: function(mode) {
441
+		$('.itp_det_head').find('button[id^="ITP_BTN_INOUTMNG03010_"]').each(function(i) {
442
+			$(this).hide();
443
+		});
444
+		$('#ITP_TAB_INOUTMNG03010').find('div[id$="_CONTAINER"]').each(function(i) {
445
+			$(this).hide();
446
+		});
447
+		if(mode == 'LIST') { // 목록
448
+			$('#ITP_AJAX_INOUTMNG03010_LIST_CONTAINER').show();
449
+			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG03010_SRH', '#ITP_BTN_INOUTMNG03010_CUC']);
450
+			$('#ITP_FORM_INOUTMNG03010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
451
+		} else if(mode == 'DETAIL') { // 출하지시 상세
452
+			$('#ITP_AJAX_INOUTMNG03010_DETAIL_CONTAINER').show();
453
+			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG03010_CUD', '#ITP_BTN_INOUTMNG03010_CANCELLIST']);
454
+			$('#ITP_FORM_INOUTMNG03010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
455
+			
456
+			//pageObj.grid.init(param);
457
+		} 
458
+	},
459
+	grid: {
460
+		init: function(param) {
461
+			this.gridId = INOUTMNG03010_DETAIL_GRID_ID;
462
+			this.gridList = INOUTMNG03010_DETAIL_GRID_LIST;
463
+			this.gridEmpty = INOUTMNG03010_DETAIL_GRID_EMPTY;
464
+			var now = new Date();
465
+			$('#ITP_TAB_INOUTMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
466
+			$('#ITP_FORM_INOUTMNG03010_DETAIL_COL_SCH_DT').datepicker('setDate', new Date(param.colSchDt));
467
+			$('#ITP_FORM_INOUTMNG03010_DETAIL .fnBrandNm').text(param.brandNm);
468
+			
469
+			this.gridRows = param.recordData;
470
+			this.unload();
471
+			this.load(param.recordData);
472
+			
473
+		},
474
+		gridId: '',
475
+		button: {},
476
+		gridList: '',
477
+		gridEmpty: '',
478
+		gridRows: '',
479
+		load: function(gridRows) {
480
+			
481
+			var _this = this;
482
+			var option = {
483
+				gridId: _this.gridId,
484
+				colModel: gridColModel.detail,
485
+				data: gridRows,
486
+				loadComplete: function(data) {
487
+					$(INOUTMNG03010_DETAIL_GRID_LIST).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
488
+					data.records === 0 ? _this.clearData(mode) : $(INOUTMNG03010_DETAIL_GRID_EMPTY).hide();
489
+					
490
+				},
491
+				onCellSelect: function(rowid, cellIdx, cellValue) {
492
+					INOUTMNG03010_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowid, cellIdx, INOUTMNG03010_GRID_LAST_ROW_ID, _this.gridId, ['pchReqDtlNo']);
493
+				}
494
+			};
495
+			itp_fn_grid_make_local(option);
496
+		},
497
+		clearData : function(mode) {
498
+			$(INOUTMNG03010_DETAIL_GRID_ID).jqGrid('clearGridData', true);
499
+			$(INOUTMNG03010_DETAIL_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
500
+			$(INOUTMNG03010_DETAIL_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
501
+			$(INOUTMNG03010_DETAIL_GRID_EMPTY).show();
502
+		},
503
+		unload : function() {
504
+			$.jgrid.gridUnload(this.gridId);
505
+		}
506
+	}
507
+};
508
+
509
+/*목록화면 Object*/
510
+let listObj = {
511
+	init: function () {
512
+		this.grid.init();
513
+	},
514
+	itp_INOUTMNG03010_search: false,
515
+	button: {
516
+		search: function() {
517
+			listObj.itp_INOUTMNG03010_search = true;
518
+			let param = $('#ITP_FORM_INOUTMNG03010_SEARCH').serializeObject();
519
+			param.gridSize = $.jgrid.defaults.rowNum;
520
+			param.gridPage = $.jgrid.defaults.page;
521
+			$(INOUTMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
522
+		},
523
+		colcreat: function() {
524
+			//선택되어진 row 값 전송할예정
525
+			let gridUpdateData = [];
526
+			const rowKey = $(INOUTMNG03010_GRID_ID).getGridParam('selrow');
527
+			if (!rowKey) {
528
+				return;
529
+		    }
530
+
531
+			var selectedIds = $(INOUTMNG03010_GRID_ID).getGridParam('selarrrow');
532
+			
533
+			var brandNm = "";
534
+			var maxColReqDt = "";
535
+			
536
+			for (var i=selectedIds.length-1; i>=0; i--) {
537
+				var rowData = $(INOUTMNG03010_GRID_ID).jqGrid('getRowData', selectedIds[i]);
538
+				
539
+				gridUpdateData.push(rowData);	
540
+				if (rowData.colReqDt > maxColReqDt) {
541
+					maxColReqDt = rowData.colReqDt;
542
+				}
543
+				sbrandNm =rowData.brandNm;
544
+			}
545
+			
546
+			let param = {brandNm: sbrandNm, colSchDt: maxColReqDt };
547
+			param.recordData = gridUpdateData;
548
+			pageObj.switchScreen('DETAIL');
549
+			itp_fn_form_clear_validate(null, '#ITP_FORM_INOUTMNG03010_DETAIL');
550
+			pageObj.grid.init(param);
551
+		}
552
+	},
553
+	empty: {
554
+		init: function() {
555
+			var _this = this;
556
+			this.push();
557
+			$(INOUTMNG03010_GRID_EMPTY).on('click', function() {
558
+				_this.back();
559
+				_this.itp_INOUTMNG03010_param.gridSize = $.jgrid.defaults.rowNum;
560
+				$(INOUTMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_INOUTMNG03010_param)}).trigger('reloadGrid');
561
+			});
562
+		},
563
+		itp_INOUTMNG03010_param: {},
564
+		push: function() {
565
+			let param = $('#ITP_FORM_INOUTMNG03010_SEARCH').serializeObject();
566
+			listObj.itp_INOUTMNG03010_param = param;
567
+		},
568
+		back: function() {
569
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_FROM_DT').val(this.itp_INOUTMNG03010_param.fromDt);
570
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_TO_DT').val(this.itp_INOUTMNG03010_param.toDt);
571
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_SWHS_ID').val(this.itp_INOUTMNG03010_param.swhsId);
572
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_SWHS_NM').val(this.itp_INOUTMNG03010_param.swhsNm);
573
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_NM').val(this.itp_INOUTMNG03010_param.srtnWhsId);
574
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_SRTN_WHS_ID').val(this.itp_INOUTMNG03010_param.srtnWhsNm);
575
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_ITEM_NM').val(this.itp_INOUTMNG03010_param.sitemNm);
576
+		}
577
+	},
578
+	grid: {
579
+		init: function () {
580
+			// 데이터 없을때
581
+			listObj.empty.push();
582
+			itp_fn_jqgrid_resize(INOUTMNG03010_GRID_ID, INOUTMNG03010_GRID_LIST, 'lg');
583
+			itp_fn_fire_window_resize();
584
+			this.search();
585
+			
586
+		},
587
+		colModel: gridColModel.list,
588
+		search: function() {
589
+			pageObj.switchScreen('LIST');
590
+			this.unload();
591
+			this.load();
592
+		},
593
+		load: function() {
594
+			let param = $('#ITP_FORM_INOUTMNG03010_SEARCH').serializeObject();
595
+			param.gridSize = $.jgrid.defaults.rowNum;
596
+			
597
+			var option = {
598
+				multiselect: true,
599
+				autowidth: true,
600
+				gridId: INOUTMNG03010_GRID_ID,
601
+				colModel: gridColModel.list,
602
+				param: param,
603
+				url: DOMAIN + API_DETAIL_GRID_LIST,
604
+				pager: INOUTMNG03010_GRID_PAGER,
605
+				loadComplete: function(data) {
606
+					itp_fn_grid_load_complete(data, INOUTMNG03010_GRID_ID, true, 'number', 'INOUTMNG03010', listObj.itp_INOUTMNG03010_search, listObj.empty, true, data.gridRecords, true);
607
+				},
608
+				onPaging: function(action) {
609
+					itp_fn_grid_paging(INOUTMNG03010_GRID_ID, action, param);
610
+				}
611
+			};
612
+			itp_fn_grid_make_remote(option);
613
+		},
614
+		button: {
615
+		},
616
+		unload : function() {
617
+			$.jgrid.gridUnload(INOUTMNG03010_GRID_ID);
618
+		},
619
+		clearData : function() {
620
+			$(INOUTMNG03010_GRID_ID).jqGrid('clearGridData', true);
621
+			$(INOUTMNG03010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
622
+			$(INOUTMNG03010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
623
+			$(INOUTMNG03010_GRID_EMPTY).show();
624
+		}
625
+	}
626
+};
627
+
628
+/*수정화면 Object*/
629
+let modifyObj = {
630
+	init: function (param) {
631
+		this.load(param);
632
+	},
633
+	button: {
634
+		modify: function (param) {
635
+			itp_fn_form_clear_validate(null, '#ITP_FORM_INOUTMNG03010_DETAIL');
636
+			//const selectVal = $('#ITP_FORM_INOUTMNG03010_VIEW_STORE_ID').val();
637
+			//const key = {brandId:fn_make_user_info.get('brandId'), storeId: selectVal, viewCd: 'R'};
638
+			//var param = $.param(key);
639
+			//modifyObj.load(param);
640
+		},
641
+		cancel: function() {
642
+			document.getElementById('ITP_FORM_INOUTMNG03010_DETAIL').reset();
643
+			listObj.grid.search();
644
+		},
645
+		save: function() {
646
+			$('body').trigger('click');
647
+			const formId = ('#ITP_FORM_INOUTMNG03010_DETAIL');
648
+			itp_fn_form_clear_validate(null, formId);
649
+
650
+			if (itp_fn_form_event.isValid(formId)) {
651
+				
652
+				var modalFn = {
653
+					callBack: () => {
654
+						itp_fn_form_event.removeChar('#ITP_FORM_OPER03010_DETAIL');
655
+						var chkQtyYn = "N";
656
+						let gridInsertData = [];
657
+						const rowData = $(INOUTMNG03010_DETAIL_GRID_ID).getRowData();
658
+						
659
+						$.each(rowData, function(key, value) {
660
+							
661
+							if (value.colQty == '' || value.colQty < 1 ) {
662
+								alert("수거수량을 입력해주세요!");
663
+								chkQtyYn = "Y";
664
+								return false;
665
+							}
666
+							
667
+							
668
+							if (value.rtnOdrQty > value.colQty ) {
669
+								 alert("수거수량이 반품 발주수량보다 클수 없습니다!");
670
+								chkQtyYn = "Y";
671
+								return false;
672
+							}
673
+							
674
+							gridInsertData.push(value);
675
+						});
676
+						
677
+						if (chkQtyYn == "Y") return;
678
+						
679
+						let param = $(formId).serializeObject();
680
+						param.viewCd = "C";
681
+						param.gridInsertData = gridInsertData;
682
+						console.log(JSON.stringify(param));
683
+						var searhFn = function () {
684
+							//ITP_FORM_INOUTMNG03010_DETAIL_IS_WRITING = false;
685
+							pageObj.grid.clearData();
686
+							modifyObj.button.cancel();
687
+						}
688
+						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
689
+					}
690
+				};
691
+				itp_fn_modal_confirm('수거지시 하시겠습니까?', modalFn);
692
+			}
693
+		}
694
+	},
695
+	
696
+	load: function(param) {
697
+		//console.log(param);
698
+		//pageObj.grid.load("DETAIL",param);
699
+	}
700
+};
701
+
702
+

+ 4 - 1
src/main/webapp/js/app/locales/locale-ko.js

@@ -257,7 +257,10 @@ const ITP_MSG_LOCALE = (function() {
257 257
 			"rtnRsnDvsnNm": "반품사유구분",
258 258
 			"colReqAmt": "수거금액",
259 259
 			"pickMgrNm": "수거담당자",
260
-			"pickMgrTelNo": "수거담당자연락처"
260
+			"pickMgrTelNo": "수거담당자연락처",
261
+			"rtnOdrQty": "반품발주수량",
262
+			"rtnWhsNm": "반품창고",
263
+			"colQty": "수거수량"
261 264
 		},
262 265
 		"table": {
263 266
 			"brandId": "브랜드ID",

+ 6 - 1
src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -275,6 +275,7 @@ let pageObj = {
275 275
 			fn_show_btn_auth_array(['#ITP_BTN_OPER01010_SRH', '#ITP_BTN_OPER01010_NEWREG']);
276 276
 		} else if(mode == 'ADD') { // 등록
277 277
 			$('#ITP_AJAX_OPER01010_DETAIL_CONTAINER').show();
278
+			$('.fnUserId').hide(); //사용자 아이디 신규등록에서 보이지 않게하기
278 279
 			fn_show_btn_auth_array(['#ITP_BTN_OPER01010_CANCELLIST', '#ITP_BTN_OPER01010_SAVE']);
279 280
 
280 281
 			$('#ITP_FORM_OPER01010_DETAIL').find('input, textarea, select, checkbox').each(function(i, elem) {
@@ -324,6 +325,7 @@ let pageObj = {
324 325
 						}
325 326
 					});
326 327
 					$((pageObj.pageMode === 'MODIFY') ? OPER01010_NEW_GRID_EMPTY : OPER01010_DETAIL_GRID_EMPTY).hide();
328
+					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //행 추가할때 2번째 마다 색변경
327 329
 				};
328 330
 				fn_call_popup('comm', 'AUTH_SCH_POPUP', '#ITP_ASIDE', popFn, null, 'S');
329 331
 			},
@@ -347,6 +349,8 @@ let pageObj = {
347 349
 				url: DOMAIN + API_USERAUTH_GRID_LIST,
348 350
 				multiselect: (this.mode !== 'VIEW'),
349 351
 				loadComplete: function(data) {
352
+					$("tr.jqgrow:odd").css("background", "#CEDFED"); //2번째 마다 색변경
353
+
350 354
 					console.log(data);
351 355
 					itp_fn_grid_load_complete(data, gridId, true, undefined, 'OPER01010_' + this.mode);
352 356
 				},
@@ -431,7 +435,7 @@ let listObj = {
431 435
 					}
432 436
 				},
433 437
 				loadComplete: function(data) {
434
-					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
438
+					$("tr.jqgrow:odd").css("background", "#F2F8FF"); //2번째 마다 색변경
435 439
 					console.log(data);
436 440
 					itp_fn_grid_load_complete(data, OPER01010_GRID_ID, true, 'number', 'OPER01010', listObj.itp_OPER01010_search, _this.itp_fn_OPER01010_empty, true, data.gridRecords, true);
437 441
 					var ids = $(OPER01010_GRID_ID).getDataIDs();
@@ -674,6 +678,7 @@ let createObj = {
674 678
 				data: gridData,
675 679
 				multiselect: true,
676 680
 				loadComplete: function(data) {
681
+					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
677 682
 					_this.clearData();
678 683
 				}
679 684
 			};

+ 3 - 1
src/main/webapp/js/app/oper/ITP_OPER03010.js

@@ -81,7 +81,7 @@ const gridColModel = {
81 81
 			sortable: false, hidden: false
82 82
 		},
83 83
 		{
84
-			index: 'OWNER_TEL', name: 'ownerTel',
84
+			index: 'OWNER_TEL', name: 'rprstTelNo',
85 85
 			label: '대표연락처',
86 86
 			width: '6', fixed: false, align: 'center',
87 87
 			sortable: false, hidden: false
@@ -316,6 +316,7 @@ let pageObj = {
316 316
 						}
317 317
 					});
318 318
 					$(OPER03010_DETAIL_GRID_EMPTY).hide();
319
+					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
319 320
 				};
320 321
 				fn_call_popup('biz', 'BIZPOP_APPL_SALES_USER_SCH', '#ITP_ASIDE', popFn, null, 'S');
321 322
 			},
@@ -331,6 +332,7 @@ let pageObj = {
331 332
 				data: gridData,
332 333
 				multiselect: (this.mode !== 'VIEW'),
333 334
 				loadComplete: function(data) {
335
+					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
334 336
 					$(_this.mode === 'VIEW' ? OPER03010_VIEW_GRID_LIST : OPER03010_DETAIL_GRID_LIST).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
335 337
 					data.records === 0 ? _this.clearData() : $(this.mode === 'VIEW' ? OPER03010_VIEW_GRID_EMPTY : OPER03010_DETAIL_GRID_EMPTY).hide();
336 338
 				}

+ 1 - 0
src/main/webapp/js/app/oper/ITP_OPER04010.js

@@ -179,6 +179,7 @@ let pageObj = {
179 179
             fn_show_btn_auth_array(['#ITP_BTN_OPER04010_CANCELLIST', '#ITP_BTN_OPER04010_SAVE', '#ITP_BTN_OPER04010_RESET_PW']);
180 180
 
181 181
             $('.itp_modify_dt').show();
182
+            $('.title').css({"border-bottom": "1px solid #ddd"});
182 183
 			$('#ITP_FORM_OPER04010_DETAIL .itp_form_info').show();
183 184
 			$('#ITP_FORM_OPER04010_DETAIL .itp_form_change').hide();
184 185
 

+ 1 - 1
src/main/webapp/main.html

@@ -23,7 +23,7 @@
23 23
 	<link rel="stylesheet" href="./bootstrap-fileUpload/dist/bootstrap-FileUpload.css" />
24 24
     <link rel="stylesheet" href="./css/ui.jqgrid-bootstrap.css" />
25 25
 	<link rel="stylesheet" href="./css/style.css" />
26
-
26
+	<link href="https://hangeul.pstatic.net/hangeul_static/css/nanum-barun-gothic.css" rel="stylesheet">
27 27
 	<script>
28 28
 		const ITP_SYSTEM_ADMIN_YN = 'Y';		
29 29
 		const VIEW_PAGE = 'MAIN'; //config.js 에서 로그인 페이지 인지 아닌지 확인하기 위한 변수