Explorar o código

모바일 디자인 적용

juney %!s(int64=2) %!d(string=hai) anos
pai
achega
48aad0a00f

+ 30 - 28
src/main/webapp/mobile/app/mrtnmng/MRTNMNG01010.html

@@ -7,40 +7,42 @@
7 7
 			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_DVSN" name="whsDvsn" value="">
8 8
 			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_RTN_REQ_ST_CD" name="rtnReqStCd" value="">
9 9
 			<div class="content">
10
-				<div class="line header">
11
-					<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품요청</div>
12
-		      	</div>
13
-				<div class="line mt5">
14
-					<label>반품요청일</label>
15
-					<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT" name="colReqDt" class="itp_input date" data-check-required="empty" readonly>
16
-				</div> 
17
-				<div class="line">
18
-					<label>반품요청금액</label>
19
-					<div class="float_left">
20
-						<div class="input_text">
21
-							<div class="fnRtnReqAmt">0원</div>
10
+				<div class="content_fix">
11
+					<div class="line header">
12
+						<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품요청</div>
13
+			      	</div>
14
+					<div class="line mt5">
15
+						<label>반품요청일</label>
16
+						<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT" name="colReqDt" class="itp_input date" data-check-required="empty" readonly>
17
+					</div> 
18
+					<div class="line">
19
+						<label>반품요청금액</label>
20
+						<div class="float_left">
21
+							<div class="input_text">
22
+								<div class="fnRtnReqAmt">1,000,000원</div>
23
+							</div>
22 24
 						</div>
23 25
 					</div>
24
-				</div>
25
-				<div class="line">
26
-					<label>반품장소</label>
27
-					<div class="float_left">
28
-						<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="빈품장소" placeholder="" readonly />
29
-						<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
30
-						<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_LOCATION" class="form-control itp_input" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="빈품장소" name="rtnLocation" value="" />
31
-       					<div class="itp_input_btn">
32
-							<button id="ITP_BTN_MRTNMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
26
+					<div class="line">
27
+						<label>반품장소</label>
28
+						<div class="float_left">
29
+							<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="빈품장소" placeholder="" readonly />
30
+							<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
31
+							<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_LOCATION" class="form-control itp_input" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="빈품장소" name="rtnLocation" value="" />
32
+	       					<div class="itp_input_btn">
33
+								<button id="ITP_BTN_MRTNMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
34
+							</div>
35
+						</div>
36
+						<div class="float_right_btn">
37
+							<button id="ITP_BTN_MRTNMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
33 38
 						</div>
34 39
 					</div>
35
-					<div class="float_right_btn">
36
-						<button id="ITP_BTN_MRTNMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
40
+					<div class="table_header">
41
+						<h1><반품 품목></h1>
42
+						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
43
+						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>
37 44
 					</div>
38 45
 				</div>
39
-				<div class="table_header">
40
-					<h1><반품 품목></h1>
41
-					<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
42
-					<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>
43
-				</div>
44 46
 			</div>
45 47
 			<div id="ITP_LIST_MRTNMNG01010_ITEM_AREA" class="scroll_area row-7">
46 48
 				<ul id="ITP_LIST_MRTNMNG01010_DETAIL_ROWS" class="mb_0 panel-group"></ul>

+ 119 - 108
src/main/webapp/mobile/app/mrtnmng/MRTNMNG04010.html

@@ -4,59 +4,61 @@
4 4
 			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
5 5
 			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 			<div class="content">
7
-				<div class="line header">
8
-				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품발주현황</div>
9
-			    </div>
10
-				<div class="line">
11
-					<label>반품요청일</label>
12
-					<div class="date_to">
13
-						<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
14
-						<div class="at">~</div>
15
-						<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
16
-					</div>
17
-				</div>
18
-				<div class="line">
19
-					<label>반품발주상태</label>
20
-					<div class="float_left">
21
-						<select id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_ODR_ST_CD" data-select-code="RTN_ODR_ST_CD" class="stcd" name="srtnOdrStCd">
22
-							<option value=""></option>
23
-						</select>
7
+				<div class="content_fix">
8
+					<div class="line header">
9
+					  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품발주현황</div>
10
+				    </div>
11
+					<div class="line">
12
+						<label>반품요청일</label>
13
+						<div class="date_to">
14
+							<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
15
+							<div class="at">~</div>
16
+							<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
17
+						</div>
24 18
 					</div>
25
-				</div>
26
-				<div class="line">
27
-					<label>수거장소</label>
28
-					<div class="float_left">
29
-						<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_WHS_NM" class="" name="srtnWhsNm" placeholder="매장명" readonly />
30
-						<input type="hidden" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
31
-						<div class="itp_input_btn">
32
-							<button id="ITP_BTN_MRTNMNG04010_LIST_SEARCH_RTN_WHS_NM"><img src="../img/search.png" alt=""></button>
19
+					<div class="line">
20
+						<label>반품발주상태</label>
21
+						<div class="float_left">
22
+							<select id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_ODR_ST_CD" data-select-code="RTN_ODR_ST_CD" class="stcd" name="srtnOdrStCd">
23
+								<option value=""></option>
24
+							</select>
33 25
 						</div>
