Przeglądaj źródła

반품관리 모바일 html 수정

whakdo963 2 lat temu
rodzic
commit
390f0b1250

+ 42 - 37
src/main/webapp/mobile/app/mrtnmng/MRTNMNG05010.html

@@ -5,13 +5,12 @@
5 5
 			<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 			<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_IDX" name="sidx" value="0">
7 7
 			<div class="content">
8
+				<div class="line header">
9
+				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품처리</div>
10
+			    </div>
8 11
 				<div class="line">
9 12
 					<label>수거예정일</label>
10 13
 					<div class="date_to">
11
-						<!--<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" readonly>
12
-						<span class="input-group-addon itp_date_to">~</span>
13
-						<input type="text" id="ITP_FORM_STINFO02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" readonly>-->
14
-
15 14
 						<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
16 15
 						<div class="at">~</div>
17 16
 						<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
@@ -21,63 +20,62 @@
21 20
 					<label>수거서번호</label>
22 21
 					<div class="search_wrap">
23 22
 						<div class="float_left">
24
-							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" style="width: 262px;" type="text" placeholder="">
23
+							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text" placeholder="">
25 24
 						</div>
26 25
 					</div>
27 26
 				</div>
28 27
 				<div class="line">
29 28
 					<label>반품입고장소</label>
30
-					<div class="search_nm">
31
-						<div class="float_left">
32
-							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" class="" name="srtnWhsNm" placeholder="매장명" readonly />
33
-							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID" data-check-required="empty" class="" name="srtnWhsId" />
34
-						</div>
35
-						<div class="float_left_btn">
29
+					<div class="float_left">
30
+						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" class="" name="srtnWhsNm" placeholder="매장명" readonly />
31
+						<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID" data-check-required="empty" class="" name="srtnWhsId" />
32
+						<div class="itp_input_btn">
36 33
 							<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM"><img src="../img/search.png" alt=""></button>
37
-							<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
38 34
 						</div>
39 35
 					</div>
36
+					<div class="float_right_btn">
37
+						<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
38
+					</div>
40 39
 				</div>
41 40
 				<div class="line">
42 41
 					<label>반품장소</label>
43
-					<div class="search_nm">
44
-						<div class="float_left">
45
-							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" class="" name="swhsNm" placeholder="매장명" readonly />
46
-							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID" data-check-required="empty" class="" name="swhsId" />
47
-						</div>
48
-						<div class="float_left_btn">
42
+					<div class="float_left">
43
+						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" class="" name="swhsNm" placeholder="매장명" readonly />
44
+						<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID" data-check-required="empty" class="" name="swhsId" />
45
+						<div class="itp_input_btn">
49 46
 							<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
50
-							<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
51 47
 						</div>
52 48
 					</div>
49
+					<div class="float_right_btn">
50
+						<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
51
+					</div>
53 52
 				</div>
54 53
 				<div class="line">
55 54
 					<label>반품품목명</label>
56
-					<div class="search_wrap">
57
-						<div class="float_left">
58
-							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="A매장명">
59
-						</div>
55
+					<div class="float_left name">
56
+						<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="A매장명">
60 57
 					</div>
61 58
 				</div>
62
-				<div class="line" style="height:50px;">
59
+				<div class="header line">
63 60
 					<div class="search">
64 61
 						<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
65 62
 					</div>
66 63
 				</div>
67 64
 				<div class="table_header">
68
-					<h1>> 반품서 내역</h1>
65
+					<h1><반품서 내역></h1>
69 66
 				</div>
70 67
 			</div>
71 68
 		</form>
72 69
 		<form id="ITP_FORM_MRTNMNG05010_LIST_MODIFY" class="form-horizontal" onsubmit="return false;">
73 70
 			<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_AREA" class="scroll_area row-4">
74 71
 				<ul id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWS" class="panel-group"></ul>
75
-				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: none;">
76
-					<li class="history_list2 list-row">
72
+				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: block;">
73
+					<li class="history_list2">
77 74
 						<div class="left">
78 75
 							<div class="nomal">
79 76
 								<label>반품번호 </label>
80 77
 								<div class="history">
78
+									<span>:</span>
81 79
 									<div class="fnRtnPodrUnqNo"></div>
82 80
 								</div>
83 81
 							</div>
@@ -86,6 +84,7 @@
86 84
 							<div class="nomal">
87 85
 								<label class="history_label">반품예정일</label>
88 86
 								<div class="history">
87
+									<span>:</span>
89 88
 									<div class="fnRtnSchDt history_info"></div>
90 89
 								</div>
91 90
 							</div>
@@ -94,10 +93,12 @@
94 93
 							<div class="nomal">
95 94
 								<label>공급업체</label>
96 95
 								<div class="history">
96
+									<span>:</span>	
97 97
 									<div class="history_info fnSpplyNm"></div>
98 98
 								</div>
99 99
 								<label class="sub_info">반품장소</label>
100 100
 								<div class="history">
101
+									<span>:</span>
101 102
 									<div class="fnRtnWhsNm"></div>
