Sfoglia il codice sorgente

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

juney 2 anni fa
parent
commit
c073898396

+ 16 - 17
src/main/webapp/app/collmng/COLLMNG01010.html

@@ -7,11 +7,7 @@
7 7
 					<button type="button" id="ITP_BTN_COLLMNG01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
8 8
 					<button type="button" id="ITP_BTN_COLLMNG01010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i> &nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
9 9
 				</div>
10
-				<div style="top:0px; text-align:center; font-size:20px;">
11
-					<span style="text-decoration:underline; font-weight:600;">테스트공급업체</span>
12
-					<button type="button" id="ITP_BTN_COLLMNG01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
13
-					<button type="button" id="ITP_BTN_COLLMNG01010_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
14
-				</div>
10
+				<div style="top:0px; text-align:center; font-size:20px;"></div>
15 11
 			</div>
16 12
 			<div class="itp_det_in">
17 13
 				<div id="ITP_AJAX_COLLMNG01010_LIST_CONTAINER">
@@ -19,6 +15,8 @@
19 15
 						<div class="itp_srh_border fix">
20 16
 							<div class="col-xs-12">
21 17
 								<form id="ITP_FORM_COLLMNG01010_SEARCH" class="form-horizontal">
18
+								<input type="hidden" id="ITP_FORM_COLLMNG01010_SEARCH_BRAND_ID" name="sbrandId" value="">
19
+								<input type="hidden" id="ITP_FORM_COLLMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
22 20
 									<div class="form-group">
23 21
 										<div class="col-xs-2 itp_ip itp_noMar">
24 22
 											<label>수거 일자 *</label>
@@ -33,16 +31,17 @@
33 31
 									</div>
34 32
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
35 33
 										<div class="col-xs-2 itp_ip itp_noMar">
36
-											<select id="ITP_FORM_COLLMNG01010_SEARCH_ST_CD" class="form-control itp_input" name="sStCd">
37
-												<option value="A">수거상태</option>											
34
+											<select id="ITP_FORM_COLLMNG01010_SEARCH_RTN_ODR_ST_CD" data-select-code="RTN_ODR_ST_CD" class="form-control itp_input" name="srtnOdrStCd">
35
+												<option value="">수거상태</option>											
38 36
 											</select>
39 37
 										</div>
40 38
 										<div class="col-xs-3 itp_ip itp_noMar">
41
-											<input type="text" id="ITP_FORM_COLLMNG01010_SEARCH_DLV_PLACE" class="form-control itp_input" name="sDlvPlace" placeholder="수거장소 (매장/창고)" />
39
+											<input type="text" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_NM" class="form-control itp_input" name="sDlvPlace" placeholder="수거장소 (매장/창고)" />
40
+											<input type="hidden" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_ID" class="form-control itp_input" name="swhsId"/>
42 41
 										</div>
43 42
 										<div class="col-xs-1 itp_in" style="padding-left: 5px; width:10%;">
44
-											<button type="button" id="ITP_BTN_COLLMNG01010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
45
-											<button type="button" id="ITP_BTN_COLLMNG01010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
43
+											<button type="button" id="ITP_BTN_COLLMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
44
+											<button type="button" id="ITP_BTN_COLLMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
46 45
 						                </div>
47 46
 										<div class="col-xs-5 itp_ip itp_noMar">
48 47
 											<input type="text" id="ITP_FORM_COLLMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="발주번호/품목번호/품목명" />
@@ -74,33 +73,33 @@
74 73
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
75 74
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
76 75
 											<label class="col-xs-2 itp_lb">발주번호</label>
77
-											<div class="col-xs-4 itp_ip fnPchPodrUnqNo"></div>
76
+											<div class="col-xs-4 itp_ip fnRtnPodrUnqNo"></div>
78 77
 										</div>
79 78
 									</div>
80 79
 									<div class="itp_form_in">
81 80
 										<div class="form-group">
82 81
 											<label class="col-xs-2 itp_lb">수거일자</label>
83
-											<div class="col-xs-4 itp_ip fnColDt"></div>
82
+											<div class="col-xs-4 itp_ip fnRtnOdrRegDt"></div>
84 83
 											<label class="col-xs-2 itp_lb">수거상태</label>
85
-											<div class="col-xs-4 itp_ip fnColCmdStCd"></div>
84
+											<div class="col-xs-4 itp_ip fnRtnOdrStNm"></div>
86 85
 										</div>
87 86
 									</div>
88 87
 									<div class="itp_form_in">	
89 88
 										<div class="form-group">
90 89
 											<label class="col-xs-2 itp_lb">수거장소</label>
91 90
 											<div class="col-xs-4 itp_ip">