34 26
 					</div>
35
-					<div class="float_right_btn">
36
-						<button id="ITP_BTN_MRTNMNG04010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
27
+					<div class="line">
28
+						<label>수거장소</label>
29
+						<div class="float_left">
30
+							<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_WHS_NM" class="" name="srtnWhsNm" placeholder="매장명" readonly />
31
+							<input type="hidden" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
32
+							<div class="itp_input_btn">
33
+								<button id="ITP_BTN_MRTNMNG04010_LIST_SEARCH_RTN_WHS_NM"><img src="../img/search.png" alt=""></button>
34
+							</div>
35
+						</div>
36
+						<div class="float_right_btn">
37
+							<button id="ITP_BTN_MRTNMNG04010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
38
+						</div>
37 39
 					</div>
38
-				</div>
39
-				<div class="line top3">
40
-					<label>반품입고장소</label>
41
-					<div class="float_left">
42
-						<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
43
-						<input type="hidden" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
44
-						<div class="itp_input_btn">
45
-							<button id="ITP_BTN_MRTNMNG04010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
40
+					<div class="line top3">
41
+						<label>반품입고장소</label>
42
+						<div class="float_left">
43
+							<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
44
+							<input type="hidden" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
45
+							<div class="itp_input_btn">
46
+								<button id="ITP_BTN_MRTNMNG04010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
47
+							</div>
48
+						</div>
49
+						<div class="float_right_btn">
50
+							<button id="ITP_BTN_MRTNMNG04010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
46 51
 						</div>
47 52
 					</div>
48
-					<div class="float_right_btn">
49
-						<button id="ITP_BTN_MRTNMNG04010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
53
+					<div class="line">
54
+						<div class="search">
55
+							<button id="ITP_BTN_MRTNMNG04010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
56
+						</div>
50 57
 					</div>
51
-				</div>
52
-				<div class="line" style="height:50px;">
53
-					<div class="search">
54
-						<button id="ITP_BTN_MRTNMNG04010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
58
+					<div class="table_header">
59
+						<h1><반품 발주 내역></h1>
55 60
 					</div>
56 61
 				</div>
57
-				<div class="table_header">
58
-					<h1><반품 발주 내역></h1>
59
-				</div>
60 62
 			</div>
61 63
 			<div id="ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA" class="scroll_area row-9">
62 64
 				<ul id="ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
@@ -64,41 +66,36 @@
64 66
 					<li class="history_list7">
65 67
 						<div class="left">
66 68
 							<div class="nomal">
67
-								<label>반품발주일자 :</label>
68
-								<div class="history">
69
-									<div class="fnRtnOdrRegDt">s</div>
70
-									(<div class="fnColDvsnNm"></div>)
71
-								</div>
69
+								<label class="col_1">반품발주일자</label>
70
+								<span>:</span>
71
+								<div class="fnRtnOdrRegDt">2022.10.10</div>
72
+								<div class="col_0 fnColDvsnNm">(홍길동)</div>
72 73
 							</div>
73 74
 						</div>
74 75
 						<div class="left">
75 76
 							<div class="nomal">
76
-								<label>반품발주상태 :</label>
77
-								<div class="history">
78
-									<div class="fnRtnOdrStNm"></div>
79
-								</div>
80
-								<label>납품장소명 :</label>
81
-								<div class="history">
82
-									<div class="fnWhsNm"></div>
83
-								</div>
77
+								<label>반품발주상태</label>
78
+								<span>:</span>
79
+								<div class="col_6 fnRtnOdrStNm">발주가능</div>
80
+								<label>납품장소명</label>
81
+								<span class="mg0">:</span>
82
+								<div class="fnWhsNm">테스트 브랜드 창고명 ㅁㅇㄴㄻㄴ</div>
84 83
 							</div>
85 84
 						</div>
86 85
 						<div class="left">
87 86
 							<div class="nomal">
88
-								<label>반품발주정보 :</label>
89
-								<div class="history">
90
-									<div class="fnRtnDodrItemQty">품목수($)</div>
91
-									<i>-</i>
92
-									<div class="fnRtnDodrTotalAmt"></div>
93
-								</div>
87
+								<label>반품발주정보</label>
88
+								<span>:</span>
89
+								<div class="col_0 fnRtnDodrItemQty">품목수</div>
90
+								<span>-</span>
91
+								<div class="fnRtnDodrTotalAmt">ㅁㄴㅇㄻㄴㅇㄻㄴㅇㄹ</div>
94 92
 							</div>
95 93
 						</div>
96 94
 						<div class="left">
