Bladeren bron

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

juney 2 jaren geleden
bovenliggende
commit
fabf7d2bbf

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

@@ -11,46 +11,52 @@
11 11
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
12 12
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_MALL_ID" name="mallId" value="">
13 13
       <div class="content">
14
-      	<div class="line header">
15
-			<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청생성</div>
16
-      	</div>
17
-        <div class="line">
18
-          <label>납기요청일</label>
19
-          <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT" name="dlvReqDt" class="itp_input date" data-check-required="empty" readonly>
20
-        </div>
21
-        <div class="line">
22
-          <label>구매요청금액</label>
23
-          <div class="line_right">
24
-            <div class="fnPchReqAmtTot">0원</div>
25
-          </div>
26
-        </div>
27
-        <div class="line">
28
-          <label>구매가능금액</label>
29
-          <div class="line_right">
30
-            <div class="fnOrdUseAmt">0원</div>
31
-          </div>
32
-        </div>
33
-        <div class="line">
34
-          <label>납품장소</label>
35
-            <div class="float_left">
36
-                <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" placeholder="매장명" readonly />
37
-                <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
38
-                <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
39
-		        <div class="itp_input_btn">
40
-		         	<button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
41
-		       	</div>
42
-            </div>
43
-            <div class="float_right_btn">
44
-              <!-- <button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button> -->
45
-              <button id="ITP_BTN_MPOMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
46
-            </div>
47
-        </div>
48
-        <div class="table_header line">
49
-          <div >
50
-            <h1><구매품목></h1>
51
-            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
52
-            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MPOMNG01010_ITEM_AREA">품목추가</button>
53
-          </div>
14
+	      <div class="content_fix">
15
+	      	<div class="line header">
16
+				<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청생성</div>
17
+	      	</div>
18
+	        <div class="line">
19
+	          <label>납기요청일</label>
20
+	          <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT" name="dlvReqDt" class="itp_input date" data-check-required="empty" readonly>
21
+	        </div>
22
+	        <div class="line">
23
+	          <label>구매요청금액</label>
24
+	          <div class="float_left">
25
+				<div class="input_text">
26
+				  <div class="fnPchReqAmtTot"></div>
27
+				</div>
28
+			  </div>
29
+	        </div>
30
+	        <div class="line">
31
+	          <label>구매가능금액</label>
32
+	          <div class="float_left">
33
+				<div class="input_text">
34
+				  <div class="fnOrdUseAmt"></div>
35
+				</div>
36
+			  </div>
37
+	        </div>
38
+	        <div class="line">
39
+	          <label>납품장소</label>
40
+	            <div class="float_left">
41
+	                <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" placeholder="매장명" readonly />
42
+	                <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
43
+	                <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
44
+			        <div class="itp_input_btn">
45
+			         	<button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
46
+			       	</div>
47
+	            </div>
48
+	            <div class="float_right_btn">
49
+	              <!-- <button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button> -->
50
+	              <button id="ITP_BTN_MPOMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
51
+	            </div>
52
+	        </div>
53
+	        <div class="table_header line">
54
+	          <div >
55
+	            <h1><구매품목></h1>
56
+	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
57
+	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MPOMNG01010_ITEM_AREA">품목추가</button>
58
+	          </div>
59
+	        </div>
54 60
         </div>
55 61
       </div>
56 62
       <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-1">
@@ -69,9 +75,9 @@
69 75
                 <div class="itp_item fnItemNm">품목명</div>
70 76
               </div>
71 77
               <div class="thick">
72
-                <div class="itp_gram fnUnitAmt"></div>
78
+                <div class="itp_gram fnUnitAmt">adsfasdf</div>
73 79
                 <div>/</div>
74
-                <div class="itp_amt fnOrdAmt"></div>
80
+                <div class="itp_amt fnOrdAmt">asdfafsd</div>
75 81
               </div>
76 82
             </div>
77 83
             <div class="right">
@@ -160,7 +166,7 @@
160 166
                 </form>
161 167
             </div>
162 168
             <div class="select_btn">
163
-                <button id="ITP_BTN_MPOMNG01010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
169
+                <button id="ITP_BTN_MPOMNG01010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
164 170
             </div>    
165 171
             <div id="ITP_LIST_MPOMNG01010_POP_WHS_AREA" class="popup_scroll">
166 172
                 <ul id="ITP_LIST_MPOMNG01010_POP_WHS_ROWS" class="mb_0 itp_nav"></ul>
@@ -168,7 +174,7 @@
168 174
                     <li class="row_2">
169 175
                         <div class="scroll_left">
170 176
                             <div class="con_2 fnWhsNm"></div>
171
-                            <div class="con_2 sub fnLocationNm"></div>
177
+                            <div class="con_2 wichi fnLocationNm"></div>
172 178
                         </div>
173 179
                         <div class="scroll_right">
174 180
                             <button id="ITP_BTN_MPOMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="" data-location="">선택</button>
@@ -196,7 +202,8 @@
196 202
                     <button id="ITP_BTN_MPOMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
197 203
                 </div>
198 204
                 <div class="select_btn">
199
-                    <button id="ITP_BTN_MPOMNG01010_POP_ITEM_NM" class="btn_blue">품목명  <img src="../img/arrow_down.png"></button>
205
+   					<button id="ITP_BTN_MPOMNG01010_POP_ITEM_ADD" class="btn_blue">추가</button>
206
+                    <button id="ITP_BTN_MPOMNG01010_POP_ITEM_NM" class="btn_red">품목명  <img src="../img/arrow_down.png"></button>
200 207
                 </div>
201 208
             </form>
202 209
             <div id="ITP_LIST_MPOMNG01010_POP_ITEM_AREA" class="popup_scroll">
@@ -211,15 +218,13 @@
211 218
 	                            <div class="amt fnOrdAmt"></div>
212 219
                             </div>
213 220
                         </div>
214
-                        <div class="scroll_right">
215
-                            <button id="ITP_BTN_MPOMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
221
+                         <div class="scroll_right">
222
+                        	<input id="ITP_FORM_MPOMNG01010_POP_ITEM_ADD" type="checkbox">
216 223
                         </div>
217
-                      	<div class="itp_num_set">
218
-		                      <div class="right">
219
-				              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_MINUS">-</button>
220
-				              <div class="num fnPchReqQty">1</div>
221
-				              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_PLUS">+</button>
222
-				            </div>
224
+                        <div class="right">
225
+			              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_MINUS">-</button>
226
+			              <div class="num fnPchReqQty">1</div>
227
+			              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_PLUS">+</button>
223 228
 			            </div>
