Explorar o código

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

dwkim %!s(int64=2) %!d(string=hai) anos
pai
achega
9dbb8d0bb1

+ 2 - 2
src/main/webapp/app/stinfo/STINFO06010.html

@@ -22,10 +22,10 @@
22 22
 										<div class="col-xs-3 itp_ip itp_noMar">
23 23
 											<input type="text" id="ITP_FORM_STINFO06010_SEARCH_STORE_NM" class="form-control itp_input" name="sstoreNm" placeholder="매장명" />
24 24
 										</div>
25
-										<div class="col-xs-2 itp_ip itp_noMar" style="width:10%;">
25
+										<!--<div class="col-xs-2 itp_ip itp_noMar" style="width:10%;">
26 26
 											<button type="button" id="ITP_BTN_STINFO06010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
27 27
 											<button type="button" id="ITP_BTN_STINFO06010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
28
-										</div>
28
+										</div>-->
29 29
 									</div>
30 30
 								</form>
31 31
 							</div>

+ 16 - 15
src/main/webapp/mobile/app/mcollmng/MCOLLMNG01010.html

@@ -1,20 +1,21 @@
1
-<link rel="stylesheet" href="/style.css">
2 1
 <section>
3
-  <div id="ITP_AJAX_COLLMNG01010_VIEW_CONTAINER" style="display: none;">
2
+  <div id="ITP_AJAX_COLLMNG01010_VIEW_CONTAINER" style="display: block;">
4 3
     <div class="content">
5 4
       <div class="line">
6 5
         <label>수거장소</label>
7
-        <div class="float_left">
8
-          <input id="ITP_FORM_MCOLLMNG01010_VIEW" type="text" placeholder="A매장명">
9
-        </div>
10
-        <div class="float_left_btn">
11
-          <button id="ITP_BTN_MCOLLMNG01010"><img src="/img/search.png" alt=""></button>
12
-          <button id="ITP_BTN_MCOLLMNG01010"><img src="/img/delete.png" alt=""></button>
6
+        <div class="search_wrap">
7
+	        <div class="float_left">
8
+	          <input id="ITP_FORM_MCOLLMNG01010_VIEW" type="text" placeholder="A매장명">
9
+	        </div>
10
+	        <div class="float_left_btn">
11
+	          <button id="ITP_BTN_MCOLLMNG01010"><img src="../img/search.png" alt=""></button>
12
+	          <button id="ITP_BTN_MCOLLMNG01010"><img src="../img/delete.png" alt=""></button>
13
+	        </div>
13 14
         </div>
14 15
       </div>
15 16
       <div class="line">
16 17
         <label>수거상태</label>
17
-        <div class="float_left">
18
+        <div class="line_right">
18 19
           <select name="" id="ITP_FORM_MCOLLMNG01010_VIEW">
19 20
             <option value=""></option>
20 21
           </select>
@@ -32,11 +33,11 @@
32 33
         <select class="label" name="" id="ITP_FORM_MCOLLMNG01010_VIEW">
33 34
           <option value="">발주번호/품목명</option>
34 35
         </select>
35
-        <div class="float_left">
36
-          <input id="ITP_FORM_MCOLLMNG01010_VIEW" style="width: 630px;" type="text" placeholder="검색어입력">
36
+        <div class="search_wrap">
37
+          <input id="ITP_FORM_MCOLLMNG01010_VIEW" style="width: 262px;" type="text" placeholder="검색어입력">
37 38
         </div>
38 39
       </div>
39
-      <div class="line">
40
+      <div class="line" style="height:50px;">
40 41
         <div class="search">
41 42
           <button id="ITP_BTN_MCOLLMNG01010" class="btn-primary btn-sm ADB">검색</button>
42 43
         </div>
@@ -63,8 +64,8 @@
63 64
           <div class="left">
64 65
             <div class="nomal">
65 66
               <label class="col_0">반품발주상태 &nbsp;:</label>
66
-              <div style="min-width: 120px;">
67
-                <div  style="min-width: 120px;" class="fn">요청</div>
67
+              <div class="col_5">
68
+                <div class="col_5 fn">요청</div>
68 69
               </div>
69 70
               <label class="col_0">반품발주일자&nbsp;:</label>
70 71
               <div>
@@ -100,7 +101,7 @@
100 101
       </li>
101 102
     </div>
102 103
   </div>
103
-  <div id="ITP_AJAX_COLLMNG01010_DETAIL_CONTAINER" style="display: block;">
104
+  <div id="ITP_AJAX_COLLMNG01010_DETAIL_CONTAINER" style="display: none;">
104 105
     <div class="content">
105 106
       <div class="line">
106 107
         <label>브랜드명</label>

+ 20 - 19
src/main/webapp/mobile/app/mcollmng/MCOLLMNG02010.html

@@ -1,15 +1,16 @@
1
-<link rel="stylesheet" href="/style.css">
2 1
 <section>
3
-  <div id="ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER" style="display: none;">
2
+  <div id="ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER" style="display: block;">
4 3
     <div class="content">
5 4
       <div class="line">
6 5
         <label>수거장소</label>
7
-        <div class="float_left">
8
-          <input id="ITP_FORM_MCOLLMNG02010_VIEW" type="text" placeholder="A매장명">
9
-        </div>
10
-        <div class="float_left_btn">
11
-          <button id="ITP_BTN_MCOLLMNG02010"><img src="/img/search.png" alt=""></button>
12
-          <button id="ITP_BTN_MCOLLMNG02010"><img src="/img/delete.png" alt=""></button>
6
+        <div class="search_wrap">
7
+	        <div class="float_left">
8
+	          <input id="ITP_FORM_MCOLLMNG02010_VIEW" type="text" placeholder="A매장명">
9
+	        </div>
10
+	        <div class="float_left_btn">
11
+	          <button id="ITP_BTN_MCOLLMNG02010"><img src="../img/search.png" alt=""></button>
12
+	          <button id="ITP_BTN_MCOLLMNG02010"><img src="../img/delete.png" alt=""></button>
13
+       		</div>
13 14
         </div>
14 15
       </div>
15 16
       <div class="line">
@@ -24,11 +25,11 @@
24 25
         <select class="label" name="" id="ITP_FORM_MCOLLMNG02010_VIEW">
25 26
           <option value="">발주번호/품목명</option>
26 27
         </select>
27
-        <div class="float_left">
28
-          <input id="ITP_FORM_MCOLLMNG02010_VIEW" style="width: 630px;" type="text" placeholder="검색어입력">
28
+        <div class="search_wrap">
29
+          <input id="ITP_FORM_MCOLLMNG02010_VIEW" style="width: 262px;" type="text" placeholder="검색어입력">
29 30
         </div>
30 31
       </div>
31
-      <div class="line">
32
+      <div class="line" style="height:45px;">
32 33
         <div class="search">
33 34
           <button id="ITP_BTN_MCOLLMNG02010" id="" class="btn-primary btn-sm ADB">검색</button>
34 35
         </div>
@@ -55,8 +56,8 @@
55 56
           <div class="left">
56 57
             <div class="nomal">
57 58
               <label class="col_0">반품발주항번 &nbsp;:</label>
58
-              <div>
59
-                <div class="fn">1</div>
59
+              <div class="col_5">
60
+                <div class="col_5 fn">1</div>
60 61
               </div>
61 62
               <label class="col_0">수거요청일 &nbsp;:</label>
62 63
               <div class="space1">
@@ -91,8 +92,8 @@
91 92
           <div class="left">
92 93
             <div class="nomal">
93 94
               <label class="col_0">단가금액 &nbsp;:</label>
94
-              <div class="space1">
95
-                <div class="fn">1,000원</div>
95
+              <div class="col_5">
96
+                <div class="col_5 fn">1,000원</div>
96 97
               </div>
97 98
               <label class="col_0">수거금액&nbsp;:</label>
98 99
               <div class="space0">
@@ -111,7 +112,7 @@
111 112
       </div>
112 113
     </div>
113 114
   </div>
114
-  <div id="ITP_AJAX_MCOLLMNG02010_DETAIL_CONTAINER" style="display: block;">
115
+  <div id="ITP_AJAX_MCOLLMNG02010_DETAIL_CONTAINER" style="display: none;">
115 116
     <div class="content">
116 117
       <div class="line">
117 118
         <label>브랜드명</label>
@@ -152,8 +153,8 @@
152 153
       <div class="line">
153 154
         <label>수거담당자</label>
154 155
         <div class="line_right">
155
-          <input id="ITP_FORM_MCOLLMNG02010_DETAIL" class="left" type="text" style="width:200px;" placeholder="이름">
156
-          <input id="ITP_FORM_MCOLLMNG02010_DETAIL" class="left" type="text" style="width:300px;" placeholder="연락처">
156
+          <input id="ITP_FORM_MCOLLMNG02010_DETAIL" class="left" type="text" style="width:100px;margin-right: 5px;" placeholder="이름">
157
+          <input id="ITP_FORM_MCOLLMNG02010_DETAIL" class="left" type="text" style="width:140px;margin-right: 10px;" placeholder="연락처">
157 158
         </div>
158 159
       </div>
159 160
       <div class="table_header">
@@ -215,7 +216,7 @@
215 216
             <div class="nomal">
216 217
               <label>수거구분 &nbsp;:</label>
217 218
               <div>
218
-                <select style="width:200px" name="" id="ITP_FORM_MCOLLMNG02010_DETAIL">
219
+                <select style="width:85px" name="" id="ITP_FORM_MCOLLMNG02010_DETAIL">
219 220
                   <option value=""></option>
220 221
                 </select>
221 222
               </div>

+ 18 - 17
src/main/webapp/mobile/app/mcollmng/MCOLLMNG03010.html

@@ -1,15 +1,16 @@
1
-<link rel="stylesheet" href="/style.css">
2 1
 <section>
3
-  <div id="ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER" style="display: none;">
2
+  <div id="ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER" style="display: block;">
4 3
     <div class="content">
5 4
       <div class="line">
6 5
         <label>수거장소</label>
7
-        <div class="float_left">
8
-          <input type="text" placeholder="A매장명">
9
-        </div>
10
-        <div class="float_left_btn">
11
-          <button><img src="/img/search.png" alt=""></button>
12
-          <button><img src="/img/delete.png" alt=""></button>
6
+        <div class="search_wrap">
7
+	        <div class="float_left">
8
+	          <input type="text" placeholder="A매장명">
9
+	        </div>
10
+	        <div class="float_left_btn">
11
+	          <button><img src="../img/search.png" alt=""></button>
12
+	          <button><img src="../img/delete.png" alt=""></button>
13
+        	</div>
13 14
         </div>
14 15
       </div>
15 16
       <div class="line">
@@ -24,11 +25,11 @@
24 25
         <select class="label" name="" id="">
25 26
           <option value="">수거서번호</option>
26 27
         </select>
27
-        <div class="float_left">
28
-          <input style="width: 630px;" type="text" placeholder="검색어입력">
28
+        <div class="search_wrap">
29
+          <input style="width: 262px;" type="text" placeholder="검색어입력">
29 30
         </div>
30 31
       </div>
31
-      <div class="line">
32
+      <div class="line" style="height:45px;">
32 33
         <div class="search">
33 34
           <button id="" class="btn-primary btn-sm ADB">검색</button>
34 35
         </div>
@@ -108,11 +109,11 @@
108 109
       </div>
109 110
     </div>
110 111
   </div>
111
-  <div id="ITP_AJAX_MCOLLMNG03010_DETAIL_CONTAINER" style="display: block;">
112
+  <div id="ITP_AJAX_MCOLLMNG03010_DETAIL_CONTAINER" style="display: none;">
112 113
     <div class="detail_content">
113 114
       <div class="detail_header">
114 115
         <div class="detail_logo">
115
-          <img src="/img/naver.png" alt="">
116
+          <img src="../img/naver.png" alt="">
116 117
         </div>
117 118
         <div class="detail_ok">
118 119
           <label>납품 확인서</label>
@@ -199,13 +200,13 @@
199 200
       </div>
200 201
     </div>
201 202
     <div class="scroll_area row-7">
202
-      <li class="history_list1">
203
+      <li class="history_list5">
203 204
         <div>
204 205
           <div class="left">
205 206
             <div class="nomal">
206 207
               <label class="col_0">수거발주번호 &nbsp;:</label>
207
-              <div class="space2">
208
-                <div class="fn">P12345</div>
208
+              <div class="col_5">
209
+                <div class="col_5 fn">P12345</div>
209 210
               </div>
210 211
               <label class="col_0">품목아이디&nbsp;:</label>
211 212
               <div class="space2">
@@ -229,7 +230,7 @@
229 230
             <div class="nomal">
230 231
               <label>수거수량 &nbsp;:</label>
231 232
               <div class="fn">
232
-                <div class="space2">10</div>
233
+                <div class="">10</div>
233 234
               </div>
234 235
               <label class="col_0">수거사유구분&nbsp;:</label>
235 236
               <div class="fn">

+ 4 - 4
src/main/webapp/mobile/app/mordmng/MORDMNG03010.html

@@ -1,5 +1,5 @@
1 1
 <section>
2
-  <div id="ITP_AJAX_MORDMNG03010_VIEW_CONTAINER" style="display: none;">
2
+  <div id="ITP_AJAX_MORDMNG03010_VIEW_CONTAINER" style="display: block;">
3 3
     <div class="content">
4 4
       <div class="line">
5 5
         <label>납품장소</label>
@@ -109,11 +109,11 @@
109 109
       </div>
110 110
     </div>
