Ver código fonte

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

dwkim 2 anos atrás
pai
commit
abb58a14f9

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

@@ -5,11 +5,11 @@
5 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-md SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i>조회</button>
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>
8
+					<button type="button" id="ITP_BTN_OPER01010_MODIFY" class="btn btn-success btn-md UPB" style="display: inline-block;"><i class="glyphicon "></i>수정</button>
9 9
 					<button type="button" id="ITP_BTN_OPER01010_NEWREG" class="btn btn-primary btn-md NEB" style="display: inline-block;"><i class="glyphicon "></i>신규등록</button>
10
-					<button type="button" id="ITP_BTN_OPER01010_DELETE" class="btn btn-danger btn-sm DEB"><i class="glyphicon "></i>&nbsp;&nbsp;삭제&nbsp;&nbsp;</button>
11
-					<button type="button" id="ITP_BTN_OPER01010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
12
-					<button type="button" id="ITP_BTN_OPER01010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
10
+					<button type="button" id="ITP_BTN_OPER01010_DELETE" class="btn btn-danger btn-md DEB"><i class="glyphicon "></i>삭제</button>
11
+					<button type="button" id="ITP_BTN_OPER01010_SAVE" class="btn btn-success btn-md SAB"><i class="glyphicon "></i>저장</button>
12
+					<button type="button" id="ITP_BTN_OPER01010_CANCELLIST" class="btn btn-warning btn-md PRB"><i class="glyphicon "></i>취소/목록</button>
13 13
 				</div>
14 14
 			</div>
15 15
 			<div class="itp_det_in">

+ 31 - 16
src/main/webapp/app/ordmng/ORDMNG02010.html

@@ -6,7 +6,7 @@
6 6
 				<div class="pull-right itp_cicon">
7 7
 					<button type="button" id="ITP_BTN_ORDMNG02010_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_ORDMNG02010_NEWREG" class="btn btn-primary btn-sm IVC" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;납품서생성&nbsp;&nbsp;</button>
9
-					<button type="button" id="ITP_BTN_ORDMNG02010_CANCELLIST" class="btn btn-warning btn-sm CRT"><i class="glyphicon "></i>&nbsp;&nbsp;생성&nbsp;&nbsp;</button>
9
+					<button type="button" id="ITP_BTN_ORDMNG02010_SAVE" class="btn btn-warning btn-sm CRT"><i class="glyphicon "></i>&nbsp;&nbsp;생성&nbsp;&nbsp;</button>
10 10
 					<button type="button" id="ITP_BTN_ORDMNG02010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
11 11
 				</div>
12 12
 				<div style="top:0px; text-align:center; font-size:20px;">
@@ -21,28 +21,29 @@
21 21
 						<div class="itp_srh_border fix">
22 22
 							<div class="col-xs-12">
23 23
 								<form id="ITP_FORM_ORDMNG02010_SEARCH" class="form-horizontal">
24
+								<input type="hidden" id="ITP_FORM_ORDMNG02010_SEARCH_BRAND_ID" name="sbrandId" value="">
25
+								<input type="hidden" id="ITP_FORM_ORDMNG02010_SEARCH_SPPLY_ID" name="sspplyId" value="">
24 26
 									<div class="form-group">
25 27
 										<div class="col-xs-2 itp_ip itp_noMar">
26
-											<select id="ITP_FORM_ORDMNG02010_SERVICE_" class="form-control itp_input" name="">
27
-												<option value="A">반품발주일자</option>											
28
-											</select>
28
+											<label>납품요청일 *</label>
29 29
 										</div>										
30 30
 										<div class="col-xs-3 itp_ip itp_noMar">
31 31
 											<div class="input-daterange input-group date">
32
-												<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_" class="form-control itp_input" name="" value="">
32
+												<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
33 33
 												<span class="input-group-addon itp_date_to">~</span>
34
-												<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_" class="form-control itp_input" name="" value="">
34
+												<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
35 35
 											</div>
36 36
 										</div>
37 37
 										<div class="col-xs-2 itp_in itp_noMar">
38
-											<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_DLV_PLACE" class="form-control itp_input" name="sDlvPlace" placeholder="수거창고/매장" />
38
+											<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="수거창고/매장" readonly/>
39
+											<input type="hidden" id="ITP_FORM_ORDMNG02010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
39 40
 										</div>
40 41
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
41
-											<button type="button" id="ITP_BTN_ORDMNG02010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
42
-											<button type="button" id="ITP_BTN_ORDMNG02010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
42
+											<button type="button" id="ITP_BTN_ORDMNG02010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
43
+											<button type="button" id="ITP_BTN_ORDMNG02010_DELETE_WHS_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
43 44
 						                </div>
44 45
 										<div class="col-xs-4 itp_ip itp_noMar">
45
-											<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="fnItemNm" placeholder="발주번호/품목번호 /품목명" />
46
+											<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
46 47
 										</div>
47 48
 									</div>
48 49
 								</form>
@@ -85,9 +86,23 @@
85 86
 									<div class="itp_form_in">	
86 87
 										<div class="form-group">
87 88
 											<label class="col-xs-2 itp_lb">납품장소</label>
88
-											<div class="col-xs-4 itp_ip fnDlvPlace"></div>
89
+											<div class="col-xs-4 itp_ip fnWhsNm"></div>
89 90
 											<label class="col-xs-2 itp_lb">납품장소연락처</label>
90
-											<div class="col-xs-4 itp_ip fnVndrTelNo"></div>
91
+											<div class="col-xs-4 itp_ip fnDeliTelNo"></div>
92
+										</div>
93
+									</div>
94
+									<div class="itp_form_in">	
95
+										<div class="form-group">
96
+											<label class="col-xs-2 itp_lb">납품예정일</label>
97
+											<div class="input-daterange input-group date">
98
+												<div class="col-xs-4 itp_ip">
99
+													<div class="col-xs-7 itp_in">
100
+													<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT" class="form-control itp_input" name="dlvSchDt" value="">
101
+													</div>
102
+												</div>
103
+											</div>											
104
+											<label class="col-xs-2 itp_lb">납품요청일</label>
105
+											<div class="col-xs-4 itp_ip fnDlvRegDt"></div>
91 106
 										</div>
92 107
 									</div>
93 108
 									<div class="itp_form_in">	
@@ -111,10 +126,10 @@
111 126
 											<h4 class="itp_table_tit">발주 품목</h4>
112 127
 										</div>
113 128
 										<div id="ITP_ORDMNG02010_DETAIL_jqGrid_list" class="itp_tb_list">
114
-										  <div id="ITP_ORDMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>
115
-										  <table id="ITP_ORDMNG02010_DETAIL_jqGrid"></table>
116
-										  <div id="ITP_ORDMNG02010_DETAIL_jqGridPager"></div>
117
-										  <div id="ITP_ORDMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
129
+											<div id="ITP_ORDMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>
130
+											<table id="ITP_ORDMNG02010_DETAIL_jqGrid"></table>
131
+											<div id="ITP_ORDMNG02010_DETAIL_jqGridPager"></div>
132
+											<div id="ITP_ORDMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
118 133
 										</div>
119 134
 									</div>
120 135
 								</section>												

+ 13 - 10
src/main/webapp/app/rtnmng/RTNMNG06010.html

@@ -15,7 +15,9 @@
15 15
 								<form id="ITP_FORM_RTNMNG06010_SEARCH" class="form-horizontal">
16 16
 									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SBRAND_ID" name="sbrandId" value="">
17 17
 									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SSTORE_ID" name="sstoreId" value="">
18
-									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_ID" name="sspplyId" value="">	<!-- 공급업체 -->
18
+									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_ID" name="sspplyId" value="">		<!-- 공급업체 -->
19
+									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_ID" name="srtnWhsId" value="">	<!-- 수거창고 -->
20
+									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SWHS_ID" name="swhsId" value="">			<!-- 반품입고창고 -->
19 21
 								
20 22
 									<div class="form-group">
21 23
 										<div class="col-xs-1 itp_ip itp_noMar" style="width:10.7%;">
@@ -31,26 +33,27 @@
31 33
 											</div>
32 34
 										</div>
33 35
 										<div class="col-xs-2 itp_ip itp_noMar">
34
-											
35
-										</div>
36
-										<div class="col-xs-5 itp_ip itp_noMar">
37
-											
36
+											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
38 37
 										</div>
38
+										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
39
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
40
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SWHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
41
+						                </div>
39 42
 									</div>
40 43
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
41 44
 										<div class="col-xs-2 itp_ip itp_noMar">
42
-											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_NM" class="form-control itp_input" placeholder="공급업체" />
45
+											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_NM" class="form-control itp_input" placeholder="공급업체" readonly="readonly" />
43 46
 										</div>
44 47
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
45 48
 											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SSPPLY_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
46
-											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
49
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
47 50
 						                </div>
48 51
 										<div class="col-xs-2 itp_ip itp_noMar">
49
-											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_STORE_NM" class="form-control itp_input" name="sStoreNm" placeholder="매장/창고" />
52
+											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="매장/창고" readonly="readonly" />
50 53
 										</div>
51 54
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
52
-											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
53
-											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
55
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SRTN_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
56
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
54 57
 						                </div>
55 58
 										<div class="col-xs-5 itp_ip itp_noMar">
56 59
 											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="품목번호 or 품목명" />

Diferenças do arquivo suprimidas por serem muito extensas
+ 3 - 1
src/main/webapp/bootstrap/dist/css/bootstrap.min.css


+ 14 - 7
src/main/webapp/css/style.css