224 229
                     </li>
225 230
                 </div>

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

@@ -1,101 +1,90 @@
1 1
 <section id="ITP_MOBILE_MPOMNG02010">
2 2
   <div id="ITP_AJAX_MPOMNG02010_LIST_CONTAINER" style="display: none;">
3 3
     <div class="content">
4
-      <form id="ITP_FORM_MPOMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
5
-        <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
6
-        <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
7
-   	    <div class="line header">
8
-			<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청현황</div>
9
-      	</div>
10
-        <div class="line">
11
-          <label>구매요청일</label>
12
-	        <div class="date_to date">
13
-	          <input type="text" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
14
-	          <div class="at">~</div>
15
-	          <input type="text" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
4
+	    <div class="content_fix">
5
+	      <form id="ITP_FORM_MPOMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
6
+	        <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
7
+	        <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
8
+	   	    <div class="line header">
9
+				<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청현황</div>
10
+	      	</div>
11
+	        <div class="line">
12
+	          <label>구매요청일</label>
13
+		        <div class="date_to date">
14
+		          <input type="text" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
15
+		          <div class="at">~</div>
16
+		          <input type="text" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
17
+		        </div>
18
+			</div>
19
+	      <div class="line">
20
+	        <label>구매요청상태</label>
21
+	        <div class="float_left">
22
+	          <select id="ITP_FORM_MPOMNG02010_LIST_SEARCH_PCH_REQ_ST_CD" data-select-code="PCH_REQ_ST_CD" class="stcd" name="spchReqStCd">
23
+	            <option value="">상태</option>
24
+	          </select>
16 25
 	        </div>
17
-		</div>
18
-      <div class="line">
19
-        <label>구매요청상태</label>
20
-        <div class="float_left">
21
-          <select id="ITP_FORM_MPOMNG02010_LIST_SEARCH_PCH_REQ_ST_CD" data-select-code="PCH_REQ_ST_CD" class="stcd" name="spchReqStCd">
22
-            <option value="">상태</option>
23
-          </select>
24
-        </div>
25
-      </div>
26
-      <div class="line">
27
-        <label>납품장소</label>
28
-        <div class="float_left">
29
-          <input id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
30
-             <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">
31
-             <div class="itp_input_btn">
32
-         		 <button id="ITP_BTN_MPOMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
33
-  			</div>
34
-        </div>
35
-        <div class="float_right_btn">
36
-          <button id="ITP_BTN_MPOMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
37
-        </div>
38
-      </div>
39
-      <div class="line">
40
-        <div class="search">
41
-          <button id="ITP_BTN_MPOMNG02010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
42
-        </div>
43
-      </div>
44
-      <div class="table_header">
45
-        <h1><구매 요청 내역></h1>
26
+	      </div>
27
+	      <div class="line">
28
+	        <label>납품장소</label>
29
+	        <div class="float_left">
30
+	          <input id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
31
+	             <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">
32
+	             <div class="itp_input_btn">
33
+	         		 <button id="ITP_BTN_MPOMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
34
+	  			</div>
35
+	        </div>
36
+	        <div class="float_right_btn">
37
+	          <button id="ITP_BTN_MPOMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
38
+	        </div>
39
+	      </div>
40
+	      <div class="line">
41
+	        <div class="search">
42
+	          <button id="ITP_BTN_MPOMNG02010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
43
+	        </div>
44
+	      </div>
45
+	      <div class="table_header">
46
+	        <h1><구매 요청 내역></h1>
47
+	      </div>
48
+        </form>
46 49
       </div>
47
-      </form>
48 50
     </div>
49 51
     <div id="ITP_LIST_MPOMNG02010_ITEM_AREA" class="scroll_area row-2">
50 52
       <ul id="ITP_LIST_MPOMNG02010_ITEM_ROWS" class="mb_0 panel-group"></ul>
51 53
       <div id="ITP_LIST_MPOMNG02010_ITEM_ROWCOPY" style="display: none;">
52
-        <li class="history_list">
54
+        <li class="history_list7">
53 55
           <div class="left">
54 56
             <div class="nomal">
55 57
               <label>구매요청일 </label>
56 58
               <span>:</span>
57
-              <div class="history">
58
-                <div class="fnPchReqDt"></div>
59
-                (<div class="fnPchReqMgrNm"></div>)
60
-              </div>
59
+              <div class="fnPchReqDt">2020.10.10</div>
60
+              <div class="fnPchReqMgrNm">(홍길동)</div>
61 61
             </div>
62 62
           </div>
63 63
           <div class="left">
64 64
             <div class="nomal">
65
-              <div class="half">
66
-                  <label>구매상태</label>
67
-                  <span>:</span>
68
-                  <div class="history">
69
-                    <div class="fnPchReqStNm"></div>
70
-                  </div>
71
-              </div>
72
-              <div class="half">
73
-                  <label>납품장소명 </label>
74
-                  <span>:</span>
75
-                  <div class="history">
76
-                    <div class="fnWhsLocationNm"></div>
77
-                  </div>
78
-              </div>
65
+	            <label>구매상태</label>
66
+	            <span>:</span>
67
+	            <div class="fnPchReqStNm">구매완료배송중</div>
68
+	            <label>결재정보 </label>
69
+              	<span>:</span>
70
+              	<div class="fnPchReqRjctNm">결재완료</div>
79 71
             </div>
80 72
           </div>
81 73
           <div class="left">
82 74
             <div class="nomal">
83
-              <label>구매요청 정보</label>
75
+              <label>품목 수</label>
84 76
               <span>:</span>
85
-              <div class="history">
86
-                <div class="fnPchReqItemQty"></div>
87
-                <i>- </i>
88
-                <div class="fnPchReqTotalAmt"></div> 원
89
-              </div>
77
+              <div class="fnPchReqItemQty">1,000</div>
78
+              <label>금액</label>
79
+              <span>:</span>
80
+              <div class="fnPchReqTotalAmt">1,000,000</div>
90 81
             </div>
91 82
           </div>
92 83
           <div class="left">
93 84
             <div class="nomal">