111 111
   </div>
112
-  <div id="ITP_AJAX_MORDMNG03010_DETAIL_CONTAINER" style="display: block;">
112
+  <div id="ITP_AJAX_MORDMNG03010_DETAIL_CONTAINER" style="display: none;">
113 113
     <div class="detail_content">
114 114
       <div class="detail_header">
115 115
         <div class="detail_logo">
116
-          <img src="/img/naver.png" alt="">
116
+          <img src="../img/naver.png" alt="">
117 117
         </div>
118 118
         <div class="detail_ok">
119 119
           <label>납품 확인서</label>
@@ -200,7 +200,7 @@
200 200
       </div>
201 201
     </div>
202 202
     <div class="scroll_area row-7">
203
-      <li class="history_list1">
203
+      <li class="history_list5">
204 204
         <div>
205 205
           <div class="left">
206 206
             <div class="nomal">

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

@@ -1,5 +1,5 @@
1 1
 <section id="ITP_MOBILE_MPOMNG01010">
2
-  <div id="ITP_POP_MPOMNG01010_REQ_CONFIRM" class="popup mobile-pop-close" style="display: none;">
2
+  <div id="ITP_POP_MPOMNG01010_REQ_AREA" class="popup mobile-pop-close" style="display: none;">
3 3
     <div class="pop">
4 4
       <div class="pop_line">
5 5
         <label>납품요청일 &nbsp;&nbsp;:</label>
@@ -15,106 +15,106 @@
15 15
       </div>
16 16
       <label class="pop_label">구매요청 하시겠습니까?</label>
17 17
       <div class="popup_btn">
18
-        <button id="ITP_BTN_MPOMNG01010_POP_CANCEL" class="cancel btn-gray CLB btn-pop-close">취소</button>
19
-        <button id="ITP_BTN_MPOMNG01010_POP_CONFIRM" class="ok btn-primary COK">확인</button>
18
+        <button id="ITP_BTN_MPOMNG01010_POP_REQ_CLOSE" class="cancel btn-gray CLB btn-pop-close">취소</button>
19
+        <button id="ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM" class="ok btn-primary COK">확인</button>
20 20
       </div>
21 21
     </div>
22 22
   </div>
23
-  <div id="ITP_POP_MPOMNG01010_WHS_NM" class="popup2 mobile-pop-close" style="display: none;">
23
+  <div id="ITP_POP_MPOMNG01010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
24 24
     <div class="pop">
25 25
       <div class="header">
26 26
         <div class="header_left">
27 27
           <label>> 납품장소</label>
28 28
         </div>
29 29
         <div class="header_right">
30
-          <button type="button" id="ITP_BTN_MPOMNG01010_POP_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
30
+          <button type="button" id="ITP_BTN_MPOMNG01010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
31 31
         </div>
32 32
       </div>
33 33
       <div class="search_bar">
34
-        <form id="ITP_FORM_MPOMNG01010_POPUP" class="form-horizontal" onsubmit="return false;">
35
-          <input id="ITP_FORM_MPOMNG01010_POP_KEYWORD" type="text" placeholder="납품장소명">
36
-          <button id="ITP_BTN_MPOMNG01010_POP_SEARCH"><img src="../img/search.png"></button>
34
+        <form id="ITP_FORM_MPOMNG01010_POP_WHS" class="form-horizontal" onsubmit="return false;">
35
+          <input id="ITP_FORM_MPOMNG01010_POP_WHS_KEYWORD" type="text" placeholder="납품장소명">
36
+          <button id="ITP_BTN_MPOMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
37 37
         </form>
38 38
       </div>
39 39
       <div class="search_bar">
40 40
         <button id="ITP_BTN_MPOMNG01010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
41 41
       </div>
42 42
       <div class="popup_scroll">
43
-        <ul id="ITP_LIST_MPOMNG01010_POP_ROWS" class="panel-group itp_nav"></ul>
44
-        <div id="ITP_LIST_MPOMNG01010_POP_ROWCOPY" style="display:none;">
43
+        <ul id="ITP_LIST_MPOMNG01010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
44
+        <div id="ITP_LIST_MPOMNG01010_POP_WHS_ROWCOPY" style="display:none;">
45 45
           <li>
46 46
             <div class="scroll_left">
47 47
               <div class="fn">브랜드 창고 명A</div>
48 48
               <div class="fn">(상세위치내용)</div>
49 49
             </div>
50 50
             <div class="scroll_right">
51
-              <button id="ITP_BTN_MPOMNG01010_POP_CHOICE">선택</button>
51
+              <button id="ITP_BTN_MPOMNG01010_POP_WHS_CHOICE">선택</button>
52 52
             </div>
53 53
           </li>
54 54
         </div>
55 55
       </div>
56 56
     </div>
57 57
   </div>
58
-  <div id="ITP_POP_MPOMNG01010_ITEM_NM" class="popup2 mobile-pop-close" style="display: none;">
58
+  <div id="ITP_POP_MPOMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
59 59
     <div class="pop">
60
-      <div class="header">
61
-        <div class="header_left">
62
-          <label>> 품목 검색</label>
63
-        </div>
64
-        <div class="header_right">
65
-          <button type="button" id="ITP_BTN_MPOMNG01010_POP_ITEM_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
60
+        <div class="header">
61
+            <div class="header_left">
62
+                <label>> 품목 검색</label>
63
+            </div>
64
+            <div class="header_right">
65
+                <button type="button" id="ITP_BTN_MPOMNG01010_POP_ITEM_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
66
+            </div>
66 67
         </div>
67
-      </div>
68
-      <form id="ITP_FORM_MPOMNG01010_POPUP_ITEM" class="form-horizontal" onsubmit="return false;">
69
-        <input type="hidden" id="ITP_FORM_MPOMNG01010_POPUP_ITEM_BRAND_ID" name="sbrandId" value="">
70
-        <input type="hidden" id="ITP_FORM_MPOMNG01010_POPUP_ITEM_STORE_ID" name="sstoreId" value="">
71
-      <div class="search_bar">
72
-          <input id="ITP_FORM_MPOMNG01010_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
73
-          <button id="ITP_BTN_MPOMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
74
-      </div>
75
-      <div class="search_bar">
76
-        <button id="ITP_BTN_MPOMNG01010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
77
-      </div>
78
-      </form>
79
-      <div id="ITP_LIST_MPOMNG01010_POP_ITEM_AREA" class="popup_scroll">
80
-        <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="panel-group"></ul>
81
-        <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display:none;">
82
-        <li class="row_2"
83
-            data-brandUnitUnqNo=""
84
-            data-podrPssblDvsn=""
85
-            data-spplyId=""
86
-            data-stddQty=""
87
-            data-storeUnitUnqNo=""
88
-            data-unit=""
89
-            data-unitAmt=""
90
-            data-unitGubun="">
91
-          <div class="left" style="width:190px;">
92
-            <div class="thick">
93
-              <div><input type="checkbox" id="ITP_FORM_MPOMNG01010_POP_ITEM_CHECKBOX" name="itemId" /></div>
68
+        <form id="ITP_FORM_MPOMNG01010_POPUP_ITEM" class="form-horizontal" onsubmit="return false;">
69
+            <input type="hidden" id="ITP_FORM_MPOMNG01010_POPUP_ITEM_BRAND_ID" name="sbrandId" value="">
70
+            <input type="hidden" id="ITP_FORM_MPOMNG01010_POPUP_ITEM_STORE_ID" name="sstoreId" value="">
71
+            <div class="search_bar">
72
+                <input id="ITP_FORM_MPOMNG01010_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
73
+                <button id="ITP_BTN_MPOMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
94 74
             </div>
95
-            <div class="thick">
96
-              <div class="fnItemNm"></div>
97
-              <div>-</div>
98
-              <div class="fnOrdUnit">1EA</div>
75
+            <div class="search_bar">
76
+                <button id="ITP_BTN_MPOMNG01010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
99 77
             </div>
100
-            <div class="nomal">
101
-              <div class="space">구매가 :</div>
102
-              <div class="fnOrdAmount">0</div>
78
+        </form>
79
+        <div id="ITP_LIST_MPOMNG01010_POP_ITEM_AREA" class="popup_scroll">
80
+            <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="panel-group"></ul>
81
+            <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display:none;">
82
+                <li class="row_2"
83
+                    data-brandUnitUnqNo=""
84
+                    data-podrPssblDvsn=""
85
+                    data-spplyId=""
86
+                    data-stddQty=""
87
+                    data-storeUnitUnqNo=""
88
+                    data-unit=""
89
+                    data-unitAmt=""
90
+                    data-unitGubun="">
91
+                    <div class="left" style="width:200px;">
92
+                        <!--<div class="check_box">
93
+                            <input type="checkbox" id="ITP_FORM_MPOMNG01010_POP_ITEM_CHECKBOX" name="itemId" />
94
+                        </div>-->
95
+                        <div class="thick">
96
+                            <div class="fnItemNm">품목명</div>
97
+                            <div>-</div>
98
+                            <div class="fnOrdUnit">EA</div>
99
+                        </div>
100
+                        <div class="thick" style="font-weight:100;">
101
+                            <div class="space">구매가 :</div>
102
+                            <div class="fnUnitAmt">0</div>
103
+                        </div>
104
+                    </div>
105
+                    <div class="right">
106
+                        <button id="ITP_BTN_MPOMNG01010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
107
+                        <div class="num">1</div>
108
+                        <button id="ITP_BTN_MPOMNG01010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
109
+                    </div>
110
+                    <div class="add">
111
+                        <button id="ITP_BTN_MPOMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
112
+                    </div>
113
+                </li>
103 114
             </div>
104
-          </div>
105
-          <div class="right">
106
-            <button id="ITP_BTN_MSTOCKMNG01010_POP_ITEM_PLUS"><</button>
107
-            <div class="num">2</div>
108
-            <button id="ITP_BTN_MSTOCKMNG01010_POP_ITEM_MINUS">></button>
109
-          </div>
110
-          <div class="add">
111
-            <button id="ITP_BTN_MSTOCKMNG01010_POP_ITEM_ADD">추가</button>
112
-          </div>
113
-        </li>
114 115
         </div>
115
-      </div>
116 116
     </div>
117
-  </div>
117
+</div>
118 118
 
119 119
   <div id="ITP_AJAX_MPOMNG01010_VIEW_CONTAINER">
120 120
     <form id="ITP_FORM_MPOMNG01010_DETAIL" class="form-horizontal" onsubmit="return false;">
@@ -132,7 +132,7 @@
132 132
         <div class="line">
133 133
           <label>구매요청금액</label>
134 134
           <div class="line_right">
135
-            <div class="fnPchReqAmt">0원</div
135
+            <div class="fnPchReqAmt">0원</div>
136 136
           </div>
137 137
         </div>
138 138
         <div class="line">
@@ -148,7 +148,7 @@
148 148
               <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_NM" class="" name="whsNm" placeholder="매장명" />
149 149
             </div>
150 150
             <div class="float_left_btn">
151
-              <button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_NM"><img src="../img/search.png" alt=""></button>
151
+              <button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
152 152
               <button id="ITP_BTN_MPOMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
153 153
             </div>
154 154
           </div>
@@ -157,17 +157,17 @@
157 157
           <div class="table_header">
158 158
             <h1>>구매 품목</h1>
159 159
             <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
160
-            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB">품목추가</button>
160
+            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MPOMNG01010_ITEM_AREA">품목추가</button>
161 161
           </div>
162 162
         </div>
163 163
       </div>
164
-      <div class="scroll_area row-1">
165
-        <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS"></ul>
164
+      <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-1">
165
+        <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="panel-group"></ul>
166 166
         <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display:none;">
167
-          <li>
167
+          <li class="row_2">
168 168
             <div class="left_info">
169 169
               <div class="thick">
170
-                <div><input type="checkbox" id="ITP_FORM_MPOMNG01010_DETAIL_CHECKBOX" name="itemId" /></div>
170
+                <div><input type="checkbox" name="itemId" class="fnBrandUnitUnqNo" /></div>
171 171
               </div>
172 172
               <div class="thick">
173 173
                 <div class="fnItemNm">품목명</div>
@@ -176,7 +176,7 @@
176 176
               </div>
177 177
               <div class="thick">
178 178
                 <label class="space0">구매가 :</label>
179
-                <div class="fnPchActAmt">1,120,000</div>
179
+                <div class="fnUnitAmt">1,120,000</div>
180 180
               </div>
181 181
             </div>
182 182
             <div class="right">
@@ -188,7 +188,7 @@
188 188
         </div>
189 189
       </div>
190 190
       <div class="button_bar">
191
-        <button id="ITP_BTN_MPOMNG01010_DETAIL_REQ_ORDER" data-call-popup="ITP_POP_MPOMNG01010_REQ_CONFIRM" class="col_3 btn-primary REQ">구매요청</button>
191
+        <button id="ITP_BTN_MPOMNG01010_DETAIL_REQ_ORDER" data-call-popup="ITP_POP_MPOMNG01010_REQ_AREA" class="col_3 btn-primary REQ">구매요청</button>
192 192
         <button id="ITP_BTN_MPOMNG01010_DETAIL_TEMP_SAVE" class="col_3 btn-gray TSA">임시저장</button>
193 193
         <button id="ITP_BTN_MPOMNG01010_DETAIL_CANCEL" class="col_3 btn-gray CLB">취소</button>
194 194
       </div>

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

@@ -54,7 +54,7 @@
54 54
           <div class="nomal">
55 55
           	<div class="half">