@@ -91,7 +91,7 @@ a, button {outline:none !important; text-decoration:none !important;}
91 91
 
92 92
 /* ITP_WRAPPER */
93 93
 #ITP_WRAPPER {width:100%; height:100%; min-width:1400px;}
94
-#ITP_CONTENT_WRAPPER {width:100%;}
94
+#ITP_CONTENT_WRAPPER {width:100%; height:96%;}
95 95
 #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;}
96 96
 
97 97
 /* ITP_LOGIN */
@@ -150,7 +150,11 @@ a, button {outline:none !important; text-decoration:none !important;}
150 150
 #ITP_HEADER .itp_menu a {color:#000; font-size:13px; text-decoration:none;}
151 151
 #ITP_HEADER .itp_out {width:70px; height:30px;  float:left; border:1px solid #333; line-height: 28px; background:#fff; margin-top:10px; border-radius: 10px; padding:0 4px;}
152 152
 #ITP_HEADER .itp_out a {padding:8.4px; color:#000; font-size:11px; text-decoration:none;}
153
-#ITP_HEADER .itp_tabs {position:relative; z-index:100; transition:all .25s ease; float:right; width:calc(100% - 240px);}
153
+
154
+#ITP_HEADER #ITP_TAB_BAR.itp_open_tab {width:99.9%;}
155
+/* #ITP_HEADER.itp_open_tab .itp_nav {visibility:visible;}
156
+#ITP_HEADER.itp_open_tab .itp_nav::-webkit-scrollbar{display:none;} */
157
+#ITP_HEADER .itp_tabs {position:relative; z-index:100; transition:all .25s ease; float:right; width:calc(100% - 238px);}
154 158
 #ITP_HEADER .itp_tabs .nav-tabs {padding:15px 4px 0 15px; background:#fff;}
155 159
 #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;}
156 160
 #ITP_HEADER .itp_tabs .nav-tabs > li a i.glyphicon-remove {font-size:10px; margin-left:4px; cursor:pointer;}
@@ -159,13 +163,15 @@ a, button {outline:none !important; text-decoration:none !important;}
159 163
 
160 164
 /* ITP_SIDEBAR */
161 165
 #ITP_SIDEBAR {width:0px; float:left; margin-left:-2px; height:calc(100vh - 68px); background:#ddd; transition:all .25s ease; border-style:solid; border-color:#ddd; border-width:0 1px 1px 1px;}
162
-#ITP_SIDEBAR.itp_open_nav {width:240px;}
166
+#ITP_SIDEBAR.itp_open_nav {width:240px; height:100%;}
163 167
 #ITP_SIDEBAR .itp_nav {list-style:none; margin:0; padding:0; height:100%; overflow-y:scroll; overflow-x:hidden; visibility:hidden;}
164 168
 #ITP_SIDEBAR.itp_open_nav .itp_nav {visibility:visible;}
169
+#ITP_SIDEBAR.itp_open_nav .itp_nav::-webkit-scrollbar{display:none;}
165 170
 #ITP_SIDEBAR .itp_nav.panel-group .panel+.panel {margin-top:0;}
166 171
 #ITP_SIDEBAR .itp_nav .panel-heading {padding:0;}
167 172
 #ITP_SIDEBAR .itp_nav .panel-title {line-height:1.1; border-bottom:1px solid #ddd;}
168
-#ITP_SIDEBAR .itp_nav .panel-title a {font-size:14px; display:block; padding:13px 15px; color:#333;}
173
+#ITP_SIDEBAR .itp_nav .panel-title a {font-size:16px; display:block; padding:13px 15px; color:#333;}
174
+#ITP_SIDEBAR .itp_nav .panel-title a:hover{background:#bbb; color:#fff;}
169 175
 #ITP_SIDEBAR .itp_nav .panel-title a .glyphicon {font-size:12px;}
170 176
 #ITP_SIDEBAR .itp_nav .panel-default {margin-bottom:0; border:none;}
171 177
 #ITP_SIDEBAR .itp_nav * {border-radius:0; border-width:1px 0 1px 0;}
@@ -182,8 +188,8 @@ a, button {outline:none !important; text-decoration:none !important;}
182 188
 #ITP_SIDEBAR .itp_nav .itp_svgs li a .itp_tt {float:left;}
183 189
 
184 190
 /* ITP_CONTAINER */
185
-#ITP_CONTAINER {height:calc(100vh - 69px); padding:8px; transition:all .25s ease; float:left; width:calc(100% - 240px);background:#fff;}
186
-#ITP_CONTAINER.itp_open_conts {padding-left:8px; width:100%;}
191
+#ITP_CONTAINER {height:calc(100vh - 100px); padding:8px; transition:all .25s ease; float:left; width:calc(100% - 240px);background:#fff;}
192
+#ITP_CONTAINER.itp_open_conts {padding-left:8px; width:99.9%;}
187 193
 #ITP_CONTAINER .itp_contents {background:#fff; height:100%;}
188 194
 #ITP_CONTAINER .itp_contents .itp_sec {height:100%;}
189 195
 #ITP_CONTAINER .itp_contents .itp_cont {display:table; width:100%; height:100%;}
@@ -243,7 +249,8 @@ a, button {outline:none !important; text-decoration:none !important;}
243 249
 #ITP_CONTAINER .itp_detail .itp_det_head .itp_det_tit {font-size:20px; margin:0; padding:0; line-height:42px;}
244 250
 #ITP_CONTAINER .itp_detail .itp_det_head .itp_det_tit .glyphicon {color:#F0831E; margin-right:4px;}
245 251
 
246
-#ITP_CONTAINER .itp_detail .itp_det_in {padding:0px 20px 15px 20px; height:calc(100vh - 127px); overflow-y:scroll;}
252
+#ITP_CONTAINER .itp_detail .itp_det_in {padding:0px 20px 15px 20px; height:calc(100vh - 180px); overflow-y:scroll;}
253
+#ITP_CONTAINER .itp_detail .itp_det_in::-webkit-scrollbar{display:none;}
247 254
 #ITP_CONTAINER .itp_detail .itp_cicon {line-height:32px; height:32px;}
248 255
 #ITP_CONTAINER .itp_detail .itp_cicon .btn-default {color:#fff; background-color:rgb(109, 110, 114); border-color:rgb(109, 110, 114);}
249 256
 #ITP_CONTAINER .itp_detail .itp_cicon .itp_store {display:inline-block; vertical-align:middle; font-size:13px; margin-right:10px;}

+ 2 - 1
src/main/webapp/css/ui.jqgrid-bootstrap.css

@@ -180,6 +180,7 @@ div.tablediv > .table-bordered {
180 180
 	margin: 0;
181 181
 	padding:0;
182 182
 	text-align:left;
183
+	overflow-x:auto !important;
183 184
 }