102 103
 								</div>
103 104
 							</div>
@@ -106,6 +107,7 @@
106 107
 							<div class="nomal">
107 108
 								<label>품목 </label>
108 109
 								<div class="history">
110
+									<span>:</span>
109 111
 									<div class="fnItemNm"></div>
110 112
 								</div>
111 113
 							</div>
@@ -113,11 +115,13 @@
113 115
 						<div class="left">
114 116
 							<div class="nomal">
115 117
 								<label class="col_2">반품요청수량</label>
116
-								<div class="col_5 history">
117
-									<div class="col_5 fnRtnReqQty"></div>
118
+								<div class=" history">
119
+									<span>:</span>
120
+									<div class=" fnRtnReqQty"></div>
118 121
 								</div>
119 122
 								<label class="col_0">반품발주수량</label>
120 123
 								<div class="history">
124
+									<span>:</span>
121 125
 									<input class="" id="ITP_FORM_MRTNMNG05010_LIST_RTN_PODR_QTY" type="text" name="rtnPodrQty">
122 126
 								</div>
123 127
 							</div>
@@ -127,7 +131,7 @@
127 131
 			</div>
128 132
 			<div class="button_bar">
129 133
 				<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-primary INPS">반품처리</button>
130
-				<!--<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
134
+				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
131 135
 			</div>
132 136
 		</form>
133 137
 	</div>
@@ -136,7 +140,7 @@
136 140
 		<div class="pop">
137 141
 			<div class="header">
138 142
 				<div class="header_left">
139
-					<label>> 납품장소</label>
143
+					<label>납품장소</label>
140 144
 				</div>
141 145
 				<div class="header_right">
142 146
 					<button type="button" id="ITP_BTN_MRTNMNG05010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
@@ -150,16 +154,17 @@
150 154
 					<button id="ITP_BTN_MRTNMNG05010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
151 155
 				</form>
152 156
 			</div>
153
-			<div class="search_bar">
154
-				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
157
+			<div class="select_btn">
158
+				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
155 159
 			</div>
156 160
 			<div id="ITP_LIST_MRTNMNG05010_POP_WHS_AREA" class="popup_scroll">
157
-				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
158
-				<div id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWCOPY" style="display:none;">
159
-					<li class="list-row">
161
+				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
162
+				<div id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWCOPY" style="display: block;">
163
+					<li class="list-row row_2">
160 164
 						<div class="scroll_left">
161 165
 							<div class="fnWhsNm">브랜드 창고 명A</div>
162
-							<div class="fnLocationNm">(상세위치내용)</div>
166
+							<div class="sub fnLocationNm">(상세위치내용)</div>
167
+							<div class="sub fnLocationNm">(상세위치내용)</div>
163 168
 						</div>
164 169
 						<div class="scroll_right">
165 170
 							<button id="ITP_BTN_MRTNMNG05010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

+ 38 - 31
src/main/webapp/mobile/app/mrtnmng/MRTNMNG06010.html

@@ -5,6 +5,9 @@
5 5
 			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_IDX" name="sidx" value="0">
7 7
 			<div class="content">
8
+				<div class="line header">
9
+				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품현황</div>
10
+			    </div>
8 11
 				<div class="line">
9 12
 					<label>반품일자</label>
10 13
 					<div class="date_to">
@@ -15,47 +18,43 @@
15 18
 				</div>
16 19
 				<div class="line">
17 20
 					<label>반품발주번호</label>
18
-					<div class="search_wrap">
19
-						<div class="line_right">
20
-							<input id="ITP_FORM_MRTNMNG06010_LIST_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text">
21
-						</div>
21
+					<div class="float_left">
22
+						<input id="ITP_FORM_MRTNMNG06010_LIST_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text">
22 23
 					</div>
23 24
 				</div>
24 25
 				<div class="line">
25 26
 					<label>반품입고장소</label>
26
-					<div class="search_wrap">
27
-						<div class="float_left">
28
-							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="매장명" readonly>
29
-							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
30
-						</div>
31
-						<div class="float_left_btn">
27
+					<div class="float_left">
28
+						<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="매장명" readonly>
29
+						<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
30
+						<div class="itp_input_btn">
32 31
 							<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" data-call-popup="ITP_POP_MRTNMNG06010_WHS_NM"><img src="../img/search.png" alt=""></button>
33
-							<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
34 32
 						</div>
35 33
 					</div>
34
+					<div class="float_right_btn">
35
+						<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
36
+					</div>
36 37
 				</div>
37 38
 				<div class="line">
38 39
 					<label>반품장소</label>
39
-					<div class="search_nm">
40 40
 						<div class="float_left">
41 41
 							<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
42 42
 							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
43
+							<div class="itp_input_btn">
44
+								<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
45
+							</div>
43 46
 						</div>
44
-						<div class="float_left_btn">
45
-							<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
47
+						<div class="float_right_btn">
46 48
 							<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
47 49
 						</div>
48
-					</div>
49 50
 				</div>
50 51
 				<div class="line">