94
-              <label>결재정보 </label>
95
-              <span>:</span>
96
-              <div class="history">
97
-                <div class="fnPchReqRjctNm"></div>
98
-              </div>
85
+             <label>납품장소명 </label>
86
+             <span>:</span>
87
+             <div class="full fnWhsLocationNm">테스트 ㅁㅇㄴㄻㄴㄹㅇㅇㄴㅁㄹㅇㄴㅁㄹ</div>
99 88
             </div>
100 89
           </div>
101 90
         </li>
@@ -104,35 +93,37 @@
104 93
   </div>
105 94
   <div id="ITP_AJAX_MPOMNG02010_VIEW_CONTAINER" style="display: none;">
106 95
     <div class="content">
107
-	  <div class="line header">
108
-		<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청현황</div>
109
-   	  </div>
110
-      <div class="line">
111
-        <label>납기요청일</label>
112
-        <div class="line_right">
113
-          <div class="fnDlvReqDt">2022.10.12</div>
114
-        </div>      
115
-      </div>
116
-      <div class="line">
117
-        <label>구매요청금액</label>
118
-        <div class="line_right">
119
-          <div class="fnPchReqTotalAmt">424,000원</div>
120
-        </div>
121
-      </div>
122
-      <div class="line">
123
-        <label>납품장소</label>
124
-        <div class="line_right">
125
-          <div class="fnLocationNm">A매장내</div>
126
-        </div>
127
-      </div>
128
-      <div class="line">
129
-        <label>결재정보</label>
130
-        <div class="line_right">
131
-          <div class="fnPchApprNm">(미납)0원</div>
132
-        </div>
133
-      </div>
134
-      <div class="table_header">
135
-        <h1><구매 품목></h1>
96
+	    <div class="content_fix">
97
+		  <div class="line header">
98
+			<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청현황</div>
99
+	   	  </div>
100
+	      <div class="line">
101
+	        <label>납기요청일</label>
102
+	        <div class="line_right">
103
+	          <div class="fnDlvReqDt">2022.10.12</div>
104
+	        </div>      
105
+	      </div>
106
+	      <div class="line">
107
+	        <label>구매요청금액</label>
108
+	        <div class="line_right">
109
+	          <div class="fnPchReqTotalAmt">424,000원</div>
110
+	        </div>
111
+	      </div>
112
+	      <div class="line">
113
+	        <label>납품장소</label>
114
+	        <div class="line_right">
115
+	          <div class="fnLocationNm">A매장내</div>
116
+	        </div>
117
+	      </div>
118
+	      <div class="line">
119
+	        <label>결재정보</label>
120
+	        <div class="line_right">
121
+	          <div class="fnPchApprNm">(미납)0원</div>
122
+	        </div>
123
+	      </div>
124
+	      <div class="table_header">
125
+	        <h1><구매 품목></h1>
126
+	      </div>
136 127
       </div>
137 128
     </div>
138 129
     <div id="ITP_LIST_MPOMNG02010_VIEW_AREA" class="scroll_area row-3">
@@ -174,45 +165,51 @@
174 165
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_MGR_ID" name="pchReqMgrId" value="">
175 166
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_MALL_ID" name="mallId" value="">
176 167
       <div class="content">
177
-      	<div class="line header">
178
-			<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청현황</div>
179
-      	</div>
180
-        <div class="line">
181
-          <label>납기요청일</label>
182
-          <input id="ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT" name="dlvReqDt" class="date fnDlvReqDt" data-check-required="empty" type="date" placeholder="">
183
-        </div>
184
-        <div class="line">
185
-          <label>구매요청금액</label>
186
-          <div class="line_right">
187
-            <div class="fnPchReqAmtTot">0 원</div>
188
-          </div>
189
-        </div>
190
-        <div class="line">
191
-          <label>구매가능금액</label>
192
-          <div class="line_right">
193
-            <div class="fnOrdUseAmt">0 원</div>
194
-          </div>
195
-        </div>
196
-        <div class="line">
197
-          <label>납품장소</label>
198
-            <div class="float_left">
199
-              <input type="text" id="ITP_FORM_MPOMNG02010_MODIFY_WHS_NM" class="" name="whsNm" data-check-required="empty" placeholder="매장명" readonly />
200
-              <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_WHS_ID" class="form-control itp_input" name="whsId" value="" />
201
-              <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_LOCATION" class="form-control itp_input" name="location" value="" />
202
-              <div class="itp_input_btn">
203
-              	<button id="ITP_BTN_MPOMNG02010_MODIFY_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
204
-              </div>
205
-            </div>
206
-            <div class="float_right_btn">
207
-              <button id="ITP_BTN_MPOMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
208
-            </div>
209
-        </div>
210
-        <div class="table_header line">
211
-          <div>
212
-            <h1><구매 품목></h1>
213
-            <button type="button" id="ITP_BTN_MPOMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
214
-            <button type="button" id="ITP_BTN_MPOMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
215
-          </div>
168
+	      <div class="content_fix">
169
+	      	<div class="line header">
170
+				<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청현황</div>
171
+	      	</div>
172
+	        <div class="line">
173
+	          <label>납기요청일</label>
174
+	          <input id="ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT" name="dlvReqDt" class="date fnDlvReqDt" data-check-required="empty" type="date" placeholder="">
175
+	        </div>
176
+	        <div class="line">
177
+	          <label>구매요청금액</label>
178
+	          <div class="float_left">
179
+				<div class="input_text">
180
+					<div class="fnPchReqAmtTot"></div>
181
+				</div>
182
+			  </div>
183
+	        </div>
184
+	        <div class="line">
185
+	          <label>구매가능금액</label>
186
+	          <div class="float_left">
187
+				<div class="input_text">
188
+					<div class="fnOrdUseAmt"></div>
189
+				</div>
190
+			  </div>
191
+	        </div>
192
+	        <div class="line">
193
+	          <label>납품장소</label>
194
+	            <div class="float_left">
195
+	              <input type="text" id="ITP_FORM_MPOMNG02010_MODIFY_WHS_NM" class="" name="whsNm" data-check-required="empty" placeholder="매장명" readonly />
196
+	              <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_WHS_ID" class="form-control itp_input" name="whsId" value="" />
197
+	              <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_LOCATION" class="form-control itp_input" name="location" value="" />
198
+	              <div class="itp_input_btn">
199
+	              	<button id="ITP_BTN_MPOMNG02010_MODIFY_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
200
+	              </div>
201
+	            </div>
202
+	            <div class="float_right_btn">
203
+	              <button id="ITP_BTN_MPOMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
204
+	            </div>
205
+	        </div>
206
+	        <div class="table_header line">
207
+	          <div>
208
+	            <h1><구매 품목></h1>
209
+	            <button type="button" id="ITP_BTN_MPOMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
210
+	            <button type="button" id="ITP_BTN_MPOMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
211
+	          </div>
212
+	        </div>
216 213
         </div>