92
-												<div class="col-xs-3 itp_in fnColPlace"></div>
91
+												<div class="col-xs-3 itp_in fnRtnWhsNm"></div>
93 92
 											</div>
94 93
 											<label class="col-xs-2 itp_lb">수거 총 금액</label>
95
-											<div class="col-xs-4 itp_ip fnColAmt"></div>
94
+											<div class="col-xs-4 itp_ip fnRtnDodrTotalAmt"></div>
96 95
 										</div>
97 96
 									</div>
98 97
 									<div class="itp_form_in">	
99 98
 										<div class="form-group">
100 99
 											<label class="col-xs-2 itp_lb">발주담당자</label>
101
-											<div class="col-xs-4 itp_ip fnPodrMgrNm"></div>
100
+											<div class="col-xs-4 itp_ip fnRtnMgrNm"></div>
102 101
 											<label class="col-xs-2 itp_lb">발주담당자연락처</label>
103
-											<div class="col-xs-4 itp_ip fnPodrMgrTelNo"></div>
102
+											<div class="col-xs-4 itp_ip fnRtnMgrTelNo"></div>
104 103
 										</div>
105 104
 									</div>
106 105
 									<div class="itp_form_in">

+ 1 - 1
src/main/webapp/app/oper/OPER01010.html

@@ -2,7 +2,7 @@
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><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_OPER01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
8 8
 					<button type="button" id="ITP_BTN_OPER01010_MODIFY" class="btn btn-success btn-sm UPB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수정&nbsp;&nbsp;</button>

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


+ 36 - 19
src/main/webapp/css/style.css

@@ -2,7 +2,12 @@
2 2
 @media print {
3 3
 	*{visibility: hidden; margin:0; paddig:0;}
4 4
 }
5
-
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
+}
6 11
 
7 12
 /* COMMON */