56 56
 	            <label>구매상태</label>
57
-     		            <span>:</span>
57
+	            <span>:</span>
58 58
 	            <div class="history">
59 59
 	              <div class="fn">대기</div>
60 60
 	            </div>

+ 146 - 70
src/main/webapp/mobile/app/mrtnmng/MRTNMNG01010.html

@@ -1,17 +1,17 @@
1
-<section id="MPOMNG01010">
2
-  <div class="popup" style="display: none;">
1
+<section id="ITP_MOBILE_MRTNMNG01010">
2
+  <div id="ITP_POP_MRTNMNG01010_REQ_CONFIRM" class="popup mobile-pop-close" style="display: none;">
3 3
     <div class="pop">
4 4
       <div class="pop_line">
5 5
         <label>반품요청일 &nbsp;&nbsp;:</label>
6
-        <div class="fn">2022.09.30</div>
6
+        <div class="fnRtnReqDt">2022.09.30</div>
7 7
       </div>
8 8
       <div class="pop_line">
9 9
         <label>품목수&nbsp;&nbsp; :</label>
10
-        <div class="fn">2개</div>
10
+        <div class="fnPop">2개</div>
11 11
       </div>
12 12
       <div class="pop_line">
13 13
         <label>반품금액 &nbsp;&nbsp;:</label>
14
-        <div class="fn">2022.09.30원</div>
14
+        <div class="fnRtnAmt">2022.09.30원</div>
15 15
       </div>
16 16
       <label class="pop_label">요청 하시겠습니까?</label>
17 17
       <div class="popup_btn">
@@ -20,89 +20,165 @@
20 20
       </div>
21 21
     </div>
22 22
   </div>
23
-  <div class="popup2" style="display: block;">
23
+  <div id="ITP_POP_MRTNMNG01010_WHS_NM" class="popup2 mobile-pop-close" style="display: block;">
24 24
     <div class="pop">
25 25
       <div class="header">
26 26
         <div class="header_left">
27 27
           <label>> 반품장소</label>
28 28
         </div>
29 29
         <div class="header_right">
30
-          <button id="ITP_BTN_MRTNMNG01010"><img src="../img/close.png"></button>
30
+          <button id="ITP_BTN_MRTNMNG01010_POP_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
31 31
         </div>
32 32
       </div>
33 33
       <div class="search_bar">
34
-        <input id="ITP_FORM_MRTNMNG01010" type="text" placeholder="반품장소명">
35
-        <button id="ITP_BTN_MRTNMNG01010"><img src="../img/search.png"></button>
34
+      	<form id="ITP_FORM_MRTNMNG01010_POPUP" class="form-horizontal" onsubmit="return false;">
35
+        	<input id="ITP_FORM_MRTNMNG01010_POP_KEYWORD" type="text" placeholder="반품장소명">
36
+        	<button id="ITP_BTN_MRTNMNG01010_POP_SEARCH"><img src="../img/search.png"></button>
37
+      	</form>
36 38
       </div>
37 39
       <div class="search_bar">
38
-        <button id="ITP_BTN_MRTNMNG01010" class="btn_blue">납품장소▼</button>
40
+        <button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
39 41
       </div>
40 42
       <div class="popup_scroll">
41
-        <li>
42
-          <div class="scroll_left">
43
-            <div class="fn">브랜드 창고 명A</div>
44
-            <div class="fn">(상세위치내용)</div>
45
-          </div>
46
-          <div class="scroll_right">
47
-            <button id="ITP_BTN_MRTNMNG01010">선택</button>
48
-          </div>
49
-        </li>
50
-      </div>
43
+	      <ul id="ITP_LIST_MRTNMNG01010_POP_ROWS" class="panel-group itp_nav"></ul>
44
+      		<div id="ITP_LIST_MRTNMNG01010_POP_ROWCOPY" style="display:none;">
45
+		        <li>
46
+		          <div class="scroll_left">
47
+		            <div class="fnBrandWhsNm">브랜드 창고 명A</div>
48
+		            <div class="fn">(상세위치내용)</div>
49
+		          </div>
50
+		          <div class="scroll_right">
51
+		            <button id="ITP_BTN_MRTNMNG01010_POP_CHOICE">선택</button>
52
+		          </div>
53
+		        </li>	
54
+	      	</div>
55
+		</div>
51 56
     </div>
52 57
   </div>
53
-  <div id="ITP_AJAX_MRTNMNG01010_VIEW_CONTAINER">
54
-    <div class="content">
55
-      <div class="line">
56
-        <label>반품요청일</label>
57
-        <input id="ITP_FORM_MRTNMNG01010_VIEW" class="date" type="date" placeholder="">
58
-      </div>
59
-      <div class="line">
60
-        <label>반품요청금액</label>
61
-        <div class="line_right">
62
-          <div class="fn">424,000원</div>
58
+  <div id="ITP_POP_MRTNMNG01010_ITEM_NM" class="popup2 mobile-pop-close" style="display: block;">
59
+    <div class="pop">
60
+        <div class="header">
61
+            <div class="header_left">
62
+                <label>> 품목 검색</label>
63
+            </div>
64
+            <div class="header_right">
65
+                <button type="button" id="ITP_BTN_MRTNMNG01010_POP_ITEM_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
66
+            </div>
63 67
         </div>
64
-      </div>
65
-      <div class="line">
66
-        <label>빈품장소</label>
67
-        <div class="search_nm">
68
-          <div class="float_left">
69
-            <input id="ITP_FORM_MRTNMNG01010_VIEW" class="fn" type="text" placeholder="A매장명">
70
-          </div>
71
-          <div class="float_left_btn">
72
-            <button id="ITP_BTN_MRTNMNG01010"><img src="../img/search.png" alt=""></button>
73
-            <button id="ITP_BTN_MRTNMNG01010"><img src="../img/delete.png" alt=""></button>
74
-          </div>
68
+        <form id="ITP_FORM_MRTNMNG01010_POPUP_ITEM" class="form-horizontal" onsubmit="return false;">
69
+            <input type="hidden" id="ITP_FORM_MRTNMNG01010_POPUP_ITEM_BRAND_ID" name="sbrandId" value="">
70
+            <input type="hidden" id="ITP_FORM_MRTNMNG01010_POPUP_ITEM_STORE_ID" name="sstoreId" value="">
71
+            <div class="search_bar">
72
+                <input id="ITP_FORM_MRTNMNG01010_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
73
+                <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
74
+            </div>
75
+            <div class="search_bar">
76
+                <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
77
+            </div>
78
+        </form>
79
+        <div class="popup_scroll">
80
+            <ul id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWS" class="panel-group"></ul>
81
+            <div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display:block;">
82
+                <li class="row_2"
83
+                    data-brandUnitUnqNo=""
84
+                    data-podrPssblDvsn=""
85
+                    data-spplyId=""
86
+                    data-stddQty=""
87
+                    data-storeUnitUnqNo=""
88
+                    data-unit=""
89
+                    data-unitAmt=""
90
+                    data-unitGubun="">
91
+                    <div class="left" style="width:200px;">
92
+                        <div class="check_box">
93
+                            <input type="checkbox" id="ITP_FORM_MRTNMNG01010_POP_ITEM_CHECKBOX" name="itemId" />
94
+                        </div>
95
+                        <div class="thick">
96
+                            <div class="fnItemNm">품목명</div>
97
+                            <div>-</div>
98
+                            <div class="fnOrdUnit">EA</div>
99
+                        </div>
100
+                        <div class="thick" style="font-weight:100;">
101
+                            <div class="space">구매가 :</div>
102
+                            <div class="fnOrdAmount">0</div>
103
+                        </div>
104
+                    </div>
105
+                    <div class="right">
106
+                        <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_PLUS">-</button>
107
+                        <div class="num">2</div>
108
+                        <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_MINUS">+</button>
109
+                    </div>
110
+                    <div class="add">
111
+                        <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD">추가</button>
112
+                    </div>
113
+                </li>
114
+            </div>
75 115
         </div>
76
-      </div>
77
-      <div class="table_header">
78
-        <h1>> 반품 품목</h1>
79
-        <button id="ITP_BTN_MRTNMNG01010" class="btn-primary btn-sm ADB">품목추가</button>
80
-      </div>
81 116
     </div>
82
-    <div class="scroll_area row-1">
83
-      <li>
84
-        <div class="left_info">
85
-          <div class="thick">
86
-            <div class="fnItemNm">품목명</div>
87
-            <div>-</div>
88
-            <div class="fnUnit">2EA</div>
117
+</div>
118
+  
119
+  <div id="ITP_AJAX_MRTNMNG01010_DETAIL_CONTAINER">
120
+    <form id="ITP_FORM_MRTNMNG01010_DETAIL" class="form-horizontal" onsubmit="return false;">
121
+	   <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_VIEW_CD" name="viewCd" value="C">
122
+	    <div class="content">
123
+	      <div class="line">
124
+	        <label>반품요청일</label>
125
+	        <input id="ITP_FORM_MRTNMNG01010_DETAIL_RTN_REQ_DT" name="rtnReqDt" class="date" type="date" placeholder="">
126
+	      </div>
127
+	      <div class="line">
128
+	        <label>반품요청금액</label>
129
+	        <div class="line_right">
130
+	          <div class="fnRtnReqAmt">424,000원</div>
131
+	        </div>
132
+	      </div>
133
+	      <div class="line">
134
+	        <label>빈품장소</label>
135
+	        <div class="search_nm">
136
+	          <div class="float_left">
137
+	            <input id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_NM" name="whsNm" type="text" placeholder="A매장명">
138
+	          </div>
139
+	          <div class="float_left_btn">
140
+	            <button id="ITP_BTN_MRTNMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG01010_WHS_NM"><img src="../img/search.png" alt=""></button>
141
+	            <button id="ITP_BTN_MRTNMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
142
+	          </div>
143
+	        </div>
144
+	      </div>
145
+	      <div class="table_header">
146
+	        <h1>> 반품 품목</h1>
147
+ 			<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
148
+            <button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB">품목추가</button>	     
89 149
           </div>
90
-          <div class="thick">
91
-            <label class="space0">구매가 :</label>
92
-            <div class="fnPchActAmt">1,120,000</div>
93
-          </div>
94
-        </div>
95
-        <div class="right">
96
-          <button id="ITP_BTN_MRTNMNG01010"><</button>
97
-          <div class="num">2</div>
98
-          <button id="ITP_BTN_MRTNMNG01010">></button>
99
-        </div>
100
-      </li>
101
-    </div>
102
-    <div class="button_bar">
103
-      <button id="ITP_BTN_MRTNMNG01010" class="col_3 btn-primary REQ">구매요청</button>
104
-      <button id="ITP_BTN_MRTNMNG01010" class="col_3 btn-gray TSA">임시저장</button>
105
-      <button id="ITP_BTN_MRTNMNG01010" class="col_3 btn-gray CLB">취소</button>
106
-    </div>
150
+    	</div>
151
+	    <div class="scroll_area row-1">
152
+        <ul id="ITP_LIST_MRTNMNG01010_DETAIL_ROWS"></ul>
153
+		<div id="ITP_LIST_MRTNMNG01010_DETAIL_ROWCOPY" style="display:none;">	     
154
+			<li>
155
+		        <div class="left_info">
156
+		        	<div class="thick">
157
+                	<div><input type="checkbox" id="ITP_FORM_MPOMNG01010_DETAIL_CHECKBOX" name="itemId" /></div>
158
+              		</div>
159
+		          <div class="thick">
160
+		            <div class="fnItemNm">품목명</div>
161
+		            <div>-</div>
162
+		            <div class="fnUnit">2EA</div>
163
+		          </div>
164
+		          <div class="thick">
165
+		            <label class="space0">구매가 :</label>
166
+		            <div class="fnPchActAmt">1,120,000</div>
167
+		          </div>
168
+		        </div>
169
+		        <div class="right">
170
+		          <button id="ITP_BTN_MRTNMNG01010_DETAIL_MINUS"><</button>
171
+		          <div class="num fnNum">2</div>
172
+		          <button id="ITP_BTN_MRTNMNG01010_DETAIL_PLUS">></button>
173
+		        </div>
174
+	      	</li>
175
+	      </div>
176
+	    </div>
177
+	    <div class="button_bar">
178
+	        <button id="ITP_BTN_MRTNMNG01010_DETAIL_REQ_ORDER" data-call-popup="ITP_POP_MRTNMNG01010_REQ_CONFIRM" class="col_3 btn-primary REQ">구매요청</button>
179
+	        <button id="ITP_BTN_MRTNMNG01010_DETAIL_TEMP_SAVE" class="col_3 btn-gray TSA">임시저장</button>
180
+	        <button id="ITP_BTN_MRTNMNG01010_DETAIL_CANCEL" class="col_3 btn-gray CLB">취소</button>
181
+	    </div>
182
+    </form>
107 183
   </div>
108 184
 </section>

+ 127 - 117
src/main/webapp/mobile/app/mrtnmng/MRTNMNG02010.html

@@ -1,123 +1,133 @@
1 1
 <section>