217 214
       </div>
218 215
       <div id="ITP_LIST_MPOMNG02010_MODIFY_AREA" class="scroll_area row-1">
@@ -243,8 +240,8 @@
243 240
         </div>
244 241
       </div>
245 242
       <div class="button_bar">
246
-        <button id="ITP_BTN_MPOMNG02010_MODIFY_REQ_ORDER" class="col_3 btn-primary REQ">구매요청</button>
247
-        <button id="ITP_BTN_MPOMNG02010_MODIFY_TEMP_SAVE" class="col_3 btn-gray TSA">임시저장</button>
243
+        <button id="ITP_BTN_MPOMNG02010_MODIFY_REQ_ORDER" class="col_3 btn-m-orange REQ">구매요청</button>
244
+        <button id="ITP_BTN_MPOMNG02010_MODIFY_TEMP_SAVE" class="col_3 btn-w-gray TSA">임시저장</button>
248 245
         <button id="ITP_BTN_MPOMNG02010_MODIFY_CANCEL" class="col_3 btn-gray CLB">취소</button>
249 246
       </div>
250 247
     </form>
@@ -302,7 +299,7 @@
302 299
         </form>
303 300
       </div>
304 301
       <div class="select_btn">
305
-        <button id="ITP_BTN_MPOMNG02010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
302
+        <button id="ITP_BTN_MPOMNG02010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
306 303
       </div>
307 304
       <div id="ITP_LIST_MPOMNG02010_POP_WHS_AREA" class="popup_scroll">
308 305
         <ul id="ITP_LIST_MPOMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -310,7 +307,7 @@
310 307
           <li class="row_2">
311 308
              <div class="scroll_left">
312 309
                  <div class="con_2 fnWhsNm"></div>
313
-                 <div class="con_2 sub fnLocationNm"></div>
310
+                 <div class="con_2 wichi fnLocationNm"></div>
314 311
              </div>
315 312
             <div class="scroll_right">
316 313
               <button id="ITP_BTN_MPOMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -338,7 +335,8 @@
338 335
           <button id="ITP_BTN_MPOMNG02010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
339 336
         </div>
340 337
         <div class="select_btn">
341
-          <button id="ITP_BTN_MPOMNG02010_POP_ITEM_NM" class="btn_blue">품목명 <img src="../img/arrow_down.png"></button>
338
+		  <button id="ITP_BTN_MPOMNG02010_POP_ITEM_ADD" class="btn_blue">추가</button>
339
+          <button id="ITP_BTN_MPOMNG02010_POP_ITEM_NM" class="btn_red">품목명 <img src="../img/arrow_down.png"></button>
342 340
         </div>
343 341
       </form>
344 342
       <div id="ITP_LIST_MPOMNG02010_POP_ITEM_AREA" class="popup_scroll">
@@ -354,7 +352,7 @@
354 352
                  </div>
355 353
              </div>
356 354
              <div class="scroll_right">
357
-                 <button id="ITP_BTN_MPOMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
355
+           		<input id="ITP_FORM_MPOMNG02010_POP_ITEM_ADD" type="checkbox">
358 356
              </div>
359 357
            	 <div class="itp_num_set">
360 358
                 <div class="right">

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

@@ -5,58 +5,60 @@
5 5
 		  <input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 		  <input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_IDX" name="sidx" value="0">
7 7
 		  <div class="content">
8
-			<div class="line header">
9
-			  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매발주현황</div>
10
-		    </div>
11
-			<div class="line">
12
-			  <label>발주일자</label>
13
-			  <div class="date_to date">
14
-				<input id="ITP_FORM_MPOMNG04010_LIST_SEARCH_FROM_DT" name="fromDt" type="text" class="itp_input date">
15
-				<div class="at">~</div>
16
-				<input id="ITP_FORM_MPOMNG04010_LIST_SEARCH_TO_DT" name="toDt" type="text" class="itp_input date">
17
-			  </div>
18
-			</div>
19
-			<div class="line">
20
-			  <label>발주상태</label>
21
-			  <div class="float_left">
22
-				<select name="spchOdrStCd" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_PCH_ORD_ST_CD" data-select-code="PCH_ODR_ST_CD">
23
-				  <option value=""></option>
24
-				</select>
25
-				</div>   
26
-			</div>
27
-			<div class="line">
28
-			  <label>공급업체</label>
29
-			  <div class="float_left">
30
-				<input type="text" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="A공급업체명">
31
-				<input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
32
-				<div class="itp_input_btn">
33
-					<button id="ITP_BTN_MPOMNG04010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
8
+			  <div class="content_fix">
9
+				<div class="line header">
10
+				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매발주현황</div>
11
+			    </div>
12
+				<div class="line">
13
+				  <label>발주일자</label>
14
+				  <div class="date_to date">
15
+					<input id="ITP_FORM_MPOMNG04010_LIST_SEARCH_FROM_DT" name="fromDt" type="text" class="itp_input date">
16
+					<div class="at">~</div>
17
+					<input id="ITP_FORM_MPOMNG04010_LIST_SEARCH_TO_DT" name="toDt" type="text" class="itp_input date">
34 18
 				  </div>
35
-			  </div>
36
-			  <div class="float_right_btn">
37
-				<button id="ITP_BTN_MPOMNG04010_LIST_DELETE_SPPLY_NM"><img src="../img/delete.png" alt=""></button>
38
-			  </div>
39
-			</div>
40
-			<div class="line top3">
41
-				<label>납품장소</label>
19
+				</div>
20
+				<div class="line">
21
+				  <label>발주상태</label>
42 22
 				  <div class="float_left">
43
-					<input type="text" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" />
44
-					<input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
45
-					   <div class="itp_input_btn">
46
-						<button id="ITP_BTN_MPOMNG04010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
47
-					</div>
23
+					<select name="spchOdrStCd" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_PCH_ORD_ST_CD" data-select-code="PCH_ODR_ST_CD">
24
+					  <option value=""></option>
25
+					</select>
26
+					</div>   
27
+				</div>
28
+				<div class="line">
29
+				  <label>공급업체</label>
30
+				  <div class="float_left">
31
+					<input type="text" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="A공급업체명">
32
+					<input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
33
+					<div class="itp_input_btn">
34
+						<button id="ITP_BTN_MPOMNG04010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
35
+					  </div>
48 36
 				  </div>
