Просмотр исходного кода

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

dwkim лет назад: 2
Родитель
Сommit
5007b37841

+ 1 - 3
src/main/webapp/app/collmng/COLLMNG01010.html

@@ -19,9 +19,7 @@
19 19
 								<input type="hidden" id="ITP_FORM_COLLMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
20 20
 									<div class="form-group">
21 21
 										<div class="col-xs-2 itp_ip itp_noMar">
22
-											<select id="ITP_FORM_COLLMNG01010_SEARCH_" class="form-control itp_input" name="service">
23
-												<option value="A">수거 일자</option>											
24
-											</select>
22
+											<label>수거일자 *</label>
25 23
 										</div>											
26 24
 										<div class="col-xs-3 itp_ip itp_noMar">
27 25
 											<div class="input-daterange input-group date">

+ 1 - 3
src/main/webapp/app/collmng/COLLMNG02010.html

@@ -21,9 +21,7 @@
21 21
 								
22 22
 									<div class="form-group">
23 23
 										<div class="col-xs-2 itp_ip itp_noMar">
24
-											<select id="ITP_FORM_COLLMNG02010_SEARCH_" class="form-control itp_input" name="service">
25
-												<option value="A">수거 요청일</option>											
26
-											</select>
24
+											<label>수거요청일 *</label>
27 25
 										</div>									
28 26
 										<div class="col-xs-3 itp_ip itp_noMar">
29 27
 											<div class="input-daterange input-group date">

+ 1 - 3
src/main/webapp/app/collmng/COLLMNG03010.html

@@ -20,9 +20,7 @@
20 20
 								<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_SPPLY_ID" name="sspplyId" value="">
21 21
 									<div class="form-group">
22 22
 										<div class="col-xs-2 itp_ip itp_noMar">
23
- 											<select id="ITP_FORM_COLLMNG03010_SEARCH_" class="form-control itp_input" name="service">
24
-												<option value="A">수거 일자</option>											
25
-											</select>
23
+ 											<label>수거일자 *</label>
26 24
 										</div>								
27 25
 										<div class="col-xs-3 itp_ip itp_noMar">
28 26
 											<div class="input-daterange input-group date">

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

@@ -137,7 +137,7 @@
137 137
 											<label class="col-xs-2 itp_lb">핸드폰번호 *</label>
138 138
 											<div class="col-xs-4 itp_ip">
139 139
 												<div class="col-xs-7 itp_in">
140
-													<input type="text" id="ITP_FORM_OPER01010_DETAIL_TEL_NO" data-check-required="empty" class="form-control itp_input" name="telNo" value="">
140
+													<input type="text" id="ITP_FORM_OPER01010_DETAIL_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="telNo" value="">
141 141
 												</div>
142 142
 											</div>
143 143
 										</div>

+ 5 - 5
src/main/webapp/app/oper/OPER03011.html

@@ -110,13 +110,13 @@
110 110
 											<label class="col-xs-2 itp_lb">사업자번호 *</label>
111 111
 											<div class="col-xs-4 itp_ip">
112 112
 												<div class="col-xs-7 itp_in">
113
-													<input type="text" id="ITP_FORM_OPER03011_DETAIL_BSNS_REG_NO" data-check-required="empty,number" class="form-control itp_input" name="bsnsRegNo" value="">
113
+													<input type="text" id="ITP_FORM_OPER03011_DETAIL_BSNS_REG_NO" data-check-required="empty,number" data-key-up="regNo" class="form-control itp_input" name="bsnsRegNo" value="">
114 114
 												</div>
115 115
 											</div>
116 116
 											<label class="col-xs-2 itp_lb">법인번호</label>
117 117
 											<div class="col-xs-4 itp_ip">
118 118
 												<div class="col-xs-7 itp_in">
119
-													<input type="text" id="ITP_FORM_OPER03011_DETAIL_CORP_REG_NO" class="form-control itp_input" name="corpRegNo" value="">
119
+													<input type="text" id="ITP_FORM_OPER03011_DETAIL_CORP_REG_NO" data-key-up="corpNo" class="form-control itp_input" name="corpRegNo" value="">
120 120
 												</div>
121 121
 											</div>
122 122
 										</div>
@@ -136,7 +136,7 @@
136 136
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
137 137
 											<div class="col-xs-4 itp_ip">
138 138
 												<div class="col-xs-7 itp_in">
139
-													<input type="tel" id="ITP_FORM_OPER03011_DETAIL_TEL_NO" data-check-required="empty" class="form-control itp_input" name="rprstTelNo" value="">
139
+													<input type="tel" id="ITP_FORM_OPER03011_DETAIL_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="rprstTelNo" value="">
140 140
 												</div>
141 141
 											</div>
142 142
 											<label class="col-xs-2 itp_lb" style="border-top:none;">브랜드그룹 로고</label>
@@ -149,7 +149,7 @@
149 149
 											<label class="col-xs-2 itp_lb">FAX *</label>
150 150
 											<div class="col-xs-4 itp_ip">
151 151
 												<div class="col-xs-7 itp_in">
152
-													<input type="text" id="ITP_FORM_OPER03011_DETAIL_FAX_NO" data-check-required="empty" class="form-control itp_input" name="rprstFaxNo" value="">
152
+													<input type="text" id="ITP_FORM_OPER03011_DETAIL_FAX_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="rprstFaxNo" value="">
153 153
 												</div>
154 154
 											</div>
155 155
 											<label class="col-xs-2 itp_lb"style="border-top:none;"></label>
@@ -194,7 +194,7 @@
194 194
 											<label class="col-xs-2 itp_lb">대표자연락처 *</label>
195 195
 											<div class="col-xs-4 itp_ip">
196 196
 												<div class="col-xs-7 itp_in">
197
-													<input type="text" id="ITP_FORM_OPER03011_DETAIL_OWNER_TEL_NO" data-check-required="empty" class="form-control itp_input" name="ownerTelNo" value="">
197
+													<input type="text" id="ITP_FORM_OPER03011_DETAIL_OWNER_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="ownerTelNo" value="">
198 198
 												</div>