2
+  <div id="ITP_AJAX_MRTNMNG02010_DETAIL_CONTAINER" style="display: block;">
3
+    <form id="ITP_FORM_MPOMNG01010_DETAIL" class="form-horizontal" onsubmit="return false;">
4
+   		<input type="hidden" id="ITP_FORM_MRTNMNG02010_DETAIL_VIEW_CD" name="viewCd" value="C">
5
+   		<div class="content">
6
+	        <div class="line">
7
+	          <label>반품요청일</label>
8
+	        <div class="date_to">
9
+	          <input id="ITP_FORM_MRTNMNG02010_DETAIL_RTN_REQ_DT" class="year" type="date">
10
+	          <div class="at">~</div>
11
+	          <input id="ITP_FORM_MRTNMNG02010_DETAIL" class="year" type="date">
12
+	        </div>
13
+	      </div>
14
+	      <div class="line">
15
+	        <label>반품요청상태</label>
16
+	        <div class="line_right">
17
+				<select id="ITP_FORM_MRTNMNG02010_DETAIL_RTN_REQ_ST_CD" data-select-code="ST_CD" data-check-required="empty" name="rtnReqStCd"></select>
18
+	        </div>
19
+	      </div>
20
+	      <div class="line">
21
+	        <label>반품장소</label>
22
+	        <div class="search_nm">
23
+		        <div class="float_left">
24
+		          <input id="ITP_FORM_MRTNMNG02010_DETAIL_WHS_NM" name="whsNm" type="text" placeholder="A매장명">
25
+		        </div>
26
+		        <div class="float_left_btn">
27
+		          <button id="ITP_BTN_MRTNMNG02010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG02010_WHS_NM"><img src="../img/search.png" alt=""></button>
28
+		          <button id="ITP_BTN_MRTNMNG02010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
29
+		        </div>
30
+	      	</div>   
31
+	      </div>
32
+	      <div class="line" style="height:45px;">
33
+	        <div class="search">
34
+	          <button id="ITP_BTN_MRTNMNG02010_DETAIL_SEARCH" class="btn-primary btn-sm ADB">검색</button>
35
+	        </div>
36
+	      </div>
37
+	      <div class="table_header">
38
+	        <h1>> 반품 요청 내역</h1>
39
+	      </div>
40
+	    </div>
41
+	    <div class="scroll_area row-2">
42
+        <ul id="ITP_LIST_MRTNMNG02010_DETAIL_ROWS"></ul>
43
+   		<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display:none;">	     
44
+	      <li class="history_list">
45
+	        <div class="left">
46
+	          <div class="nomal">
47
+	            <label>반품요청일 :</label>
48
+	            <div class="history">
49
+	              <div class="fnRtnReqDt">2022.10.01</div> 
50
+	              (<div class="fnNm">홍길동 점주</div>)
51
+	            </div>
52
+	          </div>
53
+	        </div>
54
+	        <div class="left">
55
+	          <div class="nomal">
56
+	            <label>반품상태 :</label>
57
+	            <div class="history">
58
+	              <div class="fnRtnReqStCd">대기</div>
59
+	            </div>
60
+	            <label>수거장소명 :</label>
61
+	            <div class="history">
62
+	              <div class="fnColPlaceNm">A매장내</div>
63
+	            </div>
64
+	          </div>
65
+	        </div>
66
+	        <div class="left">
67
+	          <div class="nomal">
68
+	            <label class="col_7">반품요청 정보 :</label>
69
+	            <div class="history">
70
+	              <div class="fn">품목수(3)</div> 
71
+	              <i>- </i>
72
+	              <div class="fnPchActAmt">1,200,000</div> 원
73
+	            </div>
74
+	          </div>
75
+	        </div>
76
+	      </li>
77
+	      </div>
78
+	    </div>
79
+	    </form>
80
+	  </div>
2 81
   <div id="ITP_AJAX_MRTNMNG02010_VIEW_CONTAINER" style="display: none;">
3
-    <div class="content">
4
-        <div class="line">
5
-          <label>반품요청일</label>
6
-        <div class="date_to">
7
-          <input id="ITP_FORM_MRTNMNG02010_VIEW" class="year" type="date">
8
-          <div class="at">~</div>
9
-          <input id="ITP_FORM_MRTNMNG02010_VIEW" class="year" type="date">
10
-        </div>
11
-      </div>
12
-      <div class="line">
13
-        <label>반품요청상태</label>
14
-        <div class="line_right">
15
-          <select class="stcd" name="" id="ITP_FORM_MRTNMNG02010_VIEW">
16
-            <option value="">상태</option>
17
-          </select>
18
-        </div>
19
-      </div>
20
-      <div class="line">
21
-        <label>반품장소</label>
22
-        <div class="search_nm">
23
-	        <div class="float_left">
24
-	          <input id="ITP_FORM_MRTNMNG02010_VIEW" class="fn" type="text" placeholder="A매장명">
82
+  	<form id="ITP_FORM_MRTNMNG01010_VIEW" class="form-horizontal" onsubmit="return false;">
83
+  	   <input type="hidden" id="ITP_FORM_MPOMNG01010_VIEW_VIEW_CD" name="viewCd" value="C">
84
+	    <div class="content">
85
+	      <div class="line">
86
+	        <label>반품요청일</label>
87
+	        <div class="line_right">
88
+	          <div class="fnRtnReqDt">2022.10.10</div>
89
+	        </div>      
90
+	      </div>
91
+	      <div class="line">
92
+	        <label>반품요청금액</label>
93
+	        <div class="line_right">
94
+	          <div class="fnRtnReqAmt">424,000원</div>
25 95
 	        </div>
26
-	        <div class="float_left_btn">
27
-	          <button id="ITP_BTN_MRTNMNG02010"><img src="../img/search.png" alt=""></button>
28
-	          <button id="ITP_BTN_MRTNMNG02010"><img src="../img/delete.png" alt=""></button>
96
+	      </div>
97
+	      <div class="line">
98
+	        <label>반품장소</label>
99
+	        <div class="line_right">
100
+	          <div class="fnWhsNm">A매장내</div>
29 101
 	        </div>
30
-      	</div>   
31
-      </div>
32
-      <div class="line" style="height:45px;">
33
-        <div class="search">
34
-          <button id="ITP_BTN_MRTNMNG02010" class="btn-primary btn-sm ADB">검색</button>
35
-        </div>
36
-      </div>
37
-      <div class="table_header">
38
-        <h1>> 반품 요청 내역</h1>
39
-      </div>
40
-    </div>
41
-    <div class="scroll_area row-2">
42
-      <li class="history_list">
43
-        <div class="left">
44
-          <div class="nomal">
45
-            <label>반품요청일 :</label>
46
-            <div class="history">
47
-              <div class="fn">2022.10.01</div> 
48
-              (<div class="fn">홍길동 점주</div>)
49
-            </div>
50
-          </div>
51
-        </div>
52
-        <div class="left">
53
-          <div class="nomal">
54
-            <label>반품상태 :</label>
55
-            <div class="history">
56
-              <div class="fn">대기</div>
57
-            </div>
58
-            <label>수거장소명 :</label>
59
-            <div class="history">
60
-              <div class="fn">A매장내</div>
61
-            </div>
62
-          </div>
63
-        </div>
64
-        <div class="left">
65
-          <div class="nomal">
66
-            <label class="col_7">반품요청 정보 :</label>
67
-            <div class="history">
68
-              <div class="fn">품목수(3)</div> 
69
-              <i>- </i>
70
-              <div class="fn">1,200,000</div> 원
71
-            </div>
72
-          </div>
73
-        </div>
74
-      </li>
75
-    </div>
76
-  </div>
77
-  <div id="ITP_AJAX_MRTNMNG02010_DETAIL_CONTAINER" style="display: block;">
78
-    <div class="content">
79
-      <div class="line">
80
-        <label>반품요청일</label>
81
-        <div class="line_right">
82
-          <div class="fn">2022.10.10</div>
83
-        </div>      
84
-      </div>
85
-      <div class="line">
86
-        <label>반품요청금액</label>
87
-        <div class="line_right">
88
-          <div class="fn">424,000원</div>
89
-        </div>
90
-      </div>
91
-      <div class="line">
92
-        <label>반품장소</label>
93
-        <div class="line_right">
94
-          <div class="fn">A매장내</div>
95
-        </div>
96
-      </div>
97
-      <div class="table_header">
98
-        <h1>> 반품 품목</h1>
99
-      </div>
100
-    </div>
101
-    <div class="scroll_area row-1" >
102
-      <li>
103
-        <div class="left_info">
104
-          <div class="thick">
105
-            <div class="fnItemNm">품목명</div>
106
-            <div>-</div>
107
-            <div class="fnUnit">2EA</div>
108
-          </div>
109
-          <div class="thick">
110
-            <label class="space0">반품가 :</label>
111
-            <div class="fnPchActAmt">1,120,000</div>
112
-          </div>
113
-        </div>
114
-        <div class="right">
115
-          <div class="num fnNum">2</div>
116
-        </div>
117
-      </li>
118
-    </div>
119
-    <div class="button_bar">
120
-      <button id="ITP_BTN_MRTNMNG02010" class="col_12 btn-gray CLB">취소</button>
121
-    </div>
102
+	      </div>
103
+	      <div class="table_header">
104
+	        <h1>> 반품 품목</h1>
105
+	      </div>
106
+	    </div>
107
+	    <div class="scroll_area row-1" >
108
+      	<ul id="ITP_LIST_MRTNMNG02010_VIEW_ROWS"></ul>
109
+   		<div id="ITP_LIST_MRTNMNG02010_VIEW_ROWCOPY" style="display:none;">	
110
+	      <li>
111
+	        <div class="left_info">
112
+	          <div class="thick">
113
+	            <div class="fnItemNm">품목명</div>
114
+	            <div>-</div>
115
+	            <div class="fnUnit">2EA</div>
116
+	          </div>
117
+	          <div class="thick">
118
+	            <label class="space0">반품가 :</label>
119
+	            <div class="fnPchActAmt">1,120,000</div>
120
+	          </div>
121
+	        </div>
122
+	        <div class="right">
123
+	          <div class="num fnNum">2</div>
124
+	        </div>
125
+	      </li>
126
+	      </div>
127
+	    </div>
128
+	    <div class="button_bar">
129
+        	<button id="ITP_BTN_MRTNMNG02010_VIEW_CANCEL" class="col_12 btn-gray CLB">취소</button>
130
+	    </div>
131
+    </form>
122 132
   </div>
123 133
 </section>

+ 147 - 137
src/main/webapp/mobile/app/mrtnmng/MRTNMNG03010.html

@@ -1,164 +1,174 @@
1 1
 <section>
2
-  <div id="ITP_AJAX_MRTNMNG03010_VIEW_CONTAINER" style="display: none;">
3
-    <div class="content">
4
-      <div class="line">
5
-        <label>반품발주일자</label>
6
-        <div class="date_to">
7
-          <input id="ITP_FORM_MRTNMNG03010_VIEW" class="year" type="date">
8
-          <div class="at">~</div>
9
-          <input id="ITP_FORM_MRTNMNG03010_VIEW" class="year" type="date">
2
+   <div id="ITP_AJAX_MRTNMNG03010_DETAIL_CONTAINER" style="display: none;">
3
+  	<form id="ITP_FORM_MRTNMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
4
+	  <input type="hidden" id="ITP_FORM_MRTNMNG03010_DETAIL_VIEW_CD" name="viewCd" value="C">
5
+      	<div class="content">
6
+       	<div class="line">
7
+          <label>반품발주일자</label>
8
+          <div class="date_to">
9
+            <input id="ITP_FORM_MRTNMNG03010_DETAIL" class="year" type="date">
10
+            <div class="at">~</div>
11
+            <input id="ITP_FORM_MRTNMNG03010_DETAIL" class="year" type="date">
12
+          </div>
10 13
         </div>
11
-      </div>
12
-      <div class="line">
13
-        <label>반품발주상태</label>
14
-        <div class="line_right">
15
-          <select name="" id="ITP_FORM_MRTNMNG03010_VIEW">
16
-            <option value=""></option>
17
-          </select>
14
+        <div class="line">
15
+          <label>반품발주상태</label>
16
+          <div class="line_right">
17
+		 	<select id="ITP_FORM_MRTNMNG03010_DETAIL_RTN_PODR_ST_CD" data-select-code="ST_CD" data-check-required="empty" name="rtnPodrStCd"></select>
18
+          </div>
18 19
         </div>
19
-      </div>
20
-      <div class="line">
21
-        <label>반품장소</label>
22
-        <div class="search_nm">
23
-	        <div class="float_left">
24
-	          <input id="ITP_FORM_MRTNMNG03010_VIEW" type="text" placeholder="A매장명">
25
-	        </div>
26
-	        <div class="float_left_btn">
27
-	          <button id="ITP_BTN_MRTNMNG03010"><img src="../img/search.png" alt=""></button>
28
-	          <button id="ITP_BTN_MRTNMNG03010"><img src="../img/delete.png" alt=""></button>
29
-	        </div>
20
+        <div class="line">
21
+          <label>반품장소</label>
22
+          <div class="search_nm">
23
+              <div class="float_left">
24
+                <input id="ITP_FORM_MRTNMNG03010_DETAIL_WHS_NM" name="whsNm" type="text" placeholder="A매장명">
25
+              </div>
26
+              <div class="float_left_btn">
27
+		          <button id="ITP_BTN_MRTNMNG03010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG03010_WHS_NM"><img src="../img/search.png" alt=""></button>
28
+		          <button id="ITP_BTN_MRTNMNG03010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
29
+              </div>
30
+          </div>
30 31
         </div>