49 37
 				  <div class="float_right_btn">
50
-					<button id="ITP_BTN_MPOMNG04010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
38
+					<button id="ITP_BTN_MPOMNG04010_LIST_DELETE_SPPLY_NM"><img src="../img/delete.png" alt=""></button>
51 39
 				  </div>
52 40
 				</div>
53
-			<div class="line">
54
-			  <div class="search">
55
-				<button id="ITP_BTN_MPOMNG04010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
56
-			  </div>
57
-			</div>
58
-			<div class="table_header">
59
-			  <h1><발주 내역></h1>
41
+				<div class="line top3">
42
+					<label>납품장소</label>
43
+					  <div class="float_left">
44
+						<input type="text" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" />
45
+						<input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
46
+						   <div class="itp_input_btn">
47
+							<button id="ITP_BTN_MPOMNG04010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
48
+						</div>
49
+					  </div>
50
+					  <div class="float_right_btn">
51
+						<button id="ITP_BTN_MPOMNG04010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
52
+					  </div>
53
+					</div>
54
+				<div class="line">
55
+				  <div class="search">
56
+					<button id="ITP_BTN_MPOMNG04010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
57
+				  </div>
58
+				</div>
59
+				<div class="table_header">
60
+				  <h1><발주 내역></h1>
61
+				</div>
60 62
 			</div>
61 63
 		  </div>
62 64
 		<div id="ITP_LIST_MPOMNG04010_LIST_ITEM_AREA" class="scroll_area row-4">
@@ -65,45 +67,40 @@
65 67
 				<li class="list-row2">
66 68
 				  <div class="left">
67 69
 					<div class="nomal">
68
-					  <label>발주일자 &nbsp;:</label>
69
-					  <div class="history">
70
-						<div class="fnPodrDt"></div>
71
-						(<div class="fnPodrMgrNm"></div>)
72
-					  </div>
70
+					  <label class="col_3">발주일자</label>
71
+					  <span>:</span>
72
+					  <div class="fnPodrDt">2022.10.10</div>
73
+					  <div class="fnPodrMgrNm">(홍길동)</div>
73 74
 					</div>
74 75
 				  </div>
75 76
 				  <div class="left">
76 77
 					<div class="nomal">
77
-					  <label>발주상태 &nbsp;:</label>
78
-					  <div class="history">
79
-						<div class="fnPchodrStCd"></div>
80
-					  </div>
81
-					  <label>납품장소명&nbsp;:</label>
82
-					  <div class="history">
83
-						<div class="fnLocationNm"></div>
84
-					  </div>
78
+					  <label class="col_3">발주상태</label>
79
+					  <span>:</span>
80
+					  <div class="fnPchodrStCd">발주가능</div>
81
+					  <label>납품장소명</label>
82
+					  <span>:</span>
83
+					  <div class="fnLocationNm">테스트 납품장솝명 ㄴㅇㄻㄴㅇ</div>
85 84
 					</div>
86 85
 				  </div>
87 86
 				  <div class="left">
88 87
 					<div class="nomal">
89
-					  <label>발주정보 &nbsp;:</label>
90
-					  <div class="history">
91
-						<div class="fnItemQty">품목수($)</div>
92
-						<i>-</i>
93
-						<div class="fnPodrTotalAmt"></div>원
94
-					  </div>
88
+					  <label class="col_3">품목수</label>
89
+					  <span>:</span>
90
+					  <div class="fnItemQty">1,000,000</div>
91
+					  <label>금액</label>
92
+					  <span>:</span>
93
+					  <div class="fnPodrTotalAmt">12,000,000</div>
95 94
 					</div>
96 95
 				  </div>
97 96
 				  <div class="left">
98 97
 					<div class="nomal">
99
-					  <label>공급업체 &nbsp;:</label>
100
-					  <div class="history">
101
-						<div class="fnSpplyNm"></div>
102
-					  </div>
98
+					  <label class="col_3">공급업체</label>
99
+					  <span>:</span>
100
+					  <div class="full fnSpplyNm">테스트 공금상ㅁㄴㄹ</div>
103 101
 					</div>
104 102
 				  </div>
105 103
 				</li>
106
-				
107 104
 			</div>
108 105
 		  </div>
109 106
 	  </form>
@@ -112,85 +109,73 @@
112 109
 	   <form id="ITP_FORM_MPOMNG04010_VIEW" class="form-horizontal" onsubmit="return false;">
113 110
 		<input type="hidden" id="ITP_FORM_MPOMNG04010_VIEW_VIEW_CD" name="viewCd" value="C">
114 111
 		  <div class="content">
115
-		  	<div class="line header">
116
-			  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매발주현황</div>
117
-		    </div>
118
-			<div class="line">
119
-			  <label>발주일자</label>
120
-			  <div class="line_right">
121
-				<div class="fnPodrDt"></div>
122
-			  </div>      
123
-			</div>
124
-			<div class="line">
125
-			  <label>발주금액</label>
126
-			  <div class="line_right">
127
-				<div class="fnPodrTotalAmt"></div>
128
-			  </div>
129
-			</div>
130
-			<div class="line">
131
-			  <label>납기요청일자</label>
132
-			  <div class="line_right">
133
-				  <div class="fnDlvReqDt"></div>
134
-			  </div>
135
-			</div>
136
-			<div class="line">
137
-			  <label>납품장소</label>
138
-			  <div class="line_right">
139
-				<div class="fnShmtWhsNm"></div>
140
-			  </div>
141
-			</div>
142
-			<div class="line">
143
-			  <label>공급업체</label>
144
-			  <div class="line_right">
145
-				<div class="fnWhsNm"></div>
146
-			  </div>
147
-			</div>
148
-			<div class="table_header">
149
-			  <h1><발주 품목></h1>
112
+			  <div class="content_fix">
113
+			  	<div class="line header">
114
+				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매발주현황</div>
115
+			    </div>
116
+				<div class="line">
117
+				  <label>발주일자</label>
118
+				  <div class="line_right">
119
+					<div class="fnPodrDt"></div>
120
+				  </div>      
121
+				</div>
122
+				<div class="line">
123
+				  <label>발주금액</label>
124
+				  <div class="line_right">
125
+					<div class="fnPodrTotalAmt"></div>
126
+				  </div>
127
+				</div>
128
+				<div class="line">
129
+				  <label>납기요청일자</label>
130
+				  <div class="line_right">
131
+					  <div class="fnDlvReqDt"></div>
132
+				  </div>
133
+				</div>
134
+				<div class="line">
135
+				  <label>납품장소</label>
136
+				  <div class="line_right">
137
+					<div class="fnShmtWhsNm"></div>
138
+				  </div>
139
+				</div>
140
+				<div class="line">
141
+				  <label>공급업체</label>
142
+				  <div class="line_right">
143
+					<div class="fnWhsNm"></div>
144
+				  </div>
145
+				</div>
146
+				<div class="table_header">
147
+				  <h1><발주 품목></h1>
148
+				</div>
150 149
 			</div>