97 95
 							<div class="nomal">
98
-								<label>반품입고장소 :</label>
99
-								<div class="history">
100
-									<div class="fnRtnWhsNm"></div>
101
-								</div>
96
+								<label>반품입고장소</label>
97
+								<span>:</span>
98
+								<div class="full fnRtnWhsNm">ㅌ테스트 브랜드 확인</div>
102 99
 							</div>
103 100
 						</div>
104 101
 					</li>
@@ -110,68 +107,82 @@
110 107
 		<form id="ITP_FORM_MRTNMNG04010_VIEW" class="form-horizontal" onsubmit="return false;">
111 108
 			<input type="hidden" id="ITP_FORM_MRTNMNG04010_VIEW_VIEW_CD" name="viewCd" value="C">
112 109
 			<div class="content">
113
-				<div class="line header">
114
-				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품발주현황</div>
115
-			    </div>
116
-				<div class="line">
117
-					<label>반품발주일자</label>
118
-					<div class="line_right">
119
-						<div class="fnRtnOdrRegDt"></div>
110
+				<div class="content_fix">
111
+					<div class="line header">
112
+					  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품발주현황</div>
113
+				    </div>
114
+					<div class="line">
115
+						<label>반품발주일자</label>
116
+						<div class="line_right">
117
+							<div class="fnRtnOdrRegDt">2022.10.10</div>
118
+						</div>
120 119
 					</div>
121
-				</div>
122
-				<div class="line">
123
-					<label>반품발주금액</label>
124
-					<div class="line_right">
125
-						<div class="fnRtnDodrTotalAmt"></div>
120
+					<div class="line">
121
+						<label>반품발주금액</label>
122
+						<div class="line_right">
123
+							<div class="fnRtnDodrTotalAmt">1,000,000</div>
124
+						</div>
126 125
 					</div>
127
-				</div>
128
-				<div class="line">
129
-					<label>반품장소</label>
130
-					<div class="line_right">
131
-						<div class="fnRtnWhsNm"></div>
126
+					<div class="line">
127
+						<label>반품장소</label>
128
+						<div class="line_right">
129
+							<div class="fnRtnWhsNm">ㅁㄴㅇㄹㄴㄻㄴㄻㄹㅇㄴㄻㄴㅇㄻ</div>
130
+						</div>
132 131
 					</div>
133
-				</div>
134
-				<div class="line">
135
-					<label>반품입고장소</label>
136
-					<div class="line_right">
137
-						<div class="fnWhsNm"></div>
132
+					<div class="line">
133
+						<label>반품입고장소</label>
134
+						<div class="line_right">
135
+							<div class="fnWhsNm">ㄴㅇㄻㄴㅇㄻㄴㄹㄴㅇㄴㄻㄴㅁ</div>
136
+						</div>
137
+					</div>
138
+					<div class="table_header">
139
+						<h1><반품 발주 품목></h1>
138 140
 					</div>
139
-				</div>
140
-				<div class="table_header">
141
-					<h1><반품 발주 품목></h1>
142 141
 				</div>
143 142
 			</div>
144 143
 			<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA" class="scroll_area row-3">
145 144
 				<ul id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
146 145
 				<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWCOPY" style="display: none;">
147
-					<li class="history_list5">
146
+					<li class="history_list4">
147
+					  <div class="left">
148
+						<div class="nomal">
149
+						  <label class="col_3">품목명</label>
150
+						  <span>:</span>
151
+						  <div class="full fnItemNm">asdfasdfasffasf</div>
152
+						</div>
153
+					  </div>
154
+					   <div class="left">
155
+						<div class="nomal">
156
+						  <label class="col_3">단가</label>
157
+						  <span>:</span>
158
+						  <div class="fnRtnOdrQty">1,000,000</div>
159
+						  <label class="sub_info">반품구분</label>
160
+						  <span>:</span>
161
+						  <div class="fnRtnOdrAmt">사용가능</div>
162
+						</div>
163
+					  </div>
148 164
 					  <div class="left">
149 165
 						<div class="nomal">
150
-						  <label class="col_1">품목명</label>
166
+						  <label class="col_1">반품수량</label>
167
+						  <span>:</span>
168
+						  <div class="fnRtnOdrQty">10,000</div>
169
+						  <label class="sub_info">반품금액</label>
151 170
 						  <span>:</span>
152
-						  <div class="fnItemNm"></div>
171
+						  <div class="fnRtnOdrAmt">12,000,000원</div>
153 172
 						</div>
154 173
 					  </div>
155 174
 					  <div class="left">
156 175
 						<div class="nomal">
157
-						  <label class="col_1">수량</label>
176
+						  <label class="col_1">사유구분 </label>
158 177
 						  <span>:</span>
