Procházet zdrojové kódy

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

dwkim před 2 roky
rodič
revize
f5bb00501d

+ 2 - 3
src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js

@@ -184,11 +184,10 @@ let pageObj = {
184 184
 			// 조회일자 지정	
185 185
 			var now = new Date();
186 186
 			var defaultToDate = new Date(now);
187
-			console.log(now.getDate());
187
+			defaultToDate.setDate(now.getDate()+7);
188 188
 			$('#ITP_TAB_ORDMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
189
-		
190 189
 			$('#ITP_FORM_ORDMNG01010_SEARCH_FROM_DT').datepicker('setDate', now);
191
-			$('#ITP_FORM_ORDMNG01010_SEARCH_TO_DT').datepicker('setDate', defaultToDate.setDate(now.getDate() + 7));
190
+			$('#ITP_FORM_ORDMNG01010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
192 191
 		},
193 192
 		grid: function() {
194 193
 			itp_fn_jqgrid_resize(ORDMNG01010_GRID_ID, ORDMNG01010_GRID_LIST, 'lg');

+ 17 - 15
src/main/webapp/mobile/app/mordmng/MORDMNG01010.html

@@ -1,19 +1,21 @@
1 1
 <section>
2
-  <div id="ITP_AJAX_MORDMNG01010_VIEW_CONTAINER" style="display: block;">
2
+  <div id="ITP_AJAX_MORDMNG01010_VIEW_CONTAINER" style="display: none;">
3 3
     <div class="content">
4 4
       <div class="line">
5 5
         <label>납품장소</label>
6
-        <div class="float_left">
7
-          <input id="ITP_FORM_MORDMNG01010_VIEW" type="text" placeholder="A매장명">
8
-        </div>
9
-        <div class="float_left_btn">
10
-          <button id="ITP_BTN_MORDMNG01010"><img src="/img/search.png" alt=""></button>
11
-          <button id="ITP_BTN_MORDMNG01010"><img src="/img/delete.png" alt=""></button>
6
+        <div class="search_wrap">
7
+	        <div class="float_left">
8
+	          <input id="ITP_FORM_MORDMNG01010_VIEW" type="text" placeholder="A매장명">
9
+	        </div>
10
+	        <div class="float_left_btn">
11
+	          <button id="ITP_BTN_MORDMNG01010"><img src="../img/search.png" alt=""></button>
12
+	          <button id="ITP_BTN_MORDMNG01010"><img src="../img/delete.png" alt=""></button>
13
+	        </div>	
12 14
         </div>
13 15
       </div>
14 16
       <div class="line">
15 17
         <label>수주상태</label>
16
-        <div class="float_left">
18
+        <div class="line_right">
17 19
           <select name="" id="ITP_FORM_MORDMNG01010_VIEW">
18 20
             <option value=""></option>
19 21
           </select>
@@ -31,11 +33,11 @@
31 33
         <select class="label" name="" id="ITP_FORM_MORDMNG01010_VIEW">
32 34
           <option value="">발주번호/품목명</option>
33 35
         </select>
34
-        <div class="float_left">
35
-          <input id="ITP_FORM_MORDMNG01010_VIEW" style="width: 630px;" type="text" placeholder="검색어입력">
36
+        <div class="search_wrap">
37
+          <input id="ITP_FORM_MORDMNG01010_VIEW" style="width: 262px;" type="text" placeholder="검색어입력">
36 38
         </div>
37 39
       </div>
38
-      <div class="line">
40
+      <div class="line" style="height:50px;">
39 41
         <div class="search">
40 42
           <button id="ITP_BTN_MORDMNG01010" class="btn-primary btn-sm ADB">검색</button>
41 43
         </div>
@@ -51,7 +53,7 @@
51 53
             <div class="nomal">
52 54
               <label>브랜드명 &nbsp;:</label>
53 55
               <div>
54
-                <div class="fn space1">브랜드명</div>
56
+                <div class="fn">브랜드명</div>
55 57
               </div>
56 58
               <label>발주번호&nbsp;:</label>
57 59
               <div>
@@ -63,7 +65,7 @@
63 65
             <div class="nomal">
64 66
               <label>발주상태 &nbsp;:</label>
65 67
               <div>
66
-                <div class="fn space1">요청</div>
68
+                <div class="fn">요청</div>
67 69
               </div>
68 70
               <label>발주일자&nbsp;:</label>
69 71
               <div>
@@ -87,7 +89,7 @@
87 89
             <div class="nomal">
88 90
               <label>발주금액 &nbsp;:</label>
89 91
               <div>
90
-                <div class="fn space1">2,000,000</div>
92
+                <div class="fn">2,000,000</div>
91 93
               </div>
92 94
               <label>품목수&nbsp;:</label>
93 95
               <div>
@@ -99,7 +101,7 @@
99 101
       </li>
100 102
     </div>
101 103
   </div>
102
-  <div id="ITP_AJAX_MORDMNG01010_DETAIL_CONTAINER" style="display: none;">
104
+  <div id="ITP_AJAX_MORDMNG01010_DETAIL_CONTAINER" style="display: block;">
103 105
     <div class="content">
104 106
       <div class="line">
105 107
         <label>브랜드명</label>

+ 17 - 16
src/main/webapp/mobile/app/mordmng/MORDMNG02010.html

@@ -1,15 +1,16 @@
1
-<link rel="stylesheet" href="/style.css">
2 1
 <section>
3
-  <div id="ITP_AJAX_MORDMNG02010_VIEW_CONTAINER" style="display: none;">
2
+  <div id="ITP_AJAX_MORDMNG02010_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_MORDMNG02010_VIEW" type="text" placeholder="A매장명">
9
-        </div>
10
-        <div class="float_left_btn">
11
-          <button id="ITP_BTN_MORDMNG02010"><img src="/img/search.png" alt=""></button>
12
-          <button id="ITP_BTN_MORDMNG02010"><img src="/img/delete.png" alt=""></button>
6
+        <div class="search_wrap">
7
+	        <div class="float_left">
8
+	          <input id="ITP_FORM_MORDMNG02010_VIEW" type="text" placeholder="A매장명">
9
+	        </div>
10
+	        <div class="float_left_btn">
11
+	          <button id="ITP_BTN_MORDMNG02010"><img src="../img/search.png" alt=""></button>
12
+	          <button id="ITP_BTN_MORDMNG02010"><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_MORDMNG02010_VIEW">
25 26
           <option value="">발주번호/품목명</option>
26 27
         </select>
27
-        <div class="float_left">
28
-          <input id="ITP_FORM_MORDMNG02010_VIEW" style="width: 630px;" type="text" placeholder="검색어입력">
28
+        <div class="search_wrap">
29
+          <input id="ITP_FORM_MORDMNG02010_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_MORDMNG02010" class="btn-primary btn-sm ADB">검색</button>
34 35
         </div>
@@ -91,8 +92,8 @@
91 92
           <div class="left">
92 93
             <div class="nomal">
93 94
               <label class="col_0">단가금액 &nbsp;:</label>
94
-              <div>
95
-                <div class="fn space1">1,000원</div>
95
+              <div class="col_5">
96
+                <div class="fn col_5">1,000원</div>
96 97
               </div>
97 98
               <label class="col_0">발주금액&nbsp;:</label>
98 99
               <div>
@@ -111,7 +112,7 @@
111 112
       </div>
112 113
     </div>
113 114
   </div>
114
-  <div id="ITP_AJAX_MORDMNG02010_DETAIL_CONTAINER" style="display: block;">
115
+  <div id="ITP_AJAX_MORDMNG02010_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_MORDMNG02010_DETAIL" class="left" type="text" style="width:200px;" placeholder="이름">
156
-          <input id="ITP_FORM_MORDMNG02010_DETAIL" class="left" type="text" style="width:300px;" placeholder="연락처">
156
+          <input id="ITP_FORM_MORDMNG02010_DETAIL" class="left" type="text" style="width:100px;margin-right: 5px;" placeholder="이름">
157
+          <input id="ITP_FORM_MORDMNG02010_DETAIL" class="left" type="text" style="width:140px;margin-right: 10px;" placeholder="연락처">
157 158
         </div>
158 159
       </div>
159 160
       <div class="table_header">

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

@@ -1,15 +1,16 @@
1
-<link rel="stylesheet" href="/style.css">
2 1
 <section>
3
-  <div id="ITP_AJAX_MORDMNG03010_VIEW_CONTAINER" style="display: block;">
2
+  <div id="ITP_AJAX_MORDMNG03010_VIEW_CONTAINER" style="display: none;">
4 3
     <div class="content">
5 4
       <div class="line">
6 5
         <label>납품장소</label>
7
-        <div class="float_left">
8
-          <input id="ITP_FORM_MORDMNG03010_VIEW" type="text" placeholder="A매장명">
9
-        </div>
10
-        <div class="float_left_btn">
11
-          <button id="ITP_BTN_MORDMNG03010"><img src="/img/search.png" alt=""></button>
12
-          <button id="ITP_BTN_MORDMNG03010"><img src="/img/delete.png" alt=""></button>
6
+        <div class="search_wrap">
7
+	        <div class="float_left">
8
+	          <input id="ITP_FORM_MORDMNG03010_VIEW" type="text" placeholder="A매장명">
9
+	        </div>
10
+	        <div class="float_left_btn">
11
+	          <button id="ITP_BTN_MORDMNG03010"><img src="../img/search.png" alt=""></button>
12
+	          <button id="ITP_BTN_MORDMNG03010"><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_MORDMNG03010_VIEW">
25 26
           <option value="">발주번호/품목명</option>
26 27
         </select>
27
-        <div class="float_left">
28
-          <input id="ITP_FORM_MORDMNG03010_VIEW" style="width: 630px;" type="text" placeholder="검색어입력">
28
+        <div class="search_wrap">
29
+          <input id="ITP_FORM_MORDMNG03010_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_MORDMNG03010" class="btn-primary btn-sm ADB">검색</button>
34 35
         </div>
@@ -108,7 +109,7 @@
108 109
       </div>
109 110
     </div>
110 111
   </div>
111
-  <div id="ITP_AJAX_MORDMNG03010_DETAIL_CONTAINER" style="display: none;">
112
+  <div id="ITP_AJAX_MORDMNG03010_DETAIL_CONTAINER" style="display: block;">
112 113
     <div class="detail_content">
113 114
       <div class="detail_header">
114 115
         <div class="detail_logo">

+ 47 - 30
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-popup-div" style="display: none;">
2
+  <div id="ITP_POP_MPOMNG01010_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>
@@ -15,19 +15,19 @@
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">취소</button>
18
+        <button id="ITP_BTN_MPOMNG01010_POP_CANCEL" class="cancel btn-gray CLB btn-pop-close">취소</button>
19 19
         <button id="ITP_BTN_MPOMNG01010_POP_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-popup-div" style="display: none;">
23
+  <div id="ITP_POP_MPOMNG01010_WHS_NM" 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"><img src="../img/close.png"></button>
30
+          <button type="button" id="ITP_BTN_MPOMNG01010_POP_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
31 31
         </div>
32 32
       </div>
33 33
       <div class="search_bar">
@@ -52,15 +52,6 @@
52 52
             </div>
53 53
           </li>
54 54
         </div>
55
-        <!--<li>
56
-          <div class="scroll_left">
57
-            <div class="fn">브랜드 창고 명A</div>
58
-            <div class="fn">(상세위치내용)</div>
59
-          </div>
60
-          <div class="scroll_right">
61
-            <button id="ITP_BTN_MPOMNG01010_POP_CHOICE">선택</button>
62
-          </div>
63
-        </li>-->
64 55
       </div>
65 56
     </div>
66 57
   </div>
@@ -71,43 +62,60 @@
71 62
           <label>> 품목 검색</label>
72 63
         </div>
73 64
         <div class="header_right">
74
-          <button id="ITP_BTN_MSTOCKMNG01010"><img src="../img/close.png"></button>
65
+          <button type="button" id="ITP_BTN_MPOMNG01010_POP_ITEM_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
75 66
         </div>
76 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="">
77 71
       <div class="search_bar">
78
-        <form id="ITP_FORM_MPOMNG01010_POPUP" class="form-horizontal" onsubmit="return false;">
79
-          <input id="ITP_FORM_MPOMNG01010_POP_KEYWORD" type="text" placeholder="품목명/품목번호">
80
-          <button id="ITP_BTN_MPOMNG01010_POP_SEARCH"><img src="../img/search.png"></button>
81
-        </form>
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>
82 74
       </div>
83
-       <div class="search_bar">
75
+      <div class="search_bar">
84 76
         <button id="ITP_BTN_MPOMNG01010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
85 77
       </div>
78
+      </form>
86 79
       <div class="popup_scroll">
87
-        <li class="row_2">
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="">
88 91
           <div class="left" style="width:190px;">
89 92
             <div class="thick">
90
-              <div class="fn">품목명</div>
93
+              <div><input type="checkbox" id="ITP_FORM_MPOMNG01010_POP_ITEM_CHECKBOX" name="itemId" /></div>
94
+            </div>
95
+            <div class="thick">
96
+              <div class="fnItemNm">품목명</div>
91 97
               <div>-</div>
92
-              <div class="fn">2EA</div>
98
+              <div class="fnOrdUnit">EA</div>
93 99
             </div>
94 100
             <div class="nomal">
95 101
               <div class="space">구매가 :</div>
96
-              <div class="fn">1,120,000</div>
102
+              <div class="fnOrdAmount">0</div>
97 103
             </div>
98 104
           </div>
99 105
           <div class="right">
100
-            <button id="ITP_BTN_MSTOCKMNG01010"><</button>
106
+            <button id="ITP_BTN_MSTOCKMNG01010_POP_ITEM_PLUS"><</button>
101 107
             <div class="num">2</div>
102
-            <button id="ITP_BTN_MSTOCKMNG01010">></button>
108
+            <button id="ITP_BTN_MSTOCKMNG01010_POP_ITEM_MINUS">></button>
103 109
           </div>
104 110
           <div class="add">
105
-            <button id="ITP_BTN_MSTOCKMNG01010">추가</button>
111
+            <button id="ITP_BTN_MSTOCKMNG01010_POP_ITEM_ADD">추가</button>
106 112
           </div>
107 113
         </li>
114
+        </div>
108 115
       </div>
109 116
     </div>
110
-  </div>	
117
+  </div>
118
+
111 119
   <div id="ITP_AJAX_MPOMNG01010_VIEW_CONTAINER">
112 120
     <form id="ITP_FORM_MPOMNG01010_DETAIL" class="form-horizontal" onsubmit="return false;">
113 121
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_VIEW_CD" name="viewCd" value="C">
@@ -124,7 +132,13 @@
124 132
         <div class="line">
125 133
           <label>구매요청금액</label>
126 134
           <div class="line_right">
127
-            <div class="fn">424,000원</div>
135
+            <div class="fnPchReqAmt">0원</div
136
+          </div>
137
+        </div>
138
+        <div class="line">
139
+          <label>구매가능금액</label>
140
+          <div class="line_right">
141
+            <div class="fnOrdUseAmt">0원</div>
128 142
           </div>
129 143
         </div>
130 144
         <div class="line">
@@ -152,10 +166,13 @@
152 166
         <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display:none;">
153 167
           <li>
154 168
             <div class="left_info">
169
+              <div class="thick">
170
+                <div><input type="checkbox" id="ITP_FORM_MPOMNG01010_DETAIL_CHECKBOX" name="itemId" /></div>
171
+              </div>
155 172
               <div class="thick">
156 173
                 <div class="fnItemNm">품목명</div>
157 174
                 <div>-</div>
158
-                <div class="fnUnit">2EA</div>
175
+                <div class="fnUnit">EA</div>
159 176
               </div>
160 177
               <div class="thick">
161 178
                 <label class="space0">구매가 :</label>
@@ -164,7 +181,7 @@
164 181
             </div>
165 182
             <div class="right">
166 183
               <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
167
-              <div class="num fnNum">2</div>
184
+              <div class="num fnNum">0</div>
168 185
               <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
169 186
             </div>
170 187
           </li>

+ 11 - 14
src/main/webapp/mobile/css/style.css

@@ -235,15 +235,15 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
235 235
 .detail_content .detail_header .detail_logo img {width: 150px; margin-left: 50px;}
236 236
 .detail_content .detail_header .detail_ok {float: left;}
237 237
 .detail_content .detail_header .detail_ok label {margin-left: 80px; font-size: 2.8rem; font-weight: 700;}
238
-.detail_content .detail_confirmation {width: 90%; margin: 10% auto; height: 280px; }
239
-.detail_content .detail_confirmation .detail_col {float: left; width: 100%; display: inline-flex; margin-left: 30px; margin-bottom: 10px;}
240
-.detail_content .detail_confirmation .detail_col label{font-size: 2rem; font-weight: 700; float: left; width: 235px; text-align: left;}
241
-.detail_content .detail_confirmation .detail_col i{font-size: 2rem; width: 1%; text-align: right; margin-right: 10px;}
242
-.detail_content .detail_confirmation .detail_col div{font-size: 2rem; width: auto; text-align: left;}
243
-.detail_content .detail_company_info label{font-size: 2rem; font-weight: 600;}
238
+.detail_content .detail_confirmation {height: 200px; }
239
+.detail_content .detail_confirmation .detail_col {float: left; width: 100%; display: inline-flex; margin-left: 15px; margin-bottom: 10px;}
240
+.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 div{font-size: 1rem; width: auto; text-align: left;}
243
+.detail_content .detail_company_info label{font-size: 1rem; font-weight: 600;}
244 244
 .detail_content .detail_company_info .weight {margin-bottom: 20px;}
245
-.detail_content .detail_company_info .weight label{font-size: 2.4rem; font-weight: 700;}
246
-.detail_content .detail_company_info div{font-size: 2rem;}
245
+.detail_content .detail_company_info .weight label{font-size: 1.4rem; font-weight: 700;}
246
+.detail_content .detail_company_info div{font-size: 1rem;}
247 247
 .detail_content .detail_company_info .info_left {width: 50%; height: 350px; float: left;}
248 248
 .detail_content .detail_company_info .info_left .company_info {width: 100%; float: left; display: flex; margin-left: 50px;}
249 249
 .detail_content .table_header {margin: 33% auto; width: 100%; height: 100px; background-color: skyblue; align-items: center; position: fixed; z-index: 10;}
@@ -276,7 +276,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
276 276
 
277 277
 .row-3{top: 333px;}
278 278
 .row-4{top: 377px;}
279
-.row-5{top: 850px;}
279
+.row-5{top: 418px;}
280 280
 .row-6{top: 468px;}
281 281
 .row-7{top: 1030px;}
282 282
 
@@ -297,7 +297,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
297 297
 .scroll_area li.history_list1 {height: 230px;}
298 298
 .scroll_area li.history_list2 {height: 160px; padding-top:5px;}
299 299
 .scroll_area li.history_list2 label{min-width:95px; display:inline-flex;}
300
-.scroll_area li.history_list3 {height: 330px;}
300
+.scroll_area li.history_list3 {height: 160px; padding-top:5px;}
301 301
 .scroll_area li.history_list4 {height: 150px;}
302 302
 .scroll_area li .history_info {width: auto;}
303 303
 .scroll_area li .left {width:100%; height:30px; margin-top:0px;}
@@ -324,7 +324,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
324 324
 .scroll_area li .left .nomal .half label {font-weight:100;}
325 325
 .scroll_area li .left .nomal  input{width: 85px; height:30px;}
326 326
 .scroll_area li .left .nomal .scroll_btn {margin-bottom: 10px; min-width: 0;}
327
-.scroll_area li .left .nomal .scroll_btn button{position: absolute; top: -10px; width: 100px; height: 70px; font-size: 1.8rem; padding: 0; border-radius: 15px; background: rgb(198, 170, 250);}
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);}
328 328
 
329 329
 .scroll_area li .left .nomal span {margin:0 10px;}
330 330
 
@@ -332,9 +332,6 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
332 332
 .scroll_area li .left .nomal .btn_bar button{width: 25px; height: 30px; font-size: 1rem; padding: 0;}
333 333
 .scroll_area li .left .nomal .btn_bar .col_0{min-width: auto; margin: 5px 20px;}
334 334
 
335
-.scroll_area li .left .nomal .space{ margin-left: 30px; min-width: 100px;}
336
-.scroll_area li .left .nomal .space0{ margin-left: 30px; width: auto;}
337
-.scroll_area li .left .nomal .space1{ margin-left: 0px; width: 200px;}
338 335
 .scroll_area li .left .nomal .space2 {display: inline-flex; font-size: 1.4rem; font-weight: 700;}
339 336
 .scroll_area li .left .nomal label{position:relative; margin-left: 10px;}
340 337
 .scroll_area li .left .nomal label.sub_info{min-width: 70px; display: inline-flex;}

+ 86 - 8
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -1,7 +1,7 @@
1 1
 require(['config'], function() {
2 2
 	require([
3 3
 	], function($) {
4
-		contentPageObj.init();
4
+		mobPageObj.init();
5 5
 	});
6 6
 });
7 7
 
@@ -9,15 +9,21 @@ require(['config'], function() {
9 9
 const API_MOBILE_INIT_INFO	= '/api/pomng/init-pchReq';
10 10
 const API_MOBILE_SAVE		= '/api/pomng/save-pchReq';
11 11
 const API_POP_SEARCH_LIST	= '/api/whs/mng/pop-whs-search';
12
+const API_POP_ITEM_LIST 	= '/api/item/pop-grid-list';
12 13
 
13
-let contentPageObj = {
14
+let mobPageObj = {
14 15
 	init: function () {
15 16
 		this.ui.init();
16 17
 		this.event.init();
18
+		this.ready();
17 19
 	},
18 20
 	ui: {
19 21
 		init: function () {
20
-
22
+			this.info();
23
+		},
24
+		info: function() {
25
+			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
26
+			$('input:hidden[id$="_STORE_ID"]').val(fn_make_user_info.get('storeId'));
21 27
 		}
22 28
 	},
23 29
 	event: {
@@ -27,10 +33,13 @@ let contentPageObj = {
27 33
 		button: function() {
28 34
 			$('button[id^="ITP_BTN_MPOMNG01010_DETAIL"]').on('click', function() {
29 35
 				if($(this).is('[data-call-popup]')) {
30
-					contentPopObj.show($(this).data('call-popup'));
36
+					mobPopObj.show($(this).data('call-popup'));
31 37
 				} else {
32 38
 					var id = $(this).attr('id');
33 39
 					switch (id) {
40
+						case 'ITP_BTN_MPOMNG01010_DETAIL_ADDROW': contPopObj.list.addRow(); break;
41
+						case 'ITP_BTN_MPOMNG01010_DETAIL_DELROW': contPopObj.list.delRow(); break;
42
+						case 'ITP_BTN_MPOMNG01010_DETAIL_DELETE_WHS_NM': break;
34 43
 						case 'ITP_BTN_MPOMNG01010_DETAIL_TEMP_SAVE': break;
35 44
 						case 'ITP_BTN_MPOMNG01010_DETAIL_CANCEL':break;
36 45
 					}
@@ -38,25 +47,94 @@ let contentPageObj = {
38 47
 				return false;
39 48
 			});
40 49
 		}
50
+	},
51
+	ready: function() {
52
+		contPopObj.init();
41 53
 	}
42 54
 };
43 55
 
44
-let contentPopObj = {
56
+let contPopObj = {
57
+	init: function() {
58
+		this.data.load();
59
+	},
60
+	data: {
61
+		initPchReq: null,
62
+		load: function() {
63
+			var _this = this;
64
+			var callbackFn = function(result) {
65
+				_this.initPchReq = result;
66
+				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_BRAND_ID').val(result.brandId);
67
+				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_STORE_ID').val(result.storeId);
68
+				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_LOAN_DVSN').val(result.loanDvsn);
69
+				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
70
+				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_DVSN').val(result.pchReqDvsn);
71
+
72
+				$('#ITP_FORM_MPOMNG01010_DETAIL .fnOrdUseAmt').text(itp_fn_set_comma(result.ordUseAmt) + '원');
73
+			};
74
+			const key = {brandId:fn_make_user_info.get('brandId'), storeId:fn_make_user_info.get('storeId')};
75
+			fn_ajax_call(API_MOBILE_INIT_INFO, key, callbackFn, 'GET');
76
+		}
77
+	},
78
+	list: {
79
+		addRow: function() {
80
+			var _this = this;
81
+			var callbackFn = function(result) {
82
+				mobPopObj.addRow.init(result);
83
+			};
84
+			let param = $('#ITP_FORM_MPOMNG01010_POPUP_ITEM').serializeObject();
85
+			param.gridSize = 10;
86
+			fn_ajax_call(API_POP_ITEM_LIST, JSON.stringify(param), callbackFn, 'POST');
87
+		},
88
+		delRow: function() {
89
+
90
+		}
91
+	}
92
+};
93
+
94
+let mobPopObj = {
95
+	addRow: {
96
+		rows: [],
97
+		init: function(rows) {
98
+			this.rows = rows;
99
+			mobPopObj.show('ITP_POP_MPOMNG01010_ITEM_NM');
100
+			this.view();
101
+		},
102
+		view: function() {
103
+			$.each(this.rows, function (i, item) {
104
+				$('#ITP_LIST_MPOMNG01010_POP_ITEM_ROWS').append($('#ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY').html());
105
+				var li = $('#ITP_LIST_MPOMNG01010_POP_ITEM_ROWS .panel-group > .row_2:last');
106
+				$(li).find('#ITP_FORM_MPOMNG01010_POP_ITEM_CHECKBOX').val(item.itemId);
107
+				$(li).find('.fnItemNm').text(item.itemNm);
108
+				$(li).data('brandUnitUnqNo', item.brandUnitUnqNo);
109
+				$(li).data('podrPssblDvsn', item.podrPssblDvsn);
110
+				$(li).data('spplyId', item.spplyId);
111
+				$(li).data('stddQty', item.stddQty);
112
+				$(li).data('storeUnitUnqNo', item.storeUnitUnqNo);
113
+				$(li).data('unit', item.unit);
114
+				$(li).data('unitAmt', item.unitAmt);
115
+				$(li).data('unitGubun', item.unitGubun);
116
+			});
117
+		},
118
+		search: function() {
119
+
120
+		},
121
+		choice: function() {
122
+
123
+		}
124
+	},
45 125
 	show: function(id, args, fn) {
46 126
 		this.button();
47
-		console.log(id);
48 127
 		$('#' + id).show();
49 128
 	},
50 129
 	button: function() {
51 130
 		var _this = this;
52 131
 		$('button[id^="ITP_BTN_MPOMNG01010_POP"]').off('click').on('click', function() {
53 132
 			var id = $(this).attr('id');
54
-			if(id.indexOf('POP_CLOSE') > -1) {
133
+			if($(this).hasClass('btn-pop-close')) {
55 134
 				_this.hide(id);
56 135
 				return;
57 136
 			}
58 137
 			switch (id) {
59
-				case 'ITP_BTN_MPOMNG01010_POP_CANCEL': _this.hide(id); break;
60 138
 				case 'ITP_BTN_MPOMNG01010_POP_CONFIRM': break;
61 139
 				case 'ITP_BTN_MPOMNG01010_POP_SEARCH':
62 140
 					break;

+ 10 - 0
src/main/webapp/mobile/js/config.js

@@ -499,6 +499,16 @@ function itp_fn_date_format(date, type) {
499 499
 	}
500 500
 }
501 501
 
502
+function itp_fn_set_comma(str) {
503
+	str = String(str);
504
+	return str.replace(/(\d)(?=(?:\d{3})+(?!\d))/g, '$1,');
505
+};
506
+
507
+function itp_fn_set_uncomma(str) {
508
+	str = String(str);
509
+	return str.replace(/[^\d]+/g, '');
510
+};
511
+
502 512
 let itp_fn_form_validate = function(form, element, arry, msg, type) {
503 513
 	var error = function(txt) {
504 514
 		if (type != 'ONLYCHK') {