瀏覽代碼

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

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

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

@@ -186,7 +186,7 @@ div.tablediv > .table-bordered {
186 186
 }
187 187
 .ui-jqgrid .ui-jqgrid-lmt-20 {
188 188
 	position: relative;
189
-	height:510px !important;
189
+	height:525px !important;
190 190
 	margin:0;
191 191
 	padding:0;
192 192
 	text-align:left;

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

@@ -1706,7 +1706,6 @@ function itp_fn_grid_make_not_paging(option) {
1706 1706
 			itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
1707 1707
 		}
1708 1708
 	}, option);
1709
-
1710 1709
 	$(options.gridId).jqGrid({
1711 1710
 		colModel: options.colModel,
1712 1711
 		postData: JSON.stringify(options.param),
@@ -1717,7 +1716,8 @@ function itp_fn_grid_make_not_paging(option) {
1717 1716
 		loadBeforeSend: options.loadBeforeSend,
1718 1717
 		onCellSelect: options.onCellSelect,
1719 1718
 		loadComplete: options.loadComplete,
1720
-		loadError: options.loadError
1719
+		loadError: options.loadError,
1720
+		rowNum: options.rowNum
1721 1721
 	});
1722 1722
 }
1723 1723
 

+ 7 - 4
src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -92,7 +92,7 @@ const gridColModel = {
92 92
 			index: 'VIEW_CD', name: 'viewCd',
93 93
 			label: ITP_MSG_LOCALE.label.viewCd, //공급단가
94 94
 			width: '6', fixed: false, align: 'center',
95
-			sortable: false, hidden: false
95
+			sortable: false, hidden: true
96 96
 		},