31
-      </div>
32
-      <div class="line">
33
-        <label>반품입고장소</label>
34
-        <div class="search_nm">
35
-	        <div class="float_left">
36
-	          <input id="ITP_FORM_MRTNMNG03010_VIEW" type="text" placeholder="A공급업체명">
37
-	        </div>
38
-	        <div class="float_left_btn">
39
-	          <button id="ITP_BTN_MRTNMNG03010"><img src="../img/search.png" alt=""></button>
40
-	          <button id="ITP_BTN_MRTNMNG03010"><img src="../img/delete.png" alt=""></button>
41
-        	</div>
42
-        </div>	
43
-      </div>
44
-      <div class="line" style="height:50px;">
45
-        <div class="search">
46
-          <button id="ITP_BTN_MRTNMNG03010" class="btn-primary btn-sm ADB">검색</button>
32
+        <div class="line">
33
+          <label>반품입고장소</label>
34
+          <div class="search_nm">
35
+              <div class="float_left">
36
+                <input id="ITP_FORM_MRTNMNG03010_DETAIL_WHS_NM" type="text" placeholder="A공급업체명">
37
+              </div>
38
+              <div class="float_left_btn">
39
+                <button id="ITP_BTN_MRTNMNG03010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG03010_WHS_NM"><img src="../img/search.png" alt=""></button>
40
+                <button id="ITP_BTN_MRTNMNG03010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
41
+              </div>
42
+          </div>	
47 43
         </div>
48
-      </div>
49
-      <div class="table_header">
50
-        <h1>> 반품 발주 내역</h1>
51
-      </div>
52
-    </div>
53
-    <div class="scroll_area row-3">
54
-      <li class="history_list">
55
-        <div class="left">
56
-          <div class="nomal">
57
-            <label class="col_2">반품발주일자&nbsp;:</label>
58
-            <div>
59
-              <div class="fn">2022.10.01</div> 
60
-              (&nbsp;<div class="fn">홍길동 점주</div> )
61
-            </div>
44
+        <div class="line" style="height:50px;">
45
+          <div class="search">
46
+            <button id="ITP_BTN_MRTNMNG03010_DETAIL_SEARCH" class="btn-primary btn-sm ADB">검색</button>
62 47
           </div>
63 48
         </div>
64
-        <div class="left">
65
-          <div class="nomal">
66
-            <label class="col_2">반품발주상태&nbsp;:</label>
67
-            <div class="col_5">
68
-              <div class="col_5 fn">대기</div>
49
+        <div class="table_header">
50
+          <h1>> 반품 발주 내역</h1>
51
+        </div>
52
+      </div>
53
+      <div class="scroll_area row-3">
54
+      <ul id="ITP_LIST_MRTNMNG03010_DETAIL_ROWS"></ul>
55
+      <div id="ITP_LIST_MRTNMNG03010_DETAIL_ROWCOPY" style="display:none;">	     
56
+        <li class="history_list">
57
+          <div class="left">
58
+            <div class="nomal">
59
+              <label class="col_2">반품발주일자&nbsp;:</label>
60
+              <div>
61
+                <div class="fnRtnPodrDt">2022.10.01</div> 
62
+                (&nbsp;<div class="fnNm">홍길동 점주</div> )
63
+              </div>
69 64
             </div>
70
-            <label>납품장소명&nbsp;:</label>
71
-            <div>
72
-              <div class="fn">A매장내</div>
65
+          </div>
66
+          <div class="left">
67
+            <div class="nomal">
68
+              <label class="col_2">반품발주상태&nbsp;:</label>
69
+              <div class="col_5">
70
+                <div class="col_5 fnRtnPodrStCd">대기</div>
71
+              </div>
72
+              <label>납품장소명&nbsp;:</label>
73
+              <div>
74
+                <div class="fnDlvPlaceNm">A매장내</div>
75
+              </div>
73 76
             </div>
74 77
           </div>
75
-        </div>
76
-        <div class="left">
77
-          <div class="nomal">
78
-            <label class="col_2">반품발주정보&nbsp;:</label>
79
-            <div>
80
-              <div class="fn">품목수(3)</div> 
81
-              <i>-</i>
82
-              <div class="fn">1,200,000</div>
78
+          <div class="left">
79
+            <div class="nomal">
80
+              <label class="col_2">반품발주정보&nbsp;:</label>
81
+              <div>
82
+                <div class="fn">품목수(3)</div> 
83
+                <i>-</i>
84
+                <div class="fnPchActAmt">1,200,000</div>원
85
+              </div>
83 86
             </div>
84 87
           </div>
85
-        </div>
86
-        <div class="left">
87
-          <div class="nomal">
88
-            <label class="col_2">반품입고장소&nbsp;:</label>
89
-            <div>
90
-              <div class="fn">A공급업체</div> 
88
+          <div class="left">
89
+            <div class="nomal">
90
+              <label class="col_2">반품입고장소&nbsp;:</label>
91
+              <div>
92
+                <div class="fnWhsNm">A공급업체</div> 
93
+              </div>
91 94
             </div>
92 95
           </div>
96
+        </li>
93 97
         </div>
94
-      </li>
95
-    </div>
96
-  </div>
97
-  <div id="ITP_AJAX_MRTNMNG03010_DETAIL_CONTAINER" style="display: block;">
98
-    <div class="content">
99
-      <div class="line">
100
-        <label>반품발주일자</label>
101
-        <div class="line_right">
102
-          <div class="fn">2022.10.10</div>
103
-        </div>      
104 98
       </div>
105
-      <div class="line">
106
-        <label>반품발주금액</label>
107
-        <div class="line_right">
108
-          <div class="fn">424,000원</div>
99
+      </form>
100
+    </div>
101
+   <div id="ITP_AJAX_MRTNMNG03010_VIEW_CONTAINER" style="display: block;">
102
+      <form id="ITP_FORM_MRTNMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
103
+	   	<input type="hidden" id="ITP_FORM_MPOMNG01010_VIEW_VIEW_CD" name="viewCd" value="C">
104
+      <div class="content">
105
+        <div class="line">
106
+          <label>반품발주일자</label>
107
+          <div class="line_right">
108
+            <div class="fnRtnPodrDt">2022.10.10</div>
109
+          </div>      
109 110
         </div>
110
-      </div>
111
-      <div class="line">
112
-        <label>반품장소</label>
113
-        <div class="line_right">
114
-          <div class="fn">A매장내</div>
111
+        <div class="line">
112
+          <label>반품발주금액</label>
113
+          <div class="line_right">
114
+            <div class="fnRtnPodrAmt">424,000원</div>
115
+          </div>
115 116
         </div>
116
-      </div>
117
-      <div class="line">
118
-        <label>반품입고장소</label>
119
-        <div class="line_right">
120
-          <div class="fn">A공급업체</div>
117
+        <div class="line">
118
+          <label>반품장소</label>
119
+          <div class="line_right">
120
+            <div class="fn">A매장내</div>
121
+          </div>
122
+        </div>
123
+        <div class="line">
124
+          <label>반품입고장소</label>
125
+          <div class="line_right">
126
+            <div class="fnWhsNm">A공급업체</div>
127
+          </div>
128
+        </div>
129
+        <div class="table_header">
130
+          <h1>> 반품 발주 품목</h1>
121 131
         </div>
122 132
       </div>
123
-      <div class="table_header">
124
-        <h1>> 반품 발주 품목</h1>
125
-      </div>
126
-    </div>
127
-    <div class="scroll_area row-2">
128
-      <li>
129
-        <div>
130
-          <div class="left_info col-4">
131
-            <div class="thick">
132
-              <div class="fnItemNm">품목명</div>
133
-              <i>-</i>
134
-              <div class="fnUnit">2EA</div>
133
+      <div class="scroll_area row-2">
134
+      <ul id="ITP_LIST_MRTNMNG03010_VIEW_ROWS"></ul>
135
+	  <div id="ITP_LIST_MRTNMNG03010_VIEW_ROWCOPY" style="display:none;">	
136
+        <li>
137
+          <div>
138
+            <div class="left_info col-4">
139
+              <div class="thick">
140
+                <div class="fnItemNm">품목명</div>
141
+                <i>-</i>
142
+                <div class="fnUnit">2EA</div>
143
+              </div>
135 144
             </div>
136
-          </div>
137
-          <div class="left_info col-6">
138
-            <div class="thick">
139
-              <label>수량/금액</label>
140
-              <div class="fn">2</div>
141
-              <i>/</i>
142
-              <div class="fn">24,000</div>
145
+            <div class="left_info col-6">
146
+              <div class="thick">
147
+                <label>수량/금액</label>
148
+                <div class="fn">2</div>
149
+                <i>/</i>
150
+                <div class="fn">24,000</div>
151
+              </div>
143 152
             </div>
144
-          </div>
145
-          <div class="left_info col-4">
146
-            <div class="thick">
147
-              <label style="margin:0;">구매가 :</label>
148
-              <div class="fnPchActAmt">12,000</div>
153
+            <div class="left_info col-4">
154
+              <div class="thick">
155
+                <label style="margin:0;">구매가 :</label>
156
+                <div class="fnPchActAmt">12,000</div>
157
+              </div>
149 158
             </div>
150
-          </div>
151
-          <div class="left_info col-6">
152
-            <div class="thick">
153
-              <label>납기요청일&nbsp;:&nbsp;</label>
154
-              <div class="fn">2022.10.01</div>
159
+            <div class="left_info col-6">
160
+              <div class="thick">
161
+                <label>납기요청일&nbsp;:&nbsp;</label>
162
+                <div class="fnRtnReqDt">2022.10.01</div>
163
+              </div>
155 164
             </div>
156 165
           </div>
166
+        </li>
157 167
         </div>
158
-      </li>
159
-    </div>
160
-    <div class="button_bar">
161
-      <button id="ITP_BTN_MRTNMNG03010" class="col_12 btn-gray CLB">취소</button>
168
+      </div>
169
+      <div class="button_bar">
170
+        <button id="ITP_BTN_MRTNMNG03010_VIEW_CANCEL" class="col_12 btn-gray CLB">취소</button>
171
+      </div>
172
+      </form>
162 173
     </div>
163
-  </div>
164
-</section>
174
+  </section>

+ 112 - 109
src/main/webapp/mobile/app/mrtnmng/MRTNMNG04010.html

@@ -1,117 +1,120 @@
1 1
 <section>
2
-  <div id="ITP_AJAX_MRTNMNG04010_VIEW_CONTAINER" style="display: block;">
3
-    <div class="content">
4
-      <div class="line">
5
-        <label>반품예정일</label>
6
-        <div class="line_right">
7
-          <input id="ITP_FORM_MRTNMNG04010_VIEW" class="date2" type="date" placeholder="">
8
-        </div>
9
-      </div>
10
-      <div class="line">
11
-        <label>반품서번호</label>
12
-        <div class="line_right">
13
-          <select name="" id="ITP_FORM_MRTNMNG04010_VIEW">
14
-            <option value=""></option>
15
-          </select>
16
-        </div>
17
-      </div>
18
-      <div class="line">
19
-        <label>반품입고장소</label>
20
-        <div class="search_wrap">
21
-	        <div class="float_left">
22
-	          <input id="ITP_FORM_MRTNMNG04010_VIEW" type="text" placeholder="A공급업체명">
2
+  <div id="ITP_AJAX_MRTNMNG04010_DETAIL_CONTAINER" style="display: block;">
3
+  	<form id="ITP_FORM_MPOMNG01010_DETAIL" class="form-horizontal" onsubmit="return false;">
4
+		<input type="hidden" id="ITP_FORM_MRTNMNG04010_DETAIL_VIEW_CD" name="viewCd" value="C">
5
+	    <div class="content">
6
+	      <div class="line">
7
+	        <label>반품예정일</label>
8
+	        <div class="line_right">
9
+	          <input id="ITP_FORM_MRTNMNG05010_DETAIL_RTN_SCH_DT" name="rtnSchDt" class="date2" type="date">
23 10
 	        </div>
24
-	        <div class="float_left_btn">
25
-	          <button id="ITP_BTN_MRTNMNG04010"><img src="../img/search.png" alt=""></button>
26
-	          <button id="ITP_BTN_MRTNMNG04010"><img src="../img/delete.png" alt=""></button>
11
+	      </div>
12
+	      <div class="line">
13
+	        <label>반품서번호</label>
14
+	        <div class="line_right">
15
+          		<input id="ITP_FORM_MRTNMNG05010_DETAIL_RTN_REQ_UNQ_NO" name="rtnReqUnqNo" class="" type="text">
27 16
 	        </div>
28
-        </div>
29
-      </div>
30
-      <div class="line">
31
-        <label>반품장소</label>
32
-        <div class="search_wrap">
33
-	        <div class="float_left">
34
-	          <input id="ITP_FORM_MRTNMNG04010_VIEW" type="text" placeholder="A매장명">
17
+	      </div>
18
+	      <div class="line">
19
+	        <label>반품입고장소</label>
20
+	        <div class="search_wrap">
21
+		        <div class="float_left">
22
+		          <input id="ITP_FORM_MRTNMNG04010_DETAIL_WHS_NM" name="whsNm" type="text" placeholder="A공급업체명">
23
+		        </div>
24
+		        <div class="float_left_btn">
25
+		          <button id="ITP_BTN_MRTNMNG04010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG04010_WHS_NM"><img src="../img/search.png" alt=""></button>
26
+		          <button id="ITP_BTN_MRTNMNG04010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
27
+		        </div>
35 28
 	        </div>