51 52
 					<label>품목명</label>
52
-					<div class="search_wrap">
53
-						<div class="float_left">
54
-							<input id="ITP_FORM_MRTNMNG06010_LIST_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="품목명">
55
-						</div>
53
+					<div class="float_left">
54
+						<input id="ITP_FORM_MRTNMNG06010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
56 55
 					</div>
57 56
 				</div>
58
-				<div class="line" style="height:50px;">
57
+				<div class="line">
59 58
 					<div class="search">
60 59
 						<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
61 60
 					</div>
@@ -65,13 +64,14 @@
65 64
 				</div>
66 65
 			</div>
67 66
 			<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_AREA" class="scroll_area row-4">
68
-				<ul id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS" class="panel-group"></ul>
69
-				<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWCOPY" style="display: none;">
70
-					<li class="history_list2 list-row">
67
+				<ul id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
68
+				<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWCOPY" style="display: block;">
69
+					<li class="history_list2 ">
71 70
 						<div class="left">
72 71
 							<div class="nomal">
73 72
 								<label>반품발주번호 </label>
74 73
 								<div class="history">
74
+									<span>:</span>
75 75
 									<div class="fnRtnPodrNo"></div>
76 76
 								</div>
77 77
 							</div>
@@ -80,6 +80,7 @@
80 80
 							<div class="nomal">
81 81
 								<label class="history_label">반품예정일</label>
82 82
 								<div class="history">
83
+									<span>:</span>
83 84
 									<div class="fn_info fnRtnSchDt"></div>
84 85
 								</div>
85 86
 							</div>
@@ -88,10 +89,12 @@
88 89
 							<div class="nomal">
89 90
 								<label>공급업체</label>
90 91
 								<div>
92
+									<span>:</span>
91 93
 									<div class="fnSpplyNm">A공급업체명</div>
92 94
 								</div>
93 95
 								<label class="sub_info">납품장소</label>
94 96
 								<div>
97
+									<span>:</span>
95 98
 									<div class="fnWhsNm">A매장내</div>
96 99
 								<div>
97 100
 							</div>
@@ -100,6 +103,7 @@
100 103
 							<div class="nomal">
101 104
 								<label>품목 </label>
102 105
 								<div class="history">
106
+									<span>:</span>
103 107
 									<div class="fnItemNm">품목명(EA)</div>
104 108
 								</div>
105 109
 							</div>
@@ -108,10 +112,12 @@
108 112
 							<div class="nomal">
109 113
 								<label>반품발주수량</label>
110 114
 								<div class="history">
115
+									<span>:</span>
111 116
 									<div class="col_5 fnRtnPodrQty"></div>
112 117
 								</div>
113 118
 								<label class="sub_info">반품입고수량</label>
114 119
 								<div class="history">
120
+									<span>:</span>
115 121
 									<div class="fnRtnWhsQty">10</div>
116 122
 								</div>
117 123
 							</div>
@@ -122,11 +128,11 @@
122 128
 		</form>
123 129
 	</div>
124 130
 	<div id="ITP_MOBILE_JS"></div>
125
-	<div id="ITP_POP_MRTNMNG06010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
131
+	<div id="ITP_POP_MRTNMNG06010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
126 132
 		<div class="pop">
127 133
 			<div class="header">
128 134
 				<div class="header_left">
129
-					<label>> 납품장소</label>
135
+					<label>납품장소</label>
130 136
 				</div>
131 137
 				<div class="header_right">
132 138
 					<button type="button" id="ITP_BTN_MRTNMNG06010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
@@ -140,16 +146,17 @@
140 146
 					<button id="ITP_BTN_MRTNMNG06010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
141 147
 				</form>
142 148
 			</div>
143
-			<div class="search_bar">
144
-				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
149
+			<div class="select_btn">
150
+				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
145 151
 			</div>
146 152
 			<div id="ITP_LIST_MRTNMNG06010_POP_WHS_AREA" class="popup_scroll">
147
-				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
148
-				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display:none;">
149
-					<li class="list-row">
153
+				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
154
+				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display: block;">
155
+					<li class="row_2">
150 156
 						<div class="scroll_left">
151 157
 							<div class="fnWhsNm">브랜드 창고 명A</div>
152
-							<div class="fnLocationNm">(상세위치내용)</div>
158
+							<div class="sub fnLocationNm">(상세위치내용)</div>
159
+							<div class="sub fnLocationNm">(상세위치내용)</div>
153 160
 						</div>
154 161
 						<div class="scroll_right">
155 162
 							<button id="ITP_BTN_MRTNMNG06010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

+ 1 - 1
src/main/webapp/mobile/css/style.css

@@ -379,7 +379,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
379 379
 .row-2-1{top:317px;}
380 380
 .row-3{top: 395px;}
381 381
 .row-3-1{top: 355px;}
382
-.row-4{top: 439px;}
382
+.row-4{top: 435px;}
383 383
 .row-5{top: 418px;}
384 384
 .row-6{top: 468px;}
385 385
 .row-7{top: 533px;}