8 13
 html, body {width:100%; height:100%; background:#eee; overflow-y:hidden;}
@@ -89,18 +94,19 @@ a, button {outline:none !important; text-decoration:none !important;}
89 94
 #ITP_OVERLAY {position:fixed; display:none; width:100%; height:100%; top:0; left:0; right:0; bottom:0; background:rgba(250,250,250,.8); z-index:1060;}
90 95
 
91 96
 /* ITP_LOGIN */
92
-#ITP_LOGIN {width:100%; height:100%;}
93
-#ITP_LOGIN .itp_head {margin-bottom:8px; letter-spacing:-1px;}
94
-#ITP_LOGIN .itp_bar {margin:0; padding:0; float:left; margin:0 15px 0 15px; font-size:22px;}
95
-#ITP_LOGIN .itp_logo {margin:0; padding:0; color:#337ab7; float:left;}
96
-#ITP_LOGIN .itp_tit {margin:0; padding:7px 0 0 0; float:left; font-size:22px;}
97
+#ITP_LOGIN {width:100%; height:100%; font-family: 'GmarketSansMedium'}
98
+#ITP_LOGIN .itp_head {margin:0 5%; letter-spacing:-1px; width:90%; height:40px; margin-bottom:50px;}
99
+#ITP_LOGIN .itp_bar {width:4px; height:26px; padding:0; float:left; margin:8px 7px 0 7px; font-size:27px; font-weight:100; background:#ccc;}
100
+#ITP_LOGIN .itp_logo {margin:0; padding:0; color:#000; font-size:39px; float:left; font-weight:700;}
101
+#ITP_LOGIN .itp_tit {margin:0; padding:7px 0 0 0; float:left; font-size:27px;}
97 102
 #ITP_LOGIN .itp_cont {width:100%; min-height:calc(100vh - 115px); padding:170px 20px 150px 20px; position:relative;}
98
-#ITP_LOGIN .itp_box_wrap {width:600px; height:365px; position:absolute; top:50%; left:50%; margin:-182px 0 0 -300px;}
99
-#ITP_LOGIN .itp_box {padding:20px 20px 0 20px; margin-bottom:0; border-bottom-left-radius:0; border-bottom-right-radius:0; border-bottom:0;}
103
+#ITP_LOGIN .itp_box_wrap {width:450px; height:600px; position:absolute; top:55%; left:50%; transform: translate(-50%, -50%);}
104
+#ITP_LOGIN .itp_bottom_gray {background:#eee; width:100%; height:65px; top:-65px; border-bottom-left-radius: 30px;border-bottom-right-radius: 30px;}
105
+#ITP_LOGIN .itp_box {padding:20px 20px 0 20px; height:580px; margin-bottom:0; border-radius:30px; box-shadow: 0px 0px 10px #666;}
100 106
 #ITP_LOGIN .itp_body {padding-bottom:0;}
101 107
 #ITP_LOGIN .itp_box .control-label {text-align:left;}
102 108
 #ITP_LOGIN .itp_box .itp_lb {padding-top:7px;}
103
-#ITP_LOGIN .itp_box .itp_btn {line-height:6.15; width:100%;}
109
+#ITP_LOGIN .itp_box .itp_btn {line-height:1.8; margin:0 5%; width:90%;}
104 110
 #ITP_LOGIN .itp_box .form-group .checkbox input[type=checkbox] {margin-top:3px;}
105 111
 #ITP_LOGIN .itp_error {padding-top:15px; color:#a94442;}
106 112
 #ITP_LOGIN .itp_no_mar {margin-bottom:0 !important;}
@@ -109,16 +115,27 @@ a, button {outline:none !important; text-decoration:none !important;}
109 115
 #ITP_LOGIN .itp_copyright {font-size:12px;}
110 116
 #ITP_LOGIN .itp_forgotId {width:82%;}
111 117
 #ITP_LOGIN .itp_forgotBtn {border-top-right-radius:4px; border-bottom-right-radius:4px;}
118
+#ITP_LOGIN .itp_login {height:50px;}
119
+#ITP_LOGIN .itp_find {margin-top:34px; font-weight:100; cursor:pointer;}
120
+#ITP_LOGIN .itp_btn_bar {margin-top:10px;}
121
+#ITP_LOGIN .itp_login_img {width:100%; padding:0 auto;}
122
+#ITP_LOGIN .itp_img{width:150px; height:150px; top:-60px; position: absolute; margin:0 33.3%;}
123
+#ITP_LOGIN .itp_login_input label {position:absolute; top:50%; left:27px; color:#adadad; transform:translateY(-50%); font-size: 12px; border: none; outline:none; transition: top .5s ease;}
124
+#ITP_LOGIN .itp_login_input {width:90%; margin:0 5%; position:relative;}
125
+#ITP_LOGIN .itp_login_input input {width:100%; padding:20px 10px 10px; outline:none; border-radius:7px; background:#eee;}
126
+#ITP_LOGIN .itp_login_input input:focus + label {top:15px; font-size:8px; color: #2691d9;}
127
+#ITP_LOGIN .itp_login_input input:valid + label {top:15px; font-size:8px; color: #2691d9;}
128
+#ITP_LOGIN .itp_login_input:not(:placeholder-shown) ~ label{top:0px; font-size:12px;}
112 129
 
113 130
 /* ITP_HEADER */
114
-#ITP_HEADER .itp_head {width:100%; height:36px; position:relative; line-height:36px; z-index:100;}
115
-#ITP_HEADER .itp_tit {margin:0; padding:0; line-height:36px; font-size:20px;}
131
+#ITP_HEADER .itp_head {font-family: 'GmarketSansMedium';width:100%; height:40px; position:relative; line-height:40px; z-index:100;}
132
+#ITP_HEADER .itp_tit {margin:0; padding:0; line-height:40px; font-size:20px;}
116 133
 #ITP_HEADER .itp_tit span {display: inline-block; vertical-align: middle}
117 134
 #ITP_HEADER .itp_lt {position:absolute; top:0px; left:10px;}
118 135
 #ITP_HEADER .itp_rt {position:absolute; top:0px; right:20px;}
119 136
 #ITP_HEADER .itp_icon {float:left; padding-top:3px; margin-right:10px;}
120 137
 #ITP_HEADER .itp_icon i {color:#fff; font-size:20px;}
121
-#ITP_HEADER .itp_icon i.glyphicon-home {font-size:18px;}
138
+#ITP_HEADER .itp_icon img.glyphicon-logo {width:30px; margin-top:-7px;}
122 139
 #ITP_HEADER .itp_icon i.glyphicon-user {font-size:18px;}
123 140
 #ITP_HEADER .itp_icon i.glyphicon-off {font-size:18px;}
124 141
 #ITP_HEADER .itp_user {float:left; font-size:16px; margin-left:15px;}
@@ -130,13 +147,13 @@ a, button {outline:none !important; text-decoration:none !important;}
130 147
 #ITP_HEADER .itp_sch_brand button{width:90px; border:1px solid #000;}
131 148
 #ITP_HEADER .itp_menu {float:left; border:1px solid #ddd; line-height: 26px; background:#eee;margin:4px; border-radius: 2px; padding:0 4px;}
132 149
 #ITP_HEADER .itp_menu a {color:#000; font-size:13px; text-decoration:none;}
133
-#ITP_HEADER .itp_out {float:left; border:1px solid #000; line-height: 27px; background:#666; margin:4px; border-radius: 2px; padding:0 4px;}
134
-#ITP_HEADER .itp_out a {color:#fff; font-size:13px; text-decoration:none;}
135
-#ITP_HEADER .itp_tabs {position:relative; z-index:100;}
150
+#ITP_HEADER .itp_out {width:70px; height:30px;  float:left; border:1px solid #333; line-height: 28px; background:#fff; margin:6px; border-radius: 10px; padding:0 4px;}
151
+#ITP_HEADER .itp_out a {padding:4px; color:#000; font-size:13px; text-decoration:none;}
152
+#ITP_HEADER .itp_tabs {position:relative; z-index:100; transition:all .25s ease; float:right; width:calc(100% - 240px);}
136 153
 #ITP_HEADER .itp_tabs .nav-tabs {padding:4px 4px 0 4px; background:#fff;}
137
-#ITP_HEADER .itp_tabs .nav-tabs > li a {border:1px solid #ddd; background:#f5f5f5; font-size:12px; color:#333; padding:5px 13px 5px 15px; margin-right:4px; outline:none;}
154
+#ITP_HEADER .itp_tabs .nav-tabs > li a {border:1px solid #ddd; background:#f5f5f5; font-size:12px; color:#666; padding:5px 13px 5px 15px; margin-right:4px; outline:none;}
138 155
 #ITP_HEADER .itp_tabs .nav-tabs > li a i.glyphicon-remove {font-size:10px; margin-left:4px; cursor:pointer;}
139
-#ITP_HEADER .itp_tabs .nav-tabs > li.active > a, .nav-tabs > li.active > a:focus, .nav-tabs > li.active > a:hover {background:#D6E6F3; color:#000; border:1px solid #1A3E5E; border-bottom-color:transparent;}
156
+#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;}
140 157
 #ITP_HEADER .itp_tabs .nav-tabs > li > a:hover {background:#D6E6F3 !important; border:1px solid #1A3E5E; border-bottom-color:transparent; color:#000;}
141 158
 
142 159
 /* ITP_SIDEBAR */
@@ -164,7 +181,7 @@ a, button {outline:none !important; text-decoration:none !important;}
164 181
 #ITP_SIDEBAR .itp_nav .itp_svgs li a .itp_tt {float:left;}
165 182
 
166 183
 /* ITP_CONTAINER */
167
-#ITP_CONTAINER {height:calc(100vh - 69px); padding:8px; transition:all .25s ease; float:left; width:calc(100% - 240px);}
184
+#ITP_CONTAINER {height:calc(100vh - 69px); padding:8px; transition:all .25s ease; float:left; width:calc(100% - 240px);background:#fff;}
168 185
 #ITP_CONTAINER.itp_open_conts {padding-left:8px; width:100%;}
169 186
 #ITP_CONTAINER .itp_contents {background:#fff; height:100%;}
170 187
 #ITP_CONTAINER .itp_contents .itp_sec {height:100%;}
@@ -221,7 +238,7 @@ a, button {outline:none !important; text-decoration:none !important;}
221 238
 #ITP_CONTAINER .itp_adv_srh .form-group .itp_adv_chk .itp_check {float:right; margin-left:10px;}
222 239
 #ITP_CONTAINER .itp_detail {display:table-cell; vertical-align:top; height:100%;}
223 240
 
224
-#ITP_CONTAINER .itp_detail .itp_det_head {padding:0 4px 0 4px; height:42px; background:#eee;}
241
+#ITP_CONTAINER .itp_detail .itp_det_head {padding:0 4px 0 4px; height:42px; background:#fff;}
225 242
 #ITP_CONTAINER .itp_detail .itp_det_head .itp_det_tit {font-size:15px; margin:0; padding:0; line-height:42px;}
226 243
 #ITP_CONTAINER .itp_detail .itp_det_head .itp_det_tit .glyphicon {color:#337ab7; margin-right:4px;}
227 244
 

BIN
src/main/webapp/images/oqpo.png


BIN
src/main/webapp/images/oqpologo.png


+ 128 - 17
src/main/webapp/js/app/collmng/ITP_COLLMNG01010.js

@@ -167,8 +167,8 @@ let pageObj = {
167 167
 			var defaultToDate = new Date(now);
168 168
 			defaultToDate.setDate(now.getDate()+7);
169 169
 			$('#ITP_TAB_COLLMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
170
-			$('#ITP_FORM_COLLMNG01010_SEARCH_FROM_DT').datepicker('setDate', '2022.10.01');
171
-			$('#ITP_FORM_COLLMNG01010_SEARCH_TO_DT').datepicker('setDate', '2022.12.01');
170
+			$('#ITP_FORM_COLLMNG01010_SEARCH_FROM_DT').datepicker('setDate', now);
171
+			$('#ITP_FORM_COLLMNG01010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
172 172
 		},
173 173
 		grid: function() {
174 174
 			itp_fn_jqgrid_resize(COLLMNG01010_GRID_ID, COLLMNG01010_GRID_LIST, 'lg');
@@ -213,7 +213,7 @@ let pageObj = {
213 213
             $('#ITP_FORM_COLLMNG01010_SEARCH #ITP_FORM_COLLMNG01010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
214 214
             $('#ITP_BTN_COLLMNG01010_SEARCH_WHS_NM').show();
215 215
             $('#ITP_BTN_COLLMNG01010_DELETE_WHS_NM').show();
216
-        } else if(mode == 'ADD') { // 등록
216
+        } /*else if(mode == 'ADD') { // 등록
217 217
             $('#ITP_AJAX_COLLMNG01010_DETAIL_CONTAINER').show();
218 218
             fn_show_btn_auth_array(['#ITP_BTN_COLLMNG01010_CANCELLIST', '#ITP_BTN_COLLMNG01010_SAVE']);
219 219
 
@@ -239,7 +239,7 @@ let pageObj = {
239 239
             $('#ITP_FORM_COLLMNG01010_DETAIL #ITP_FORM_COLLMNG01010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
240 240
 
241 241
             $('.fnBrandId').text('(자동부여)');
242
-        } else if(mode == 'MODIFY') { // 수정
242
+        } */else if(mode == 'MODIFY') { // 수정
243 243
             $('#ITP_AJAX_COLLMNG01010_DETAIL_CONTAINER').show();
244 244
             fn_show_btn_auth_array(['#ITP_BTN_COLLMNG01010_CANCELLIST', '#ITP_BTN_COLLMNG01010_SAVE']);
245 245
 
@@ -267,6 +267,7 @@ let pageObj = {
267 267
 let listObj = {
268 268
 	init: function() {
269 269
 		this.grid.init();
270
+		this.action();
270 271
 	},
271 272
 	itp_COLLMNG01010_param: {},
272 273
 	itp_COLLMNG01010_search: false,
@@ -276,9 +277,8 @@ let listObj = {
276 277
 			let param = $('#ITP_FORM_COLLMNG01010_SEARCH').serializeObject();
277 278
 			param.gridSize = $.jgrid.defaults.rowNum;
278 279
             param.gridPage = $.jgrid.defaults.page;
279
-            param.sbrandId = LOGIN_USER_INFO.sbrandId;            
280
-            param.sspplyId = LOGIN_USER_INFO.spplyId;
281
-            param.sidx = '0';
280
+            //param.sbrandId = 'BRD221100002';            
281
+            //param.sspplyId = 'SPY221100004';
282 282
             console.log(JSON.stringify(param));
283 283
             $(COLLMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
284 284
         }
@@ -296,13 +296,13 @@ let listObj = {
296 296
         push: function() {
297 297
             let param = $('#ITP_FORM_COLLMNG01010_SEARCH').serializeObject();
298 298
             listObj.itp_COLLMNG01010_param = param;
299
-            listObj.itp_COLLMNG01010_param.sidx = '0';
299
+            //listObj.itp_COLLMNG01010_param.sbrandId = 'BRD221100002';            
300
+            //listObj.itp_COLLMNG01010_param.sspplyId = 'SPY221100004';
300 301
         },
301 302
         back: function() {
302 303
             $('#ITP_FORM_COLLMNG01010_SERVICE_BRAND_TYPE').val(listObj.itp_COLLMNG01010_param.brandType);
303 304
             $('#ITP_FORM_COLLMNG01010_SERVICE_ST_CD').val(listObj.itp_COLLMNG01010_param.stCd);
304 305
             $('#ITP_FORM_COLLMNG01010_SEARCH_BRAND_NM').val(listObj.itp_COLLMNG01010_param.brandNm);
305
-        	console.log('here');
306 306
         	console.log(listObj.itp_COLLMNG01010_param);            
307 307
         }
308 308
 	},
@@ -321,9 +321,8 @@ let listObj = {
321 321
 		load: function() {
322 322
             let param = $('#ITP_FORM_COLLMNG01010_SEARCH').serializeObject();
323 323
             param.gridSize = $.jgrid.defaults.rowNum;
324
-            param.sbrandId = 'BRD221100002';            
325
-            param.sspplyId = 'SPY221100004';
326
-            param.sidx = '0';
324
+            //param.sbrandId = 'BRD221100002';            
325
+            //param.sspplyId = 'SPY221100004';
327 326
             console.log(JSON.stringify(param));
328 327
             var option = {
329 328
             	gridId: COLLMNG01010_GRID_ID,
@@ -334,11 +333,11 @@ let listObj = {
334 333
             	onCellSelect: function(rowId, cellIdx, cellValue) {
335 334
                     var cm = $(this).jqGrid('getGridParam', 'colModel');
336 335
                     var colNm = cm[cellIdx].name;
337
-                    if (colNm === 'pchPodrUnqNo') {
338
-                        const pchPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'pchPodrUnqNo');
336
+                    if (colNm === 'rtnPodrUnqNo') {
337
+                        const rtnPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'rtnPodrUnqNo');
339 338
                         const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
340 339
                         const spplyIdVal = fn_make_user_info.get('spplyId'); 
341
-                        const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal, spplyId: spplyIdVal};
340
+                        const key = {rtnPodrUnqNo: rtnPodrUnqNoVal, brandId: brandIdVal, spplyId: spplyIdVal};
342 341
                         var param = $.param(key);
343 342
                         viewObj.init(param);
344 343
                     }
@@ -348,7 +347,7 @@ let listObj = {
348 347
                     itp_fn_grid_load_complete(data, COLLMNG01010_GRID_ID, true, 'number', 'COLLMNG01010', listObj.itp_COLLMNG01010_search, listObj.empty, true, data.gridRecords, true);
349 348
                     var ids = $(COLLMNG01010_GRID_ID).getDataIDs();
350 349
                     $.each(ids, function(idx, rowId) {
351
-                        $(COLLMNG01010_GRID_ID).jqGrid('setCell', rowId, 'pchPodrUnqNo', '', ITP_GRID_COL_STYLE.link);
350
+                        $(COLLMNG01010_GRID_ID).jqGrid('setCell', rowId, 'rtnPodrUnqNo', '', ITP_GRID_COL_STYLE.link);
352 351
                     });
353 352
 				},
354 353
 				onPaging: function(action) {
@@ -366,5 +365,117 @@ let listObj = {
366 365
 		unload: function() {
367 366
 			$.jgrid.gridUnload(COLLMNG01010_GRID_ID);
368 367
 		}
368
+	},
369
+	action: function() {
370
+		var _this = this;
371
+		// 납품장소 조회 버튼 클릭
372
+		$('#ITP_BTN_COLLMNG01010_SEARCH_WHS_NM').on('click', function() {
373
+			_this.popup();
374
+		});
375
+		// 납품장소 텍스트 삭제 버튼 클릭
376
+		$('#ITP_BTN_COLLMNG01010_DELETE_WHS_NM').on('click', function() {
377
+			$('#ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_NM').val('');
378
+			$('#ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_ID').val('');
379
+		});
380
+	},
381
+	popup: function() {
382
+		// 팝업
383
+		var popFn = this.callback.create;
384
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
385
+		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
386
+	},
387
+	callback: {
388
+		create: function(rowDataPop) {
389
+			if(rowDataPop) {
390
+				$('#ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_NM').val(rowDataPop.whsNm);
391
+				$('#ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_ID').val(rowDataPop.whsId);
392
+			}
393
+		}
394
+	}
395
+}
396
+
397
+
398
+/*상세화면 Object*/
399
+let viewObj = {
400
+	init: function(param) {
401
+		this.load(param);
402
+	},
403
+	itp_COLLMNG01010_param: {},
404
+	itp_COLLMNG01010_search: false,
405
+	button: {
406
+		cancel: function() {
407
+			listObj.grid.search();
408
+		}
409
+	},
410
+	empty: {
411
+		init: function() {
412
+            var _this = this;
413
+            this.push();
414
+            $(COLLMNG01010_VIEW_GRID_EMPTY).on('click', function() {
415
+                _this.back();
416
+                viewObj.itp_COLLMNG01010_param.gridSize = $.jgrid.defaults.rowNum;
417
+                $(COLLMNG01010_DETAIL_GRID_ID).setGridParam({'postData': JSON.stringify(viewObj.itp_COLLMNG01010_param)}).trigger('reloadGrid');
418
+            });
419
+        },
420
+        push: function() {
421
+            let param = $('#ITP_FORM_COLLMNG01010_DETAIL').serializeObject();
422
+            viewObj.itp_COLLMNG01010_param = param;
423
+        },
424
+        back: function() {
425
+            $('#ITP_FORM_COLLMNG01010_SERVICE_BRAND_TYPE').val(viewObj.itp_COLLMNG01010_param.brandType);
426
+            $('#ITP_FORM_COLLMNG01010_SERVICE_ST_CD').val(viewObj.itp_COLLMNG01010_param.stCd);
427
+            $('#ITP_FORM_COLLMNG01010_SEARCH_BRAND_NM').val(viewObj.itp_COLLMNG01010_param.brandNm);
428
+        }
429
+	},
430
+	load: function(param) {
431
+		fn_ajax_call(API_RTNMNG_RTN_INFO_INFO_RTNODR, param, this.callback, 'GET');
432
+	},
433
+	callback: function(result) {
434
+		console.log(result);
435
+		
436
+		pageObj.switchScreen('MODIFY');
437
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnBrandNm').text(result.brandNm);							// 브랜드명
438
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnPodrUnqNo').text(result.rtnPodrUnqNo);				// 발주번호
439
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnOdrRegDt').text(result.rtnOdrRegDt);					// 수거일자
440
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnOdrStNm').text(result.rtnOdrStNm);					// 수거상태
441
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnWhsNm').text(result.rtnWhsNm);						// 수거장소
442
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnDodrTotalAmt').text(result.rtnDodrTotalAmt);			// 수거 총 금액
443
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnMgrNm').text(result.rtnMgrNm);						// 발주담당자
444
+		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnMgrTelNo').text(result.rtnMgrTelNo);					// 발주담당자연락처
445
+		
446
+		for(var i = 0; i < result.rtnOdrDtlList.length; i++){
447
+			result.rtnOdrDtlList[i].colReqDt = result.colReqDt;
448
+		}
449
+		
450
+		viewObj.grid.init(result.rtnOdrDtlList);
451
+	},
452
+	grid: {
453
+		init: function(gridData) {
454
+			this.mode = 'MODIFY';
455
+			this.gridId = COLLMNG01010_DETAIL_GRID_ID;
456
+			this.gridList = COLLMNG01010_DETAIL_GRID_LIST;
457
+			this.gridEmpty = COLLMNG01010_DETAIL_GRID_EMPTY;
458
+			this.unload();
459
+			this.load(gridData);
460
+		},
461
+		mode: '',
462
+		colModel: gridColModel.detail,
463
+		load: function(gridData) {
464
+			var _this = this;
465
+			var option = {
466
+				gridId: _this.gridId,
467
+				colModel: gridColModel.detail,
468
+				data: gridData,
469
+				multiselect: true,
470
+				loadComplete: function(data) {
471
+					console.log(data);
472
+					itp_fn_grid_load_complete(data, COLLMNG01010_DETAIL_GRID_ID, true, 'number', 'COLLMNG01010', viewObj.itp_COLLMNG01010_search, viewObj.empty, true, data.gridRecords, true);
473
+				}
474
+			};
475
+			itp_fn_grid_make_local(option);
476
+		},
477
+		unload: function() {
478
+			$.jgrid.gridUnload(this.gridId);
479
+		}
369 480
 	}
370
-}
481
+};

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

@@ -54,7 +54,7 @@ var itp_fn_MAIN_NOTICE_grid = {
54 54
 				{
55 55
 					index: 'NTICE_TITL', name: 'nticeTitl',
56 56
 					label: '공지사항', //공지제목
57
-					width: '15', fixed: false, align: 'center',
57
+					width: '15', fixed: false, align: 'left',
58 58
 					sortable: false, hidden: false
59 59
 				},
60 60
 				{

+ 27 - 24
src/main/webapp/login.html

@@ -30,39 +30,36 @@
30 30
 		<div class="itp_cont">
31 31
 			<div class="container">
32 32
 				<div class="itp_box_wrap">
33
-					<div class="itp_head fix">
34
-						<h1 class="itp_logo">오더퀸</h1>
35
-						<span class="itp_bar">|</span>
36
-						<h2 class="text-center itp_tit">수발주시스템</h2>
33
+					<div class="itp_login_img">
34
+						<img src="/oqpo-view/images/oqpologo.png" alt="로고" id="ITP_LOGIN_BRAND_LOGO" class="itp_img" name="" >
37 35
 					</div>
38 36
 					<div class="panel panel-default itp_box">
39 37
 						<div class="panel-body itp_body">
40 38
 							<form id="command" class="form-horizontal" action="" method="post" onsubmit="return false;">
41 39
 								<input id="userId" name="userId" type="hidden" value="" />
42 40
 	        					<input id="password" name="password" type="hidden" value="" />
43
-
44
-								<div class="row">
45
-									<div class="col-xs-9">
46
-										<div class="form-group">
47
-											<label class="col-xs-3 itp_lb">아이디</label>
48
-											<div class="col-xs-9">
49
-												<input type="text" class="form-control" id="ITP_FORM_LOGIN_USER_ID" autofocus>
50
-											</div>
41
+								<div class="row" style="margin-top:100px;">
42
+									<div class="col-xs-12 itp_login_input">
43
+										<div class="itp_head">
44
+											<h1 class="itp_logo">오더퀸</h1>
45
+											<span class="itp_bar">&nbsp;</span>
46
+											<h2 class="text-center itp_tit">수발주시스템</h2>
51 47
 										</div>
48
+									</div>	
49
+									<div class="col-xs-12">
52 50
 										<div class="form-group">
53
-											<label class="col-xs-3 itp_lb">비밀번호</label>
54
-											<div class="col-xs-9">
55
-												<input type="password" class="form-control" id="ITP_FORM_LOGIN_USER_PW" autocomplete="off">
51
+											<div class="col-xs-11 itp_login_input">
52
+												<input type="text" class="form-control itp_login" id="ITP_FORM_LOGIN_USER_ID" autofocus required="">
53
+												<label>아이디</label>
56 54
 											</div>
57 55
 										</div>
58 56
 										<div class="form-group">
59
-											<div class="col-xs-offset-3 col-xs-9">
60
-												<div class="checkbox pull-left">
61
-													<label><input type="checkbox" id="ITP_FORM_LOGIN_SAVE_ID"> 아이디저장</label>
62
-												</div>
57
+											<div class="col-xs-11 itp_login_input">
58
+												<input type="password" class="form-control itp_login" id="ITP_FORM_LOGIN_USER_PW" required="" autocomplete="off">
59
+												<label>비밀번호</label>
63 60
 											</div>
64 61
 										</div>
65
-										<div class="form-group">
62
+										<div class="form-group" style="display: none;">
66 63
 											<div class="col-xs-offset-3 col-xs-9">
67 64
 												<p class="text-nowrap itp_error" id="ITP_FORM_LOGIN_ERROR">
68 65
 												아이디와 비밀번호를 입력하세요.
@@ -70,15 +67,21 @@
70 67
 											</div>
71 68
 										</div>
72 69
 									</div>
73
-									<div class="col-xs-3">
74
-										<button type="submit" id="login_btn" class="btn btn-primary btn-lg itp_btn">로그인</button>
70
+									<div class="col-xs-12 itp_btn_bar">
71
+										<button type="submit" id="login_btn" class="btn btn-orange btn-lg itp_btn">로그인</button>
72
+									</div>
73
+									<div class="col-xs-12 itp_login_input">
74
+										<div class="form-group">
75
+											<div class="col-xs-12 itp_find">
76
+												<span>아이디/비밀번호 찾기</span>
77
+											</div>
78
+										</div>
75 79
 									</div>
76 80
 								</div>
77 81
 							</form>
78 82
 						</div>
79 83
 					</div>
80
-					<div class="panel panel-default text-center itp_foot">본 시스템은 크롬 브라우저에 최적화 되어 있습니다.</div>
81
-					<div class="text-center itp_copyright">COPYRIGHT © NOORIJA Co., Ltd. ALL RIGHTS RESERVED</div>
84
+					<div class="col-xs-12 itp_bottom_gray"></div>
82 85
 				</div>
83 86
 			</div>
84 87
 		</div>

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

@@ -47,7 +47,7 @@
47 47
 
48 48
 		<!-- 상단 -->
49 49
 		<header id="ITP_HEADER">
50
-			<div class="itp_head bg-primary">
50
+			<div class="itp_head bg-orange">
51 51
 				<h1 class="text-center itp_tit">
52 52
 					<span id="ITP_TXT_MAIN_SHR_AFFL">오더퀸</span>
53 53
 					<span style="font-size: 18px; margin-top: -3px">|</span>
@@ -55,7 +55,7 @@
55 55
 				</h1>
56 56
 				<div class="itp_lt">
57 57
 					<span class="itp_icon"><a href="javascript:void(0)" id="ITP_BTN_MENU"><i class="glyphicon glyphicon-align-justify"></i></a></span>
58
-					<span class="itp_icon"><a href="javascript:void(0)" id="ITP_BTN_HOME"><i class="glyphicon glyphicon-home"></i></a></span>
58
+					<span class="itp_icon"><a href="javascript:void(0)" id="ITP_BTN_HOME"><img src="/oqpo-view/images/oqpo.png" alt="로고" id="ITP_LOGIN_BRAND_LOGO" class="glyphicon-logo" name="" ></a></span>
59 59
 					<span class="itp_user" id="ITP_LOGIN_USER" style="cursor: pointer;"></span>
60 60
 				</div>
61 61
 				<div class="itp_rt">