159
-						  <div class="history">
160
-							<div class="fnRtnOdrQty"></div>
161
-						  </div>
162
-						  <label class="sub_info">금액&nbsp;:</label>
163
-						  <div class="history">
164
-							<div class="fnRtnOdrAmt"></div>
165
-						  </div>
178
+						  <div class="full fnUnitAmt">어떤사유길다란거</div>
166 179
 						</div>
167 180
 					  </div>
168 181
 					  <div class="left">
169 182
 						<div class="nomal">
170
-						  <label class="col_1">구매가 </label>
171
-						  <div class="history">
183
+						  <label class="col_1">반품사유 </label>
172 184
 						  <span>:</span>
173
-						  <div class="fnUnitAmt"></div>
174
-						  </div>
185
+						  <div class="full fnUnitAmt">어쩌고저쩌곰ㅇㄻㄴㄹㅇㅁㄹㅇㄴ</div>
175 186
 						</div>
176 187
 					  </div>
177 188
 					</li>
@@ -204,7 +215,7 @@
204 215
 				</form>
205 216
 			</div>
206 217
 			<div class="select_btn">
207
-				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
218
+				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
208 219
 			</div>
209 220
 			<div id="ITP_LIST_MRTNMNG04010_POP_WHS_AREA" class="popup_scroll">
210 221
 				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

+ 66 - 78
src/main/webapp/mobile/app/mrtnmng/MRTNMNG05010.html

@@ -5,130 +5,118 @@
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>
11
-				<div class="line">
12
-					<label>수거예정일</label>
13
-					<div class="date_to">
14
-						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
15
-						<div class="at">~</div>
16
-						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
17
-					</div>
18
-				</div>
19
-				<div class="line">
20
-					<label>수거서번호</label>
21
-					<div class="float_left">
22
-						<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text" placeholder="">
8
+				<div class="content_fix">
9
+					<div class="line header">
10
+					  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품처리</div>
11
+				    </div>
12
+					<div class="line">
13
+						<label>수거예정일</label>
14
+						<div class="date_to">
15
+							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
16
+							<div class="at">~</div>
17
+							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
18
+						</div>
23 19
 					</div>
24
-				</div>
25
-				<div class="line">
26
-					<label>반품입고장소</label>
27
-					<div class="float_left">
28
-						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" class="" name="srtnWhsNm" placeholder="수거창고" readonly />
29
-						<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
30
-						<div class="itp_input_btn">
31
-							<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM"><img src="../img/search.png" alt=""></button>
20
+					<div class="line">
21
+						<label>수거서번호</label>
22
+						<div class="float_left">
23
+							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text" placeholder="">
32 24
 						</div>
33 25
 					</div>
34
-					<div class="float_right_btn">
35
-						<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
26
+					<div class="line">
27
+						<label>반품입고장소</label>
28
+						<div class="float_left">
29
+							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" class="" name="srtnWhsNm" placeholder="수거창고" readonly />
30
+							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
31
+							<div class="itp_input_btn">
32
+								<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM"><img src="../img/search.png" alt=""></button>
33
+							</div>
34
+						</div>
35
+						<div class="float_right_btn">
36
+							<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
37
+						</div>
36 38
 					</div>
37
-				</div>
38
-				<div class="line">
39
-					<label>반품장소</label>
40
-					<div class="float_left">
41
-						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" class="" name="swhsNm" placeholder="매장명" readonly />
42
-						<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID" data-check-required="empty" class="" name="swhsId" />
43
-						<div class="itp_input_btn">
44
-							<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
39
+					<div class="line">
40
+						<label>반품장소</label>
41
+						<div class="float_left">
42
+							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" class="" name="swhsNm" placeholder="매장명" readonly />
43
+							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID" data-check-required="empty" class="" name="swhsId" />
44
+							<div class="itp_input_btn">
45
+								<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
46
+							</div>
47
+						</div>
48
+						<div class="float_right_btn">
49
+							<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
45 50
 						</div>
46 51
 					</div>
47
-					<div class="float_right_btn">
48
-						<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
52
+					<div class="line">
53
+						<label>반품품목명</label>
54
+						<div class="float_left name">
55
+							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="A매장명">
56
+						</div>
49 57
 					</div>
50
-				</div>
51
-				<div class="line">
52
-					<label>반품품목명</label>
53
-					<div class="float_left name">
54
-						<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="A매장명">
58
+					<div class="header line top6">
59
+						<div class="search">
60
+							<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
61
+						</div>
55 62
 					</div>
56
-				</div>
57
-				<div class="header line top6">
58
-					<div class="search">
59
-						<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
63
+					<div class="table_header">
64
+						<h1><반품서 내역></h1>
60 65
 					</div>
61 66
 				</div>
62
-				<div class="table_header">
63
-					<h1><반품서 내역></h1>
64
-				</div>
65 67
 			</div>
66 68
 		</form>
67 69
 		<form id="ITP_FORM_MRTNMNG05010_LIST_MODIFY" class="form-horizontal" onsubmit="return false;">