36
-	        <div class="float_left_btn">
37
-	          <button id="ITP_BTN_MRTNMNG04010"><img src="../img/search.png" alt=""></button>
38
-	          <button id="ITP_BTN_MRTNMNG04010"><img src="../img/delete.png" alt=""></button>
29
+	      </div>
30
+	      <div class="line">
31
+	        <label>반품장소</label>
32
+	        <div class="search_wrap">
33
+		        <div class="float_left">
34
+		          <input id="ITP_FORM_MRTNMNG04010_DETAIL_WHS_NM" type="text" placeholder="A매장명">
35
+		        </div>
36
+		        <div class="float_left_btn">
37
+		          <button id="ITP_BTN_MRTNMNG04010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG04010_WHS_NM"><img src="../img/search.png" alt=""></button>
38
+		          <button id="ITP_BTN_MRTNMNG04010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
39
+		        </div>
40
+	      	</div>  
41
+	      </div>
42
+	      <div class="line">
43
+	        <label>반품품목명</label>
44
+	       	<div class="search_wrap">
45
+		        <div class="float_left">
46
+		          <input id="ITP_FORM_MRTNMNG04010_DETAIL_ITEM_NM" name="itemNm" style="width: 262px;" type="text" placeholder="A매장명">
47
+		        </div>
48
+	  	  	</div>   
49
+	      </div>
50
+	      <div class="line" style="height:50px;">
51
+	        <div class="search">
52
+	          <button id="ITP_BTN_MRTNMNG04010_DETAIL_SEARCH" class="btn-primary btn-sm ADB">검색</button>
39 53
 	        </div>
40
-      	</div>  
41
-      </div>
42
-      <div class="line">
43
-        <label>반품품목명</label>
44
-       	<div class="search_wrap">
45
-	        <div class="float_left">
46
-	          <input id="ITP_FORM_MRTNMNG04010_VIEW" style="width: 262px;" type="text" placeholder="A매장명">
54
+	      </div>
55
+	      <div class="table_header">
56
+	        <h1>> 반품서 내역</h1>
57
+	      </div>
58
+	    </div>
59
+	    <div class="scroll_area row-4" >
60
+     	<ul id="ITP_LIST_MRTNMNG04010_DETAIL_ROWS"></ul>
61
+   		<div id="ITP_LIST_MRTNMNG04010_DETAIL_ROWCOPY" style="display:none;">	    
62
+	      <li class="history_list2">
63
+	        <div class="left">
64
+	          <div class="nomal">
65
+	            <label>반품번호 </label>
66
+	            <div class="history">
67
+	              <div class="fnRtnNo">202210010000001-0100</div> 
68
+	            </div>
69
+	          </div>
47 70
 	        </div>
48
-  	  	</div>   
49
-      </div>
50
-      <div class="line" style="height:50px;">
51
-        <div class="search">
52
-          <button id="ITP_BTN_MRTNMNG04010" class="btn-primary btn-sm ADB">검색</button>
53
-        </div>
54
-      </div>
55
-      <div class="table_header">
56
-        <h1>> 반품서 내역</h1>
57
-      </div>
58
-    </div>
59
-    <div class="scroll_area row-4" >
60
-      <li class="history_list2">
61
-        <div class="left">
62
-          <div class="nomal">
63
-            <label>반품번호 </label>
64
-            <div class="history">
65
-              <div class="fn">202210010000001-0100</div> 
66
-            </div>
67
-          </div>
68
-        </div>
69
-        <div class="left">
70
-          <div class="nomal">
71
-            <label class="history_label">반품예정일</label>
72
-            <div class="history">
73
-              <div class="fn">2022.10.03</div>
74
-            </div>
75
-          </div>
76
-        </div>
77
-        <div class="left">
78
-          <div class="nomal">
79
-            <label>공급업체</label>
80
-            <div class="history">
81
-              <div class="history_info">A공급업체명</div>
82
-            </div>
83
-            <label class="sub_info">반품장소</label>
84
-            <div class="history">
85
-              <div class="fn">A매장내</div>
86
-            </div>
87
-          </div>
88
-        </div>
89
-        <div class="left">
90
-          <div class="nomal">
91
-            <label>품목 </label>
92
-            <div class="history">
93
-              <div class="fn">품목명(EA)</div> 
94
-            </div>
95
-          </div>
96
-        </div>
97
-        <div class="left">
98
-          <div class="nomal">
99
-            <label class="col_2">반품요청수량</label>
100
-            <div class="col_5 history">
101
-              <div class="col_5 fn">10</div>
102
-            </div>
103
-            <label class="col_0">반품발주수량</label>
104
-            <div class="history">
105
-              <input class="" id="ITP_FORM_MRTNMNG04010_VIEW" type="text" placeholder="10">
106
-            </div>
107
-          </div>
108
-        </div>
109
-      </li>
110
-  </div>
111
-  <div class="button_bar">
112
-    <button id="ITP_BTN_MRTNMNG04010" class="btn_col_6 btn-primary INPS">입고처리</button>
113
-    <button id="ITP_BTN_MRTNMNG04010" class="btn_col_3 btn-gray CLB">취소</button>
114
-  </div>
71
+	        <div class="left">
72
+	          <div class="nomal">
73
+	            <label class="history_label">반품예정일</label>
74
+	            <div class="history">
75
+	              <div class="fnRtnSchDt">2022.10.03</div>
76
+	            </div>
77
+	          </div>
78
+	        </div>
79
+	        <div class="left">
80
+	          <div class="nomal">
81
+	            <label>공급업체</label>
82
+	            <div class="history">
83
+	              <div class="history_info fnSpplyNm">A공급업체명</div>
84
+	            </div>
85
+	            <label class="sub_info">반품장소</label>
86
+	            <div class="history">
87
+	              <div class="fnWhsNm">A매장내</div>
88
+	            </div>
89
+	          </div>
90
+	        </div>
91
+	        <div class="left">
92
+	          <div class="nomal">
93
+	            <label>품목 </label>
94
+	            <div class="history">
95
+	              <div class="fnItemNm">품목명(EA)</div> 
96
+	            </div>
97
+	          </div>
98
+	        </div>
99
+	        <div class="left">
100
+	          <div class="nomal">
101
+	            <label class="col_2">반품요청수량</label>
102
+	            <div class="col_5 history">
103
+	              <div class="col_5 fnRtnReqQty">10</div>
104
+	            </div>
105
+	            <label class="col_0">반품발주수량</label>
106
+	            <div class="history">
107
+	              <input class="" id="ITP_FORM_MRTNMNG04010_DETAIL_RTN_PODR_QTY" type="text" name="rtnPodrQty">
108
+	            </div>
109
+	          </div>
110
+	        </div>
111
+	      </li>
112
+	      </div>
113
+	  </div>
114
+	  <div class="button_bar">
115
+	    <button id="ITP_BTN_MRTNMNG04010_DETAIL_" class="btn_col_6 btn-primary INPS">입고처리</button>
116
+	    <button id="ITP_BTN_MRTNMNG04010_DETAIL_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
117
+	  </div>
118
+  	</form>
115 119
   </div>
116
-  
117 120
 </section>

+ 111 - 107
src/main/webapp/mobile/app/mrtnmng/MRTNMNG05010.html

@@ -1,114 +1,118 @@
1 1
 <section>
2
-  <div id="ITP_AJAX_MRTNMNG05010_VIEW_CONTAINER">
3
-    <div class="content">
4
-      <div class="line">
5
-        <select class="label" name="" id="ITP_FORM_MRTNMNG05010_VIEW">
6
-          <option value="">반품일자</option>
7
-        </select>
8
-        <div class="date_to">
9
-          <input id="ITP_FORM_MRTNMNG05010_VIEW" class="year" type="date">
10
-          <div class="at">~</div>
11
-          <input id="ITP_FORM_MRTNMNG05010_VIEW" class="year" type="date">
12
-        </div>
13
-      </div>
14
-      <div class="line">
15
-        <label>반품발주번호</label>
16
-        <div class="line_right">
17
-          <input id="ITP_FORM_MRTNMNG05010_VIEW" type="text">
18
-        </div>
19
-      </div>
20
-      <div class="line">
21
-        <label>반품입고장소</label>
22
-        <div class="search_wrap">
23
-	        <div class="float_left">
24
-	          <input id="ITP_FORM_MRTNMNG05010_VIEW" type="text" placeholder="A공급업체명">
2
+	<div id="ITP_AJAX_MRTNMNG05010_DETAIL_CONTAINER" style="display: block;">    
3
+    <form id="ITP_FORM_MPOMNG01010_DETAIL" class="form-horizontal" onsubmit="return false;">
4
+  		<input type="hidden" id="ITP_FORM_MRTNMNG02010_DETAIL_VIEW_CD" name="viewCd" value="C">
5
+		<div class="content">
6
+	      <div class="line">
7
+			<select id="ITP_FORM_MRTNMNG05010_DETAIL_RTN_DT" data-select-code="RTN_DT" data-check-required="empty" name="rtnDt"></select>
8
+	        <div class="date_to">
9
+	          <input id="ITP_FORM_MRTNMNG05010_DETAIL" class="year" type="date">
10
+	          <div class="at">~</div>
11
+	          <input id="ITP_FORM_MRTNMNG05010_DETAIL" class="year" type="date">
25 12
 	        </div>
26
-	        <div class="float_left_btn">
27
-	          <button id="ITP_BTN_MRTNMNG05010"><img src="../img/search.png" alt=""></button>
28
-	          <button id="ITP_BTN_MRTNMNG05010"><img src="../img/delete.png" alt=""></button>
13
+	      </div>
14
+	      <div class="line">
15
+	        <label>반품발주번호</label>
16
+	        <div class="line_right">
17
+	          <input id="ITP_FORM_MRTNMNG05010_DETAIL_RTN_PODR_NO" name="rtnPodrNo" type="text">
29 18
 	        </div>
30
-        </div>
31
-      </div>
32
-      <div class="line">
33
-        <label>반품장소</label>
34
-        <div class="search_wrap">
35
-	        <div class="float_left">
36
-	          <input id="ITP_FORM_MRTNMNG05010_VIEW" type="text" placeholder="A매장명">
19
+	      </div>
20
+	      <div class="line">
21
+	        <label>반품입고장소</label>
22
+	        <div class="search_wrap">
23
+		        <div class="float_left">
24
+		          <input id="ITP_FORM_MRTNMNG05010_DETAIL_WHS_NM" name="whsNm" type="text" placeholder="A공급업체명">
25
+		        </div>
26
+		        <div class="float_left_btn">
27
+		          <button id="ITP_BTN_MRTNMNG05010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG05010_WHS_NM"><img src="../img/search.png" alt=""></button>
28
+		          <button id="ITP_BTN_MRTNMNG05010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
29
+		        </div>
37 30
 	        </div>
38
-	        <div class="float_left_btn">
39
-	          <button id="ITP_BTN_MRTNMNG05010"><img src="../img/search.png" alt=""></button>
40
-	          <button id="ITP_BTN_MRTNMNG05010"><img src="../img/delete.png" alt=""></button>
31
+	      </div>
32
+	      <div class="line">
33
+	        <label>반품장소</label>
34
+	        <div class="search_wrap">
35
+		        <div class="float_left">
36
+		          <input id="ITP_FORM_MRTNMNG05010_DETAIL_WHS_NM" type="text" placeholder="A매장명">
37
+		        </div>
38
+		        <div class="float_left_btn">
39
+		          <button id="ITP_BTN_MRTNMNG05010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG05010_WHS_NM"><img src="../img/search.png" alt=""></button>
40
+		          <button id="ITP_BTN_MRTNMNG05010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
41
+		        </div>
41 42
 	        </div>
42
-        </div>
43
-      </div>
44
-      <div class="line">
45
-        <label>품목명</label>
46
-        <div class="search_wrap">
47
-	        <div class="float_left">
48
-	          <input id="ITP_FORM_MRTNMNG05010_VIEW" style="width: 262px;" type="text" placeholder="A매장명">
43
+	      </div>
44
+	      <div class="line">
45
+	        <label>품목명</label>
46
+	        <div class="search_wrap">
47
+		        <div class="float_left">
48
+		          <input id="ITP_FORM_MRTNMNG05010_DETAIL_ITEM_NM" name="itemNm" style="width: 262px;" type="text" placeholder="A매장명">
49
+		        </div>
49 50
 	        </div>