151 150
 		  </div>
152 151
 		<div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA" class="scroll_area row-4-1">
153 152
 		  <ul id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
154 153
 			  <div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWCOPY" style="display: none;">
155
-				<li class="list-row2">
154
+				<li class="history_list8">
156 155
 				  <div class="left">
157 156
 					<div class="nomal">
158 157
 					  <label class="col_1">품목명</label>
159 158
 					  <span>:</span>
160
-					  <div class="fnItemNm"></div>
159
+					  <div class="full fnItemNm"></div>
161 160
 					</div>
162 161
 				  </div>
163 162
 				  <div class="left">
164 163
 					<div class="nomal">
165 164
 					  <label class="col_1">수량</label>
166 165
 					  <span>:</span>
167
-					  <div class="history">
168
-						<div class="fnPodrQty"></div>
169
-					  </div>
170
-					  <label class="sub_info">금액&nbsp;:</label>
171
-					  <div class="history">
172
-						<div class="fnUnitAmt"></div>
173
-					  </div>
166
+					  <div class="fnPodrQty"></div>
167
+					  <label class="sub_info">금액</label>
168
+					  <span>:</span>
169
+					  <div class="fnUnitAmt"></div>
174 170
 					</div>
175 171
 				  </div>
176 172
 				  <div class="left">
177 173
 					<div class="nomal">
178 174
 					  <label class="col_1">구매가 </label>
179
-					  <div class="history">
180 175
 					  <span>:</span>
181
-					  <div class="fnPodrAmt"></div>
182
-					  </div>
176
+					  <div class="full fnPodrAmt"></div>
183 177
 					</div>
184 178
 				  </div>
185
-				  <!--<div class="left">
186
-					<div class="nomal">
187
-					  <label>납기요청일가 </label>
188
-					  <div class="history">
189
-					  	<span>:</span>
190
-						<div class="fnDlvReqDt"></div>
191
-					  </div>
192
-					</div>
193
-				  </div>-->
194 179
 				</li>
195 180
 			</div>
196 181
 		  </div>
@@ -219,7 +204,7 @@
219 204
 				</form>
220 205
 			</div>
221 206
 			<div class="select_btn">
222
-				<button id="ITP_BTN_MPOMNG04010_POP_SPPLY_NM" class="btn_blue">공급업체 <img src="../img/arrow_down.png"></button>
207
+				<button id="ITP_BTN_MPOMNG04010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
223 208
 			</div>
224 209
 			<div id="ITP_POP_MPOMNG04010_SPPLY_LIST_AREA" class="popup_scroll">
225 210
 				<ul id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -227,7 +212,7 @@
227 212
 					<li class="row_2">
228 213
 						<div class="scroll_left">
229 214
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
230
-							<div class="con_2 sub fnStNm">($)</div>
215
+							<div class="con_2 wichi fnStNm">($)</div>
231 216
 						</div>
232 217
 						<div class="scroll_right">
233 218
 							<button id="ITP_BTN_MPOMNG04010_POP_SPPLY_CHOICE" class="fnSpplyId">선택</button>
@@ -256,7 +241,7 @@
256 241
 				</form>
257 242
 			</div>
258 243
 			<div class="select_btn">
259
-				<button id="ITP_BTN_MPOMNG04010_POP_WHS_NM" class="btn_blue">납품장소<img src="../img/arrow_down.png"></button>
244
+				<button id="ITP_BTN_MPOMNG04010_POP_WHS_NM" class="btn_red">납품장소<img src="../img/arrow_down.png"></button>
260 245
 			</div>
261 246
 			<div id="ITP_LIST_MPOMNG04010_POP_WHS_AREA" class="popup_scroll">
262 247
 				<ul id="ITP_LIST_MPOMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -264,7 +249,7 @@
264 249
 					<li class="row_2">
265 250
 						<div class="scroll_left">
266 251
 							<div class="con_2 fnWhsNm"></div>
267
-							<div class="con_2 sub fnLocationNm"></div>
252
+							<div class="con_2 wichi fnLocationNm"></div>
268 253
 						</div>
269 254
 						<div class="scroll_right">
270 255
 							<button id="ITP_BTN_MPOMNG04010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

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

@@ -5,71 +5,73 @@
5 5
 			<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 			<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_IDX" name="sidx" value="0">
7 7
 			<div class="content">
8
-				<div class="line header">
9
-				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">납품서현황</div>
10
-			    </div>
11
-				<div class="line">
12
-					<select class="itp_label_select" name="dtlGubun" id="ITP_FORM_MPOMNG05010_LIST_DTL_GUBUN">
13
-						<option value="1">발주생성일</option>
14
-						<option value="2">납품요청일</option>
15
-						<option value="3">납품예정일</option>
16
-						<option value="4">납품완료일</option>
17
-					</select>
18
-					<div class="date_to">
19
-						<input id="ITP_FORM_MPOMNG05010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date" type="text">
20
-						<div class="at">~</div>
21
-						<input id="ITP_FORM_MPOMNG05010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date" type="text">
22
-					</div>
23
-				</div>
24
-				<div class="line">
25
-					<label>납품상태</label>
26
-					<div class="float_left">
27
-						<select id="ITP_FORM_MPOMNG04010_LIST_SEARCH_DLV_ST_CD" data-select-code="DLV_ST_CD" class="stcd" name="sdlvStCd">
28
-						<select name="dlvStCd" id="ITP_FORM_MPOMNG05010_LIST_DLV_ST_CD">
29
-							<option value=""></option>
8
+				<div class="content_fix">
9
+					<div class="line header">
10
+					  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">납품서현황</div>
11
+				    </div>
12
+					<div class="line">
13
+						<select class="itp_label_select" name="dtlGubun" id="ITP_FORM_MPOMNG05010_LIST_DTL_GUBUN">
14
+							<option value="1">발주생성일</option>
15
+							<option value="2">납품요청일</option>
16
+							<option value="3">납품예정일</option>
17
+							<option value="4">납품완료일</option>
30 18
 						</select>