199 199
 											</div>
200 200
 											<label class="col-xs-2 itp_lb">계약기간 *</label>

+ 1 - 3
src/main/webapp/app/ordmng/ORDMNG01010.html

@@ -22,9 +22,7 @@
22 22
 								<input type="hidden" id="ITP_FORM_ORDMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
23 23
 									<div class="form-group">
24 24
 										<div class="col-xs-2 itp_ip itp_noMar">
25
-											<select id="ITP_FORM_ORDMNG01010_SEARCH_" class="form-control itp_input" name="service">
26
-												<option value="A">수주일자</option>											
27
-											</select>
25
+											<label>수주일자 *</label>
28 26
 										</div>											
29 27
 										<div class="col-xs-3 itp_ip itp_noMar">
30 28
 											<div class="input-daterange input-group date">

+ 1 - 3
src/main/webapp/app/ordmng/ORDMNG02010.html

@@ -22,9 +22,7 @@
22 22
 								<input type="hidden" id="ITP_FORM_ORDMNG02010_SEARCH_SPPLY_ID" name="sspplyId" value="">
23 23
 									<div class="form-group">
24 24
 										<div class="col-xs-2 itp_ip itp_noMar">
25
-											<select id="ITP_FORM_ORDMNG02010_SEARCH_" class="form-control itp_input" name="service">
26
-												<option value="A">납품요청일</option>											
27
-											</select>
25
+											<label>납품요청일 *</label>
28 26
 										</div>										
29 27
 										<div class="col-xs-3 itp_ip itp_noMar">
30 28
 											<div class="input-daterange input-group date">

+ 1 - 3
src/main/webapp/app/ordmng/ORDMNG03010.html

@@ -18,9 +18,7 @@
18 18
 								<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
19 19
 									<div class="form-group">
20 20
 										<div class="col-xs-2 itp_ip itp_noMar">
21
-											<select id="ITP_FORM_ORDMNG03010_SEARCH_" class="form-control itp_input" name="service">
22
-												<option value="A">납품예정일자</option>											
23
-											</select>
21
+											<label>납품예정일자 *</label>
24 22
 										</div>										
25 23
 										<div class="col-xs-3 itp_ip itp_noMar">
26 24
 											<div class="input-daterange input-group date">

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