50
-        </div>
51
-      </div>
52
-      <div class="line" style="height:50px;">
53
-        <div class="search">
54
-          <button id="ITP_BTN_MRTNMNG05010"class="btn-primary btn-sm ADB">검색</button>
55
-        </div>
56
-      </div>
57
-      <div class="table_header">
58
-        <h1>> 반품 내역</h1>
59
-      </div>
60
-    </div>
61
-    <div class="scroll_area row-4">
62
-      <li class="history_list2">
63
-        <div class="left">
64
-          <div class="nomal">
65
-            <label>반품발주번호 </label>
66
-            <div>
67
-              <div class="fn">202210010000001-0100</div> 
68
-            </div>
69
-          </div>
70
-        </div>
71
-        <div class="left">
72
-          <div class="nomal">
73
-            <label class="fn_label">반품예정일</label>
74
-            <div>
75
-              <div class="fn_info">2022.10.03</div>
76
-            </div>
77
-          </div>
78
-        </div>
79
-        <div class="left">
80
-          <div class="nomal">
81
-            <label>공급업체</label>
82
-            <div>
83
-              <div class="fn">A공급업체명</div>
84
-            </div>
85
-            <label class="sub_info">납품장소</label>
86
-            <div>
87
-              <div class="fn">A매장내</div>
88
-            </div>
89
-          </div>
90
-        </div>
91
-        <div class="left">
92
-          <div class="nomal">
93
-            <label>품목 </label>
94
-            <div>
95
-              <div class="fn">품목명(EA)</div> 
96
-            </div>
97
-          </div>
98
-        </div>
99
-        <div class="left">
100
-          <div class="nomal">
101
-            <label>반품발주수량</label>
102
-            <div class="col_5">
103
-              <div class="col_5 fn">10</div>
104
-            </div>
105
-            <label>반품입고수량</label>
106
-            <div>
107
-              <div class="fn">10</div>
108
-            </div>
109
-          </div>
110
-        </div>
111
-      </li>
112
-    </div>
113
-  </div>
51
+	      </div>
52
+	      <div class="line" style="height:50px;">
53
+	        <div class="search">
54
+	          <button id="ITP_BTN_MRTNMNG05010_DETAIL_SEARCH" class="btn-primary btn-sm ADB">검색</button>
55
+	        </div>
56
+	      </div>
57
+	      <div class="table_header">
58
+	        <h1>> 반품 내역</h1>
59
+	      </div>
60
+	    </div>
61
+	    <div class="scroll_area row-4">
62
+      	<ul id="ITP_LIST_MRTNMNG05010_DETAIL_ROWS"></ul>
63
+   		<div id="ITP_LIST_MRTNMNG05010_DETAIL_ROWCOPY" style="display:none;">
64
+	      <li class="history_list2">
65
+	        <div class="left">
66
+	          <div class="nomal">
67
+	            <label>반품발주번호 </label>
68
+	            <div>
69
+	              <div class="fnRtnPodrNo">202210010000001-0100</div> 
70
+	            </div>
71
+	          </div>
72
+	        </div>
73
+	        <div class="left">
74
+	          <div class="nomal">
75
+	            <label class="fn_label">반품예정일</label>
76
+	            <div>
77
+	              <div class="fn_info fnRtnSchDt">2022.10.03</div>
78
+	            </div>
79
+	          </div>
80
+	        </div>
81
+	        <div class="left">
82
+	          <div class="nomal">
83
+	            <label>공급업체</label>
84
+	            <div>
85
+	              <div class="fnSpplyNm">A공급업체명</div>
86
+	            </div>
87
+	            <label class="sub_info">납품장소</label>
88
+	            <div>
89
+	              <div class="fnWhsNm">A매장내</div>
90
+	            </div>
91
+	          </div>
92
+	        </div>
93
+	        <div class="left">
94
+	          <div class="nomal">
95
+	            <label>품목 </label>
96
+	            <div>
97
+	              <div class="fn">품목명(EA)</div> 
98
+	            </div>
99
+	          </div>
100
+	        </div>
101
+	        <div class="left">
102
+	          <div class="nomal">
103
+	            <label>반품발주수량</label>
104
+	            <div class="col_5">
105
+	              <div class="col_5 fnRtnPodrQty">10</div>
106
+	            </div>
107
+	            <label>반품입고수량</label>
108
+	            <div>
109
+	              <div class="fnRtnWhsQty">10</div>
110
+	            </div>
111
+	          </div>
112
+	        </div>
113
+	      </li>
114
+	      </div>
115
+	    </div>
116
+	    </form>
117
+	  </div>
114 118
 </section>

+ 55 - 36
src/main/webapp/mobile/app/mstockmng/MSTOCKMNG01010.html

@@ -1,45 +1,64 @@
1 1
 <section id="MSTOCK01010">
2
-  <div class="popup2" style="display: none;">
2
+  <div id="ITP_POP_MSTOCKMNG_ITEM_NM" class="popup2 mobile-pop-close" style="display: block;">
3 3
     <div class="pop">
4
-      <div class="header">
5
-        <div class="header_left">
6
-          <label>> 품목 검색</label>
7
-        </div>
8
-        <div class="header_right">
9
-          <button id="ITP_BTN_MSTOCKMNG01010"><img src="../img/close.png"></button>
4
+        <div class="header">
5
+            <div class="header_left">
6
+                <label>> 품목 검색</label>
7
+            </div>
8
+            <div class="header_right">
9
+                <button type="button" id="ITP_BTN_MSTOCKMNG_POP_ITEM_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
10
+            </div>
10 11
         </div>
11
-      </div>
12
-      <div class="search_bar">
13
-        <input id="ITP_FORM_MSTOCKMNG01010" style="width:100%" type="text" placeholder="품목명/품목번호">
14
-      </div>
15
-      <div class="search_bar" style="padding:0;">
16
-        <button id="ITP_BTN_MSTOCKMNG01010" class="search btn-primary">검색</button>
17
-      </div>
18
-      <div class="popup_scroll">
19
-        <li class="row_2">
20
-          <div class="left" style="width:190px;">
21
-            <div class="thick">
22
-              <div class="fn">품목명</div>
23
-              <div>-</div>
24
-              <div class="fn">2EA</div>
12
+        <form id="ITP_FORM_MSTOCKMNG_POPUP_ITEM" class="form-horizontal" onsubmit="return false;">
13
+            <input type="hidden" id="ITP_FORM_MSTOCKMNG_POPUP_ITEM_BRAND_ID" name="sbrandId" value="">
14
+            <input type="hidden" id="ITP_FORM_MSTOCKMNG_POPUP_ITEM_STORE_ID" name="sstoreId" value="">
15
+            <div class="search_bar">
16
+                <input id="ITP_FORM_MSTOCKMNG_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
17
+                <button id="ITP_BTN_MSTOCKMNG_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
25 18
             </div>
26
-            <div class="nomal">
27
-              <div class="space">구매가 :</div>
28
-              <div class="fn">1,120,000</div>
19
+            <div class="search_bar">
20
+                <button id="ITP_BTN_MSTOCKMNG_POP_ITEM_NM" class="btn_blue">품목명▼</button>
29 21
             </div>
30
-          </div>
31
-          <div class="right">
32
-            <button id="ITP_BTN_MSTOCKMNG01010"><</button>
33
-            <div class="num">2</div>
34
-            <button id="ITP_BTN_MSTOCKMNG01010">></button>
35
-          </div>
36
-          <div class="add">
37
-            <button id="ITP_BTN_MSTOCKMNG01010">추가</button>
38
-          </div>
39
-        </li>
40
-      </div>
22
+        </form>
23
+        <div class="popup_scroll">
24
+            <ul id="ITP_LIST_MSTOCKMNG_POP_ITEM_ROWS" class="panel-group"></ul>
25
+            <div id="ITP_LIST_MSTOCKMNG_POP_ITEM_ROWCOPY" style="display:block;">
26
+                <li class="row_2"
27
+                    data-brandUnitUnqNo=""
28
+                    data-podrPssblDvsn=""
29
+                    data-spplyId=""
30
+                    data-stddQty=""
31
+                    data-storeUnitUnqNo=""
32
+                    data-unit=""
33
+                    data-unitAmt=""
34
+                    data-unitGubun="">
35
+                    <div class="left" style="width:200px;">
36
+                        <div class="check_box">
37
+                            <input type="checkbox" id="ITP_FORM_MSTOCKMNG_POP_ITEM_CHECKBOX" name="itemId" />
38
+                        </div>
39
+                        <div class="thick">
40
+                            <div class="fnItemNm">품목명</div>
41
+                            <div>-</div>
42
+                            <div class="fnOrdUnit">EA</div>
43
+                        </div>
44
+                        <div class="thick" style="font-weight:100;">
45
+                            <div class="space">구매가 :</div>
46
+                            <div class="fnOrdAmount">0</div>
47
+                        </div>
48
+                    </div>
49
+                    <div class="right">
50
+                        <button id="ITP_BTN_MSTOCKMNG_POP_ITEM_PLUS">-</button>
51
+                        <div class="num">2</div>
52
+                        <button id="ITP_BTN_MSTOCKMNG_POP_ITEM_MINUS">+</button>
53
+                    </div>
54
+                    <div class="add">
55
+                        <button id="ITP_BTN_MSTOCKMNG_POP_ITEM_ADD">추가</button>
56
+                    </div>
57
+                </li>
58
+            </div>
59
+        </div>
41 60
     </div>
42
-  </div>
61
+</div>
43 62
   <div id="ITP_AJAX_MSTOCKMNG01010_VIEW_CONTAINER">
44 63
     <div class="content">
45 64
       <div class="line">

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