68 70
 			<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_AREA" class="scroll_area row-10">
69
-				<ul id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWS" class="panel-group"></ul>
71
+				<ul id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
70 72
 				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: none;">
71 73
 					<li class="history_list2">
72 74
 						<div class="left">
73 75
 							<div class="nomal">
74 76
 								<label>반품번호 </label>
75
-								<div class="history">
76
-									<span>:</span>
77
-									<div class="fnRtnPodrUnqNo"></div>
78
-								</div>
77
+								<span>:</span>
78
+								<div class="full fnRtnPodrUnqNo"></div>
79 79
 							</div>
80 80
 						</div>
81 81
 						<div class="left">
82 82
 							<div class="nomal">
83 83
 								<label class="history_label">반품예정일</label>
84
-								<div class="history">
85
-									<span>:</span>
86
-									<div class="fnRtnSchDt history_info"></div>
87
-								</div>
84
+								<span>:</span>
85
+								<div class="fnRtnSchDt history_info"></div>
88 86
 							</div>
89 87
 						</div>
90 88
 						<div class="left">
91 89
 							<div class="nomal">
92 90
 								<label>공급업체</label>
93
-								<div class="history">
94
-									<span>:</span>	
95
-									<div class="history_info fnSpplyNm"></div>
96
-								</div>
91
+								<span>:</span>	
92
+								<div class="history_info fnSpplyNm"></div>
97 93
 								<label class="sub_info">반품장소</label>
98
-								<div class="history">
99
-									<span>:</span>
100
-									<div class="fnRtnWhsNm"></div>
101
-								</div>
94
+								<span>:</span>
95
+								<div class="fnRtnWhsNm"></div>
102 96
 							</div>
103 97
 						</div>
104 98
 						<div class="left">
105 99
 							<div class="nomal">
106 100
 								<label>품목 </label>
107
-								<div class="history">
108
-									<span>:</span>
109
-									<div class="fnItemNm"></div>
110
-								</div>
101
+								<span>:</span>
102
+								<div class="full fnItemNm"></div>
111 103
 							</div>
112 104
 						</div>
113 105
 						<div class="left">
114 106
 							<div class="nomal">
115 107
 								<label class="col_0">반품요청수량</label>
116
-								<div class=" history">
117
-									<span>:</span>
118
-									<div class=" fnRtnReqQty"></div>
119
-								</div>
108
+								<span>:</span>
109
+								<div class=" fnRtnReqQty"></div>
120 110
 								<label class="col_0">반품발주수량</label>
121
-								<div class="history">
122
-									<span>:</span>
123
-									<input class="" id="ITP_FORM_MRTNMNG05010_LIST_RTN_PODR_QTY" type="text" name="rtnPodrQty">
124
-								</div>
111
+								<span>:</span>
112
+								<input class="" id="ITP_FORM_MRTNMNG05010_LIST_RTN_PODR_QTY" type="text" name="rtnPodrQty">
125 113
 							</div>
126 114
 						</div>
127 115
 					</li>
128 116
 				</div>
129 117
 			</div>
130 118
 			<div class="button_bar">
131
-				<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-primary INPS">반품처리</button>
119
+				<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-m-orange INPS">반품처리</button>
132 120
 				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
133 121
 			</div>
134 122
 		</form>
@@ -153,7 +141,7 @@
153 141
 				</form>
154 142
 			</div>
155 143
 			<div class="select_btn">
156
-				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
144
+				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
157 145
 			</div>
158 146
 			<div id="ITP_LIST_MRTNMNG05010_POP_WHS_AREA" class="popup_scroll">
159 147
 				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

+ 69 - 81
src/main/webapp/mobile/app/mrtnmng/MRTNMNG06010.html

@@ -5,121 +5,109 @@
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_SPPLY_ID" name="sspplyId" value="">
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>
11
-				<div class="line">
12
-					<label>반품일자</label>
13
-					<div class="date_to">
14
-						<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
15
-						<div class="at">~</div>
16
-						<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
17
-					</div>
18
-				</div>
19
-				<div class="line">
20
-					<label>반품발주번호</label>
21
-					<div class="float_left">
22
-						<input id="ITP_FORM_MRTNMNG06010_LIST_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text">
8
+				<div class="content_fix">
9
+					<div class="line header">
10
+					  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품현황</div>
11
+				    </div>
12
+					<div class="line">
13
+						<label>반품일자</label>
14
+						<div class="date_to">
15
+							<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
16
+							<div class="at">~</div>
17
+							<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
18
+						</div>
23 19
 					</div>
24
-				</div>
25
-				<div class="line top3">
26
-					<label>반품입고장소</label>
27
-					<div class="float_left">
28
-						<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" placeholder="매장명" readonly>
29
-						<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
30
-						<div class="itp_input_btn">
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>
20
+					<div class="line">
21
+						<label>반품발주번호</label>
22
+						<div class="float_left">
23
+							<input id="ITP_FORM_MRTNMNG06010_LIST_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text">
32 24
 						</div>