19
+						<div class="date_to">
20
+							<input id="ITP_FORM_MPOMNG05010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date" type="text">
21
+							<div class="at">~</div>
22
+							<input id="ITP_FORM_MPOMNG05010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date" type="text">
23
+						</div>
31 24
 					</div>
32
-				</div>
33
-				<div class="line">
34
-					<label>공급업체</label>
35
-					<div class="float_left">
36
-						<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="A공급업체명" readonly>
37
-						<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
38
-           				<div class="itp_input_btn">
39
-							<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
25
+					<div class="line">
26
+						<label>납품상태</label>
27
+						<div class="float_left">
28
+							<select id="ITP_FORM_MPOMNG04010_LIST_SEARCH_DLV_ST_CD" data-select-code="DLV_ST_CD" class="stcd" name="sdlvStCd">
29
+							<select name="dlvStCd" id="ITP_FORM_MPOMNG05010_LIST_DLV_ST_CD">
30
+								<option value=""></option>
31
+							</select>
40 32
 						</div>
41 33
 					</div>
42
-					<div class="float_right_btn">
43
-						<button id="ITP_BTN_MPOMNG05010_LIST_DELETE_SPPLY_NM"><img src="../img/delete.png" alt=""></button>
34
+					<div class="line">
35
+						<label>공급업체</label>
36
+						<div class="float_left">
37
+							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="A공급업체명" readonly>
38
+							<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
39
+	           				<div class="itp_input_btn">
40
+								<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
41
+							</div>
42
+						</div>
43
+						<div class="float_right_btn">
44
+							<button id="ITP_BTN_MPOMNG05010_LIST_DELETE_SPPLY_NM"><img src="../img/delete.png" alt=""></button>
45
+						</div>
44 46
 					</div>
45
-				</div>
46
-				<div class="line top3">
47
-					<label>납품장소</label>
48
-					<div class="float_left">
49
-						<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
50
-						<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
51
-           				<div class="itp_input_btn">
52
-							<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
47
+					<div class="line">
48
+						<label>납품장소</label>
49
+						<div class="float_left">
50
+							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
51
+							<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
52
+	           				<div class="itp_input_btn">
53
+								<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
54
+							</div>
55
+						</div>
56
+						<div class="float_right_btn">
57
+							<button id="ITP_BTN_MPOMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
53 58
 						</div>
54 59
 					</div>
55
-					<div class="float_right_btn">
56
-						<button id="ITP_BTN_MPOMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
60
+					<div class="line">
61
+						<label>품목명</label>
62
+						<div class="float_left name">
63
+							<input id="ITP_FORM_MPOMNG05010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
64
+						</div>
57 65
 					</div>
58
-				</div>
59
-				<div class="line top6">
60
-					<label>품목명</label>
61
-					<div class="float_left name">
62
-						<input id="ITP_FORM_MPOMNG05010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
66
+					<div class="line">
67
+						<div class="search">
68
+							<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
69
+						</div>
63 70
 					</div>
64
-				</div>
65
-				<div class="line" style="height:50px;">
66
-					<div class="search">
67
-						<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
71
+					<div class="table_header">
72
+						<h1><납품서 내역></h1>
68 73
 					</div>
69 74
 				</div>
70
-				<div class="table_header">
71
-					<h1><납품서 내역></h1>
72
-				</div>
73 75
 			</div>
74 76
 			<div id="ITP_LIST_MPOMNG05010_LIST_ITEM_AREA" class="scroll_area row-5">
75 77
 				<ul id="ITP_LIST_MPOMNG05010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
@@ -77,9 +79,9 @@
77 79
 					<li class="history_list2">
78 80
 						<div class="left">
79 81
 							<div class="nomal">
80
-								<label class="col_3">납품번호 </label>
82
+								<label>납품번호 </label>
81 83
 								<span>:</span>
82
-								<div class="fnDlvSttmtUnqNo"></div>
84
+								<div class="full fnDlvSttmtUnqNo"></div>
83 85
 							</div>
84 86
 						</div>
85 87
 						<div class="left">
@@ -94,7 +96,7 @@
94 96
 						</div>
95 97
 						<div class="left">
96 98
 							<div class="nomal">
97
-								<label class="col_3">공급업체</label>
99
+								<label>공급업체</label>
98 100
 								<span>:</span>
99 101
 								<div class="fnSpplyNm history_info"></div>
100 102
 								<label class="sub_info">납품장소</label>
@@ -104,14 +106,14 @@
104 106
 						</div>
105 107
 						<div class="left">
106 108
 							<div class="nomal">
107
-								<label class="col_3">품목 </label>
109
+								<label>품목 </label>
108 110
 								<span>:</span>
109
-								<div class="fnItemNm"></div>
111
+								<div class="full fnItemNm"></div>
110 112
 							</div>
111 113
 						</div>
112 114
 						<div class="left">
113 115
 							<div class="nomal">
114
-								<label class="col_3">발주수량</label>
116
+								<label>발주수량</label>
115 117
 								<span>:</span>
116 118
 								<div class="fnPodrQty history_info"></div>
117 119
 								<label class="sub_info">납품수량</label>
@@ -144,7 +146,7 @@
144 146
 				</form>
145 147
 			</div>
146 148
 			<div class="select_btn">
147
-				<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_NM" class="btn_blue">공급업체 <img src="../img/arrow_down.png"></button>
149
+				<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
148 150
 			</div>
149 151
 			<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
150 152
 				<ul id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -152,7 +154,7 @@
152 154
 					<li class="row_2">
153 155
 						<div class="scroll_left">
154 156
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
155
-							<div class="con_2 sub fnStNm">($)</div>
157
+							<div class="con_2 wichi fnStNm">($)</div>
156 158
 						</div>
157 159
 						<div class="scroll_right">
158 160
 							<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
@@ -181,7 +183,7 @@
181 183
 				</form>
182 184
 			</div>
183 185
 			<div class="select_btn">
184
-				<button id="ITP_BTN_MPOMNG05010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
186
+				<button id="ITP_BTN_MPOMNG05010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
185 187
 			</div>