@@ -41,9 +41,10 @@ section .popup2 .pop .popup_scroll {position: relative; width: 100%;height: 720p
41 41
 section .popup2 .pop .popup_scroll li {list-style: none; width: 99%; height: 50px; border: 1px solid #000; margin: 0 auto;}
42 42
 section .popup2 .pop .popup_scroll li.row_2 {height: 80px;}
43 43
 section .popup2 .pop .popup_scroll li .left {position: relative; float: left;}
44
+section .popup2 .pop .popup_scroll li .left .check_box {width:30px; float:left; height:80px; padding-left:5px; padding-top:20px;}
44 45
 section .popup2 .pop .popup_scroll li .left div {display: inline-block;}
45 46
 section .popup2 .pop .popup_scroll li .left label{font-size: 2.5rem;}
46
-section .popup2 .pop .popup_scroll li .left .thick {float: left; margin: 10px 0 0 10px; font-size: 1rem; text-align: left; width: 100%; font-weight: 600;}
47
+section .popup2 .pop .popup_scroll li .left .thick {float: left; margin: 12px 0 0 10px; font-size: 1rem; text-align: left; width: 140px; font-weight: 600;}
47 48
 section .popup2 .pop .popup_scroll li .left .nomal {float: left; margin: 15px 0px 0px 15px; font-size: 1.2rem; text-align: left; width: 100%;}
48 49
 section .popup2 .pop .popup_scroll li .left .history {font-weight: 700; font-size: 2.4rem; margin-left: 20px;}
49 50
 section .popup2 .pop .popup_scroll li .left .history input{width: 150px;}
@@ -54,7 +55,7 @@ section .popup2 .pop .popup_scroll li .scroll_right button {width: 60px; height:
54 55
 section .popup2 .pop .popup_scroll li .right {position: relative; display: flex; font-size: 1.6rem; font-weight: 700; float: left; top:20px;}
55 56
 section .popup2 .pop .popup_scroll li .right .num {margin: 0 20px; width: auto;}
56 57
 section .popup2 .pop .popup_scroll li .right button {padding: 5px; font-size: 1rem; border-radius: 0px;}
57
-section .popup2 .pop .popup_scroll li .add button{float: right; width: 60px; height: 55px; margin: 10px 10px; border-radius: 10px; font-size: 1rem; background: rgb(198, 170, 250);}
58
+section .popup2 .pop .popup_scroll li .add button{float: right; width: 60px; height: 55px; margin: 12px 9px; border-radius: 10px; font-size: 1rem; background: rgb(198, 170, 250);}
58 59
 section .popup2 .pop .content .line button {width: 40%; height: 35px;font-size: 1rem; padding: 0; margin: 0 10px;}
59 60
 
60 61
 section .popup3 { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
@@ -230,24 +231,25 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
230 231
 .content .table_header button {float: right; width: 111px; font-size: 1rem; padding: 5px 20px; margin: 8px;}
231 232
 
232 233
 .detail_content {top: 0px; position: fixed; z-index: 10; width:100%; background: #fff;}
233
-.detail_content .detail_header {width: 100%; height: 80px;}
234
+.detail_content .detail_header {width: 100%; height: 80px; padding-top:65px}
234 235
 .detail_content .detail_header .detail_logo {float: left;}
235
-.detail_content .detail_header .detail_logo img {width: 150px; margin-left: 50px;}
236
+.detail_content .detail_header .detail_logo img {width: 70px; margin-left: 15px;}
236 237
 .detail_content .detail_header .detail_ok {float: left;}
237
-.detail_content .detail_header .detail_ok label {margin-left: 80px; font-size: 2.8rem; font-weight: 700;}
238
-.detail_content .detail_confirmation {height: 200px; }
238
+.detail_content .detail_header .detail_ok label {margin-left: 50px; font-size: 1.6rem; font-weight: 700;}
239
+.detail_content .detail_confirmation {height: 260px; }
239 240
 .detail_content .detail_confirmation .detail_col {float: left; width: 100%; display: inline-flex; margin-left: 15px; margin-bottom: 10px;}
240 241
 .detail_content .detail_confirmation .detail_col label{font-size: 1rem; font-weight: 700; float: left; width: 100px; text-align: left;}
241
-.detail_content .detail_confirmation .detail_col i{font-size: 1rem; width: 1%; text-align: right; margin-right: 10px;}
242
+.detail_content .detail_confirmation .detail_col i{font-size: 1rem; font-style:normal; width: 1%; text-align: right; margin-right: 10px;}
242 243
 .detail_content .detail_confirmation .detail_col div{font-size: 1rem; width: auto; text-align: left;}
244
+.detail_content .detail_company_info {height:150px;}
243 245
 .detail_content .detail_company_info label{font-size: 1rem; font-weight: 600;}
244 246
 .detail_content .detail_company_info .weight {margin-bottom: 20px;}
245
-.detail_content .detail_company_info .weight label{font-size: 1.4rem; font-weight: 700;}
247
+.detail_content .detail_company_info .weight label{font-size: 1.2rem; font-weight: 700;}
246 248
 .detail_content .detail_company_info div{font-size: 1rem;}
247
-.detail_content .detail_company_info .info_left {width: 50%; height: 350px; float: left;}
248
-.detail_content .detail_company_info .info_left .company_info {width: 100%; float: left; display: flex; margin-left: 50px;}
249
-.detail_content .table_header {margin: 33% auto; width: 100%; height: 100px; background-color: skyblue; align-items: center; position: fixed; z-index: 10;}
250
-.detail_content .table_header h1 {margin-top: 20px; margin-left: 15px; font-size: 2.2rem; float: left;}
249
+.detail_content .detail_company_info .info_left {width: 50%; height: 150px; float: left;}
250
+.detail_content .detail_company_info .info_left .company_info {width: 100%; float: left; display: flex; margin-left: 15px;}
251
+.detail_content .table_header {margin: 0% auto; width: 100%; height: 45px; background-color: skyblue; align-items: center; position: fixed; z-index: 10;}
252
+.detail_content .table_header h1 {margin-top: 12px; margin-left: 15px; font-size: 1.2rem; float: left;}
251 253
 .detail_content .table_header button {float: right; width: 200px; font-size: 2rem; padding: 5px 20px; margin: 20px;}
252 254
 
253 255
 /* select.stcd {
@@ -278,7 +280,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
278 280
 .row-4{top: 377px;}
279 281
 .row-5{top: 418px;}
280 282
 .row-6{top: 468px;}
281
-.row-7{top: 1030px;}
283
+.row-7{top: 533px;}
282 284
 
283 285
 .col-4{width:40% !important;}
284 286
 .col-6{width:60% !important;}
@@ -295,10 +297,11 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
295 297
 .scroll_area li.history_list .button_right {float: right; display: grid;}
296 298
 .scroll_area li.history_list .button_right button {width: 65px; height: 70px; font-size: 1rem; margin: 0; border-radius: 0;}
297 299
 .scroll_area li.history_list1 {height: 230px;}
298
-.scroll_area li.history_list2 {height: 160px; padding-top:5px;}
300
+.scroll_area li.history_list2 {height: 165px; padding-top:5px;}
299 301
 .scroll_area li.history_list2 label{min-width:95px; display:inline-flex;}
300 302
 .scroll_area li.history_list3 {height: 160px; padding-top:5px;}
301 303
 .scroll_area li.history_list4 {height: 150px;}
304
+.scroll_area li.history_list5 {height: 100px; padding-top:5px;}
302 305
 .scroll_area li .history_info {width: auto;}
303 306
 .scroll_area li .left {width:100%; height:30px; margin-top:0px;}
304 307
 .scroll_area li .btn {width:calc(100% - 65px); padding-top:12px;}
@@ -324,7 +327,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
324 327
 .scroll_area li .left .nomal .half label {font-weight:100;}
325 328
 .scroll_area li .left .nomal  input{width: 85px; height:30px;}
326 329
 .scroll_area li .left .nomal .scroll_btn {margin-bottom: 10px; min-width: 0;}
327
-.scroll_area li .left .nomal .scroll_btn button{width: 50px; height: 40px; font-size: 0.8rem; padding: 0; border-radius: 10px; background: rgb(198, 170, 250);}
330
+.scroll_area li .left .nomal .scroll_btn button{top: 120px; position: absolute; width: 50px; height: 40px; font-size: 0.8rem; padding: 0; border-radius: 10px; background: rgb(198, 170, 250);}
328 331
 
329 332
 .scroll_area li .left .nomal span {margin:0 10px;}
330 333
 
@@ -332,7 +335,6 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
332 335
 .scroll_area li .left .nomal .btn_bar button{width: 25px; height: 30px; font-size: 1rem; padding: 0;}
333 336
 .scroll_area li .left .nomal .btn_bar .col_0{min-width: auto; margin: 5px 20px;}
334 337
 
335
-.scroll_area li .left .nomal .space2 {display: inline-flex; font-size: 1.4rem; font-weight: 700;}
336 338
 .scroll_area li .left .nomal label{position:relative; margin-left: 10px;}
337 339
 .scroll_area li .left .nomal label.sub_info{min-width: 70px; display: inline-flex;}
338 340
 .scroll_area li .left .nomal label.col_0{width: auto;}

+ 114 - 49
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -33,11 +33,11 @@ let mobPageObj = {
33 33
 		button: function() {
34 34
 			$('button[id^="ITP_BTN_MPOMNG01010_DETAIL"]').on('click', function() {
35 35
 				if($(this).is('[data-call-popup]')) {
36
+					console.log($(this).attr('id'));
36 37
 					mobPopObj.show($(this).data('call-popup'));
37 38
 				} else {
38 39
 					var id = $(this).attr('id');
39 40
 					switch (id) {
40
-						case 'ITP_BTN_MPOMNG01010_DETAIL_ADDROW': contPopObj.list.addRow(); break;
41 41
 						case 'ITP_BTN_MPOMNG01010_DETAIL_DELROW': contPopObj.list.delRow(); break;
42 42
 						case 'ITP_BTN_MPOMNG01010_DETAIL_DELETE_WHS_NM': break;
43 43
 						case 'ITP_BTN_MPOMNG01010_DETAIL_TEMP_SAVE': break;
@@ -76,73 +76,138 @@ let contPopObj = {
76 76
 		}
77 77
 	},
78 78
 	list: {
79
+		rows: [],
79 80
 		addRow: function() {
80
-			var _this = this;
81
-			$('#ITP_LIST_MPOMNG01010_POP_ITEM_ROWS').empty();
82
-			var callbackFn = function(result) {
83
-				mobPopObj.addRow.init(result);
84
-			};
85
-			let param = $('#ITP_FORM_MPOMNG01010_POPUP_ITEM').serializeObject();
86
-			param.gridSize = 10;
87
-			fn_ajax_call(API_POP_ITEM_LIST, JSON.stringify(param), callbackFn, 'POST');
88 81
 		},
89 82
 		delRow: function() {
90
-
83
+			this.detachRow();
84
+		},
85
+		attachRow: function (item) {
86
+			console.log(item);
87
+			var fnIsExist = function(rows) {
88
+				var isExist = false;
89
+				$.each(rows, function(i, row) {
90
+					if(row.brandUnitUnqNo === item.brandUnitUnqNo) {
91
+						isExist = true;
92
+						return false;
93
+					}
94
+				});
95
+				return isExist;
96
+			};
97
+			if(!fnIsExist(this.rows)) {
98
+				this.rows.push(item);
99
+				$('#ITP_LIST_MPOMNG01010_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY').html());
100
+				var $li = $('#ITP_LIST_MPOMNG01010_ITEM_AREA .panel-group > .row_2:last');
101
+				$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
102
+				$li.find('.fnItemNm').text(item.itemNm);
103
+				$li.find('.fnUnitAmt').text(itp_fn_set_comma(item.unitAmt));
104
+			}
105
+		},
106
+		detachRow: function () {
107
+			$('#ITP_LIST_MPOMNG01010_DETAIL_ROWS li').each(function(index, elem) {
108
+				var isChecked = $(this).find('input[type="checkbox"]').is(':checked');
109
+				console.log(index + " ===> " + isChecked);
110
+			});
91 111
 		}
92 112
 	}
93 113
 };
94 114
 
95 115
 let mobPopObj = {
96
-	addRow: {
97
-		rows: [],
98
-		init: function(rows) {
99
-			this.rows = rows.gridRows;
100
-			mobPopObj.show('ITP_POP_MPOMNG01010_ITEM_NM');
101
-			this.view();
102
-		},
103
-		view: function() {
104
-			$.each(this.rows, function (i, item) {
105
-				$('#ITP_LIST_MPOMNG01010_POP_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY').html());
106
-				var $li = $('#ITP_LIST_MPOMNG01010_POP_ITEM_AREA .panel-group > .row_2:last');
107
-				$li.data('brandUnitUnqNo', item.brandUnitUnqNo);
108
-				$li.data('podrPssblDvsn', item.podrPssblDvsn);
109
-				$li.data('spplyId', item.spplyId);
110
-				$li.data('stddQty', item.stddQty);
111
-				$li.data('storeUnitUnqNo', item.storeUnitUnqNo);
112
-				$li.data('unit', item.unit);
113
-				$li.data('unitAmt', item.unitAmt);
114
-				$li.data('unitGubun', item.unitGubun);
115
-				$li.find('#ITP_FORM_MPOMNG01010_POP_ITEM_CHECKBOX').val(item.itemId);
116
-				$li.find('.fnItemNm').text(item.itemNm);
117
-				$li.find('.fnItemNm').text(item.unitAmt);
118
-			});
116
+	popItem: {
117
+		parentFn: null,
118
+		rows: null,
119
+		init: function(fn) {
120
+			console.log(fn);
121
+			this.parentFn = fn;
122
+			this.search();
119 123
 		},
120 124
 		search: function() {
121
-
125
+			$('#ITP_LIST_MPOMNG01010_POP_ITEM_AREA .panel-group').empty();
126
+			var callbackFn = function(result) {
127
+				mobPopObj.popItem.rows = result.gridRows;
128
+				$.each(mobPopObj.popItem.rows, function (i, item) {
129
+					$('#ITP_LIST_MPOMNG01010_POP_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY').html());
130
+					var $li = $('#ITP_LIST_MPOMNG01010_POP_ITEM_AREA .panel-group > .row_2:last');
131
+					$li.data('brandUnitUnqNo', item.brandUnitUnqNo);
132
+					$li.data('podrPssblDvsn', item.podrPssblDvsn);
133
+					$li.data('spplyId', item.spplyId);
134
+					$li.data('stddQty', item.stddQty);
135
+					$li.data('storeUnitUnqNo', item.storeUnitUnqNo);
136
+					$li.data('unit', item.unit);
137
+					$li.data('unitAmt', item.unitAmt);
138
+					$li.data('unitGubun', item.unitGubun);
139
+					$li.find('#ITP_FORM_MPOMNG01010_POP_ITEM_CHECKBOX').val(item.itemId);
140
+					$li.find('.fnItemNm').text(item.itemNm);
141
+					$li.find('.fnUnitAmt').text(itp_fn_set_comma(item.unitAmt));
142
+				});
143
+				mobPopObj.popItem.addRow.init();
144
+			};
145
+			let param = $('#ITP_FORM_MPOMNG01010_POPUP_ITEM').serializeObject();
146
+			fn_ajax_call(API_POP_ITEM_LIST, JSON.stringify(param), callbackFn, 'POST');
147
+		},
148
+		addRow: {
149
+			init: function() {
150
+				this.button.init();
151
+			},
152
+			button: {
153
+				init: function() {
154
+					console.log('button');
155
+					var _this = this;
156
+					$('button[id^="ITP_BTN_MPOMNG01010_POP_ITEM_"]').off('click').on('click', function() {
157
+						var id = $(this).attr('id');
158
+						switch (id) {
159
+							case 'ITP_BTN_MPOMNG01010_POP_ITEM_PLUS': _this.actPlus($(this)); break;
160
+							case 'ITP_BTN_MPOMNG01010_POP_ITEM_MINUS': _this.actMinus($(this)); break;
161
+							case 'ITP_BTN_MPOMNG01010_POP_ITEM_ADD': _this.actItemAdd($(this)); break;
162
+							case 'ITP_BTN_MPOMNG01010_POP_ITEM_SEARCH': mobPopObj.popItem.search(); break;
163
+							case 'ITP_BTN_MPOMNG01010_POP_ITEM_CLOSE': mobPopObj.hide(id); break;
164
+						}
165
+						return false;
166
+					});
167
+				},
168
+				actPlus: function(elem) {
169
+					var $div = $(elem).closest('div').find('.num');
170
+					var num = Number($div.text());
171
+					$($div).text((num + 1).toString());
172
+				},
173
+				actMinus: function(elem) {
174
+					var $div = $(elem).closest('div').find('.num');
175
+					var num = Number($div.text());
176
+					if(num <= 1) {
177
+						alert('주문수량을 확인하세요.');
178
+					} else {
179
+						$($div).text((num - 1).toString());
180
+					}
181
+				},
182
+				actItemAdd: function(elem) {
183
+					var index = $(elem).closest('li').index();
184
+					contPopObj.list.attachRow(mobPopObj.popItem.rows[index]);
185
+				}
186
+			}
122 187
 		},
123
-		choice: function() {
188
+		delRow: function() {
124 189
 
125 190
 		}
126 191
 	},
127
-	show: function(id, args, fn) {
128
-		this.button();
129
-		$('#' + id).show();
192
+	popWhsNm: {
193
+
194
+	},
195
+	popReqConfirm: {
196
+
130 197
 	},
131
-	button: function() {
132
-		var _this = this;
133
-		$('button[id^="ITP_BTN_MPOMNG01010_POP"]').off('click').on('click', function() {
198
+	show: function(id) {
199
+		console.log('show ===> ' + id);
200
+		$('#' + id).show();
201
+		$('button[id$="CLOSE"]').off('click').on('click', function() {
134 202
 			var id = $(this).attr('id');
203
+			console.log('CLOSE ===> ' + id);
135 204
 			if($(this).hasClass('btn-pop-close')) {
136
-				_this.hide(id);
137
-				return;
205
+				$('#' + id).closest('.mobile-pop-close').hide();
138 206
 			}
139
-			switch (id) {
140
-				case 'ITP_BTN_MPOMNG01010_POP_CONFIRM': break;
141
-				case 'ITP_BTN_MPOMNG01010_POP_SEARCH':
142
-					break;
143
-			}
144
-			return false;
145 207
 		});
208
+		if(id.indexOf('ITEM_AREA') > -1) {
209
+			this.popItem.init();
210
+		}
146 211
 	},
147 212
 	hide: function(id) {
148 213
 		$('#' + id).closest('.mobile-pop-close').hide();