33 25
 					</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>
26
+					<div class="line">
27
+						<label>반품입고장소</label>
28
+						<div class="float_left">
29
+							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" placeholder="매장명" readonly>
30
+							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
31
+							<div class="itp_input_btn">
32
+								<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
+							</div>
34
+						</div>
35
+						<div class="float_right_btn">
36
+							<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
37
+						</div>
36 38
 					</div>
37
-				</div>
38
-				<div class="line top6">
39
-					<label>반품장소</label>
40
-					<div class="float_left">
41
-						<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
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>
39
+					<div class="line">
40
+						<label>반품장소</label>
41
+						<div class="float_left">
42
+							<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
43
+							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
44
+							<div class="itp_input_btn">
45
+								<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
46
+							</div>
47
+						</div>
48
+						<div class="float_right_btn">
49
+							<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
45 50
 						</div>
46 51
 					</div>
47
-					<div class="float_right_btn">
48
-						<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
52
+					<div class="line">
53
+						<label>품목명</label>
54
+						<div class="float_left">
55
+							<input id="ITP_FORM_MRTNMNG06010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
56
+						</div>
49 57
 					</div>
50
-				</div>
51
-				<div class="line top9">
52
-					<label>품목명</label>
53
-					<div class="float_left">
54
-						<input id="ITP_FORM_MRTNMNG06010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
58
+					<div class="line">
59
+						<div class="search">
60
+							<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
61
+						</div>
55 62
 					</div>
56
-				</div>
57
-				<div class="line top6">
58
-					<div class="search">
59
-						<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
63
+					<div class="table_header">
64
+						<h1><반품 내역></h1>
60 65
 					</div>
61 66
 				</div>
62
-				<div class="table_header">
63
-					<h1><반품 내역></h1>
64
-				</div>
65 67
 			</div>
66 68
 			<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_AREA" class="scroll_area row-6">
67 69
 				<ul id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
68 70
 				<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWCOPY" style="display: none;">
69
-					<li class="history_list2 ">
71
+					<li class="history_list4 ">
70 72
 						<div class="left">
71 73
 							<div class="nomal">
72
-								<label>반품발주번호 </label>
73
-								<div class="history">
74
-									<span>:</span>
75
-									<div class="fnRtnPodrNo"></div>
76
-								</div>
74
+								<label>발주번호 </label>
75
+								<span>:</span>
76
+								<div class="full fnRtnPodrNo">212121212121112</div>
77 77
 							</div>
78 78
 						</div>
79 79
 						<div class="left">
80 80
 							<div class="nomal">
81 81
 								<label class="history_label">반품예정일</label>
82
-								<div class="history">
83
-									<span>:</span>
84
-									<div class="fn_info fnRtnSchDt"></div>
85
-								</div>
82
+								<span>:</span>
83
+								<div class="fn_info fnRtnSchDt">2022.10.10</div>
86 84
 							</div>
87 85
 						</div>
88 86
 						<div class="left">
89 87
 							<div class="nomal">
90 88
 								<label>공급업체</label>
91
-								<div>
92
-									<span>:</span>
93
-									<div class="fnSpplyNm">A공급업체명</div>
94
-								</div>
89
+								<span>:</span>
90
+								<div class="fnSpplyNm">A공급업체명</div>
95 91
 								<label class="sub_info">납품장소</label>
96
-								<div>
97
-									<span>:</span>
98
-									<div class="fnWhsNm">A매장내</div>
99
-								<div>
92
+								<span>:</span>
93
+								<div class="fnWhsNm">A매장내</div>
100 94
 							</div>
101 95
 						</div>
102 96
 						<div class="left">
103 97
 							<div class="nomal">
104 98
 								<label>품목 </label>
105
-								<div class="history">
106
-									<span>:</span>
107
-									<div class="fnItemNm">품목명(EA)</div>
108
-								</div>
99
+								<span>:</span>
100
+								<div class="full fnItemNm">품목명(EA)</div>
109 101
 							</div>
110 102
 						</div>
111 103
 						<div class="left">
112 104
 							<div class="nomal">
113
-								<label>반품발주수량</label>
114
-								<div class="history">
115
-									<span>:</span>
116
-									<div class="col_5 fnRtnPodrQty"></div>
117
-								</div>
118
-								<label class="sub_info">반품입고수량</label>
119
-								<div class="history">
120
-									<span>:</span>
121
-									<div class="fnRtnWhsQty">10</div>
122
-								</div>
105
+								<label>발주수량</label>
106
+								<span>:</span>
107
+								<div class="col_5 fnRtnPodrQty"></div>
108
+								<label class="sub_info">입고수량</label>
109
+								<span>:</span>
110
+								<div class="fnRtnWhsQty">10</div>
123 111
 							</div>