186 188
 			<div id="ITP_LIST_MPOMNG05010_POP_WHS_AREA" class="popup_scroll">
187 189
 				<ul id="ITP_LIST_MPOMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -189,7 +191,7 @@
189 191
 					<li class="row_2">
190 192
 						<div class="scroll_left">
191 193
 							<div class="con_2 fnWhsNm"></div>
192
-							<div class="con_2 sub fnLocationNm"></div>
194
+							<div class="con_2 wichi fnLocationNm"></div>
193 195
 						</div>
194 196
 						<div class="scroll_right">
195 197
 							<button id="ITP_BTN_MPOMNG05010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

+ 2 - 1
src/main/webapp/mobile/app/mrtnmng/MRTNMNG02010.html

@@ -327,6 +327,7 @@
327 327
 					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
328 328
 				</div>
329 329
 				<div class="select_btn">
330
+					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_ADD" class="btn_blue ">추가</button>
330 331
 					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_red">품목명 <img src="../img/arrow_down.png"></button>
331 332
 				</div>
332 333
 			</form>
@@ -343,7 +344,7 @@
343 344
 							</div>
344 345
 						</div>
345 346
 						<div class="scroll_right">
346
-							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
347
+                        	<input id="ITP_FORM_MRTNMNG02010_POP_ITEM_ADD" type="checkbox">
347 348
 						</div>
348 349
 						<div class="right">
349 350
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>

+ 7 - 6
src/main/webapp/mobile/css/style.css

@@ -99,7 +99,7 @@ section .popup2 .pop .popup_scroll li .scroll_left .con_2 {padding-top:0px;}
99 99
 section .popup2 .pop .popup_scroll li .scroll_left .mg_0 {margin:0; width:100%;}
100 100
 section .popup2 .pop .popup_scroll li .scroll_left .mg_0 div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:40%; margin:0; padding: 8px 2px 0px 2px;}
101 101
 section .popup2 .pop .popup_scroll li .scroll_left .mg_0 .type_hide {width:auto;}
102
-section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14pt; color:gray; width:75px !important;}
102
+section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14pt; color:gray; width:45px !important;}
103 103
 section .popup2 .pop .popup_scroll li .scroll_left .wichi{font-size:14pt; color:gray;}
104 104
 section .popup2 .pop .popup_scroll li .scroll_left .amt{font-size:14pt; color:#b88278;}
105 105
 section .popup2 .pop .popup_scroll li .scroll_right {float: right;}
@@ -338,7 +338,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
338 338
 .content .line label {min-width:125px; color:#898989; font-size: 14pt; float: left; text-align: left; margin-top: 7px; font-weight:100;}
339 339
 .content .line label.pay_label {margin:20px 1%; width:98%;}
340 340
 .content .line select.label {border: 1px solid #000; font-size: 0.9rem;margin:9px 0 0 5px; float: left; width: 120px; height: 30px; text-align: left;}
341
-.content .line .itp_label_select {padding:0;width:98px; height:27px; color:#666; font-size: 14px; float: left;  margin:0 2.5px; font-weight:100; border:1px solid #aaa; border-radius:5px;}
341
+.content .line .itp_label_select {padding:0;width:120px; height:34px; color:#666; font-size: 14pt; float: left;  margin:3px 2.5px; font-weight:100; border:1px solid #aaa; border-radius:5px;}
342 342
 .content .line .float_left {float: left; width:168px;;}
343 343
 .content .line .float_left.name {width:60%;}
344 344
 .content .line .float_left button {float:right; left:-2px; top:-2px; position:relative; background:transparent; border:none; width:34px; height:34px; padding:0;} 
@@ -429,7 +429,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
429 429
 .button_bar button.col_12 {font-weight:100; width: 100%; height: 47px; font-size: 14pt;}
430 430
 
431 431
 /* scroll_area 조정 */
432
-.scroll_area {position: relative; top:0; width: 100%; height: 456px;border-bottom:2px solid #000; margin-bottom:47px; overflow: auto; background: #fff;}
432
+.scroll_area {position: relative; top:0; width: 100%; height: 456px;border-bottom:2px solid #000;overflow: auto; background: #fff;}
433 433
 .scroll_area ul {display:grid;}
434 434
 
435 435
 
@@ -449,12 +449,12 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
449 449
 .scroll_area li .left_info {width: calc(100% - 66px); float:left;}
450 450
 .scroll_area li .left_info div {display: inline-block; font-size:14pt;}
451 451
 .scroll_area li .left_info span {font-size: 14pt;}
452
-.scroll_area li .left_info label{font-size: 14pt; font-weight:100; margin-left:10px;}
452
+.scroll_area li .left_info label{font-size: 14pt; font-weight:100; margin-left:10px; margin-top:5px;}
453 453
 .scroll_area li .left_info .check_box {padding-top:8px; height:50px; float:left; width:22px;}
454 454
 .scroll_area li .left_info .check_box input[type=checkbox] {width:15px; margin:10px 0 0 7px;}
455
-.scroll_area li .left_info .thick {float:left; text-align: left; width: 90%; height:36px; font-weight: 100;}
455
+.scroll_area li .left_info .thick {float:left; text-align: left; width: 90%; height:38px; font-weight: 100;}
456 456
 .scroll_area li .left_info .thick .itp_item {color:gray;text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:60%; top:7px; text-align:left; position:relative;}
457
-.scroll_area li .left_info .thick .itp_gram {color:#aaa; font-size:14pt;}
457
+.scroll_area li .left_info .thick .itp_gram {position:relative; top:7px; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; color:#aaa; font-size:14pt; text-align:left; width:45px;}
458 458
 .scroll_area li .left_info .thick .itp_amt {color:#b88278; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:60%; top: 7px; position:relative; text-align:left;}
459 459
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
460 460
 .scroll_area li .left_info .history input{width: 150px;}
@@ -473,6 +473,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
473 473
 .scroll_area li.history_list3 .btn_check {height:158px; margin-top:-5px; width:90%; float:right; padding-top:7px; }
474 474
 .scroll_area li.history_list4 {height: 150px; padding-top:4px;}
475 475
 .scroll_area li.history_list5 {height: 65px; padding-top:5px;}
476
+.scroll_area li.history_list8 {height: 100px; padding-top:5px;}
476 477
 .scroll_area li.history_list6 {height: 110px; padding-top:5px;}
477 478
 .scroll_area li.history_list7 {height: 120px; padding-top:5px;}
478 479