184 185
 .ui-jqgrid .ui-jqgrid-btable {
185 186
 	table-layout: fixed;
@@ -195,7 +196,7 @@ div.tablediv > .table-bordered {
195 196
 }
196 197
 @media all and (-ms-high-contrast: none) {
197 198
 	.ui-jqgrid .ui-jqgrid-btable tbody tr.jqgrow td {
198
-		overflow: hidden;
199
+		overflow: auto;
199 200
 		padding-right: 2px;
200 201
 	}
201 202
 }

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

@@ -160,6 +160,7 @@ require([
160 160
 		//$('#ITP_OVERLAY').toggle();
161 161
 		$('#ITP_SIDEBAR').toggleClass('itp_open_nav');
162 162
 		$('#ITP_CONTAINER').toggleClass('itp_open_conts');
163
+		$('#ITP_TAB_BAR').toggleClass('itp_open_tab');
163 164
 		itp_fn_fire_window_resize();
164 165
 
165 166
 		/*
@@ -1797,7 +1798,7 @@ function itp_fn_grid_load_complete(data, gridId, paging, rn, menuId, isSrh, empt
1797 1798
 		}
1798 1799
 
1799 1800
 		if (shrinkToFit) {
1800
-			$(gridId + '_list').find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
1801
+			$(gridId + '_list').find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'auto');
1801 1802
 		} else {
1802 1803
 			$(gridId + '_list').find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'auto');
1803 1804
 		}

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

@@ -342,6 +342,8 @@ let pageObj = {
342 342
 				gridId: gridId,
343 343
 				colModel: gridColModel.detail,
344 344
 				param: param,
345
+				autowidth: true,
346
+				shrinkToFit :false,
345 347
 				url: DOMAIN + API_USERAUTH_GRID_LIST,
346 348
 				multiselect: (this.mode !== 'VIEW'),
347 349
 				loadComplete: function(data) {
@@ -416,6 +418,8 @@ let listObj = {
416 418
 				param: param,
417 419
 				url: DOMAIN + API_DETAIL_GRID_LIST,
418 420
 				pager: OPER01010_GRID_PAGER,
421
+				autowidth: true,
422
+				shrinkToFit :false,
419 423
 				onCellSelect: function(rowId, cellIdx, cellValue) {
420 424
 					var cm = $(this).jqGrid('getGridParam', 'colModel');
421 425
 					var colNm = cm[cellIdx].name;
@@ -665,6 +669,8 @@ let createObj = {
665 669
 			var option = {
666 670
 				gridId: this.gridId,
667 671
 				colModel: gridColModel.detail,
672
+				autowidth: true,
673
+				shrinkToFit :false,
668 674
 				data: gridData,
669 675
 				multiselect: true,
670 676
 				loadComplete: function(data) {

+ 2 - 0
src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -429,6 +429,8 @@ let listObj = {
429 429
 				gridId: OPER02010_GRID_ID,
430 430
 				colModel: this.colModel,
431 431
 				param: param,
432
+			    autowidth:true,    
433
+		        shrinkToFit:false,
432 434
 				url: DOMAIN + NTICE_DETAIL_GRID_LIST,
433 435
 				pager: OPER02010_GRID_PAGER,
434 436
 				onCellSelect: function(rowId, cellIdx, cellValue) {

+ 530 - 0
src/main/webapp/js/app/ordmng/ITP_ORDMNG02010.js

@@ -0,0 +1,530 @@
1
+require(['config'], function() {
2
+	require([
3
+	], function($) {
4
+		pageObj.init();
5
+	});
6
+});
7
+
8
+
9
+/*화면 변수*/
10
+const ORDMNG02010_GRID_ID = '#ITP_ORDMNG02010_jqGrid';
11
+const ORDMNG02010_GRID_LIST = '#ITP_ORDMNG02010_jqGrid_list';
12
+const ORDMNG02010_GRID_PAGER = '#ITP_ORDMNG02010_jqGridPager';
13
+const ORDMNG02010_GRID_EMPTY = '#ITP_ORDMNG02010_jqGridEmpty';
14
+
15
+const ORDMNG02010_DETAIL_GRID_ID = '#ITP_ORDMNG02010_DETAIL_jqGrid';
16
+const ORDMNG02010_DETAIL_GRID_LIST = '#ITP_ORDMNG02010_DETAIL_jqGrid_list';
17
+const ORDMNG02010_DETAIL_GRID_PAGER = '#ITP_ORDMNG02010_DETAIL_jqGridPager';
18
+const ORDMNG02010_DETAIL_GRID_EMPTY = '#ITP_ORDMNG02010_DETAIL_jqGridEmpty';
19
+
20
+let ORDMNG02010_GRID_LAST_ROW_ID;
21
+
22
+//let shmtQtyValue;
23
+
24
+/*API URL*/
25
+let API_POMNG_INOUTMNG_SPPLY_TARGET_GRID_LIST = '/api/pomng/inoutmng/spply-target-grid-list';	// 공급사 납품 대상리스트 그리 리스트
26
+let API_POMNG_INOUTMNG_INIT_SPPLY_INV = '/api/pomng/inoutmng/init-spply-inv'; 					// 공급사 발주데이타 납품서 생성 초기데이타
27
+let API_POMNG_INOUTMNG_SAVE_SPPLY_INV = '/api/pomng/inoutmng/save-spply-inv'					//공급사 납품서 생성 저장 저장
28
+
29
+
30
+/*화면 Grid ColModel*/
31
+const gridColModel = {
32
+	list: [
33
+		{
34
+			index: 'VIEW_CD', name: 'viewCd',
35
+			label: ITP_MSG_LOCALE.label.viewCd,
36
+			width: '10', fixed: false, align: 'center',
37
+			sortable: false, hidden: true
38
+		},
39
+		{
40
+			index: 'BRAND_ID', name: 'brandId',
41
+			label: ITP_MSG_LOCALE.label.brandId, 			//브랜드ID
42
+			width: '10', fixed: false, align: 'center',
43
+			sortable: false, hidden: true
44
+		},
45
+		{
46
+			index: 'BRAND_NM', name: 'brandNm',
47
+			label: ITP_MSG_LOCALE.label.brandNm, 			//브랜드명
48
+			width: '10', fixed: false, align: 'center',
49
+			sortable: false, hidden: false
50
+		},
51
+		{
52
+			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
53
+			label: ITP_MSG_LOCALE.label.pchPodrUnqNo, 		//발주번호
54
+			width: '10', fixed: false, align: 'center',
55
+			sortable: false, hidden: false
56
+		},
57
+		{
58
+			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
59
+			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, 		//발주항번
60
+			width: '7', fixed: false, align: 'center',
61
+			sortable: false, hidden: false
62
+		},
63
+		{
64
+			index: 'DLV_REQ_DT', name: 'dlvReqDt',
65
+			label: ITP_MSG_LOCALE.label.dlvReqDt, 			//납품요청일
66
+			width: '9', fixed: false, align: 'center',
67
+			sortable: false, hidden: false
68
+		},
69
+		{
70
+			index: 'WHS_NM', name: 'whsNm',
71
+			label: ITP_MSG_LOCALE.label.whsNm, 				//납품장소
72
+			width: '10', fixed: false, align: 'center',
73
+			sortable: false, hidden: false
74
+		},
75
+		{
76
+			index: 'ITEM_ID', name: 'itemId',
77
+			label: ITP_MSG_LOCALE.label.itemId, 			//품목번호
78
+			width: '10', fixed: false, align: 'center',
79
+			sortable: false, hidden: false
80
+		},
81
+		{
82
+			index: 'ITEM_NM', name: 'itemNm',
83
+			label: ITP_MSG_LOCALE.label.itemNm, 			//품목명
84
+			width: '8', fixed: false, align: 'center',
85
+			sortable: false, hidden: false
86
+		},
87
+		{
88
+			index: 'PODR_QTY', name: 'podrQty',
89
+			label: ITP_MSG_LOCALE.label.podrQty, 			//발주수량
90
+			width: '7', fixed: false, align: 'center',
91
+			sortable: false, hidden: false
92
+		},
93
+		{
94
+			index: 'UNIT_AMT', name: 'unitAmt',
95
+			label: ITP_MSG_LOCALE.label.unitAmt, 			//단가
96
+			width: '6', fixed: false, align: 'center',
97
+			sortable: false, hidden: false
98
+		},
99
+		{
100
+			index: 'PODR_AMT', name: 'podrAmt',
101
+			label: ITP_MSG_LOCALE.label.podrAmt, 			//발주금액
102
+			width: '8', fixed: false, align: 'center',
103
+			sortable: false, hidden: false
104
+		}
105
+	],
106
+	view: [],
107
+	detail: [
108
+		{
109
+			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
110
+			label: ITP_MSG_LOCALE.label.pchPodrDtlNo,  		//발주항번
111
+			width: '20', fixed: false, align: 'center',
112
+			sortable: false, hidden: false, edittype: 'text',
113
+			editable: false
114
+		},
115
+		{
116
+			index: 'ITEM_ID', name: 'itemId',
117
+			label: ITP_MSG_LOCALE.label.itemId, 			//품목번호
118
+			width: '20', fixed: false, align: 'center',
119
+			sortable: false, hidden: false, edittype: 'text',
120
+			editable: false
121
+		},
122
+		{
123
+			index: 'ITEM_NM', name: 'itemNm',
124
+			label: ITP_MSG_LOCALE.label.itemNm,  			//품목명
125
+			width: '20', fixed: false, align: 'center',
126
+			sortable: false, hidden: false, edittype: 'text',
127
+			editable: false
128
+		},
129
+		{
130
+			index: 'UNIT', name: 'unit',
131
+			label: ITP_MSG_LOCALE.label.unit,  				//기본단위
132
+			width: '20', fixed: false, align: 'center',
133
+			sortable: false, hidden: false, edittype: 'text',
134
+			editable: false
135
+		},
136
+		{
137
+			index: 'PODR_QTY', name: 'podrQty',
138
+			label: ITP_MSG_LOCALE.label.podrQty,  			//발주수량
139
+			width: '20', fixed: false, align: 'center',
140
+			sortable: false, hidden: false, edittype: 'text',
141
+			editable: false
142
+		},
143
+		{
144
+			index: 'SHMT_QTY', name: 'shmtQty',
145
+			label: ITP_MSG_LOCALE.label.shmtQty, 	 		//출하수량
146
+			width: '20', fixed: false, align: 'center',
147
+			sortable: false, hidden: false, edittype: 'text',
148
+			editable: true, /*editrules: {custom: true, custom_func: shmtQtyValue}*/
149
+		},
150
+		{
151
+			index: 'EXPRY_YN', name: 'expryYn',
152
+			label: ITP_MSG_LOCALE.label.expryYn,  			//유통기한여부
153
+			width: '20', fixed: false, align: 'center',
154
+			sortable: false, hidden: false, edittype: 'text',
155
+			editable: false
156
+		},
157
+		{
158
+			index: 'EXPRY_DATE', name: 'expryDate',
159
+			label: ITP_MSG_LOCALE.label.expryDate,  		//유통기한일자
160
+			width: '20', fixed: false, align: 'center',
161
+			sortable: false, hidden: false, edittype: 'date',
162
+			editable: true
163
+		},
164
+		{
165
+			index: 'REMARK', name: 'remark',
166
+			label: ITP_MSG_LOCALE.label.remark,  			//비고
167
+			width: '20', fixed: false, align: 'center',
168
+			sortable: false, hidden: false, edittype: 'text',
169
+			editable: true
170
+		}
171
+	]
172
+};
173
+
174
+
175
+/*화면공통 Object*/
176
+let pageObj = {
177
+	init: function() {
178
+		this.ui.init();
179
+		this.event.init();
180
+	},
181
+	ui: {
182
+		init: function() {
183
+			this.view();
184
+			this.grid();
185
+			this.ready();
186
+		},
187
+		view: function() {
188
+			// 버튼 권한설정
189
+			fn_proc_btn_auth('ORDMNG02010');
190
+			// 공통코드 표시
191
+			$('select').each(function() {
192
+				if($(this).data('select-code')) {
193
+					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
194
+				}
195
+			});
196
+			// 조회일자 지정	
197
+			var now = new Date();
198
+			var defaultToDate = new Date(now);
199
+			defaultToDate.setDate(now.getDate() + 7);
200
+			$('#ITP_TAB_ORDMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
201
+			$('#ITP_FORM_ORDMNG02010_SEARCH_FROM_DT').datepicker('setDate', '2022.10.01'/*now*/);
202
+			$('#ITP_FORM_ORDMNG02010_SEARCH_TO_DT').datepicker('setDate', '2024.10.01'/*defaultToDate*/);
203
+		},
204
+		grid: function() {
205
+			itp_fn_jqgrid_resize(ORDMNG02010_GRID_ID, ORDMNG02010_GRID_LIST, 'lg');
206
+			listObj.empty.init();
207
+			itp_fn_fire_window_resize();
208
+		},
209
+		ready: function() {
210
+			listObj.init();
211
+		}
212
+	},
213
+	event: {
214
+		init: function() {
215
+			this.button();
216
+		},
217
+		button: function() {
218
+			// 버튼 클릭 이벤트
219
+			$('button').each(function() {
220
+				var id = $(this).attr('id');
221
+				$(this).on('click', function() {
222
+					switch (id) {
223
+						case 'ITP_BTN_ORDMNG02010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
224
+						case 'ITP_BTN_ORDMNG02010_NEWREG'			: listObj.button.create(); 		break;	// 신규등록 버튼
225
+						case 'ITP_BTN_ORDMNG02010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
226
+						case 'ITP_BTN_ORDMNG02010_SAVE'				: modifyObj.button.save();		break;	// 발주 취소 버튼(예정)
227
+					}
228
+				});
229
+			});
230
+			
231
+			$('body').on('click', function(e) {
232
+				var gridId = ORDMNG02010_DETAIL_GRID_ID.replace('#', '');
233
+				itp_fn_grid_reset_selection(e, ORDMNG02010_GRID_LAST_ROW_ID, gridId, 'ORDMNG02010');
234
+			})
235
+		}
236
+	},
237
+	switchScreen: function(mode) {
238
+		$('.itp_det_head').find('button[id^="ITP_BTN_ORDMNG02010_"]').each(function(i) {
239
+			$(this).hide();
240
+		});
241
+		$('#ITP_TAB_ORDMNG02010').find('div[id$="_CONTAINER"]').each(function(i) {
242
+			$(this).hide();
243
+		});
244
+		if(mode === 'LIST') { // 목록
245
+			$('#ITP_AJAX_ORDMNG02010_LIST_CONTAINER').show();
246
+			fn_show_btn_auth_array(['#ITP_BTN_ORDMNG02010_SRH', '#ITP_BTN_ORDMNG02010_NEWREG']);
247
+			$('#ITP_FORM_ORDMNG02010_SEARCH #ITP_FORM_ORDMNG02010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
248
+            $('#ITP_FORM_ORDMNG02010_SEARCH #ITP_FORM_ORDMNG02010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
249
+            $('#ITP_BTN_ORDMNG02010_SEARCH_WHS_ID').show();
250
+            $('#ITP_BTN_ORDMNG02010_DELETE_WHS_ID').show();
251
+		}/* else if(mode == 'ADD') { // 등록
252
+			$('#ITP_AJAX_ORDMNG02010_DETAIL_CONTAINER').show();
253
+			fn_show_btn_auth_array(['#ITP_BTN_ORDMNG02010_CANCELLIST', '#ITP_BTN_ORDMNG02010_SAVE']);
254
+
255
+			$('#ITP_FORM_ORDMNG02010_DETAIL').find('input, textarea, select, checkbox').each(function(i, elem) {
256
+				$(this).attr('id') === 'ITP_FORM_ORDMNG02010_DETAIL_VIEW_CD' ? $(this).val('C') : $(this).val('');
257
+				if(elem.type === 'select') {
258
+					$(this).val('').prop('selected', true);
259
+				}
260
+			});
261
+
262
+			$('#ITP_FORM_ORDMNG02010_DETAIL_USER_ID').removeAttr('readonly');
263
+			$('#ITP_FORM_ORDMNG02010_DETAIL_DUP').removeAttr('disabled');
264
+			$('#ITP_FORM_ORDMNG02010_DETAIL_SEARCH_BRAND_ID option').remove();
265
+			$('#ITP_FORM_ORDMNG02010_DETAIL_SEARCH_AFFL_SHOP').show();
266
+			$('#ITP_FORM_ORDMNG02010_DETAIL_DELETE_AFFL_SHOP').show();
267
+		}*/ else if(mode === 'MODIFY') { // 수정
268
+			$('#ITP_AJAX_ORDMNG02010_DETAIL_CONTAINER').show();
269
+			fn_show_btn_auth_array(['#ITP_BTN_ORDMNG02010_CANCELLIST', '#ITP_BTN_ORDMNG02010_SAVE', '#ITP_BTN_ORDMNG02010_RESET_PW']);
270
+
271
+			$('#ITP_FORM_ORDMNG02010_DETAIL_USER_ID').attr('readonly', true);
272
+			$('#ITP_FORM_ORDMNG02010_DETAIL_DUP').attr('disabled', true);
273
+			$('#ITP_FORM_ORDMNG02010_DETAIL_SEARCH_AFFL_SHOP_NM').attr('readonly', true);
274
+			$('#ITP_FORM_ORDMNG02010_DETAIL_USER_NM').attr('readonly', true);
275
+			$('#ITP_FORM_ORDMNG02010_DETAIL_SEARCH_AFFL_SHOP').hide();
276
+			$('#ITP_FORM_ORDMNG02010_DETAIL_DELETE_AFFL_SHOP').hide();
277
+			$('#ITP_BTN_ORDMNG02010_CANCELLIST').show();
278
+            $('#ITP_BTN_ORDMNG02010_SAVE').show();
279
+		} /*else if(mode === 'VIEW') { // 보기
280
+			$('#ITP_AJAX_ORDMNG02010_VIEW_CONTAINER').show();
281
+			fn_show_btn_auth_array(['#ITP_BTN_ORDMNG02010_MODIFY', '#ITP_BTN_ORDMNG02010_CANCELLIST']);
282
+		}*/
283
+	}
284
+};
285
+
286
+
287
+/*목록화면 Object*/
288
+let listObj = {
289
+	init: function() {
290
+		this.grid.init();
291
+		this.action();
292
+	},
293
+	itp_ORDMNG02010_param: {},
294
+	itp_ORDMNG02010_search: false,
295
+	button: {
296
+		search: function() {
297
+			listObj.itp_ORDMNG02010_search = true;
298
+			let param = $('#ITP_FORM_ORDMNG02010_SEARCH').serializeObject();
299
+			param.gridSize = $.jgrid.defaults.rowNum;
300
+            param.gridPage = $.jgrid.defaults.page;
301
+            console.log(1234);
302
+            console.log(JSON.stringify(param));
303
+            $(ORDMNG02010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
304
+        },
305
+        create: function() {
306
+        	var selectedIds = $(ORDMNG02010_GRID_ID).getGridParam('selarrrow');
307
+    		if(selectedIds.length > 1) { // 1이상 선택시
308
+    			alert("납품서 하나만 선택해주세요 (대표 납품서번호)") ;//출력
309
+    			return; //리턴
310
+    		}
311
+    		var selRowData ; //변수선언		
312
+    		for (var i=selectedIds.length-1; i>=0; i--) {		//1개만 선택시
313
+    			selRowData = $(ORDMNG02010_GRID_ID).jqGrid('getRowData', selectedIds[i]);		//cell 선택
314
+    		}
315
+    		let param = {brandId: selRowData.brandId, pchPodrUnqNo: selRowData.pchPodrUnqNo};
316
+    		param.spplyId = fn_make_user_info.get('spplyId');
317
+    		pageObj.switchScreen('MODIFY');
318
+			itp_fn_form_clear_validate(null, '#ITP_FORM_POMNG03010_DETAIL');
319
+			modifyObj.init(param);
320
+		}
321
+	},
322
+	empty: {
323
+		init: function() {
324
+			var _this = this;
325
+            this.push();
326
+            $(ORDMNG02010_GRID_EMPTY).on('click', function() {
327
+                _this.back();
328
+                listObj.itp_ORDMNG02010_param.gridSize = $.jgrid.defaults.rowNum;
329
+                $(ORDMNG02010_GRID_ID).setGridParam({'postData': JSON.stringify(listObj.itp_ORDMNG02010_param)}).trigger('reloadGrid');
330
+            });
331
+		},
332
+		push: function() {
333
+            let param = $('#ITP_FORM_ORDMNG02010_SEARCH').serializeObject();
334
+            listObj.itp_ORDMNG02010_param = param;
335
+        },
336
+        back: function() {
337
+            $('#ITP_FORM_ORDMNG02010_SERVICE_BRAND_TYPE').val(listObj.itp_ORDMNG02010_param.brandType);
338
+            $('#ITP_FORM_ORDMNG02010_SERVICE_ST_CD').val(listObj.itp_ORDMNG02010_param.stCd);
339
+            $('#ITP_FORM_ORDMNG02010_SEARCH_BRAND_NM').val(listObj.itp_ORDMNG02010_param.brandNm);
340
+        }
341
+	},
342
+	grid: {
343
+		init: function() {
344
+			// 데이터 없을때
345
+            listObj.empty.push();
346
+            this.search();
347
+		},
348
+		colModel: gridColModel.list,
349
+		search: function() {
350
+			pageObj.switchScreen('LIST');
351
+			this.unload();
352
+			this.load();
353
+		},
354
+		load: function() {
355
+            let param = $('#ITP_FORM_ORDMNG02010_SEARCH').serializeObject();
356
+            param.gridSize = $.jgrid.defaults.rowNum;
357
+            console.log(JSON.stringify(param));
358
+            var option = {
359
+            	gridId: ORDMNG02010_GRID_ID,
360
+            	colModel: gridColModel.list,
361
+            	param: param,
362
+            	url: DOMAIN + API_POMNG_INOUTMNG_SPPLY_TARGET_GRID_LIST,
363
+            	pager: ORDMNG02010_GRID_PAGER,
364
+            	multiselect: true,
365
+				multiboxonly : false,
366
+				rownumbers: false,/*
367
+            	onCellSelect: function(rowId, cellIdx, cellValue) {
368
+                    var cm = $(this).jqGrid('getGridParam', 'colModel');
369
+                    var colNm = cm[cellIdx].name;
370
+                    if (colNm === 'pchPodrUnqNo') {
371
+                        const pchPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'pchPodrUnqNo');
372
+                        const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
373
+                        const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal};
374
+                        var param = $.param(key);
375
+                        modifyObj.init(param);
376
+                    }
377
+				},*/
378
+				loadComplete: function(data) {
379
+					console.log(data);
380
+                    itp_fn_grid_load_complete(data, ORDMNG02010_GRID_ID, true, 'number', 'ORDMNG02010', listObj.itp_ORDMNG02010_search, listObj.empty, true, data.gridRecords, true);
381
+				},
382
+				onPaging: function(action) {
383
+                    itp_fn_grid_paging(ORDMNG02010_GRID_ID, action, param);
384
+                }
385
+            };
386
+            itp_fn_grid_make_remote(option);
387
+		},
388
+		clearData: function() {
389
+			$(ORDMNG02010_GRID_ID).jqGrid('clearGridData', true);
390
+            $(ORDMNG02010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
391
+            $(ORDMNG02010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
392
+            $(ORDMNG02010_GRID_EMPTY).show();
393
+		},
394
+		unload: function() {
395
+			$.jgrid.gridUnload(ORDMNG02010_GRID_ID);
396
+		}
397
+	},
398
+	action: function() {
399
+		var _this = this;
400
+		// 출하창고 조회 버튼 클릭
401
+		$('#ITP_BTN_ORDMNG02010_SEARCH_WHS_ID').on('click', function() {
402
+			_this.popup();
403
+		});
404
+		// 출하창고 텍스트 삭제 버튼 클릭
405
+		$('#ITP_BTN_ORDMNG02010_DELETE_WHS_ID').on('click', function() {
406
+			$('#ITP_FORM_ORDMNG02010_SEARCH_WHS_NM').val('');
407
+			$('#ITP_FORM_ORDMNG02010_SEARCH_WHS_ID').val('');
408
+		});
409
+	},
410
+	popup: function() {
411
+		var popFn = this.callback.create;
412
+		
413
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'),whsDvsn: ''};
414
+		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
415
+	},
416
+	callback: {
417
+		create: function(rowDataPop) {
418
+			console.log(rowDataPop);
419
+			$('#ITP_FORM_ORDMNG02010_SEARCH_WHS_ID').val(rowDataPop.whsId);
420
+			$('#ITP_FORM_ORDMNG02010_SEARCH_WHS_NM').val(rowDataPop.whsNm);
421
+		}
422
+	}
423
+};
424
+
425
+
426
+/*수정화면 Object*/
427
+let modifyObj = {
428
+	init: function(param) {
429
+		console.log(param);
430
+		this.load(param);
431
+	},
432
+	itp_ORDMNG02010_param: {},
433
+	itp_ORDMNG02010_search: false,
434
+	button: {
435
+		cancel: function() {
436
+			listObj.grid.search();
437
+		}
438
+	},
439
+	empty: {
440
+		init: function() {
441
+            var _this = this;
442
+            this.push();
443
+            $(ORDMNG02010_VIEW_GRID_EMPTY).on('click', function() {
444
+                _this.back();
445
+                modifyObj.itp_ORDMNG02010_param.gridSize = $.jgrid.defaults.rowNum;
446
+                $(ORDMNG02010_DETAIL_GRID_ID).setGridParam({'postData': JSON.stringify(modifyObj.itp_ORDMNG02010_param)}).trigger('reloadGrid');
447
+            });
448
+        },
449
+        push: function() {
450
+            let param = $('#ITP_FORM_ORDMNG02010_DETAIL').serializeObject();
451
+            modifyObj.itp_ORDMNG02010_param = param;
452
+        },
453
+        back: function() {
454
+            $('#ITP_FORM_ORDMNG02010_SERVICE_BRAND_TYPE').val(modifyObj.itp_ORDMNG02010_param.brandType);
455
+            $('#ITP_FORM_ORDMNG02010_SERVICE_ST_CD').val(modifyObj.itp_ORDMNG02010_param.stCd);
456
+            $('#ITP_FORM_ORDMNG02010_SEARCH_BRAND_NM').val(modifyObj.itp_ORDMNG02010_param.brandNm);
457
+        }
458
+	},
459
+	load: function(param) {
460
+		fn_ajax_call(API_POMNG_INOUTMNG_INIT_SPPLY_INV, param, this.callback, 'GET');
461
+	},
462
+	callback: function(result) {
463
+		console.log(result);
464
+		pageObj.switchScreen('MODIFY');
465
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnBrandNm').text(result.brandNm);										// 브랜드
466
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnPchPodrUnqNo').text(result.invPoInfoList[0].pchPodrUnqNo);			// 발주번호
467
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvRegDt);									// 납품서생성일자
468
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnPodrTotalAmt').text(result.podrTotalAmt);							// 발주총금액
469
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnWhsNm').text(result.whsNm);											// 발주총금액
470
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDeliTelNo').text(result.deliTelNo);									// 납품장소연락처
471
+		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT').val(result.dlvSchDt);			// 납품예정일
472
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvRegDt);									// 납품요청일
473
+		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_NM').val(result.dlvMgrNm);			// 납품담당자
474
+		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_TEL_NO').val(result.dlvMgrTelNo);	// 납품담당자연락처
475
+
476
+		/*shmtQtyValue = function(value, colname) {
477
+			for(let i = 0; i < result.invPoInfoList.length; i++){
478
+				let podrQty = result.invPoInfoList[i].podrQty;
479
+				if(value > podrDty) {
480
+					return [false, '발주수량 이하 값 입력'];
481
+				} else {
482
+					return [true, ''];
483
+				}
484
+			}
485
+		};*/
486
+		
487
+		modifyObj.grid.init('MODIFY', result.invPoInfoList);
488
+		
489
+	},
490
+	grid: {
491
+		init: function(mode, gridData) {
492
+			this.mode = mode;
493
+			this.gridId = ORDMNG02010_DETAIL_GRID_ID;
494
+			this.gridList = ORDMNG02010_DETAIL_GRID_LIST;
495
+			this.gridEmpty = ORDMNG02010_DETAIL_GRID_EMPTY;
496
+			this.unload();
497
+			this.load(gridData);
498
+		},
499
+		mode: '',
500
+		colModel: gridColModel.detail,
501
+		load: function(gridData) {
502
+			var _this = this;
503
+			var option = {
504
+				gridId: _this.gridId,
505
+				colModel: gridColModel.detail,
506
+				data: gridData,
507
+				multiselect: true,
508
+				loadComplete: function(data) {
509
+					console.log(data);
510
+					itp_fn_grid_load_complete(data, ORDMNG02010_DETAIL_GRID_ID, true, 'number', 'ORDMNG02010', modifyObj.itp_ORDMNG02010_search, modifyObj.empty, true, data.gridRecords, true);
511
+				},
512
+				onCellSelect: function(rowId, cellIdx, cellValue) {
513
+					ORDMNG02010_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowId, cellIdx, ORDMNG02010_GRID_LAST_ROW_ID, ORDMNG02010_DETAIL_GRID_ID, ['actionId']);
514
+					itp_fn_form_event.onKeyup(ORDMNG02010_DETAIL_GRID_ID);
515
+				}
516
+			};
517
+			itp_fn_grid_make_local(option);
518
+		},
519
+		unload: function() {
520
+			$.jgrid.gridUnload(this.gridId);
521
+		}
522
+	}/*,
523
+	changeRows: function(gridRows) {
524
+		var modifyRows = [];
525
+		var chkColums = ['podrQty', 'expryDate', 'remark'];
526
+		$.each(this.rows, function(index, item) {
527
+			var row = gridRows[index];
528
+		});
529
+	}*/
530
+};

+ 78 - 104
src/main/webapp/js/app/rtnmng/ITP_RTNMNG06010.js

@@ -24,109 +24,87 @@ const gridColModel = {
24 24
 			sortable: false, hidden: true
25 25
 		},
26 26
 		{
27
-			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
28
-			label: ITP_MSG_LOCALE.label.pchPodrUnqNo, 		// 발주번호
27
+			index: 'BRAND_NM', name: 'brandNm',
28
+			label: '브랜드', 
29 29
 			width: '10', fixed: false, align: 'center',
30 30
 			sortable: false, hidden: false
31 31
 		},
32 32
 		{
33
-			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
34
-			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, 		// 발주항번
35
-			width: '5', fixed: false, align: 'center',
36
-			sortable: false, hidden: false
37
-		},
38
-		{
39
-			index: 'DLV_STTMT_UNQ_NO', name: 'dlvSttmtUnqNo',
40
-			label: ITP_MSG_LOCALE.label.dlvSttmtUnqNo, 		// 납품번호
33
+			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
34
+			label: '반품발주번호', 
41 35
 			width: '10', fixed: false, align: 'center',
42 36
 			sortable: false, hidden: false
43 37
 		},
44 38
 		{
45
-			index: 'DLV_STTMT_DTL_NO', name: 'dlvSttmtDtlNo',
46
-			label: ITP_MSG_LOCALE.label.dlvSttmtDtlNo, 		// 납품항번
47
-			width: '5', fixed: false, align: 'center',
48
-			sortable: false, hidden: false
49
-		},
50
-		{
51
-			index: 'PODR_QTY', name: 'podrQty',
52
-			label: ITP_MSG_LOCALE.label.podrQty, 			// 발주수량
39
+			index: 'RTN_PODR_DTL_NO', name: 'rtnPodrDtlNo',
40
+			label: '항번', 
53 41
 			width: '5', fixed: false, align: 'center',
54 42
 			sortable: false, hidden: false
55 43
 		},
56 44
 		{
57
-			index: 'DLV_QTY', name: 'dlvQty',
58
-			label: ITP_MSG_LOCALE.label.dlvQty, 			// 납품수량
59
-			width: '5', fixed: false, align: 'center',
60
-			sortable: false, hidden: false
61
-		},
62
-		{
63
-			index: 'WHS_QTY', name: 'whsQty',
64
-			label: ITP_MSG_LOCALE.label.whsQty, 			// 입고수량
65
-			width: '5', fixed: false, align: 'center',
66
-			sortable: false, hidden: false
67
-		},
68
-		{
69
-			index: 'DIV_REQ_DT', name: 'dlvReqDt',
70
-			label: ITP_MSG_LOCALE.label.dlvReqDt, 			// 납품요청일
45
+			index: 'ITEM_ID', name: 'itemId',
46
+			label: ITP_MSG_LOCALE.label.itemId, 			// 품목번호
71 47
 			width: '8', fixed: false, align: 'center',
72 48
 			sortable: false, hidden: false
73 49
 		},
74
-		
75 50
 		{
76
-			index: 'DLV_SCH_DT', name: 'dlvSchDt',
77
-			label: ITP_MSG_LOCALE.label.dlvSchDt, 			// 납품예정일
51
+			index: 'ITEM_NM', name: 'itemNm',
52
+			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
78 53
 			width: '8', fixed: false, align: 'center',
79 54
 			sortable: false, hidden: false
80 55
 		},
81 56
 		{
82
-			index: 'DLV_CMPLT_DT', name: 'dlvCmpltDt',
83
-			label: ITP_MSG_LOCALE.label.dlvCmpltDt, 		// 납품일자
84
-			width: '8', fixed: false, align: 'center',
85
-			sortable: false, hidden: false
57
+			index: 'RODR_QTY', name: 'rodrQty',
58
+			label: '반품발주수량', 
59
+			width: '5', fixed: false, align: 'center',
60
+			sortable: false, hidden: false, 
61
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
86 62
 		},
87 63
 		{
88
-			index: 'WHS_CNFM_NM', name: 'whsCnfmNm',
89
-			label: ITP_MSG_LOCALE.label.whsCnfmNm, 			// 입고확인자
90
-			width: '8', fixed: false, align: 'center',
91
-			sortable: false, hidden: false
64
+			index: 'COL_REQ_QTY', name: 'colReqQty',
65
+			label: '수거요청수량', 
66
+			width: '5', fixed: false, align: 'center',
67
+			sortable: false, hidden: false, 
68
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
92 69
 		},
93 70
 		{
94
-			index: 'DLV_MGR_NM', name: 'dlvMgrNm',
95
-			label: ITP_MSG_LOCALE.label.dlvMgrNm, 			// 납품자명
96
-			width: '8', fixed: false, align: 'center',
97
-			sortable: false, hidden: false
71
+			index: 'COL_QTY', name: 'colQty',
72
+			label: '수거수량', 
73
+			width: '5', fixed: false, align: 'center',
74
+			sortable: false, hidden: false, 
75
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
98 76
 		},
99 77
 		{
100
-			index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',
101
-			label: ITP_MSG_LOCALE.label.dlvMgrTelNo, 		// 납품자전화번호
78
+			index: 'COL_AMT', name: 'colAmt',
79
+			label: '수거금액', 
102 80
 			width: '8', fixed: false, align: 'center',
81
+			sortable: false, hidden: false,
82
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
83
+		}, 
84
+		{
85
+			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
86
+			label: '수거창고', 
87
+			width: '10', fixed: false, align: 'center',
103 88
 			sortable: false, hidden: false
104 89
 		},
105 90
 		{
106
-			index: 'ITEM_ID', name: 'itemId',
107
-			label: ITP_MSG_LOCALE.label.itemId, 			// 품목번호
91
+			index: 'COL_SCH_DT', name: 'colSchDt',
92
+			label: '수거예정일', 
108 93
 			width: '8', fixed: false, align: 'center',
109 94
 			sortable: false, hidden: false
110 95
 		},
111 96
 		{
112
-			index: 'ITEM_NM', name: 'itemNm',
113
-			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
97
+			index: 'PICK_MGR_NM', name: 'pickMgrNm',
98
+			label: '수거담당자명', 
114 99
 			width: '8', fixed: false, align: 'center',
115 100
 			sortable: false, hidden: false
116 101
 		},
117 102
 		{
118
-			index: 'UNIT', name: 'unit',
119
-			label: ITP_MSG_LOCALE.label.unit, 				// 기본단위
120
-			width: '5', fixed: false, align: 'center',
103
+			index: 'PICK_MGR_TEL_NO', name: 'pickMgrTelNo',
104
+			label: '수거담당자전화번호', 
105
+			width: '10', fixed: false, align: 'center',
121 106
 			sortable: false, hidden: false
122
-		},
123
-		{
124
-			index: 'WHS_AMT', name: 'whsAmt',
125
-			label: ITP_MSG_LOCALE.label.whsAmt, 			// 입고금액
126
-			width: '8', fixed: false, align: 'center',
127
-			sortable: false, hidden: false,
128
-			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
129
-		}
107
+		}		
130 108
 	],
131 109
 	view: [],
132 110
 	detail: []
@@ -213,7 +191,6 @@ let pageObj = {
213 191
     }
214 192
 }
215 193
 
216
-
217 194
 /*목록화면 Object*/
218 195
 let listObj = {
219 196
 	init: function() {
@@ -275,18 +252,6 @@ let listObj = {
275 252
             	url: DOMAIN + API_POMNG_INOUTMNG_WAREHOUSE_GRID_LIST,
276 253
             	pager: RTNMNG06010_GRID_PAGER,
277 254
             	rownumbers: false,
278
-            	/*onCellSelect: function(rowId, cellIdx, cellValue) {
279
-                    var cm = $(this).jqGrid('getGridParam', 'colModel');
280
-                    var colNm = cm[cellIdx].name;
281
-                    if (colNm === 'pchPodrUnqNo') {
282
-                        const pchPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'pchPodrUnqNo');
283
-                        const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
284
-                        const spplyIdVal = LOGIN_USER_INFO.spplyId;
285
-                        const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal, spplyId: spplyIdVal};
286
-                        var param = $.param(key);
287
-                        viewObj.init(param);
288
-                    }
289
-				},*/
290 255
 				loadComplete: function(data) {
291 256
 					console.log(data);
292 257
                     itp_fn_grid_load_complete(data, RTNMNG06010_GRID_ID, true, 'number', 'RTNMNG06010', listObj.itp_RTNMNG06010_search, listObj.empty, true, data.gridRecords, true);
@@ -314,53 +279,62 @@ let listObj = {
314 279
 	action: function() {
315 280
 		var _this = this;
316 281
 		// 공급업체 조회 버튼 클릭
317
-		$('#ITP_BTN_RTNMNG06010_SEARCH_SPPLY_ID').on('click', function() {
282
+		$('#ITP_BTN_RTNMNG06010_SEARCH_POP_SSPPLY_NM').on('click', function() {
318 283
 			_this.popup('spply');
319 284
 		});
320 285
 		// 공급업체 텍스트 삭제 버튼 클릭
321
-		$('#ITP_BTN_RTNMNG06010_DELETE_SPPLY_ID').on('click', function() {
322
-			$('#ITP_FORM_RTNMNG06010_DETAIL_SPPLY_NM').val('');
323
-			$('#ITP_FORM_RTNMNG06010_DETAIL_SPPLY_ID').val('');
286
+		$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM').on('click', function() {
287
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_NM').val('');
288
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_ID').val('');
324 289
 		});
325 290
 		
326 291
 		// 매장/창고 조회 버튼 클릭
327
-		$('#ITP_BTN_RTNMNG06010_SEARCH_WHS_ID').on('click', function() {
292
+		$('#ITP_BTN_RTNMNG06010_SEARCH_POP_SWHS_NM').on('click', function() {
328 293
 			_this.popup('whs');
329 294
 		});
330 295
 		// 매장/창고 텍스트 삭제 버튼 클릭
331
-		$('#ITP_BTN_RTNMNG06010_DELETE_WHS_ID').on('click', function() {
332
-			$('#ITP_FORM_RTNMNG06010_DETAIL_WHS_NM').val('');
333
-			$('#ITP_FORM_RTNMNG06010_DETAIL_WHS_ID').val('');
296
+		$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SWHS_NM').on('click', function() {
297
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM').val('');
298
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_ID').val('');
299
+		});
300
+		
301
+		// 매장/창고 조회 버튼 클릭
302
+		$('#ITP_BTN_RTNMNG06010_SEARCH_POP_SRTN_WHS_NM').on('click', function() {
303
+			_this.popup('rwhs');
304
+		});
305
+		// 매장/창고 텍스트 삭제 버튼 클릭
306
+		$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM').on('click', function() {
307
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM').val('');
308
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_ID').val('');
334 309
 		});
335 310
 	},
336
-	popup: function(keyword) {
337
-		var popFn = this.callback.create;
338
-		 
311
+	popup: function(keyword) {		 
339 312
 		if(keyword === 'spply'){
313
+			var popFn = this.callback.supply;			
340 314
 			const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
341 315
 			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, key, 'S');
342 316
 		} else if(keyword === 'whs'){
317
+			var popFn = this.callback.whs;
318
+			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
319
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
320
+		} else if(keyword === 'rwhs'){
321
+			var popFn = this.callback.rwhs;
343 322
 			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
344 323
 			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
345 324
 		}
346 325
 	},
347 326
 	callback: {
348
-		create: function(rowDataPop) {
349
-			console.log(rowDataPop);
350
-			console.log(Array.isArray(rowDataPop));
351
-			if(rowDataPop.hasOwnProperty('whsId') == false) {
352
-				console.log(rowDataPop.spplyId);
353
-				$('#ITP_FORM_RTNMNG06010_DETAIL_SPPLY_NM').val(rowDataPop.spplyNm);
354
-				$('#ITP_FORM_RTNMNG06010_DETAIL_SPPLY_ID').val(rowDataPop.spplyId);
355
-				//console.log(rowDataPop[0].storeId);
356
-				//$('#ITP_FORM_RTNMNG06010_DETAIL_STORE_NM').val(rowDataPop[0].storeNm);
357
-				//$('#ITP_FORM_RTNMNG06010_DETAIL_STORE_ID').val(rowDataPop[0].storeId);
358
-			} else {
359
-				console.log(rowDataPop);
360
-				console.log(rowDataPop.whsId);
361
-				$('#ITP_FORM_RTNMNG06010_DETAIL_WHS_NM').val(rowDataPop.whsNm);
362
-				$('#ITP_FORM_RTNMNG06010_DETAIL_WHS_ID').val(rowDataPop.whsId);
363
-			}
327
+		supply: function(rowDataPop) {
328
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_NM').val(rowDataPop.spplyNm);
329
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_ID').val(rowDataPop.spplyId);
330
+		},
331
+		whs: function(rowDataPop) {
332
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM').val(rowDataPop.whsNm);
333
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_ID').val(rowDataPop.whsId);
334
+		}, 
335
+		rwhs: function(rowDataPop) {
336
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM').val(rowDataPop.whsNm);
337
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_ID').val(rowDataPop.whsId);
364 338
 		}
365 339
 	}
366 340
 }

+ 2 - 2
src/main/webapp/js/app/vendinfo/ITP_VENDINFO01010.js

@@ -266,8 +266,8 @@ let pageObj = {
266 266
 					});
267 267
 					modifyObj.rows = data.gridRows;
268 268
 				},
269
-				onCellSelect: function(rowid, cellIdx, cellValue) {
270
-					VENDINFO01010_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowid, cellIdx, VENDINFO01010_GRID_LAST_ROW_ID, VENDINFO01010_DETAIL_GRID_ID, ['actionId']);
269
+				onCellSelect: function(rowId, cellIdx, cellValue) {
270
+					VENDINFO01010_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowId, cellIdx, VENDINFO01010_GRID_LAST_ROW_ID, VENDINFO01010_DETAIL_GRID_ID, ['actionId']);
271 271
 					itp_fn_form_event.onKeyup(VENDINFO01010_DETAIL_GRID_ID);
272 272
 				},
273 273
 			};

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

@@ -67,7 +67,7 @@
67 67
 				</div>
68 68
 			</div>
69 69
 			<!-- 상단 탭 부분 -->
70
-			<div class="itp_tabs">
70
+			<div id="ITP_TAB_BAR" class="itp_tabs">
71 71
 				<ul class="nav nav-tabs itp_tab_list" role="tablist">
72 72
 					<li class="active"><a href="#ITP_TAB_SUMMARY" role="tab" data-toggle="tab" class="itp_tab_open">메뉴안내</a></li>
73 73
 				</ul>

+ 3 - 3
src/main/webapp/mobile/app/login.html

@@ -26,7 +26,7 @@
26 26
         </div>
27 27
         <div class="num_area">
28 28
           <div class="input_area">
29
-            <input type="text" name="bsnsRegNo" id="ITP_FORM_LOGIN_BSNS_REG_NO" required>
29
+            <input type="text" name="bsnsRegNo" id="ITP_FORM_LOGIN_BSNS_REG_NO" required value="1">
30 30
             <label for="ITP_FORM_LOGIN_BSNS_REG_NO">사업자번호</label>
31 31
             <button type="button" id="ITP_BTN_LOGIN_BSNS_REG_NO">연결</button>
32 32
           </div>
@@ -38,11 +38,11 @@
38 38
         </div>
39 39
         <div class="login_page">
40 40
           <div class="input_area">
41
-            <input type="text" id="ITP_FORM_LOGIN_USER_ID" required>
41
+            <input type="text" id="ITP_FORM_LOGIN_USER_ID" required value="BRD221100002">
42 42
             <label for="ITP_FORM_LOGIN_USER_ID">아이디</label>
43 43
           </div>
44 44
           <div class="input_area">
45
-            <input type="password" id="ITP_FORM_LOGIN_USER_PW"  required>
45
+            <input type="password" id="ITP_FORM_LOGIN_USER_PW"  required value="1">
46 46
             <label for="ITP_FORM_LOGIN_USER_PW">비밀번호</label>
47 47
           </div>
48 48
         </div>

+ 2 - 2
src/main/webapp/mobile/app/popup/biz/BIZPOP_PO_PAYMENT.html

@@ -103,7 +103,7 @@
103 103
 							<!--------------------------->
104 104
 							<!-- ::: 공통 인증 요청 값 -->
105 105
 							<!--------------------------->
106
-							
106
+
107 107
 							<input type="hidden" id="EP_mall_nm"        name="EP_mall_nm"           value="">         <!-- 가맹점명-->
108 108
 							<input type="hidden" id="EP_currency"       name="EP_currency"          value="00">       <!-- 통화코드 // 00 : 원화-->
109 109
 							<input type="hidden" id="EP_return_url"     name="EP_return_url"        value="">         <!-- 가맹점 CALLBACK URL // -->
@@ -187,7 +187,7 @@
187 187
 							<!--------------------------------->
188 188
 							
189 189
 							<input type="hidden" id="EP_pay_type"           name="EP_pay_type"           value="">      	<!--  결제수단 // -->
190
-							<input type="hidden" id="EP_window_type"        name="EP_window_type"        value="iframe">    <!--  윈도우타입 (iframe[default], popup) // -->
190
+							<input type="hidden" id="EP_window_type"        name="EP_window_type"        value="popup">    <!--  윈도우타입 (iframe[default], popup) // -->
191 191
 							<input type="hidden" id="EP_cert_type"          name="EP_cert_type"          value="">      	<!--  인증타입 (일반-"", 인증-"21", 비인증-"22") // -->
192 192
 							
193 193
 							<!--------------------------------->

+ 8 - 2
src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js

@@ -193,12 +193,14 @@ let mobContentObj = {
193 193
 	},
194 194
 	barcode: {
195 195
 		callApp: function() {
196
+			location.replace('app:scan');
197
+			return;
196 198
 			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
197 199
 			itp_fn_form_clear_validate(null, formId);
198 200
 			if (itp_fn_form_event.isValid(formId)) {
199 201
 				// this.callbackApp('BRD2211000022211100000003005');
200
-				location.replace('app:barcode');
201
-				// location.href = 'app:barcode';
202
+				location.replace('app:scan');
203
+				// location.href = 'app:scan';
202 204
 			}
203 205
 		},
204 206
 		callbackApp: function(barcode) {
@@ -384,3 +386,7 @@ let mobPopObj = {
384 386
 		$('#' + popId).closest('.mobile-pop-close').hide();
385 387
 	}
386 388
 };
389
+
390
+function jsBarcodeFn(barcode) {
391
+	mobContentObj.barcode.callbackApp(barcode);
392
+}

+ 37 - 37
src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

@@ -114,13 +114,13 @@ var popPageObj = {
114 114
 			
115 115
 			var frm_pay = document.frm_pay;
116 116
 
117
-			/*-- 결제--*/
117
+			/*--모바일 결제--*/
118 118
 		    /*--공통--*/        
119 119
 		    frm_pay.kiccActionWebUrl.value  	= KICC_ACTION_WEB_URL;       						  
120 120
 		    frm_pay.kiccActionMobileUrl.value  	= KICC_ACTION_MOBILE_URL;       						  
121 121
 		    frm_pay.EP_mall_id.value        = MALL_ID;       						   //가맹점 ID
122 122
 		    frm_pay.EP_mall_nm.value        = fn_make_user_info.get('brandNm');		   //가맹점명
123
-		    frm_pay.EP_order_no.value       = result.poOrdNo;   					   //가맹점 주문번호    
123
+		    frm_pay.EP_order_no.value       = result.poOrdNo;   					   //가맹점 주문번호
124 124
 		                                                                               //결제수단(select)
125 125
 		    frm_pay.EP_currency.value       = "00";                                    //통화코드 : 00-원
126 126
 		    frm_pay.EP_product_nm.value     = result.goodsNm;				   		   //상품명
@@ -138,28 +138,28 @@ var popPageObj = {
138 138
 		    frm_pay.EP_product_type.value   = "0";                                     //상품정보구분 : 0-실물, 1-서비스
139 139
 		    frm_pay.EP_product_expr.value   = "";             				           //서비스기간 : YYYYMMDD
140 140
 		    frm_pay.EP_return_url.value     = WEB_RETURN_URL;  							   // Return 받을 URL (HTTP부터 입력)
141
-		                                    
142
-		    /*--신용카드--*/                    
141
+
142
+		    /*--신용카드--*/
143 143
 		    frm_pay.EP_usedcard_code.value  = "";                                      //사용가능한 카드 LIST
144 144
 		    frm_pay.EP_quota.value          = "";                                      //할부개월
145
-		
146
-		                                                                               //무이자 여부(Y/N) (select)   
145
+
146
+		                                                                               //무이자 여부(Y/N) (select)
147 147
 		    frm_pay.EP_noinst_term.value    = "";		                               //무이자기간
148
-		                                                                               //카드사포인트 사용여부(select) 
148
+		                                                                               //카드사포인트 사용여부(select)
149 149
 		    frm_pay.EP_point_card.value     = "";	                                   //포인트카드 LIST
150 150
 		                                                                               //조인코드(select)
151
-		                                                                               //국민 앱카드 사용(select)                                                                                  
152
-		                                                                                                               
151
+		                                                                               //국민 앱카드 사용(select)
152
+
153 153
 		    /*--가상계좌--*/
154
-		    frm_pay.EP_vacct_bank.value     = "";                                      //가상계좌 사용가능한 은행 LIST 
154
+		    frm_pay.EP_vacct_bank.value     = "";                                      //가상계좌 사용가능한 은행 LIST
155 155
 		    frm_pay.EP_vacct_end_date.value = "";		                               //입금 만료 날짜
156 156
 		    frm_pay.EP_vacct_end_time.value = "";        	                           //입금 만료 시간
157
-		    
157
+
158 158
 			/*--모바일 결제--*/
159
-		    /*--공통--*/        
159
+		    /*--공통--*/
160 160
 		    frm_pay.sp_mall_id.value        = MALL_ID;    							   //가맹점 ID
161 161
 		    frm_pay.sp_mall_nm.value        = fn_make_user_info.get('brandNm');		   //가맹점명
162
-		    frm_pay.sp_order_no.value       = result.poOrdNo;  						   //가맹점 주문번호    
162
+		    frm_pay.sp_order_no.value       = result.poOrdNo;  						   //가맹점 주문번호
163 163
 		                                                                               //결제수단(select)
164 164
 		    frm_pay.sp_currency.value       = "00";                                    //통화코드 : 00-원
165 165
 		    frm_pay.sp_product_nm.value     = result.goodsNm;               	   	   //상품명
@@ -177,50 +177,50 @@ var popPageObj = {
177 177
 		    frm_pay.sp_product_type.value   = "0";                                     //상품정보구분 : 0-실물, 1-서비스
178 178
 		    frm_pay.sp_product_expr.value   = "";									   //서비스기간 : YYYYMMDD
179 179
 		    frm_pay.sp_app_scheme.value     = "";                                      //가맹점 app scheme : 모바일app으로 서비스시 필수
180
-		                                    
181
-		    /*--신용카드--*/                    
180
+
181
+		    /*--신용카드--*/
182 182
 		    frm_pay.sp_usedcard_code.value  = "";                                      //사용가능한 카드 LIST
183 183
 		    frm_pay.sp_quota.value          = "";                                      //할부개월
184
-		                                                                               //무이자 여부(Y/N) (select)   
184
+		                                                                               //무이자 여부(Y/N) (select)
185 185
 		    frm_pay.sp_noinst_term.value    = "";		                               //무이자기간
186
-		                                                                               //카드사포인트 사용여부(select) 
186
+		                                                                               //카드사포인트 사용여부(select)
187 187
 		    frm_pay.sp_point_card.value     = "";         		                       //포인트카드 LIST
188 188
 		                                                                               //조인코드(select)
189
-		    /*--가상계좌--*/                        
190
-		    frm_pay.sp_vacct_bank.value     = "";                                      //가상계좌 사용가능한 은행 LIST 
189
+		    /*--가상계좌--*/
190
+		    frm_pay.sp_vacct_bank.value     = "";                                      //가상계좌 사용가능한 은행 LIST
191 191
 		    frm_pay.sp_vacct_end_date.value = "";               		               //입금 만료 날짜
192 192
 		    frm_pay.sp_vacct_end_time.value = "";                       	           //입금 만료 시간
193
-			
193
+
194 194
 		}, 'POST');
195
-	}, 
195
+	},
196 196
 	fnPaymentReq: function() {
197 197
 		const formId = '#ITP_FORM_PO_PAYMENT_POPUP';
198 198
 		itp_fn_form_clear_validate(null, formId);
199
-		
199
+
200 200
 		var vali_goodsAmt = itp_fn_form_validate(formId, formId + '_GOODS_AMT', ['empty'], undefined);
201 201
 		var vali_ordTel = itp_fn_form_validate(formId, formId + '_ORD_TEL', ['empty'], undefined);
202 202
 		var vali_ordEmail = itp_fn_form_validate(formId, formId + '_ORD_EMAIL', ['email'], undefined);
203
-		
204
-		if (vali_goodsAmt && vali_ordTel && vali_ordEmail) {		
205
-			// var sttlRjctRsn = $('#ITP_FORM_PO_PAYMENT_POPUP_STTL_RJCT_RSN').val();	
206
-			
203
+
204
+		if (vali_goodsAmt && vali_ordTel && vali_ordEmail) {
205
+			// var sttlRjctRsn = $('#ITP_FORM_PO_PAYMENT_POPUP_STTL_RJCT_RSN').val();
206
+
207 207
 			// popPageObj.parentPopFn(sttlRjctRsn);
208 208
 			// $('#ITP_BIZPOP_PO_PAYMENT').modal('hide'); // 팝업닫기
209
-			
209
+
210 210
 			// $(formId).attr('action', '/oqpo-view/easypay/oqpo/oqpo_order.jsp');
211 211
 			// $(formId).submit();
212
-			
212
+
213 213
 			var frm_pay = document.frm_pay;
214 214
 			frm_pay.EP_pay_type.value       = $('#ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD').val();  	// 결제방법
215
-			frm_pay.EP_product_amt.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val();  	// 결제금액			
215
+			frm_pay.EP_product_amt.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val();  	// 결제금액
216 216
 			frm_pay.EP_user_phone1.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val();  		// 휴대폰
217 217
 			frm_pay.EP_user_mail.value      = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL').val();  	// 이메일
218
-			
218
+
219 219
 			frm_pay.sp_pay_type.value       = $('#ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD').val();  	// 결제방법
220
-			frm_pay.sp_product_amt.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val();  	// 결제금액			
220
+			frm_pay.sp_product_amt.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val();  	// 결제금액
221 221
 			frm_pay.sp_user_phone1.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val();  		// 휴대폰
222 222
 			frm_pay.sp_user_mail.value      = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL').val();  	// 이메일
223
-			
223
+
224 224
 			if (isMobile() || window.innerWidth < 1201 ) {
225 225
 				f_mobile_cert();
226 226
 			} else {
@@ -228,13 +228,13 @@ var popPageObj = {
228 228
 				// f_mobile_cert();
229 229
 			}
230 230
 		}
231
-	} 
231
+	}
232 232
 };
233 233
 
234 234
 /* 인증창 호출, 인증 요청 */
235 235
 function f_cert() {
236 236
     var frm_pay = document.frm_pay;
237
-    
237
+
238 238
     /*  주문정보 확인 */
239 239
     if( !frm_pay.EP_order_no.value ) {
240 240
         alert("가맹점주문번호가 존재하지않습니다.");
@@ -246,7 +246,7 @@ function f_cert() {
246 246
         alert("상품금액이 존재하지않습니다.");
247 247
         frm_pay.EP_product_amt.focus();
248 248
         return;
249
-    } 
249
+    }
250 250
 
251 251
     /* UTF-8 사용가맹점의 경우 EP_charset 값 셋팅 필수 */
252 252
     if( frm_pay.EP_charset.value == "UTF-8" ) {
@@ -259,7 +259,7 @@ function f_cert() {
259 259
 
260 260
     /* 가맹점에서 원하는 인증창 호출 방법을 선택 */
261 261
     if( frm_pay.EP_window_type.value == "iframe" ) {
262
-	
262
+
263 263
     	easypay_webpay(frm_pay,"/oqpo-view/easypay/oqpo/oqpo_iframe_req.jsp","hiddenifr","0","0","iframe",30);
264 264
 
265 265
         if( frm_pay.EP_charset.value == "UTF-8" ) {
@@ -270,7 +270,7 @@ function f_cert() {
270 270
             frm_pay.EP_user_addr.value      = decodeURIComponent( frm_pay.EP_user_addr.value );
271 271
         }
272 272
     } else if( frm_pay.EP_window_type.value == "popup" ) {
273
-    	
273
+
274 274
         easypay_webpay(frm_pay,"/oqpo-view/easypay/oqpo/oqpo_popup_req.jsp","hiddenifr","","","popup",30);
275 275
 
276 276
         if( frm_pay.EP_charset.value == "UTF-8" ) {