124 112
 						</div>
125 113
 					</li>
@@ -147,7 +135,7 @@
147 135
 				</form>
148 136
 			</div>
149 137
 			<div class="select_btn">
150
-				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
138
+				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
151 139
 			</div>
152 140
 			<div id="ITP_LIST_MRTNMNG06010_POP_WHS_AREA" class="popup_scroll">
153 141
 				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -155,7 +143,7 @@
155 143
 					<li class="row_2">
156 144
 						<div class="scroll_left">
157 145
 							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
158
-							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
146
+							<div class="con_2 wichi fnLocationNm">(상세위치내용)</div>
159 147
 						</div>
160 148
 						<div class="scroll_right">
161 149
 							<button id="ITP_BTN_MRTNMNG06010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

+ 16 - 15
src/main/webapp/mobile/css/style.css

@@ -100,6 +100,7 @@ section .popup2 .pop .popup_scroll li .scroll_left .mg_0 {margin:0; width:100%;}
100 100
 section .popup2 .pop .popup_scroll li .scroll_left .mg_0 div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:40%; margin:0; padding: 8px 2px 0px 2px;}
101 101
 section .popup2 .pop .popup_scroll li .scroll_left .mg_0 .type_hide {width:auto;}
102 102
 section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14pt; color:gray; width:75px !important;}