@@ -207,6 +207,7 @@ let pageObj = {
207 207
 	ui: {
208 208
 		init: function () {
209 209
 			this.button();
210
+			this.form();
210 211
 			this.ready();
211 212
 		},
212 213
 		button: function () {
@@ -226,6 +227,9 @@ let pageObj = {
226 227
 			$('#ITP_FORM_OPER01010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
227 228
 			$('#ITP_FORM_OPER01010_SEARCH_TO_DT').datepicker('setDate', new Date());
228 229
 		},
230
+		form: function() {
231
+			itp_fn_form_event.onKeyup('#ITP_FORM_OPER01010_DETAIL');
232
+		},
229 233
 		afflInfo: {
230 234
 			init: function() {
231 235
 				this.authTpCd 		= fn_make_user_info.get('authTpCd');

+ 4 - 0
src/main/webapp/js/app/oper/ITP_OPER03011.js

@@ -113,6 +113,7 @@ let pageObj = {
113 113
 	ui: {
114 114
 		init: function () {
115 115
 			this.view();
116
+			this.form();
116 117
 			this.grid();
117 118
 			this.ready();
118 119
 		},
@@ -140,6 +141,9 @@ let pageObj = {
140 141
 				}
141 142
 			});
142 143
 		},
144
+		form: function() {
145
+			itp_fn_form_event.onKeyup('#ITP_FORM_OPER03011_DETAIL');
146
+		},
143 147
 		grid: function() {
144 148
 		},
145 149
 		ready: function() {

+ 3 - 3
src/main/webapp/js/app/pomng/ITP_POMNG02010.js

@@ -539,8 +539,7 @@ let pageObj = {
539 539
 					}				
540 540
 				});
541 541
 				$('#ITP_FORM_POMNG02010_DETAIL .fnPchReqTotalAmt').text(itp_fn_number_comma(pchReqAmt));
542
-			}
543
-			
542
+			}			
544 543
 		},
545 544
 		clearData : function() {
546 545
 			$(this.gridId).jqGrid('clearGridData', true);
@@ -608,7 +607,6 @@ let listObj = {
608 607
 			param.gridSize = $.jgrid.defaults.rowNum;
609 608
 			param.sbrandId = fn_make_user_info.get('brandId');
610 609
 			param.sstoreId = fn_make_user_info.get('storeId');
611
-			console.log(param);
612 610
 			var option = {
613 611
 				gridId: POMNG02010_GRID_ID,
614 612
 				colModel: gridColModel.list,
@@ -617,6 +615,8 @@ let listObj = {
617 615
 				param: param,
618 616
 				url: DOMAIN + API_DETAIL_GRID_LIST,
619 617
 				pager: POMNG02010_GRID_PAGER,
618
+				multiselect: true,
619
+				rownumbers: false,
620 620
 				onCellSelect: function(rowId, cellIdx, cellValue) {
621 621
 					var cm = $(this).jqGrid('getGridParam', 'colModel');
622 622
 					var colNm = cm[cellIdx].name;

+ 5 - 5
src/main/webapp/js/app/pomng/ITP_POMNG03010.js

@@ -79,14 +79,13 @@ const gridColModel = {
79 79
 		{
80 80
 			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
81 81
 			label: ITP_MSG_LOCALE.label.pchReqUnqNo, //구매요청고유번호
82
-			width: '10', fixed: false, align: 'center',
83
-			minwidth: 140,
82
+			width: '12', fixed: false, align: 'center',
84 83
 			sortable: false, hidden: false
85 84
 		},
86 85
 		{
87 86
 			index: 'DLV_DVSN_NM', name: 'dlvDvsnNm',
88 87
 			label: ITP_MSG_LOCALE.label.dlvDvsnNm, //배송구분
89
-			width: '10', fixed: false, align: 'center',
88
+			width: '9', fixed: false, align: 'center',
90 89
 			sortable: false, hidden: false
91 90
 		},
92 91
 		{
@@ -170,7 +169,7 @@ const gridColModel = {
170 169
 		{
171 170
 			index: 'PCH_REQ_QTY', name: 'pchReqQty',
172 171
 			label: ITP_MSG_LOCALE.label.pchReqQty, //구매요청수량
173
-			width: '10', fixed: false, align: 'right',
172
+			width: '8', fixed: false, align: 'right',
174 173
 			sortable: false, hidden: false,
175 174
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
176 175
 		},
@@ -183,7 +182,7 @@ const gridColModel = {
183 182
 		{
184 183
 			index: 'PCH_REQ_AMT', name: 'pchReqAmt',
185 184
 			label: ITP_MSG_LOCALE.label.pchReqAmt, //납품요청금액
186
-			width: '10', fixed: false, align: 'right',
185
+			width: '8', fixed: false, align: 'right',
187 186
 			sortable: false, hidden: false,
188 187
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
189 188
 		},
@@ -935,6 +934,7 @@ let listObj = {
935 934
 				param: param,
936 935
 				url: DOMAIN + API_DETAIL_GRID_LIST,
937 936
 				pager: POMNG03010_GRID_PAGER,
937
+				rownumbers: false,
938 938
 				loadComplete: function(data) {
939 939
 					itp_fn_grid_load_complete(data, POMNG03010_GRID_ID, true, 'number', 'POMNG03010', listObj.itp_POMNG03010_search, listObj.empty, true, data.gridRecords, true);
940 940
 					var ids = $(POMNG03010_GRID_ID).getDataIDs();

+ 5 - 5
src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -121,13 +121,13 @@ const gridColModel = {
121 121
 		{
122 122
 			index: 'ITEM_ID', name: 'itemId',
123 123
 			label: ITP_MSG_LOCALE.label.itemId, //품목번호
124
-			width: '10', fixed: false, align: 'center',
124
+			width: '12', fixed: false, align: 'center',
125 125
 			sortable: false, hidden: false
126 126
 		},
127 127
 		{
128 128
 			index: 'ITEM_NM', name: 'itemNm',
129 129
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
130
-			width: '13', fixed: false, align: 'left',
130
+			width: '11', fixed: false, align: 'left',
131 131
 			sortable: false, hidden: false
132 132
 		},
133 133
 		{
@@ -145,14 +145,14 @@ const gridColModel = {
145 145
 		{
146 146
 			index: 'UNIT', name: 'unit',
147 147
 			label: ITP_MSG_LOCALE.label.unit, //기본단위
148
-			width: '9', fixed: false, align: 'center',
148
+			width: '8', fixed: false, align: 'center',
149 149
 			sortable: false, editable: false, formatter: 'select', edittype: 'select',
150 150
 			editoptions: {value: ITP_COMMON_CD_DSTRBT_COST_UNIT}
151 151
 		},
152 152
 		{
153 153
 			index: 'CURR', name: 'curr',
154 154
 			label: ITP_MSG_LOCALE.label.curr, //통화
155
-			width: '9', fixed: false, align: 'center',
155
+			width: '7', fixed: false, align: 'center',
156 156
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
157 157
 			editoptions: {value: ITP_COMMON_CD_CURR},
158 158
 			classes: 'input_color',
@@ -170,7 +170,7 @@ const gridColModel = {
170 170
 		{
171 171
 			index: 'UNIT_TARGET_CD', name: 'unitTargetCd',
172 172
 			label: ITP_MSG_LOCALE.label.unitTargetCd, //대상여부
173
-			width: '10', fixed: false, align: 'center',
173
+			width: '7', fixed: false, align: 'center',
174 174
 			classes: 'input_color',
175 175
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
176 176
 			editoptions: {value: ITP_COMMON_CD_UNIT_TARGET_CD},

+ 26 - 14
src/main/webapp/mobile/app/mpomng/MPOMNG02010.html

@@ -1,5 +1,5 @@
1 1
 <section id="ITP_MOBILE_MPOMNG02010">
2
-  <div id="ITP_AJAX_MPOMNG02010_LIST_CONTAINER" style="display: block;">
2
+  <div id="ITP_AJAX_MPOMNG02010_LIST_CONTAINER" style="display: none;">
3 3
     <div class="content">
4 4
       <form id="ITP_FORM_MPOMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
5 5
         <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
@@ -48,7 +48,7 @@
48 48
     </div>
49 49
     <div id="ITP_LIST_MPOMNG02010_ITEM_AREA" class="scroll_area row-1">
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: none;">
51
+      <div id="ITP_LIST_MPOMNG02010_ITEM_ROWCOPY" style="display: block;">
52 52
         <li class="history_list">
53 53
           <div class="left">
54 54
             <div class="nomal">
@@ -217,7 +217,7 @@
217 217
           <li class="list-row">
218 218
             <div class="left_info">
219 219
               <div class="check_box">
220
-                <div style="display:none;"><input style="width:20px;" type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
220
+                <input style="width:20px;" type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
221 221
               </div>
222 222
               <div class="thick">
223 223
               	<label>품목명</label>
@@ -246,18 +246,30 @@
246 246
     </form>
247 247
   </div>
248 248
   <div id="ITP_POP_MPOMNG02010_REQ_AREA" class="popup mobile-pop-close" style="display: none;">
249
-    <div class="pop">
250
-      <div class="pop_line">
251
-        <label>납품요청일 &nbsp;&nbsp;:</label>
252
-        <div class="fnPopDlvReqDt"></div>
253
-      </div>
254
-      <div class="pop_line">
255
-        <label>품목수&nbsp;&nbsp; :</label>
256
-        <div class="fnItemQty">개</div>
257
-      </div>
249
+    <div class="pop short">
258 250
       <div class="pop_line">
259
-        <label>구매금액 &nbsp;&nbsp;:</label>
260
-        <div class="fnOrdAmt">원</div>
251
+	       <div class="itp_label_area">
252
+	           <label>납품요청일</label>
253
+	       </div>
254
+	       <div class="itp_info_area">
255
+	           <div class="fnPopDlvReqDt"></div>
256
+	       </div>
257
+       </div>
258
+       <div class="pop_line">
259
+	      <div class="itp_label_area">
260
+   		  	<label>품목수</label>
261
+	      </div>
262
+	      <div class="itp_info_area">
263
+         	<div class="fnItemQty"></div>
264
+	      </div>
265
+       </div>
266
+       <div class="pop_line border">
267
+	      <div class="itp_label_area">
268
+	        <label>구매금액</label>
269
+	      </div>  
270
+	      <div class="itp_info_area">
271
+	        <div class="fnOrdAmt">원</div>
272
+	      </div>
261 273
       </div>
262 274
       <label class="pop_label pop_msg">구매요청 하시겠습니까?</label>
263 275
       <div class="popup_btn">

+ 3 - 3
src/main/webapp/mobile/app/mpomng/MPOMNG04010.html

@@ -144,7 +144,7 @@
144 144
 			  </div>
145 145
 			</div>
146 146
 			<div class="table_header">
147
-			  <h1>> 발주 품목</h1>
147
+			  <h1><발주 품목></h1>
148 148
 			</div>
149 149
 		  </div>
150 150
 		<div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA" class="scroll_area row-2">
@@ -254,7 +254,7 @@
254 254
 				</form>
255 255
 			</div>
256 256
 			<div class="select_btn">
257
-				<button id="ITP_BTN_MPOMNG04010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
257
+				<button id="ITP_BTN_MPOMNG04010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
258 258
 			</div>
259 259
 			<div id="ITP_LIST_MPOMNG04010_POP_WHS_AREA" class="popup_scroll">
260 260
 				<ul id="ITP_LIST_MPOMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -273,4 +273,4 @@
273 273
 			</div>
274 274
 		</div>
275 275
 	</div>
276
-  </section>
276
+</section>

+ 2 - 2
src/main/webapp/mobile/app/mpomng/MPOMNG05010.html

@@ -144,7 +144,7 @@
144 144
 				</form>
145 145
 			</div>
146 146
 			<div class="select_btn">
147
-				<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
147
+				<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_NM" class="btn_blue">공급업체 ▼</button>
148 148
 			</div>
149 149
 			<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
150 150
 				<ul id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -181,7 +181,7 @@
181 181
 				</form>
182 182
 			</div>
183 183
 			<div class="select_btn">
184
-				<button id="ITP_BTN_MPOMNG05010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
184
+				<button id="ITP_BTN_MPOMNG05010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
185 185
 			</div>
186 186
 			<div id="ITP_LIST_MPOMNG05010_POP_WHS_AREA" class="popup_scroll">
187 187
 				<ul id="ITP_LIST_MPOMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

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

@@ -153,7 +153,7 @@
153 153
 				</form>
154 154
 			</div>
155 155
 			<div class="select_btn">
156
-				<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
156
+				<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_NM" class="btn_blue">공급업체 ▼</button>
157 157
 			</div>
158 158
 			<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_AREA" class="popup_scroll">
159 159
 				<ul id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -161,7 +161,7 @@
161 161
 					<li class="row_2">
162 162
 						<div class="scroll_left">
163 163
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
164
-							<div class="con_2 fnStNm">($)</div>
164
+							<div class="con_2 sub fnStNm">($)</div>
165 165
 						</div>
166 166
 						<div class="scroll_right">
167 167
 							<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
@@ -175,7 +175,7 @@
175 175
 		<div class="pop">
176 176
 			<div class="header">
177 177
 				<div class="header_left">
178
-					<label>> 납품장소</label>
178
+					<label>납품장소</label>
179 179
 				</div>
180 180
 				<div class="header_right">
181 181
 					<button type="button" id="ITP_BTN_MPOMNG06010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
@@ -190,7 +190,7 @@
190 190
 				</form>
191 191
 			</div>
192 192
 			<div class="select_btn">
193
-				<button id="ITP_BTN_MPOMNG06010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
193
+				<button id="ITP_BTN_MPOMNG06010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
194 194
 			</div>
195 195
 			<div id="ITP_LIST_MPOMNG06010_POP_WHS_AREA" class="popup_scroll">
196 196
 				<ul id="ITP_LIST_MPOMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

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

@@ -60,7 +60,7 @@
60 60
 	        </div>
61 61
 	      </div>
62 62
 	      <div class="table_header">
63
-	        <h1>> 입고 내역</h1>
63
+	        <h1><입고 내역></h1>
64 64
 	      </div>
65 65
 	    </div>
66 66
       <div id="ITP_LIST_MPOMNG07010_LIST_ITEM_AREA" class="scroll_area row-4">
@@ -147,7 +147,7 @@
147 147
 				</form>
148 148
 			</div>
149 149
 			<div class="select_btn">
150
-				<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
150
+				<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_NM" class="btn_blue">공급업체 ▼</button>
151 151
 			</div>
152 152
 			<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_AREA" class="popup_scroll">
153 153
 				<ul id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -155,7 +155,7 @@
155 155
 					<li class="row_2">
156 156
 						<div class="scroll_left">
157 157
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
158
-							<div class="con_2 fnStNm">($)</div>
158
+							<div class="con_2 sub fnStNm">($)</div>
159 159
 						</div>
160 160
 						<div class="scroll_right">
161 161
 							<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
@@ -184,7 +184,7 @@
184 184
 				</form>
185 185
 			</div>
186 186
 			<div class="select_btn">
187
-				<button id="ITP_BTN_MPOMNG07010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
187
+				<button id="ITP_BTN_MPOMNG07010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
188 188
 			</div>
189 189
 			<div id="ITP_LIST_MPOMNG07010_POP_WHS_AREA" class="popup_scroll">
190 190
 				<ul id="ITP_LIST_MPOMNG07010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -192,7 +192,7 @@
192 192
 					<li class="row_2">
193 193
 						<div class="scroll_left">
194 194
 							<div class="fnWhsNm">브랜드 창고 명A</div>
195
-							<div class="fnLocationNm">(상세위치내용)</div>
195
+							<div class="sub fnLocationNm">(상세위치내용)</div>
196 196
 							<div class="sub fnLocationNm">누리자 B/D</div>
197 197
 						</div>
198 198
 						<div class="scroll_right">

+ 25 - 13
src/main/webapp/mobile/app/mrtnmng/MRTNMNG01010.html

@@ -49,7 +49,7 @@
49 49
 					<li class="list-row">
50 50
 						<div class="left_info">
51 51
 			              <div class="check_box">
52
-			                <div style="display:none;"><input style="width:20px;" type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
52
+			                <input style="width:20px;" type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
53 53
 			              </div>
54 54
 			              <div class="thick">
55 55
 			              	<label>품목명</label>
@@ -59,7 +59,7 @@
59 59
 			              <div class="thick">
60 60
 			              	<label>구매가</label>
61 61
 			                <span>:</span>
62
-			                <div class="itp_amt fnUnitAmt">asdfasdf</div>
62
+			                <div class="itp_amt fnUnitAmt"></div>
63 63
 			              </div>
64 64
 			            </div>
65 65
 						<div class="right">
@@ -79,18 +79,30 @@
79 79
 	</div>
80 80
 	<div id="ITP_MOBILE_JS"></div>
81 81
 	<div id="ITP_POP_MRTNMNG01010_RTN_AREA" class="popup mobile-pop-close" style="display: none;">
82
-		<div class="pop">
82
+		<div class="pop short">
83 83
 			<div class="pop_line">
84
-				<label>반품요청일 &nbsp;&nbsp;:</label>
85
-				<div class="fnRtnReqDt"></div>
84
+            	<div class="itp_label_area">
85
+					<label>반품요청일</label>
86
+				</div>
87
+	            <div class="itp_info_area">
88
+					<div class="fnRtnReqDt"></div>
89
+				</div>
86 90
 			</div>
87 91
 			<div class="pop_line">
88
-				<label>품목수&nbsp;&nbsp; :</label>
89
-				<div class="fnItemQty">개</div>
92
+				<div class="itp_label_area">
93
+					<label>품목수</label>
94
+				</div>
95
+				<div class="itp_info_area">
96
+					<div class="fnItemQty"></div>
97
+				</div>
90 98
 			</div>
91
-			<div class="pop_line">
92
-				<label>반품금액 &nbsp;&nbsp;:</label>
93
-				<div class="fnRtnAmt">원</div>
99
+			<div class="pop_line border">
100
+				<div class="itp_label_area">
101
+					<label>반품금액</label>
102
+				</div>
103
+				<div class="itp_info_area">
104
+					<div class="fnRtnAmt"></div>
105
+				</div>
94 106
 			</div>
95 107
 			<label class="pop_label msg_save">요청 하시겠습니까?</label>
96 108
 			<div class="popup_btn">
@@ -118,7 +130,7 @@
118 130
 				</form>
119 131
 			</div>
120 132
 			<div class="select_btn">
121
-				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_blue">반품장소▼</button>
133
+				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_blue">반품장소 ▼</button>
122 134
 			</div>
123 135
 			<div id="ITP_LIST_MRTNMNG01010_POP_WHS_AREA" class="popup_scroll">
124 136
 				<ul id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -155,12 +167,12 @@
155 167
 					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
156 168
 				</div>
157 169
 				<div class="select_btn">
158
-					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
170
+					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_blue">품목명 ▼</button>
159 171
 				</div>
160 172
 			</form>
161 173
 			<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_AREA" class="popup_scroll">
162 174
 				<ul id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
163
-				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: block;">
175
+				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
164 176
 					<li class="row_2">
165 177
 						 <div class="scroll_left">
166 178
                             <div class="fnItemNm"></div>

+ 97 - 85
src/main/webapp/mobile/app/mrtnmng/MRTNMNG02010.html

@@ -1,9 +1,12 @@
1 1
 <section id="ITP_MOBILE_MRTNMNG02010">
2
-	<div id="ITP_AJAX_MRTNMNG02010_LIST_CONTAINER" style="display: none;">
2
+	<div id="ITP_AJAX_MRTNMNG02010_LIST_CONTAINER" style="display: block;">
3 3
 		<div class="content">
4 4
 			<form id="ITP_FORM_MRTNMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
5 5
 				<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
6 6
 				<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
7
+			  	<div class="line header">
8
+					<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품요청현황</div>
9
+		      	</div>
7 10
 				<div class="line">
8 11
 					<label>반품요청일</label>
9 12
 					<div class="input-group date_to date">
@@ -14,7 +17,7 @@
14 17
 				</div>
15 18
 				<div class="line">
16 19
 					<label>반품요청상태</label>
17
-					<div class="line_right">
20
+					<div class="float_left">
18 21
 						<select id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_RTN_REQ_ST_CD" data-select-code="RTN_REQ_ST_CD" class="stcd" name="srtnReqStCd">
19 22
 							<option value="">상태</option>
20 23
 						</select>
@@ -22,16 +25,16 @@
22 25
 				</div>
23 26
 				<div class="line">
24 27
 					<label>납품장소</label>
25
-					<div class="search_wrap">
26
-						<div class="float_left">
27
-							<input id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
28
-							<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">
29
-						</div>
30
-						<div class="float_left_btn">
28
+					<div class="float_left">
29
+						<input id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
30
+						<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">
31
+						<div class="itp_input_btn">
31 32
 							<button id="ITP_BTN_MRTNMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
32
-							<button id="ITP_BTN_MRTNMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
33 33
 						</div>
34 34
 					</div>
35
+					<div class="float_right_btn">
36
+						<button id="ITP_BTN_MRTNMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
37
+					</div>
35 38
 				</div>
36 39
 				<div class="line" style="height:50px;">
37 40
 					<div class="search">
@@ -39,21 +42,21 @@
39 42
 					</div>
40 43
 				</div>
41 44
 				<div class="table_header">
42
-					<h1>>구매 요청 내역</h1>
45
+					<h1><반품 요청 내역></h1>
43 46
 				</div>
44 47
 			</form>
45 48
 		</div>
46
-		<div id="ITP_LIST_MRTNMNG02010_LIST_AREA" class="scroll_area row-1-1">
47
-			<ul id="ITP_LIST_MRTNMNG02010_LIST_ROWS" class="panel-group"></ul>
48
-			<div id="ITP_LIST_MRTNMNG02010_LIST_ROWCOPY" style="display:none;">
49
-				<li class="history_list list-row">
49
+		<div id="ITP_LIST_MRTNMNG02010_LIST_AREA" class="scroll_area row-10">
50
+			<ul id="ITP_LIST_MRTNMNG02010_LIST_ROWS" class="mb_0 panel-group"></ul>
51
+			<div id="ITP_LIST_MRTNMNG02010_LIST_ROWCOPY" style="display: block;">
52
+				<li class="history_list5">
50 53
 					<div class="left">
51 54
 						<div class="nomal">
52 55
 							<label>반품요청일 </label>
53 56
 							<span>:</span>
54 57
 							<div class="history">
55
-								<div class="fnRtnReqDt"></div>
56
-								(<div class="fnRtnReqMgrNm"></div>)
58
+								<div class="fnRtnReqDt">asdf</div>
59
+								(<div class="fnRtnReqMgrNm">asdf</div>)
57 60
 							</div>
58 61
 						</div>
59 62
 					</div>
@@ -114,23 +117,24 @@
114 117
 				<h1>> 반품 품목</h1>
115 118
 			</div>
116 119
 		</div>
117
-		<div id="ITP_LIST_MRTNMNG02010_DETAIL_AREA" class="scroll_area row-2">
118
-			<ul id="ITP_LIST_MRTNMNG02010_DETAIL_ROWS" class="panel-group"></ul>
119
-			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display:none;">
120
+		<div id="ITP_LIST_MRTNMNG02010_DETAIL_AREA" class="scroll_area row-11">
121
+			<ul id="ITP_LIST_MRTNMNG02010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
122
+			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display: block;">
120 123
 				<li class="list-row">
121 124
 					<div class="left_info">
122 125
 						<div class="thick">
123
-							<div class="fnItemNm">품목명</div>
124
-							<div>-</div>
125
-							<div class="fnUnit"></div>
126
-						</div>
127
-						<div class="thick">
128
-							<label class="space0">반품가 :</label>
129
-							<div class="fnRtnAmt"></div>
130
-						</div>
126
+			              	<label>품목명</label>
127
+			                <span>:</span>
128
+			                <div class="itp_item fnItemNm"></div>
129
+	                	</div>
130
+		                <div class="thick">
131
+		              		<label>구매가</label>
132
+		                	<span>:</span>
133
+		                	<div class="itp_amt fnRtnAmt"></div>
134
+		                </div>
131 135
 					</div>
132 136
 					<div class="right">
133
-						<div class="fnRtnQty"></div>
137
+						<div class="fnnum fnRtnQty">1</div>
134 138
 					</div>
135 139
 				</li>
136 140
 			</div>
@@ -149,6 +153,9 @@
149 153
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_MGR_ID" name="rtnReqMgrId" value="">
150 154
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_ST_CD" name="rtnReqStCd" value="">
151 155
 			<div class="content">
156
+				<div class="line header">
157
+					<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품요청현황</div>
158
+		      	</div>
152 159
 				<div class="line">
153 160
 					<label>반품요청일</label>
154 161
 					<input id="ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT" name="colReqDt" class="date fnColReqDt" data-check-required="empty" type="date" placeholder="">
@@ -161,43 +168,44 @@
161 168
 				</div>
162 169
 				<div class="line">
163 170
 					<label>반품장소</label>
164
-					<div class="search_nm">
165
-						<div class="float_left">
166
-							<input type="text" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" placeholder="매장명" readonly />
167
-							<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
168
-							<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_LOCATION" class="form-control itp_input" name="rtnLocation" value="" />
169
-						</div>
170
-						<div class="float_left_btn">
171
+					<div class="float_left">
172
+						<input type="text" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" placeholder="매장명" readonly />
173
+						<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
174
+						<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_LOCATION" class="form-control itp_input" name="rtnLocation" value="" />
175
+						<div class="itp_input_btn">
171 176
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
172
-							<button id="ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
173 177
 						</div>
174 178
 					</div>
179
+					<div class="float_right_btn">
180
+						<button id="ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
181
+					</div>
175 182
 				</div>
176
-				<div class="line">
183
+				<div class="header line">
177 184
 					<div class="table_header">
178
-						<h1>>반품 품목</h1>
185
+						<h1><반품 품목></h1>
179 186
 						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
180 187
 						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
181 188
 					</div>
182 189
 				</div>
183 190
 			</div>
184
-			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-1-1">
185
-				<ul id="ITP_LIST_MRTNMNG02010_MODIFY_ROWS" class="panel-group"></ul>
186
-				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display:none;">
191
+			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-2-1">
192
+				<ul id="ITP_LIST_MRTNMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
193
+				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display: block;">
187 194
 					<li class="list-row">
188 195
 						<div class="left_info">
189 196
 							<div class="check_box"><!-- class 변경 -->
190
-								<div><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
191
-							</div>
192
-							<div class="thick">
193
-								<div class="fnItemNm">품목명</div>
194
-								<div>-</div>
195
-								<div class="fnUnit">EA</div>
197
+								<input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
196 198
 							</div>
197 199
 							<div class="thick">
198
-								<label class="space0">구매가 :</label>
199
-								<div class="fnUnitAmt"></div>
200
-							</div>
200
+				              	<label>품목명</label>
201
+				                <span>:</span>
202
+				                <div class="itp_item fnItemNm">품목명</div>
203
+			              	</div>
204
+			              	<div class="thick">
205
+				              	<label>구매가</label>
206
+				                <span>:</span>
207
+				                <div class="itp_amt fnUnitAmt"></div>
208
+			             	 </div>
201 209
 						</div>
202 210
 						<div class="right">
203 211
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_MINUS" class="DETAIL_ITEM_MINUS">-</button>
@@ -215,18 +223,30 @@
215 223
 		</form>
216 224
 	</div>
217 225
 	<div id="ITP_POP_MRTNMNG02010_REQ_AREA" class="popup mobile-pop-close" style="display: none;">
218
-		<div class="pop">
226
+		<div class="pop short">
219 227
 			<div class="pop_line">
220
-				<label>반품요청일 &nbsp;&nbsp;:</label>
221
-				<div class="fnPopDlvReqDt"></div>
228
+            	<div class="itp_label_area">
229
+					<label>반품요청일</label>
230
+				</div>
231
+	            <div class="itp_info_area">
232
+					<div class="fnPopDlvReqDt"></div>
233
+				</div>
222 234
 			</div>
223 235
 			<div class="pop_line">
224
-				<label>품목수&nbsp;&nbsp; :</label>
225
-				<div class="fnItemQty"></div>
236
+				<div class="itp_label_area">
237
+					<label>품목수</label>
238
+				</div>
239
+				<div class="itp_info_area">
240
+					<div class="fnItemQty"></div>
241
+				</div>
226 242
 			</div>
227
-			<div class="pop_line">
228
-				<label>구매금액 &nbsp;&nbsp;:</label>
229
-				<div class="fnRtnTotalAmt"></div>
243
+			<div class="pop_line border">
244
+				<div class="itp_label_area">
245
+					<label>반품금액</label>
246
+				</div>
247
+				<div class="itp_info_area">
248
+					<div class="fnRtnTotalAmt"></div>
249
+				</div>
230 250
 			</div>
231 251
 			<label class="pop_label msg_save">구매요청 하시겠습니까?</label>
232 252
 			<div class="popup_btn">
@@ -253,16 +273,17 @@
253 273
 					<button id="ITP_BTN_MRTNMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
254 274
 				</form>
255 275
 			</div>
256
-			<div class="search_bar">
257
-				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
276
+			<div class="select_btn">
277
+				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
258 278
 			</div>
259 279
 			<div id="ITP_LIST_MRTNMNG02010_POP_WHS_AREA" class="popup_scroll">
260
-				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
261
-				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display:none;">
280
+				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
281
+				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display: block;">
262 282
 					<li class="row_2">
263 283
 						<div class="scroll_left">
264 284
 							<div class="fnWhsNm">브랜드 창고 명A</div>
265
-							<div class="fnLocationNm">(상세위치내용)</div>
285
+							<div class="sub fnLocationNm">(상세위치내용)</div>
286
+							<div class="sub fnLocationNm">누리자 B/D</div>
266 287
 						</div>
267 288
 						<div class="scroll_right">
268 289
 							<button id="ITP_BTN_MRTNMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -289,36 +310,27 @@
289 310
 					<input id="ITP_FORM_MRTNMNG02010_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
290 311
 					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
291 312
 				</div>
292
-				<div class="search_bar">
293
-					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
313
+				<div class="select_btn">
314
+					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_blue">품목명 ▼</button>
294 315
 				</div>
295 316
 			</form>
296 317
 			<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_AREA" class="popup_scroll">
297
-				<ul id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWS" class="panel-group"></ul>
298
-				<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWCOPY" style="display:none;">
318
+				<ul id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
319
+				<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWCOPY" style="display: block;">
299 320
 					<li class="row_2">
300
-						<div class="left" style="width:180px;">
301
-							<!--<div class="check_box">
302
-                                <input type="checkbox" id="ITP_FORM_MRTNMNG02010_POP_ITEM_CHECKBOX" name="itemId" />
303
-                            </div>-->
304
-							<div class="thick">
305
-								<div class="fnItemNm">품목명</div>
306
-								<div>-</div>
307
-								<div class="fnUnit">EA</div>
308
-							</div>
309
-							<div class="thick" style="font-weight:100;">
310
-								<div class="space">구매가 :</div>
311
-								<div class="fnUnitAmt">0</div>
312
-							</div>
313
-						</div>
321
+						 <div class="scroll_left">
322
+                            <div class="fnItemNm"></div>
323
+                            <div class="sub fnKg"></div>
324
+                            <div class="amt fnUnitAmt"></div>
325
+                        </div>
326
+                        <div class="scroll_right">
327
+                            <button id="ITP_BTN_MPOMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
328
+                        </div>
314 329
 						<div class="right">
315 330
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
316
-							<div class="num fnRtnQty">1</div>
331
+							<div class="num fnPchReqQty">1</div>
317 332
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
318 333
 						</div>
319
-						<div class="add">
320
-							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
321
-						</div>
322 334
 					</li>
323 335
 				</div>
324 336
 			</div>

+ 13 - 10
src/main/webapp/mobile/css/style.css

@@ -12,6 +12,7 @@ body .login {position:fixed;}
12 12
 /* 팝업 */
13 13
 section .popup { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
14 14
 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;}
15
+section .popup .pop.short {height:260px;}
15 16
 section .popup .pop label.pop_label {position:relative; top:10px; font-size: 16px;}
16 17
 section .popup .pop div.pop_msg {padding:0 5%; text-align:left; position:relative; top:10px; font-size: 16px;}
17 18
 section .popup .pop .pop_line {width: 90%; margin:0 5%; display:flex; border:1px solid #aaa; border-bottom:none;}
@@ -224,7 +225,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
224 225
 
225 226
 /* 메뉴바 */
226 227
 #ITP_MENU .menu_area {position: fixed; width: 100%; height: 100%; top: 0; left: -0%; background: #000; opacity: 0.7; z-index: 12; transition: all 0.5s;}
227
-#ITP_MENU .menu_area button {float: right; width: 20px; height: 20px; padding: 0; background: transparent; border: none;}
228
+#ITP_MENU .menu_area button {float: right; width: 50px; height: 50px; padding: 0; background: transparent; border: none;}
228 229
 #ITP_MENU .menu_area button img {float: right; width: 40px; height: 40px; margin: 7px;}
229 230
 #ITP_MENU .menu_bar {position: fixed; width: 70%; height: 100%; left: -0%; top: 0; background: #fff; opacity: 1; z-index: 13; transition: all 0.5s;}
230 231
 #ITP_MENU .menu_bar .menu_header {width: 100%; height: 100px; border-bottom: 1px solid #000 ;}
@@ -287,7 +288,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
287 288
 .content .line label {min-width:110px; color:#666; font-size: 18px; margin-left: 10px; float: left; text-align: left; margin-top: 10px; font-weight:100;}
288 289
 .content .line label.pay_label {margin:38px 1%; width:98%;}
289 290
 .content .line select.label {border: 1px solid #000; font-size: 0.9rem;margin:9px 0 0 5px; float: left; width: 120px; height: 30px; text-align: left;}
290
-.content .line .itp_label_select {padding:0;width:120px; color:#666; font-size: 18px; float: left; margin-top: 3px; font-weight:100;}
291
+.content .line .itp_label_select {padding:0;width:116px; color:#666; font-size: 18px; float: left; margin-top: 5px; margin-right:4px; font-weight:100; border:1px solid #aaa; border-radius:5px;}
291 292
 .content .line .float_left {float: left; margin-top:2px; width:50%;}
292 293
 .content .line .float_left.name {width:60%;}
293 294
 .content .line .float_left button {float:right; left:-5px; position:relative; background:transparent; border:none; width:36px; height:36px; padding:0;} 
@@ -311,10 +312,10 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
311 312
 .content .line .line_right select {float: right; width: 180px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem; margin-right:93px;}
312 313
 .content .line input.date {width: 50%; margin: 5px 0; height: 35px; float: left; text-align:center; font-size:14px;background: url(../img/calender.png)no-repeat 95% 50%/20px auto #fff;}
313 314
 .content .line input.date2 {width: 140px; height: 30px; margin-right:133px;}
314
-.content .line div.date_to {width:60%; float: left; margin-right:0px;}
315
-.content .line div.date_to input {width:45%; font-size:14px;}
315
+.content .line div.date_to {display:flex; width:60%; float: left; margin-right:0px;}
316
+.content .line div.date_to input {font-weight:100; width:47%; font-size:14px;}
316 317
 
317
-.content .line div.date_to div.at {width: 3%;  font-size: 1rem; float: right; display: contents;}
318
+.content .line div.date_to div.at {width: 6%;  font-size: 16px; padding-top:12px; float: right;}
318 319
 .content .line .search {width: 100%; height: 50px; padding-top:8px;}
319 320
 .content .line .search button {width: 50%; height: 35px; font-size: 14px; font-weight:100; padding: 0;}
320 321
 .content .line .search button.col_3 {width: 25%; margin:0 12px;}
@@ -374,15 +375,17 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
374 375
 .scroll_area {position: absolute; width: 100%; height: 1090px; bottom: 30px; overflow: auto; background: #fff;}
375 376
 .row-1{top: 347px;}
376 377
 .row-1-1{top:363px;}
377
-.row-2{top: 300px;}
378
+.row-2{top: 345px;}
378 379
 .row-2-1{top:317px;}
379 380
 .row-3{top: 395px;}
380
-.row-4{top: 440px;}
381
+
382
+.row-4{top: 439px;}
381 383
 .row-5{top: 418px;}
382 384
 .row-6{top: 468px;}
383 385
 .row-7{top: 533px;}
384 386
 .row-9{top: 383px;}
385
-
387
+.row-10{top: 349px;}
388
+.row-11{top: 254px;}
386 389
 .col-4{width:35% !important;}
387 390
 .col-6{width:60% !important;}
388 391
 .col-4 .thick{width:100% !important;}
@@ -445,7 +448,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
445 448
 .scroll_area li .left .nomal .half {float:left;}
446 449
 .scroll_area li .left .nomal .half label {min-width:auto;}
447 450
 .scroll_area li .left .nomal .half div {min-width:auto; margin-right:5px; margin-top:0;}
448
-.scroll_area li .left .nomal  input{width: 85px; height:30px;}
451
+.scroll_area li .left .nomal  input{width: 85px; height:30px; margin-top:-3px;}
449 452
 
450 453
 .scroll_area li .scroll_btn {width:10%; height:158px; margin-top:-5px; display:inline-flex;}
451 454
 
@@ -507,7 +510,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
507 510
 	.content .line .float_left .itp_input_btn {width:70%;}
508 511
 	.content .line .float_left {width:70%;}
509 512
 	.content .line div.date_to {width:70%;}
510
-	.content .line div.date_to input {width:45%}
513
+	.content .line div.date_to input {width:47%}
511 514
 	.content .line .float_left.name {width:76%;}
512 515
 	.modal-dialog {margin:auto 20% !important;}
513 516
 	.scroll_area li .left_info .thick {width: 90%;}

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

@@ -55,10 +55,9 @@ require([
55 55
 	});
56 56
 
57 57
 	$('#ITP_MOBILE_BTN_SETTING').on('click', function() {
58
-		$('#ITP_MENU').toggle();
59 58
 	});
60 59
 
61
-	$('#ITP_BTN_NAV_CLOSE').on('click', function() {
60
+	$('.ITP_BTN_NAV_CLOSE').on('click', function() {
62 61
 		$('#ITP_MENU').toggle();
63 62
 	});
64 63