97 97
 		{
98 98
 			index: 'VIEW_NM', name: 'viewNm',
@@ -632,7 +632,7 @@ let modifyObj = {
632 632
 	search: function() {
633 633
 		listObj.itp_STINFO06010_search = true;
634 634
 		let param = $('#ITP_FORM_STINFO06010_DETAIL').serializeObject();
635
-		param.gridSize = $.jgrid.defaults.rowNum;
635
+		param.gridSize = 100 ; //$.jgrid.defaults.rowNum;
636 636
 		param.gridPage = $.jgrid.defaults.page;
637 637
 		$(STINFO06010_DETAIL_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
638 638
 	},
@@ -644,7 +644,7 @@ let modifyObj = {
644 644
 			this.push();
645 645
 			$(STINFO06010_DETAIL_GRID_EMPTY).on('click', function() {
646 646
 				_this.back();
647
-				_this.itp_STINFO06010_param.gridSize = $.jgrid.defaults.rowNum;
647
+				_this.itp_STINFO06010_param.gridSize = 100 ; // $.jgrid.defaults.rowNum;
648 648
 				$(STINFO06010_DETAIL_GRID_ID).setGridParam($.param(_this.itp_STINFO06010_param)).trigger('reloadGrid');
649 649
 			});
650 650
 		},
@@ -673,6 +673,8 @@ let modifyObj = {
673 673
 				gridId: STINFO06010_DETAIL_GRID_ID,
674 674
 				colModel: fn_make_user_info.get('authTpCd') === '50' ?  gridColModel.sdetail : gridColModel.detail,
675 675
 				param: param,
676
+				height : 'auto',
677
+				rowNum: '',
676 678
 				url: DOMAIN + API_DETAIL_INFO,
677 679
 				loadComplete: function(data) {
678 680
 					//console.log("12121212121212");
@@ -689,7 +691,8 @@ let modifyObj = {
689 691
 					itp_fn_grid_paging(STINFO06010_GRID_ID, action, param);
690 692
 				}
691 693
 			};
692
-			itp_fn_grid_make_remote(option);
694
+			//itp_fn_grid_make_remote(option);
695
+			itp_fn_grid_make_not_paging(option);
693 696
 		},
694 697
 		clearData : function() {
695 698
 			$(STINFO06010_DETAIL_GRID_ID).jqGrid('clearGridData', true);

+ 5 - 4
src/main/webapp/mobile/app/mpomng/MPOMNG01010.html

@@ -8,6 +8,7 @@
8 8
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
9 9
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
10 10
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
11
+      <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
11 12
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_MALL_ID" name="mallId" value="">
12 13
       <div class="content">
13 14
       	<div class="line header">
@@ -200,14 +201,14 @@
200 201
             </form>
201 202
             <div id="ITP_LIST_MPOMNG01010_POP_ITEM_AREA" class="popup_scroll">
202 203
                 <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
203
-                <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display: block;">
204
+                <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
204 205
                      <li class="row_2">
205 206
                         <div class="scroll_left">
206
-                            <div class="con_2 fnItemNm">아이템명</div>
207
+                            <div class="con_2 fnItemNm"></div>
207 208
                             <div class="mg_0">
208
-	                            <div class="sub fnKg">12,000,000</div>
209
+	                            <div class="sub fnUnitAmt"></div>
209 210
 	                            <div class="type_hide">/</div>
210
-	                            <div class="amt fnUnitAmt">12,000,000</div>
211
+	                            <div class="amt fnOrdAmt"></div>
211 212
                             </div>
212 213
                         </div>
213 214
                         <div class="scroll_right">

+ 9 - 31
src/main/webapp/mobile/app/mpomng/MPOMNG02010.html

@@ -48,7 +48,7 @@
48 48
     </div>
49 49
     <div id="ITP_LIST_MPOMNG02010_ITEM_AREA" class="scroll_area row-2">
50 50
       <ul id="ITP_LIST_MPOMNG02010_ITEM_ROWS" class="mb_0 panel-group"></ul>
51
-      <div id="ITP_LIST_MPOMNG02010_ITEM_ROWCOPY" style="display: block;">
51
+      <div id="ITP_LIST_MPOMNG02010_ITEM_ROWCOPY" style="display: none;">
52 52
         <li class="history_list">
53 53
           <div class="left">
54 54
             <div class="nomal">
@@ -137,7 +137,7 @@
137 137
     </div>
138 138
     <div id="ITP_LIST_MPOMNG02010_VIEW_AREA" class="scroll_area row-3">
139 139
       <ul id="ITP_LIST_MPOMNG02010_VIEW_ROWS" class="mb_0 panel-group"></ul>
140
-      <div id="ITP_LIST_MPOMNG02010_VIEW_ROWCOPY" style="display: block;">
140
+      <div id="ITP_LIST_MPOMNG02010_VIEW_ROWCOPY" style="display: none;">
141 141
         <li class="list-row">
142 142
           <div class="left_info">
143 143
             <div class="thick">
@@ -148,7 +148,7 @@
148 148
               <div class="thick">
149 149
               	<label>구매가</label>
150 150
                 <span>:</span>
151
-                <div class="itp_amt fnUnitAmt">asdfasdf</div>
151
+                <div class="itp_amt fnUnitAmt"></div>
152 152
               </div>
153 153
            </div>   
154 154
           <div class="right">
@@ -216,7 +216,7 @@
216 216
       </div>
217 217
       <div id="ITP_LIST_MPOMNG02010_MODIFY_AREA" class="scroll_area row-1">
218 218
         <ul id="ITP_LIST_MPOMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
219
-        <div id="ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY" style="display: grid;"><!-- display:grid -->
219
+        <div id="ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY" style="display: none;"><!-- display:grid -->
220 220
           <li class="list-row">
221 221
             <div class="left_info">
222 222
               <div class="check_box">
@@ -239,28 +239,6 @@
239 239
               <button id="ITP_BTN_MPOMNG02010_MODIFY_PLUS">+</button>
240 240
             </div>
241 241
           </li>
242
-           <li class="list-row">
243
-            <div class="left_info">
244
-              <div class="check_box">
245
-                <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
246
-              </div>
247
-              <div class="thick">
248
-              	<label>품목명</label>
249
-                <span>:</span>
250
-                <div class="itp_item fnItemNm">품목명</div>
251
-              </div>
252
-              <div class="thick">
253
-              	<label>구매가</label>
254
-                <span>:</span>
255
-                <div class="itp_amt fnUnitAmt">asdfasdf</div>
256
-              </div>
257
-            </div>
258
-            <div class="right">
259
-              <button id="ITP_BTN_MPOMNG02010_MODIFY_MINUS">-</button>
260
-              <div class="num fnPchReqQty">1</div>
261
-              <button id="ITP_BTN_MPOMNG02010_MODIFY_PLUS">+</button>
262
-            </div>
263
-          </li>
264 242
         </div>
265 243
       </div>
266 244
       <div class="button_bar">
@@ -327,7 +305,7 @@
327 305
       </div>
328 306
       <div id="ITP_LIST_MPOMNG02010_POP_WHS_AREA" class="popup_scroll">
329 307
         <ul id="ITP_LIST_MPOMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
330
-        <div id="ITP_LIST_MPOMNG02010_POP_WHS_ROWCOPY" style="display: block;">
308
+        <div id="ITP_LIST_MPOMNG02010_POP_WHS_ROWCOPY" style="display: none;">
331 309
           <li class="row_2">
332 310
              <div class="scroll_left">
333 311
                  <div class="con_2 fnWhsNm"></div>
@@ -341,7 +319,7 @@
341 319
       </div>
342 320
     </div>
343 321
   </div>
344
-  <div id="ITP_POP_MPOMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: n;">
322
+  <div id="ITP_POP_MPOMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
345 323
     <div class="pop">
346 324
       <div class="header">
347 325
         <div class="header_left">
@@ -364,14 +342,14 @@
364 342
       </form>
365 343
       <div id="ITP_LIST_MPOMNG02010_POP_ITEM_AREA" class="popup_scroll">
366 344
         <ul id="ITP_LIST_MPOMNG02010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
367
-        <div id="ITP_LIST_MPOMNG02010_POP_ITEM_ROWCOPY" style="display: block;">
345
+        <div id="ITP_LIST_MPOMNG02010_POP_ITEM_ROWCOPY" style="display: none;">
368 346
            <li class="row_2">
369 347
              <div class="scroll_left">
370 348
                  <div class="con_2 fnItemNm">아이템명</div>
371 349
                  <div class="mg_0">
372
-	                 <div class="sub fnKg">12,000,000</div>
350
+	                 <div class="sub fnKg"></div>
373 351
 	                 <div class="type_hide">/</div>
374
-	                 <div class="amt fnUnitAmt">12,000,000</div>
352
+	                 <div class="amt fnUnitAmt"></div>
375 353
                  </div>
376 354
              </div>
377 355
              <div class="scroll_right">

+ 12 - 13
src/main/webapp/mobile/app/mstockmng/MSTOCKMNG01010.html

@@ -19,7 +19,7 @@
19 19
 				<button id="ITP_BTN_MSTOCKMNG01010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
20 20
 			  </div>
21 21
 			</div>
22
-			<div class="line">
22
+			<div class="line top6">
23 23
 			  <label>Location</label>
24 24
 			  <div class="float_left">
25 25
 				<select name="slocation" id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_LOCATION">
@@ -27,13 +27,13 @@
27 27
 				</select>
28 28
 			  </div>
29 29
 			</div>
30
-			<div class="line">
30
+			<div class="line top6">
31 31
 			  <label>품목명</label>
32 32
 			  <div class="float_left">
33 33
 				<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
34 34
 			  </div>
35 35
 			</div>
36
-			<div class="line" style="height:45px;">
36
+			<div class="line top3">
37 37
 			  <div class="search">
38 38
 				<button id="ITP_BTN_MSTOCKMNG01010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
39 39
 			  </div>
@@ -43,9 +43,9 @@
43 43
 			  <button type="button" id="ITP_BTN_MSTOCKMNG01010_LIST_ADD_STCK" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MSTOCKMNG01010_STCK_AREA">재고처리</button>
44 44
 			</div>
45 45
 		  </div>
46
-			<div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA" class="scroll_area row-2">
46
+			<div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA" class="scroll_area row-12">
47 47
 			  <ul id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
48
-			  <div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
48
+			  <div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWCOPY" style="display: grid;"><!-- style="display: grid;" -->
49 49
 				<li class="history_list2 list-row">
50 50
 				  <div>
51 51
 					<div class="left">
@@ -139,16 +139,15 @@
139 139
 				</form>
140 140
 			</div>
141 141
 			<div class="select_btn">
142
-				<button id="ITP_BTN_MSTOCKMNG01010_POP_WHS_NM" class="btn_blue">납품장소</button>
142
+				<button id="ITP_BTN_MSTOCKMNG01010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
143 143
 			</div>
144 144
 			<div id="ITP_LIST_MSTOCKMNG01010_POP_WHS_AREA" class="popup_scroll">
145 145
 				<ul id="ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
146
-				<div id="ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWCOPY" style="display: none;">
146
+				<div id="ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWCOPY" style="display: block;">
147 147
 					<li class="row_2">
148 148
 						<div class="scroll_left">
149
-							<div class="fnWhsNm">브랜드 창고 명A</div>
150
-							<div class="sub fnLocationNm">(상세위치내용)</div>
151
-							<div class="sub fnLocationNm">(상세위치내용)</div>
149
+							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
150
+							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
152 151
 						</div>
153 152
 						<div class="scroll_right">
154 153
 							<button id="ITP_BTN_MSTOCKMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -173,13 +172,13 @@
173 172
 				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POP_ITEM_ID" name="itemId" value="">
174 173
 				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POP_SOURCE_LOCATION" name="sourceLocation" value="">
175 174
 				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POP_SOURCE_WHS_ID" name="sourceWhsId" value="">
176
-			<div style="margin-top:10px;">
175
+			<div>
177 176
 				<div class="list_line">
178 177
 					<div class="list_label">
179 178
 						<label>창고명</label>
180 179
 					</div>
181 180
 					<div class="list_info">
182
-						<div class="pay_info fnWhsNm"></div>
181
+						<div class="pay_info fnWhsNm">fasdfsafsf</div>
183 182
 					</div>
184 183
 				</div>
185 184
 				<div class="list_line">
@@ -261,4 +260,4 @@
261 260
 			</div>
262 261
 		</div>
263 262
 	</div>
264
-  </section>
263
+  </section

+ 16 - 107
src/main/webapp/mobile/app/mstockmng/MSTOCKMNG02010.html

@@ -13,7 +13,7 @@
13 13
 				  <input type="text" id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_STCK_DT" name="cddDt" class="itp_input date full" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="재고실사일자" readonly>
14 14
 			  </div>
15 15
 			</div>
16
-			<div class="line">
16
+			<div class="line top3">
17 17
 			  <label>창고선택</label>
18 18
 			  <div class="float_left">
19 19
 				<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A창고명">
@@ -25,19 +25,19 @@
25 25
 				<button id="ITP_BTN_MSTOCKMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
26 26
 			  </div>
27 27
 			</div>
28
-			<div class="line">
28
+			<div class="line top9">
29 29
 			  <label>Location</label>
30 30
 			  <div class="float_left">
31 31
 				<select name="slocation" id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="Location"></select>
32 32
 			  </div>
33 33
 			</div>
34
-			  <div class="line">
34
+			  <div class="line top12">
35 35
 				  <label>실사구분</label>
36 36
 				  <div class="float_left">
37 37
 					  <select id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_CDD_DVSN" data-select-code="CDD_DVSN" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="실사구분" name="cddDvsn"></select>
38 38
 				  </div>
39 39
 			  </div>
40
-			<div class="line" style="height:45px;">
40
+			<div class="line top12" >
41 41
 			  <div class="search">
42 42
 				<button id="ITP_BTN_MSTOCKMNG02010_LIST_SEARCH" class="btn-primary btn-sm ADB">대상 검색</button>
43 43
 			  </div>
@@ -47,64 +47,19 @@
47 47
 			  <button id="ITP_BTN_MSTOCKMNG02010_LIST_BARCODE" class="btn-primary btn-sm ADB">바코드</button>
48 48
 			</div>
49 49
 		  </div>
50
-			<div id="ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA" class="scroll_area row-3-2">
50
+			<div id="ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA" class="scroll_area row-4">
51 51
 			  <ul id="ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
52 52
 			  <div id="ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWCOPY" style="display: grid;"> <!-- display:gird -->
53 53
 				<li class="history_list5 list-row">
54 54
 				  <div>
55 55
 					<div class="left">
56 56
 					  <div class="nomal">
57
-						<label>품목번호</label>
58
-						<span>:</span>
59
-						<div>
60
-						  <div class="fnItemId"></div>
61
-						</div>
62
-						<label>품목명&nbsp;:</label>
63
-						<div>
64
-						  <div class="fnItemNm"></div>
65
-						</div>
66
-					  </div>
67
-					</div>
68
-					<div class="left">
69
-					  <div class="nomal">
70
-						<label>단위</label>
71
-						<span>:</span>
72
-						<div>
73
-						  <div class="fnUnit"></div>
74
-						</div>
75
-						<label>단위수량&nbsp;:</label>
76
-						<div>
77
-						  <div class="fnUnitQty"></div>
78
-						</div>
79
-					  </div>
80
-					</div>
81
-					<div class="left">
82
-					  <div class="nomal">
83
-						<label class="col_0">현재고수량</label>
84
-						<span>:</span>
85
-						<div class="fn">
86
-						  <div class="fnStckQty"></div>
87
-						</div>
88
-						<label class="col_6">실사수량&nbsp;:</label>
89
-						<div class="btn_bar">
90
-						  <button class="DETAIL_ITEM_MINUS"><</button>
91
-						  <div class="fnCddQty col_0">1</div>
92
-						  <button class="DETAIL_ITEM_PLUS">></button>
93
-						</div>
94
-					  </div>
95
-					</div>
96
-				  </div>
97
-				</li>
98
-				<li class="history_list5 list-row">
99
-				  <div>
100
-					<div class="left">
101
-					  <div class="nomal">
102
-						<label>품목번호</label>
57
+						<label class="col_3">품목번호</label>
103 58
 						<span>:</span>
104 59
 						<div>
105 60
 						  <div class="fnItemId"></div>
106 61
 						</div>
107
-						<label>품목명&nbsp;:</label>
62
+						<label class="col_0">품목명&nbsp;:</label>
108 63
 						<div>
109 64
 						  <div class="fnItemNm"></div>
110 65
 						</div>
@@ -112,57 +67,12 @@
112 67
 					</div>
113 68
 					<div class="left">
114 69
 					  <div class="nomal">
115
-						<label>단위</label>
116
-						<span>:</span>
117
-						<div>
118
-						  <div class="fnUnit"></div>
119
-						</div>
120
-						<label>단위수량&nbsp;:</label>
121
-						<div>
122
-						  <div class="fnUnitQty"></div>
123
-						</div>
124
-					  </div>
125
-					</div>
126
-					<div class="left">
127
-					  <div class="nomal">
128
-						<label class="col_0">현재고수량</label>
129
-						<span>:</span>
130
-						<div class="fn">
131
-						  <div class="fnStckQty"></div>
132
-						</div>
133
-						<label class="col_6">실사수량&nbsp;:</label>
134
-						<div class="btn_bar">
135
-						  <button class="DETAIL_ITEM_MINUS"><</button>
136
-						  <div class="fnCddQty col_0">1</div>
137
-						  <button class="DETAIL_ITEM_PLUS">></button>
138
-						</div>
139
-					  </div>
140
-					</div>
141
-				  </div>
142
-				</li>
143
-				<li class="history_list5 list-row">
144
-				  <div>
145
-					<div class="left">
146
-					  <div class="nomal">
147
-						<label>품목번호</label>
148
-						<span>:</span>
149
-						<div>
150
-						  <div class="fnItemId"></div>
151
-						</div>
152
-						<label>품목명&nbsp;:</label>
153
-						<div>
154
-						  <div class="fnItemNm"></div>
155
-						</div>
156
-					  </div>
157
-					</div>
158
-					<div class="left">
159
-					  <div class="nomal">
160
-						<label>단위</label>
70
+						<label class="col_3">단위</label>
161 71
 						<span>:</span>
162 72
 						<div>
163 73
 						  <div class="fnUnit"></div>
164 74
 						</div>
165
-						<label>단위수량&nbsp;:</label>
75
+						<label class="col_0">단위수량&nbsp;:</label>
166 76
 						<div>
167 77
 						  <div class="fnUnitQty"></div>
168 78
 						</div>
@@ -170,12 +80,12 @@
170 80
 					</div>
171 81
 					<div class="left">
172 82
 					  <div class="nomal">
173
-						<label class="col_0">현재고수량</label>
83
+						<label class="col_3">현재고수량</label>
174 84
 						<span>:</span>
175 85
 						<div class="fn">
176 86
 						  <div class="fnStckQty"></div>
177 87
 						</div>
178
-						<label class="col_6">실사수량&nbsp;:</label>
88
+						<label class="col_3">실사수량&nbsp;:</label>
179 89
 						<div class="btn_bar">
180 90
 						  <button class="DETAIL_ITEM_MINUS"><</button>
181 91
 						  <div class="fnCddQty col_0">1</div>
@@ -196,7 +106,7 @@
196 106
 	<div id="ITP_MOBILE_JS"></div>
197 107
 	<div id="ITP_POP_MSTOCKMNG02010_BARCODE_AREA" class="popup2" style="display: none;">
198 108
 		<div class="barcode">
199
-			<h1>바코드를 스캔 하시면 재고  실사 목록에 스캔한<br>바코드의품목이 추가 되고 실사 수량을 입력<br>하시기 바랍니다.</h1>
109
+			<h1>바코드를 스캔 하시면 재고  실사 목록에 스캔한 바코드의품목이 추가 되고 실사 수량을 입력하시기 바랍니다.</h1>
200 110
 		</div>
201 111
 		<div class="barcode_area">
202 112
 
@@ -224,16 +134,15 @@
224 134
 				</form>
225 135
 			</div>
226 136
 			<div class="select_btn">
227
-				<button id="ITP_BTN_MSTOCKMNG02010_POP_WHS_NM" class="btn_blue">납품장소</button>
137
+				<button id="ITP_BTN_MSTOCKMNG02010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
228 138
 			</div>
229 139
 			<div id="ITP_LIST_MSTOCKMNG02010_POP_WHS_AREA" class="popup_scroll">
230 140
 				<ul id="ITP_LIST_MSTOCKMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
231
-				<div id="ITP_LIST_MSTOCKMNG02010_POP_WHS_ROWCOPY" style="display: block;">
141
+				<div id="ITP_LIST_MSTOCKMNG02010_POP_WHS_ROWCOPY" style="display: none;">
232 142
 					<li class="row_2">
233 143
 						<div class="scroll_left">
234
-							<div class="fnWhsNm">브랜드 창고 명A</div>
235
-							<div class="sub fnLocationNm">(상세위치내용)</div>
236
-							<div class="sub fnLocationNm">(상세위치내용)</div>
144
+							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
145
+							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
237 146
 						</div>
238 147
 						<div class="scroll_right">
239 148
 							<button id="ITP_BTN_MSTOCKMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

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

@@ -7,8 +7,8 @@
7 7
 			</div>
8 8
 			<div class="modal-body">
9 9
 
10
-				<div class="itp_form itp_type1 fix">
11
-					<div class="col-xs-12 itp_ip">
10
+				<div class="itp_form itp_type1 fix" >
11
+					<div class="col-xs-12 itp_ip" style="top:-30px;">
12 12
 						수발주 <b><span id="ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM"></span></b>을 위해 아래 항목을 입력을 한 후에 결제 버튼을 클릭하여 PG사 결제 절차에 따라 결재을 진행해 주시기 바랍니다.
13 13
 						<br>
14 14
 						<br>
@@ -36,52 +36,72 @@
36 36
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_KICC_ACTION_MOBILE_URL" name="kiccActionMobileUrl" value="" />
37 37
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_MALL_ID" name="mallId" value="" />
38 38
 
39
-								<div class="form-group shot">
40
-									<label class="col-xs-4 itp_lb shot">주문번호</label>
41
-									<div class="col-xs-9 itp_ip fnPoOrdNo"></div>
39
+								<div class="line shot">
40
+									<div class="label_box">
41
+										<label class="shot">주문번호</label>
42
+									</div>
43
+									<div class="info_box">
44
+										<div class="fnPoOrdNo">ㅁㅇㄹㄴㄹㄴㅁㅇㄹㄴ</div>
45
+									</div>
42 46
 								</div>
43
-								<div class="form-group shot">
44
-									<label class="col-xs-4 itp_lb shot">구매자명</label>
45
-									<div class="col-xs-9 itp_ip fnOrdNm"></div>
47
+								<div class="line shot">
48
+									<div class="label_box">
49
+										<label class="shot">구매자명</label>
50
+									</div>
51
+									<div class="info_box">
52
+										<div class="fnOrdNm"></div>
53
+									</div>
46 54
 								</div>
47
-								<div class="form-group shot">
48
-									<label class="col-xs-4 itp_lb shot">상품명</label>
49
-									<div class="col-xs-9 itp_ip fnGoodsNm"></div>
55
+								<div class="line shot">
56
+									<div class="label_box">
57
+										<label class="itp_lb shot">상품명</label>
58
+									</div>
59
+									<div class="info_box">
60
+										<div class="fnGoodsNm">삼풍명ㅁ</div>
61
+									</div>
50 62
 								</div>
51
-								<div class="form-group">
52
-									<label class="col-xs-4 itp_lb">결제금액*</label>
53
-									<div class="col-xs-9 itp_ip">
54
-										<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT" class="form-control itp_input" name="goodsAmt" />
63
+								<div class="line">
64
+									<div class="label_box">
65
+										<label class="itp_lb">결제금액*</label>
66
+									</div>
67
+									<div class="info_box">
68
+										<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT" class="itp_input" name="goodsAmt" />
55 69
 									</div>
56 70
 								</div>
57
-								<div class="form-group shot">
58
-									<label class="col-xs-4 itp_lb shot">결제방법*</label>
59
-									<div class="col-xs-9 itp_ip">
60
-										<select id="ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD" class="form-control itp_input" name="payMethod">
71
+								<div class="line shot">
72
+									<div class="label_box">
73
+										<label class="itp_lb shot">결제방법*</label>
74
+									</div>
75
+									<div class="info_box">
76
+										<select id="ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD" class="itp_input" name="payMethod">
61 77
 											<option value="11">신용카드</option>
62 78
 											<option value="21">계좌이체</option>
63 79
 										</select>
64 80
 									</div>
65 81
 								</div>
66
-								<div class="form-group">
67
-									<label class="col-xs-4 itp_lb">휴대폰번호*</label>
68
-									<div class="col-xs-9 itp_ip">
69
-										<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL" class="form-control itp_input" name="ordTel" placeholder="010-0000-0000" />
82
+								<div class="line">
83
+									<div class="label_box">
84
+										<label class="">휴대폰번호*</label>
85
+									</div>
86
+									<div class="info_box">
87
+										<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL" class="itp_input" name="ordTel" placeholder="010-0000-0000" />
70 88
 									</div>
71 89
 								</div>
72
-								<div class="form-group shot">
73
-									<label class="col-xs-4 itp_lb shot">이메일</label>
74
-									<div class="col-xs-9 itp_ip">
75
-										<div class="col-xs-3 itp_pd_none">
90
+								<div class="line border shot">
91
+									<div class="label_box">
92
+										<label class="shot">이메일</label>
93
+									</div>
94
+									<div class="info_box">
95
+										<div class="itp_pd_none email">
76 96
 											<input id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL" name="ordEmail" class="" type="hidden">
77
-											<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_ID" class="form-control itp_input" name="emailId" />
97
+											<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_ID" class="itp_input" name="emailId" />
78 98
 										</div>
79
-										<div class="col-xs-a" style="padding:0 5px;">@</div>
80
-										<div class="col-xs-3 itp_pd_none">
81
-											<input id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_NM" name="emailNm" class="form-control itp_input" type="text" data-check-required="empty">
99
+										<div style="padding:0 5px;">@</div>
100
+										<div class="itp_pd_none email">
101
+											<input id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_NM" name="emailNm" class="itp_input" type="text" data-check-required="empty">
82 102
 										</div>
83 103
 										<div class="col-xs-5">
84
-											<select name="emailCd" id="ITP_FORM_PO_PAYMENT_POPUP_EMAIL_CD" data-select-code="EMAIL_CD" class="form-control itp_input">
104
+											<select name="emailCd" id="ITP_FORM_PO_PAYMENT_POPUP_EMAIL_CD" data-select-code="EMAIL_CD" class="itp_input">
85 105
 											</select>
86 106
 										</div>
87 107
 									</div>
@@ -302,8 +322,10 @@
302 322
 				</div>
303 323
 			</div>
304 324
 			<div class="modal-footer">
305
-				<button type="button" id="ITP_BTN_PO_PAYMENT_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
306
-				<button type="button" id="ITP_BTN_PO_PAYMENT_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;결제요청&nbsp;&nbsp;</button>
325
+				<div class="pop_btn_bar">
326
+					<button type="button" id="ITP_BTN_PO_PAYMENT_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
327
+					<button type="button" id="ITP_BTN_PO_PAYMENT_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;결제요청&nbsp;&nbsp;</button>
328
+				</div>
307 329
 			</div>
308 330
 		</div>
309 331
 	</div>

+ 40 - 22
src/main/webapp/mobile/css/style.css

@@ -12,7 +12,7 @@ body{background: #fff; position: relative; width: 100%; height: auto; font-famil
12 12
 body .login {position:fixed;}
13 13
 .color-gray {color:#aaa;}
14 14
 /* 팝업 */
15
-section .popup { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
15
+section .popup {position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
16 16
 section .popup .pop {position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 70%; height: 360px; padding-top: 20px; background: #fff; border: 2px solid #000; border-top-left-radius: 10px; border-top-right-radius: 10px;}
17 17
 section .popup .pop.short {height:260px;}
18 18
 section .popup .pop label.pop_label {position:relative; top:10px; font-size: 16px;}
@@ -33,9 +33,9 @@ section .popup2 {position: fixed; width: 100%; height: 100%; background: rgba(20
33 33
 section .popup2 .content {position: fixed; z-index: 10; width:100%; background: #fff;}
34 34
 section .popup2 .barcode {width: 100%;}
35 35
 section .popup2 .barcode_area {width: 300px; height: 300px; margin: auto; background: #fff; border: 1px solid #000; margin-top: 10%;}
36
-section .popup2 .barcode h1{text-align: left; width: 85%; font-size: 20px; margin:auto; margin-top: 20%;}
36
+section .popup2 .barcode h1{text-align: left; width: 85%; font-size: 16px; margin:auto; margin-top: 10%;}
37 37
 section .popup2 .btn_barcode {margin-top: 20%;}
38
-section .popup2 .btn_barcode button {width: 35%; height: 50px; font-size: 15px; font-weight:100;}
38
+section .popup2 .btn_barcode button {width: 35%; height: 40px; font-size: 15px; font-weight:100;}
39 39
 section .popup2 .pop { position: absolute; top: 40%; left: 50%; transform: translate(-50%,-50%); width: 95%; height: 70%; background: #fff; border: 1px solid #000; border-radius:10px;}
40 40
 section .popup2 .pop .header {position: relative; height: 40px; background: #f0831e; color:#eee; border-bottom: 1px solid #000; border-top-right-radius: 10px; border-top-left-radius: 10px;}
41 41
 section .popup2 .pop .header .header_left {padding-top: 12px;}
@@ -51,10 +51,10 @@ section .popup2 .pop .search_bar input {width: 90%; margin:0 5%; height: 27px; p
51 51
 section .popup2 .pop .search_bar button {position:relative; top:-64px; background:transparent; margin-right:5%; float: right; border: none; padding-top:3px;}
52 52
 section .popup2 .pop .search_bar button img {width: 18px;}
53 53
 section .popup2 .pop .search_bar button.search {float: none; width: 50%; height: 35px; background:rgb(46, 46, 248); color: #fff; font-size: 1rem; padding: 0; border: 1px solid #000; margin: 0 auto;}
54
-section .popup2 .pop .search_item_bar {width:98%;margin:5px auto; display:flex;}
55
-section .popup2 .pop .search_item_bar input {width:40%; border-radius:5px; margin:0;}
56
-section .popup2 .pop .search_item_bar select {width:22%;border-radius:5px; margin-right:5px;}
57
-section .popup2 .pop .search_btn_bar {width:100%; height:50px; margin-top:10px; margin-right:10px;}
54
+section .popup2 .pop .search_item_bar {width:98%;margin:5px auto; position: relative; top:-40px; display:flex;}
55
+section .popup2 .pop .search_item_bar input {width:40%; height:27px; border-radius:5px; margin:0; font-size:12px;}
56
+section .popup2 .pop .search_item_bar select {width:22%; height:27px; border-radius:5px; margin-right:5px;}
57
+section .popup2 .pop .search_btn_bar {width:100%; height:50px; margin-top:-30px; margin-right:10px;}
58 58
 section .popup2 .pop .search_btn_bar .btn_right {float:right; margin-right:10px;}
59 59
 section .popup2 .pop .search_btn_bar .btn_right button img{width:18px; height:18px; margin-right:2px;}
60 60
 section .popup2 .pop .search_btn_bar .btn_right button {height:30px; padding:5px 12px; font-size:12px; font-weight:100; border-radius:3px; border:1px solid #333;}
@@ -62,14 +62,17 @@ section .popup2 .pop .search_btn_bar .btn_right button {height:30px; padding:5px
62 62
 section .popup2 .pop .table{width:98%; margin:0 auto; border:1px solid #aaa; border-bottom:none;}
63 63
 section .popup2 .pop .table .table_tr {display:flex;}
64 64
 section .popup2 .pop .table .table_tr .tabel_th{width:23%;; height:30px; border-left:1px solid #aaa; background:#eee;}
65
-section .popup2 .pop .table .table_tr .tabel_th label {font-size:14px; font-weight:100;}
66
-section .popup2 .pop .table .table_tr .tabel_th .chkAll {margin:-2px;}
65
+section .popup2 .pop .table .table_tr .tabel_th label {font-size:14px; padding-top:5px; font-weight:100;}
66
+section .popup2 .pop .table .table_tr .tabel_th .chkAll {margin:-3px;}
67 67
 
68
-section .popup2 .pop .table_body{width:98%; margin:0 auto; border:1px solid #aaa; border-bottom: none;}
68
+section .popup2 .pop .table_body{width:98%; height:120px; margin:0 auto; border:1px solid #aaa; border-bottom: none; overflow:auto;}
69
+section .popup2 .pop .table_body::-webkit-scrollbar {
70
+    display: none; /* Chrome, Safari, Opera*/
71
+}
69 72
 section .popup2 .pop .table_body .table_tr {display:flex; height:31px; border-bottom:1px solid #aaa;}
70 73
 section .popup2 .pop .table_body .table_tr .table_td{width:23%;; height:30px; padding-top:5px; border-left:1px solid #aaa; background:#fff;}
71
-section .popup2 .pop .table_body .table_tr .table_td div {font-size:14px; font-weight:100;}
72
-section .popup2 .pop .table_body .table_tr .table_td .chkItem {margin:-7px;}
74
+section .popup2 .pop .table_body .table_tr .table_td div {font-size:12px; font-weight:100;}
75
+section .popup2 .pop .table_body .table_tr .table_td .chkItem {margin:-3px;}
73 76
 
74 77
 section .popup2 .pop .popup_scroll ul.mb_0 {margin-bottom:0 !important;}
75 78
 section .popup2 .pop .popup_scroll {position: relative; top:-25px; width: 100%;height: 75%; overflow: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
@@ -98,10 +101,10 @@ section .popup2 .pop .popup_scroll li .right {position: relative; display: flex;
98 101
 section .popup2 .pop .popup_scroll li .right button {padding: 5px; font-size: 22px; width:24px;}
99 102
 section .popup2 .pop .popup_scroll li .add button{float: right; width: 60px; height: 55px; margin: 12px 9px; border-radius: 10px; font-size: 1rem; background: rgb(198, 170, 250);}
100 103
 section .popup2 .pop .content .line button {width: 35%; height: 35px;font-size: 14px; font-weight:100; padding-top: 7px; margin: 0 10px;}
101
-section .popup2	.list_line {width:98%; float:left; height:50px;display: inline-flex; margin:0 1%; font-size:12px;}
104
+section .popup2	.list_line {width:98%; float:left; height:40px;display: inline-flex; margin:0 1%; font-size:12px;}
102 105
 section .popup2 .border {border-bottom: 1px solid #000 !important;}
103
-section .popup2 .list_line .list_label {width:30%;border:1px solid #000; height:50px; padding-top:17px; border-bottom:none; background:#eee;}
104
-section .popup2 .list_line .list_info {width:70%;height:50px; border:1px solid #000; padding-top:17px; border-left:none; border-bottom:none;}
106
+section .popup2 .list_line .list_label {width:30%;border:1px solid #000; height:40px; padding-top:10px; border-bottom:none; background:#eee;}
107
+section .popup2 .list_line .list_info {width:70%;height:40px; border:1px solid #000; padding-top:10px; border-left:none; border-bottom:none;}
105 108
 section .popup2 .list_line .list_info input{width:90%;}
106 109
 section .popup2 .list_line .mail input {width:30%;}
107 110
 section .popup2 .list_line .mail select {width:30%;}
@@ -109,7 +112,7 @@ section .popup2 .list_line .list_info .pay_info {text-align:left; padding-left:1
109 112
 section .popup_scroll li .right .num {padding:8px 12px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
110 113
 section .popup_scroll li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
111 114
 section .popup2 .list_line .line_right {float:right; width:70%;}
112
-section .popup2 .list_line .line_right select {width:200px; float:right;}
115
+section .popup2 .list_line .line_right select {width:200px; float:right; height:27px; margin-top:6px;}
113 116
 section .popup2 .list_line .line_right input {width:200px; float:right;}
114 117
 section .popup2 .list_line .info{width:30%; padding-top:10px; padding-left:20px; text-align:left;}
115 118
 
@@ -237,7 +240,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
237 240
 #ITP_WRAPPER header .header_wrap img.brand {float: right; height: 45px; margin: 5px; border-radius: 50%; border: 1px solid #666;}
238 241
 #ITP_WRAPPER header .header_wrap label{ margin-top: 15px; width: 50px; height: 25px; font-size: 1rem;float: left; color: #fff;}
239 242
 #ITP_WRAPPER header .header_wrap .name_info {width: calc(100% - 160px); height:45px; display:inline-flex;}
240
-#ITP_WRAPPER header .header_wrap .name_info div {width: 100%; font-size: 20px; color:#eee; margin-top:12px;}
243
+#ITP_WRAPPER header .header_wrap .name_info div {width: 100%; font-size: 14px; color:#eee; margin-top:14px;}
241 244
 
242 245
 #ITP_WRAPPER header .header_wrap .logout {float: right; width: 60px;}
243 246
 #ITP_WRAPPER header .header_wrap .logout button {margin: -2px 10px; width: 50px; height: 50px; border:none; font-size: 0.8rem;background: transparent;}
@@ -338,7 +341,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
338 341
 .content .line .line_right input.mg0 {margin-right:10px;}
339 342
 .content .line .line_right input.date{width:140px; margin-right:132px; height:35px;} 
340 343
 .content .line .line_right select {float: right; width: 180px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem; margin-right:93px;}
341
-.content .line input.date {width: 55%; margin: 5px 0; height: 27px; float: left; text-align:center; font-size:14px;background: url(../img/calender.png)no-repeat 95% 50%/20px auto #fff;}
344
+.content .line input.date {width: 55%; height: 27px; float: left; text-align:center; font-size:14px;}
342 345
 .content .line input.full {width: 100%;}
343 346
 .content .line div.date_to {display:flex; width:60%; height:27px; float: left; margin-right:0px;}
344 347
 .content .line div.date_to input {font-weight:100; width:47%; height:27px; font-size:14px; margin:0;}
@@ -461,7 +464,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
461 464
 .scroll_area li.history_list6 {height: 110px; padding-top:5px;}
462 465
 .scroll_area li.history_list7 {height: 120px; padding-top:5px;}
463 466
 .scroll_area li .history_info {width: auto;}
464
-.scroll_area li .left {width:100%; height:30px; margin-top:0px;}
467
+.scroll_area li .left {width:100%; height:26px; margin-top:0px;}
465 468
 .scroll_area li .btn_list {width:calc(100% - 65px); height:35px; padding-top:12px;}
466 469
 .scroll_area li .left div {display: inline-block;}
467 470
 .scroll_area li .left label{font-size: 1.1rem;}
@@ -496,14 +499,15 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
496 499
 .scroll_area li .left .nomal .btn_bar button{width: 25px; height: 30px; font-size: 1rem; padding: 0;}
497 500
 .scroll_area li .left .nomal .btn_bar .col_0{min-width: auto; margin: 5px 20px;}
498 501
 
499
-.scroll_area li .left .nomal label{position:relative; margin-left: 10px; font-size:14px; font-weight:700; min-width:81px; text-align:left;}
502
+.scroll_area li .left .nomal label{position:relative; margin-left: 10px; font-size:14px; font-weight:100; min-width:81px; text-align:left;}
500 503
 .scroll_area li .left .nomal label.sub_info{min-width: auto; display: inline-flex;}
504
+.scroll_area li .left .nomal label.col_0{min-width: auto;}
501 505
 .scroll_area li .left .nomal label.col_1{min-width: 45px;}
502 506
 .scroll_area li .left .nomal label.col_3{min-width: 70px;}
503 507
 .scroll_area li .left .nomal label.col_2{width: 95px;}
504 508
 
505 509
 .scroll_area li .left .nomal i{width: 50px; text-align: center;}
506
-.scroll_area li .left .nomal div{ display: inline-flex; font-weight: 100; font-size: 15px;}
510
+.scroll_area li .left .nomal div{display: inline-flex; font-weight: 700; font-size: 15px;}
507 511
 .scroll_area li .left .nomal .col_5{min-width:50px;}
508 512
 
509 513
 .scroll_area li .right {margin: 12px 10px 0 0; position: relative; display: flex; height:35px; font-size: 1.4rem; font-weight: 700; float: right;}
@@ -543,6 +547,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
543 547
 #ITP_FOOTER .itp_modal .itp_form .itp_mip {padding: 8px 5px 4px 12px; height:42px; text-align: left; font-size: 16px; border:1px solid #ccc;}
544 548
 
545 549
 @media screen and (min-width: 550px) {
550
+	
546 551
 	.content .line input.date {width: 70%;}
547 552
 	.content .line input.full {width: 100%;}
548 553
 	
@@ -558,6 +563,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
558 563
 	.content .line .search_wrap select {width:78%;}	
559 564
 }
560 565
 @media screen and (max-width: 380px) {
566
+	section .popup2 .barcode_area {width: 250px; height: 250px;}
561 567
 	section .popup2 .pop .popup_scroll li.row_2 {height: 85px;}
562 568
 	section .popup2 .pop .popup_scroll li .scroll_left .mg_0 {margin:0; width:100px;}
563 569
 	.type_hide {display:none;}
@@ -576,12 +582,24 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
576 582
 .modal {position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: 1050; display: none; overflow: hidden; outline: 0;}
577 583
 .itp_modal {z-index: 10000;}
578 584
 .modal-dialog {position: relative; width: auto; margin: 10px;}
585
+.modal-dialog .line {display:flex;border:1px solid #aaa; border-bottom:none; height:40px;}
586
+.modal-dialog .border{border-bottom:1px solid #aaa;}
587
+.modal-dialog .border .label_box {height:38px !important;}
588
+.modal-dialog .line .label_box {padding:8px; width:100px; height:39px; background:#eee; border-right:1px solid #aaa;}
589
+.modal-dialog .line .label_box label {font-size:14px; font-weight:100;}
590
+.modal-dialog .line .info_box {width: calc(100% - 100px); padding:10px; display:flex;}
591
+.modal-dialog .line .info_box .email {width:30%;}
592
+.modal-dialog .line .info_box input{position:relative; top:-4px; width:100%; margin:0;}
593
+.modal-dialog .line .info_box select{position:relative; top:-4px; width:100%; height:27px;}
594
+.modal-dialog .line .info_box div{font-size:14px; font-weight:100;}
579 595
 .modal-content {position: relative; background-color: #fff; background-clip: padding-box; border: 1px solid #999; border: 1px solid rgba(0,0,0,.2); border-radius: 6px; outline: 0; box-shadow: 0 3px 9px rgb(0 0 0 / 50%);}
580
-.modal-header {min-height: 16.43px; padding: 15px; border-bottom: 1px solid #e5e5e5; padding: 12px 15px 12px 15px; background: #337ab7; cursor: move;}
596
+.modal-header {min-height: 16.43px; padding: 15px; border-bottom: 1px solid #e5e5e5; color:#fff; padding: 12px 15px 12px 15px; background: #337ab7; cursor: move;}
581 597
 .modal-header .close { margin-top: -2px; color: #fff; opacity: 1;}
582 598
 button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background: 0 0; border: 0;}
583 599
 .close {float: right; font-size: 21px; font-weight: 700; line-height: 1; text-shadow: 0 1px 0 #fff;}
584 600
 .modal-body {position: relative; padding: 15px;}
585 601
 .modal-footer {padding: 15px; text-align: right; border-top: 1px solid #e5e5e5;}
602
+.modal-footer .pop_btn_bar {float:right; margin-top:12px;}
586 603
 .modal-footer .btn {border-radius:6px; padding: 6px 12px;}
587 604
 
605
+

+ 39 - 14
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -90,6 +90,7 @@ let mobContObj = {
90 90
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_UNQ_NO').val(result.pchReqUnqNo);
91 91
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_MALL_ID').val(result.mallId);
92 92
 
93
+				$('#ITP_FORM_MPOMNG01010_DETAIL .fnPchReqAmtTot').text(CommonObj.currency.add('0'));
93 94
 				$('#ITP_FORM_MPOMNG01010_DETAIL .fnOrdUseAmt').text(CommonObj.currency.add(result.ordUseAmt));
94 95
 				if(result.whsId !== '' && result.location !== '') {
95 96
 					$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_WHS_ID').val(result.whsId);
@@ -156,18 +157,19 @@ let mobContObj = {
156 157
 			this.empty();
157 158
 		},
158 159
 		actPlus: function(elem) {
159
-			var $div = $(elem).siblings('div');
160
-			var num = Number($div.text());
161
-			$($div).text((num + 1).toString());
162
-			this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
163
-			this.pchReqAmtUnit(elem, $($div).text());
160
+			var $li = $(elem).closest('li');
161
+			var num = Number($li.find('.fnPchReqQty').text());
162
+			var calcNum = num + 1;
163
+			$($li).find('.fnPchReqQty').text(calcNum.toString());
164
+			this.rows[$li.index()]['pchReqQty'] = calcNum;
165
+			this.pchReqAmtUnit(elem, calcNum);
164 166
 			this.pchReqAmtTot();
165 167
 		},
166 168
 		actMinus: function(elem) {
167 169
 			var $div = $(elem).siblings('div');
168 170
 			var num = Number($div.text());
169 171
 			if(num <= 1) {
170
-				alert('주문수량을 확인하세요.');
172
+				itp_fn_modal_alert_ajax('주문수량을 확인하세요.');
171 173
 			} else {
172 174
 				$($div).text((num - 1).toString());
173 175
 				this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
@@ -193,6 +195,10 @@ let mobContObj = {
193 195
 			($('#ITP_LIST_MPOMNG01010_DETAIL_ROWS li').length > 0) ? $('.itp_non_data').hide() :  $('.itp_non_data').show();
194 196
 		}
195 197
 	},
198
+	reset: function() {
199
+		$('#ITP_LIST_MPOMNG01010_DETAIL_ROWS').children().remove();
200
+		this.data.load();
201
+	},
196 202
 	cancel: function () {
197 203
 		$(location).attr('href', MOBILE_CONTEXTPATH + '/app/main.html');
198 204
 	}
@@ -222,6 +228,7 @@ let mobPopObj = {
222 228
 					$li.find('#ITP_FORM_MPOMNG01010_POP_ITEM_CHECKBOX').val(item.itemId);
223 229
 					$li.find('.fnItemNm').text(item.itemNm);
224 230
 					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
231
+					$li.find('.fnOrdAmt').text(CommonObj.currency.add(item.unitAmt));
225 232
 				});
226 233
 				mobPopObj.popItem.addRow.init();
227 234
 			};
@@ -251,19 +258,28 @@ let mobPopObj = {
251 258
 					var $div = $(elem).siblings('div');
252 259
 					var num = Number($div.text());
253 260
 					$($div).text((num + 1).toString());
261
+					this.reqAmtUnit(elem, $($div).text());
254 262
 				},
255 263
 				actMinus: function(elem) {
256 264
 					var $div = $(elem).siblings('div');
257 265
 					var num = Number($div.text());
258 266
 					if(num <= 1) {
259
-						alert('주문수량을 확인하세요.');
267
+						itp_fn_modal_alert_ajax('주문수량을 확인하세요.');
260 268
 					} else {
261 269
 						$($div).text((num - 1).toString());
270
+						this.reqAmtUnit(elem, $($div).text());
262 271
 					}
263 272
 				},
273
+				reqAmtUnit: function(elem, qty) {
274
+					var $li = $(elem).closest('li');
275
+					var unitAmt = CommonObj.onlyNumber($li.find('.fnUnitAmt').text());
276
+					$li.find('.fnOrdAmt').text(CommonObj.currency.add(Number(unitAmt ? unitAmt : 0) * Number(qty)));
277
+				},
264 278
 				actItemAdd: function(elem) {
265
-					var index = $(elem).closest('li').index();
266
-					var item = mobPopObj.popItem.rows[index];
279
+					var $li = $(elem).closest('li');
280
+					// var index = $(elem).closest('li').index();
281
+					var item = mobPopObj.popItem.rows[$li.index()];
282
+					// var item = mobPopObj.popItem.rows[index];
267 283
 					item['pchReqQty'] = $(elem).closest('li').find('.fnPchReqQty').html();
268 284
 					mobContObj.list.attachRow(item);
269 285
 				}
@@ -344,11 +360,15 @@ let mobPopObj = {
344 360
 					popMsg = '구매요청 하시겠습니까?';
345 361
 					$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
346 362
 				} else {
347
-					if (ordUseAmt < pchReqAmtTot) { // 요청금액이 가능금액보다 클 경우
363
+					if (Number(ordUseAmt) < Number(pchReqAmtTot)) { // 요청금액이 가능금액보다 클 경우
348 364
 						if($('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_MALL_ID').val() === '') {	// PG 정보 없음
349 365
 							this.saveMode = 3;
350
-							popMsg = 	'무통장 입금 후 구매요청해 주세요.<br>' +
351
-										'임시저장 하시겠습니까?';
366
+							if(loanDvsn === 'LD01') {	// 선불매장
367
+								popMsg = 	'선불매장이므로 입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야  구매요청을 하실 수 있습니다.';
368
+							} else if(loanDvsn === 'LD02') { // 후불매장
369
+								popMsg = 	'구매한도가 부족합니다.<br>' +
370
+									'선입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을  하실 수 있습니다.\n';
371
+							}
352 372
 							$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
353 373
 						} else {
354 374
 							if(loanDvsn === 'LD01') {	// 선불매장
@@ -377,6 +397,8 @@ let mobPopObj = {
377 397
 			}
378 398
 			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT').val());
379 399
 			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContObj.list.rows.length, '개'));
400
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdReqAmt').text($('#ITP_AJAX_MPOMNG01010_VIEW_CONTAINER .fnPchReqAmtTot').text());
401
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdPssblAmt').text($('#ITP_AJAX_MPOMNG01010_VIEW_CONTAINER .fnOrdUseAmt').text());
380 402
 			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add(pchReqAmtTot));
381 403
 			$('#ITP_POP_MPOMNG01010_REQ_AREA .pop_msg').html(popMsg);
382 404
 		},
@@ -397,8 +419,11 @@ let mobPopObj = {
397 419
 				var saveFn = function (result) {
398 420
 					console.log(result);
399 421
 					mobPopObj.hide('ITP_POP_MPOMNG01010_REQ_AREA');
400
-					if(typeof rtnFn === 'function') rtnFn();
422
+					console.log(typeof rtnFn === 'function');
423
+					// if(typeof rtnFn === 'function') rtnFn();
424
+					mobContObj.reset();
401 425
 				};
426
+				console.log(param);
402 427
 				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
403 428
 			};
404 429
 			if (this.saveMode === 1 || this.saveMode === 2 || this.saveMode === 3) {
@@ -409,7 +434,7 @@ let mobPopObj = {
409 434
 				// 결제 팝업 결과
410 435
 				var popFn = function(rowDataPop) {
411 436
 					console.log(JSON.stringify(rowDataPop));
412
-					procSave(function(result) { mobContObj.data.load(); });
437
+					procSave(function(result) { mobContObj.reset(); });
413 438
 				};
414 439
 				// 결제 팝업
415 440
 				var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG01010_DETAIL .fnOrdUseAmt').text());

+ 8 - 4
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG02010.js

@@ -547,11 +547,15 @@ let mobPopObj = {
547 547
 					popMsg = '구매요청 하시겠습니까?';
548 548
 					$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
549 549
 				} else {
550
-					if (ordUseAmt < pchReqAmtTot) { // 요청금액이 가능금액보다 클 경우
551
-						if($('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_MALL_ID').val() === '') {	// PG 정보 없음
550
+					if (Number(ordUseAmt) < Number(pchReqAmtTot)) { // 요청금액이 가능금액보다 클 경우
551
+						if($('#ITP_FORM_MPOMNG02010_DETAIL #ITP_FORM_MPOMNG02010_DETAIL_MALL_ID').val() === '') {	// PG 정보 없음
552 552
 							this.saveMode = 3;
553
-							popMsg = 	'무통장 입금 후 구매요청해 주세요.<br>' +
554
-								'임시저장 하시겠습니까?';
553
+							if(loanDvsn === 'LD01') {	// 선불매장
554
+								popMsg = 	'선불매장이므로 입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야  구매요청을 하실 수 있습니다.';
555
+							} else if(loanDvsn === 'LD02') { // 후불매장
556
+								popMsg = 	'구매한도가 부족합니다.<br>' +
557
+									'선입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을  하실 수 있습니다.\n';
558
+							}
555 559
 							$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
556 560
 						} else {
557 561
 							if(loanDvsn === 'LD01') {	// 선불매장

+ 2 - 2
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG06010.js

@@ -36,8 +36,8 @@ let mobPageObj = {
36 36
 
37 37
 			// 조회일자 지정
38 38
 			$('#ITP_MOBILE_MPOMNG06010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
39
-			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -1));
40
-			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
39
+			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', 0));
40
+			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 1));
41 41
 		},
42 42
 		info: function() {
43 43
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));

+ 5 - 21
src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js

@@ -126,7 +126,7 @@ let mobContentObj = {
126 126
 		itemAdd: function(rows) {
127 127
 			var _this = this;
128 128
 			$.each(rows, function(index, item) {
129
-				$('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWCOPY').html());
129
+				$('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWS .panel-group').append($('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWCOPY').html());
130 130
 				var $li = $('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group > .list-row:last');
131 131
 				$li.find('.fnItemId').text(item.itemId);
132 132
 				$li.find('.fnItemNm').text(item.itemNm);
@@ -311,28 +311,12 @@ let mobPopObj = {
311 311
 				_this.rows = result.gridRows;
312 312
 				$.each(result.gridRows, function (i, item) {
313 313
 					$('#ITP_POP_MSTOCKMNG02010_TABLE_AREA').append($('#ITP_POP_MSTOCKMNG02010_TABLE_TR').html());
314
-					// if(i === 0) {
315
-					// 	var tmp = $('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA.table > .table_tr:last');
316
-					// 	console.log(tmp);
317
-					// 	console.log($(tmp).html());
318
-					// }
319 314
 					var $li = $('#ITP_POP_MSTOCKMNG02010_TABLE_AREA > .table_tr:last');
320 315
 					$li.find('.fnItemId').text(item.itemId);
321 316
 					$li.find('.fnItemNm').text(item.itemNm);
322 317
 					$li.find('.fnUnit').text(item.unit);
323 318
 					$li.find('.fnStckQty').text(CommonObj.currency.add(item.stckQty, '개'));
324
-
325
-					// var tr =	'<tr>' +
326
-					// 			'	<td><input type="checkbox" checked></td>' +
327
-					// 			'	<td class="fnItemId">' 	+ item.itemId + '</td>' +
328
-					// 			'	<td class="fnItemNm">' 	+ item.itemNm + '</td>' +
329
-					// 			'	<td class="fnUnit">' 	+ item.unit + '</td>' +
330
-					// 			'	<td class="fnStckQty">' + CommonObj.currency.add(item.stckQty, '개') + '</td>' +
331
-					// 			'</tr>';
332
-					// $('#ITP_POP_MSTOCKMNG02010_TABLE_AREA > tbody').append(tr);
333 319
 				});
334
-				console.log($('#ITP_POP_MSTOCKMNG02010_TABLE_AREA').prop('tagName'));
335
-				// console.log($('#ITP_POP_MSTOCKMNG02010_TABLE_AREA.table').find($('.table_tr')));
336 320
 			};
337 321
 			var param = $('#ITP_FORM_MSTOCKMNG02010_POPUP_ITEM').serializeObject();
338 322
 			fn_ajax_call(API_POP_STOCK_MNG_LIST, JSON.stringify(param), callbackFn, 'POST');
@@ -350,18 +334,18 @@ let mobPopObj = {
350 334
 			});
351 335
 		},
352 336
 		checked: function(elem) {
353
-			var table = $(elem).closest('table');
337
+			var clsNm = '.table_tr';
354 338
 			if($(elem).hasClass('chkAll')) {
355
-				$(table).find('input:checkbox').prop('checked', $(elem).is(':checked'));
339
+				$(clsNm).find('input:checkbox').prop('checked', $(elem).is(':checked'));
356 340
 			} else {
357 341
 				var isChkAll = true;
358
-				$(table).find('input:checkbox').each(function() {
342
+				$(clsNm).find('input:checkbox').each(function() {
359 343
 					if(!$(this).hasClass('chkAll') && !$(this).is(':checked')) {
360 344
 						isChkAll = false;
361 345
 						return false;
362 346
 					}
363 347
 				});
364
-				$(table).find('.chkAll').prop('checked', isChkAll);
348
+				$(clsNm).find('.chkAll').prop('checked', isChkAll);
365 349
 			}
366 350
 		},
367 351
 		choice: function() {