103
+section .popup2 .pop .popup_scroll li .scroll_left .wichi{font-size:14pt; color:gray;}
103 104
 section .popup2 .pop .popup_scroll li .scroll_left .amt{font-size:14pt; color:#b88278;}
104 105
 section .popup2 .pop .popup_scroll li .scroll_right {float: right;}
105 106
 section .popup2 .pop .popup_scroll li .scroll_right input[type=checkbox]{width:27px; margin:18px 11px 0 11px;}
@@ -352,7 +353,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
352 353
 .content .line .float_right_btn button {padding:0; width:34px; height:34px; border-radius:5px; border:1px solid #aaa;}
353 354
 .content .line .float_right_btn button img {width:18px; height:18px;}
354 355
 .content .line .float_left select {float: left; width: 100%; height: 34px; margin-top:3px; border: 1px solid #aaa; border-radius:5px; font-size: 14pt; font-weight:100;}
355
-.content .line .line_right {float: left; margin-right: 0%; width:57%}
356
+.content .line .line_right {float: right; margin-right: 0%; width:57%}
356 357
 .content .line .line_right div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:100%; text-align:right; float: right; font-size: 14pt; margin-top: 7px; margin-right:0%; color:#555;padding-right:5px;}
357 358
 .content .line .line_right input {position: relative; text-align: right; margin-right: 84px;}
358 359
 .content .line .line_right input.m9 {margin-right:93px;}
@@ -423,7 +424,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
423 424
 .button_bar button.btn_col_3 {width: 35%;}
424 425
 .button_bar button.btn_col_6 {width: 65%;}
425 426
 .button_bar button.btn_col_3,
426
-.button_bar button.btn_col_6 {border: 1px solid #000; float: left; height: 47px; font-size: 14pt; font-weight: 100; border-radius: 0px;}
427
+.button_bar button.btn_col_6 {border:none; float: left; height: 47px; font-size: 14pt; font-weight: 100; border-radius: 0px;}
427 428
 .button_bar button.col_12 {font-weight:100; width: 100%; height: 47px; font-size: 14pt;}
428 429
 
429 430
 /* scroll_area 조정 */
@@ -469,12 +470,12 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
469 470
 .scroll_area li.history_list2 label{min-width:95px; display:inline-flex;}
470 471
 .scroll_area li.history_list3 {height: 160px; padding-top:5px;}
471 472
 .scroll_area li.history_list3 .btn_check {height:158px; margin-top:-5px; width:90%; float:right; padding-top:7px; }
472
-.scroll_area li.history_list4 {height: 150px;}
473
+.scroll_area li.history_list4 {height: 150px; padding-top:4px;}
473 474
 .scroll_area li.history_list5 {height: 65px; padding-top:5px;}
474 475
 .scroll_area li.history_list6 {height: 110px; padding-top:5px;}
475 476
 .scroll_area li.history_list7 {height: 120px; padding-top:5px;}
476 477
 .scroll_area li .history_info {width: auto;}
477
-.scroll_area li .left {width:100%; height:27px; margin-top:0px;}
478
+.scroll_area li .left {width:100%; height:28px; margin-top:0px;}
478 479
 .scroll_area li .btn_list {width:calc(100% - 65px); height:35px; padding-top:12px;}
479 480
 .scroll_area li .left div {display: inline-block;}
480 481
 .scroll_area li .left label{font-size: 1.1rem;}
@@ -493,32 +494,36 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
493 494
 .scroll_area li .detail_right .detail_info label {margin: 5px 30px; font-size: 2rem;}
494 495
 .scroll_area li .detail_right .detail_info div {width: auto; font-size: 14px; font-weight: 100;}
495 496
 .scroll_area li .detail_right .detail_info i {width: auto; font-size: 1rem; margin: 0 20px;}
496
-.scroll_area li .left .nomal  {position:relative; left:50%; transform: translateX(-50%); width: auto; float:left; text-align: left; font-size: 1.2rem;}
497
+.scroll_area li .left .nomal  {position:relative; left:50%; transform: translateX(-50%); width: 330px; height:28px; float:left; text-align: left; font-size: 1.2rem;}
497 498
 .scroll_area li .left .nomal .half {float:left;}
498 499
 .scroll_area li .left .nomal .half label {min-width:auto;}
499 500
 .scroll_area li .left .nomal .half div {min-width:auto; margin-right:5px; margin-top:0;}
500
-.scroll_area li .left .nomal  input{width: 60px; height:27px; margin-top:-3px;}
501
+.scroll_area li .left .nomal  input{width: 47px; height:28px; top:-3px; position:relative;}
501 502
 
502 503
 .scroll_area li .scroll_btn {width:10%; height:158px; margin-top:-5px; display:inline-flex;}
503 504
 
504 505
 .scroll_area li .scroll_btn input {width:15px; margin:auto 10px;}
505 506
 .scroll_area li .scroll_btn input:checked ~ .scroll_btn {background:#eee;}
506
-.scroll_area li .left .nomal span {margin:0 5px; font-size:15px; font-weight:700;}
507
+.scroll_area li .left .nomal span {position:relative; top:-5px; margin:0 2px; font-size:15px; font-weight:700;}
508
+.scroll_area li .left .nomal span.mg0 {margin:0;}
507 509
 
508 510
 .scroll_area li .left .nomal .btn_bar{position: relative; width: auto; font-size: 2.2rem;}
509 511
 .scroll_area li .left .nomal .btn_bar button{width: 25px; height: 30px; font-size: 1rem; padding: 0;}
510 512
 .scroll_area li .left .nomal .btn_bar .col_0{min-width: auto; margin: 5px 20px;}
511 513
 
512
-.scroll_area li .left .nomal label{position:relative; margin-left: 10px; font-size:12pt; font-weight:100; min-width:81px; text-align:left;}
514
+.scroll_area li .left .nomal label{position:relative; top:-5px; font-size:12pt; font-weight:100; min-width:75px; text-align:left;}
513 515
 .scroll_area li .left .nomal label.sub_info{min-width: auto; display: inline-flex;}
514 516
 .scroll_area li .left .nomal label.col_0{min-width: auto;}
515 517
 .scroll_area li .left .nomal label.col_1{min-width: 45px;}
516
-.scroll_area li .left .nomal label.col_3{min-width: 65px;}
518
+.scroll_area li .left .nomal label.col_3{min-width: 60px;}
517 519
 .scroll_area li .left .nomal label.col_2{width: 95px;}
518 520
 
519 521
 .scroll_area li .left .nomal i{width: 50px; text-align: center;}
520
-.scroll_area li .left .nomal div{display: inline-flex; font-weight: 700; font-size: 12pt; min-width:75px;}
521
-.scroll_area li .left .nomal .col_5{min-width:50px;}
522
+.scroll_area li .left .nomal div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align:left; font-weight: 700; font-size: 12pt; width:73px;}
523
+.scroll_area li .left .nomal .full{width:200px;}
524
+.scroll_area li .left .nomal .col_0{width:auto;}
525
+.scroll_area li .left .nomal .col_6{width:60px;}
526
+
522 527
 
523 528
 .scroll_area li .right {margin: 22px 10px 22px 0; position: relative; display: flex; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
524 529
 .scroll_area li .right .num {padding:2px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB; background:#fff; font-size:14pt;}
@@ -559,7 +564,6 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
559 564
 
560 565
 @media screen and (min-width: 550px) {
561 566
 	.content .line div.date_to input {width:47%}
562
-	.content .line .float_left.name {width:76%;}
563 567
 	.modal-dialog {margin:auto 20% !important;}
564 568
 	.scroll_area li .left_info .thick {width: 90%;}
565 569
 	.content .line .search_wrap input {width:78%;}
@@ -576,9 +580,6 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
576 580
 @media screen and (min-width: 650px) {
577 581
 	.content .line {margin:0 100px -10px 100px;}
578 582
 }
579
-@media screen and (min-width: 600px) {
580
-	.scroll_area li .left .nomal  {margin:0 100px;
581
-}
582 583
 @media screen and (max-height: 720px) {
583 584
 	#ITP_LOGIN {position:fixed; top:80px; max-width: 500px; margin: 0 auto;}
584 585
 	.bg_gray {position:relative; top:-90px;}