Browse Source

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

dwkim 2 years ago
parent
commit
0b16d28d8e
45 changed files with 578 additions and 618 deletions
  1. 1 1
      src/main/webapp/app/collmng/COLLMNG01010.html
  2. 12 4
      src/main/webapp/app/oper/OPER01010.html
  3. 12 4
      src/main/webapp/app/oper/OPER02010.html
  4. 6 2
      src/main/webapp/app/oper/OPER06010.html
  5. 3 1
      src/main/webapp/app/popup/biz/BIZPOP_ITEM_CLASS_MANAGE.html
  6. 48 35
      src/main/webapp/app/stinfo/STINFO05010.html
  7. 12 2
      src/main/webapp/app/stinfo/STINFO06010.html
  8. 3 5
      src/main/webapp/app/vendinfo/VENDINFO02010.html
  9. 2 2
      src/main/webapp/bootstrap/dist/css/bootstrap.min.css
  10. 5 4
      src/main/webapp/css/style.css
  11. 2 2
      src/main/webapp/css/ui.jqgrid-bootstrap.css
  12. 21 43
      src/main/webapp/js/app/collmng/ITP_COLLMNG01010.js
  13. 5 18
      src/main/webapp/js/app/collmng/ITP_COLLMNG02010.js
  14. 10 38
      src/main/webapp/js/app/collmng/ITP_COLLMNG03010.js
  15. 8 17
      src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js
  16. 10 28
      src/main/webapp/js/app/ordmng/ITP_ORDMNG02010.js
  17. 12 21
      src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js
  18. 4 6
      src/main/webapp/js/app/vendinfo/ITP_VENDINFO01010.js
  19. 6 11
      src/main/webapp/js/app/vendinfo/ITP_VENDINFO02010.js
  20. 3 6
      src/main/webapp/js/app/vendinfo/ITP_VENDINFO03010.js
  21. 119 188
      src/main/webapp/mobile/app/main.html
  22. 0 3
      src/main/webapp/mobile/app/mcollmng/MCOLLMNG01010.html
  23. 1 1
      src/main/webapp/mobile/app/mcollmng/MCOLLMNG02010.html
  24. 1 1
      src/main/webapp/mobile/app/mcollmng/MCOLLMNG03010.html
  25. 0 3
      src/main/webapp/mobile/app/mordmng/MORDMNG01010.html
  26. 2 2
      src/main/webapp/mobile/app/mordmng/MORDMNG02010.html
  27. 1 1
      src/main/webapp/mobile/app/mordmng/MORDMNG03010.html
  28. 1 1
      src/main/webapp/mobile/app/mpomng/MPOMNG02010.html
  29. 5 5
      src/main/webapp/mobile/app/mpomng/MPOMNG04010.html
  30. 1 1
      src/main/webapp/mobile/app/mpomng/MPOMNG05010.html
  31. 9 9
      src/main/webapp/mobile/app/mrtnmng/MRTNMNG04010.html
  32. 1 1
      src/main/webapp/mobile/app/mrtnmng/MRTNMNG06010.html
  33. 30 1
      src/main/webapp/mobile/css/style.css
  34. 3 14
      src/main/webapp/mobile/js/app/main.js
  35. 7 7
      src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG01010.js
  36. 22 10
      src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG02010.js
  37. 18 12
      src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG03010.js
  38. 19 10
      src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG02010.js
  39. 18 10
      src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG03010.js
  40. 52 28
      src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js
  41. 45 39
      src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG02010.js
  42. 3 2
      src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG01010.js
  43. 5 5
      src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG04010.js
  44. 13 5
      src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG06010.js
  45. 17 9
      src/main/webapp/mobile/js/config.js

+ 1 - 1
src/main/webapp/app/collmng/COLLMNG01010.html

@@ -44,7 +44,7 @@
44 44
 											<button type="button" id="ITP_BTN_COLLMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
45 45
 						                </div>
46 46
 										<div class="col-xs-5 itp_ip itp_noMar">
47
-											<input type="text" id="ITP_FORM_COLLMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="발주번호/품목번호/품목명" />
47
+											<input type="text" id="ITP_FORM_COLLMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호/품목명" />
48 48
 										</div>
49 49
 									</div>
50 50
 								</form>

+ 12 - 4
src/main/webapp/app/oper/OPER01010.html

@@ -22,11 +22,15 @@
22 22
 									<input type="hidden" id="ITP_FORM_OPER01010_SEARCH_AFFL_BRAND_ID" name="brandId" value="">
23 23
 									<div class="form-group">
24 24
 										<div class="col-xs-2 itp_ip itp_noMar">
25
-											<input type="text" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" />
25
+											<div class="input-group">
26
+												<input readonly type="text" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" readonly="readonly" disabled>
27
+												<span class="input-group-btn">
28
+													<button id="ITP_FORM_OPER01010_DELETE_AFFL_SHOP" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
29
+												</span>
30
+											</div>
26 31
 										</div>
27 32
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
28 33
 											<button type="button" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP" class="btn btn-orange btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
29
-											<button type="button" id="ITP_FORM_OPER01010_DELETE_AFFL_SHOP" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
30 34
 						                </div>
31 35
 										<div class="col-xs-2 itp_ip itp_noMar">
32 36
 											<select id="ITP_FORM_OPER01010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId">
@@ -84,11 +88,15 @@
84 88
 											<label class="col-xs-2 itp_lb">브랜드그룹</label>
85 89
 											<div class="col-xs-4 itp_ip">
86 90
 												<div class="col-xs-7 itp_in">
87
-													<input type="text" name="afflShopNm" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" placeholder="브랜드그룹명" readonly>
91
+													<div class="input-group">
92
+														<input type="text" name="afflShopNm" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" placeholder="브랜드그룹명" readonly>
93
+														<span class="input-group-btn">
94
+															<button id="ITP_FORM_OPER01010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-default btn-sm itp_btn SHOW" type="button"><i class="glyphicon glyphicon-erase"></i></button>
95
+														</span>
96
+													</div>
88 97
 												</div>
89 98
 												<div class="col-xs-3 itp_in">
90 99
 													<button type="button" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button>
91
-													<button type="button" id="ITP_FORM_OPER01010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm SEB"><i class="glyphicon glyphicon-erase"></i></button>
92 100
 												</div>
93 101
 											</div>
94 102
 											<label class="col-xs-2 itp_lb">브랜드</label>

+ 12 - 4
src/main/webapp/app/oper/OPER02010.html

@@ -21,11 +21,15 @@
21 21
 									<input type="hidden" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_ID" name="safflShopId" value="">
22 22
 									<div class="form-group">
23 23
 										<div class="col-xs-2 itp_ip itp_noMar">
24
-											<input type="text" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" />
24
+											<div class="input-group">
25
+												<input type="text" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" readonly/>
26
+												<span class="input-group-btn">
27
+													<button id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
28
+												</span>
29
+											</div>										
25 30
 										</div>
26 31
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
27 32
 											<button type="button" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_BTN" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
28
-											<button type="button" id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
29 33
 										</div>
30 34
 										<div class="col-xs-2 itp_ip itp_noMar">
31 35
 											<select id="ITP_FORM_OPER02010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId">
@@ -76,11 +80,15 @@
76 80
 											<label class="col-xs-2 itp_lb">브랜드그룹</label>
77 81
 											<div class="col-xs-4 itp_ip">
78 82
 												<div class="col-xs-5 itp_in" style="width:65%;">
79
-													<input type="text" name="afflShopNm" id="ITP_FORM_OPER02010_DETAIL_AFFL_SHOP_NM" class="form-control itp_input" placeholder="브랜드그룹명" readonly>
83
+													<div class="input-group">
84
+														<input type="text" name="afflShopNm" id="ITP_FORM_OPER02010_DETAIL_AFFL_SHOP_NM" class="form-control itp_input" placeholder="브랜드그룹명" readonly>
85
+														<span class="input-group-btn">
86
+															<button id="ITP_FORM_OPER02010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
87
+														</span>
88
+													</div>
80 89
 												</div>
81 90
 												<div class="col-xs-3 itp_in">
82 91
 													<button type="button" id="ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button>
83
-													<button type="button" id="ITP_FORM_OPER02010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm SEB"><i class="glyphicon glyphicon-erase"></i></button>
84 92
 												</div>
85 93
 											</div>
86 94
 											<label class="col-xs-2 itp_lb">브랜드</label>

+ 6 - 2
src/main/webapp/app/oper/OPER06010.html

@@ -20,11 +20,15 @@
20 20
 									<input type="hidden" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID" name="safflShopId" />
21 21
 									<div class="form-group">
22 22
 										<div class="col-xs-2 itp_ip itp_noMar">
23
-											<input type="text" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" readonly="readonly" />
23
+											<div class="input-group">
24
+												<input type="text" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="브랜드그룹" readonly="readonly" />
25
+												<span class="input-group-btn">
26
+													<button id="ITP_BTN_OPER06010_DELETE_AFFL_SHOP" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
27
+												</span>
28
+											</div>
24 29
 										</div>
25 30
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
26 31
 											<button type="button" id="ITP_BTN_OPER06010_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
27
-											<button type="button" id="ITP_BTN_OPER06010_DELETE_AFFL_SHOP" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
28 32
 										</div>
29 33
 										<div class="col-xs-2 itp_ip itp_noMar">
30 34
 											<select id="ITP_FORM_OPER06010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId">

+ 3 - 1
src/main/webapp/app/popup/biz/BIZPOP_ITEM_CLASS_MANAGE.html

@@ -7,9 +7,11 @@
7 7
 			</div>
8 8
 			<div class="modal-body">
9 9
 				<div class="itp_form itp_type1 fix">
10
+							<div class="itp_madal_header">
11
+								<h4 class="itp_form_tit">분류 정보</h4>
12
+							</div>
10 13
 					<div class="col-xs-12">
11 14
 						<div class="form-horizontal">
12
-							<h4 class="itp_form_tit">분류 정보</h4>
13 15
 							<form id="ITP_FORM_NOTICE_INFO_POPUP">
14 16
 								<input type="hidden" id="ITP_FORM_STINFO07010_POP_VIEW_CD" name="viewCd" value="C">
15 17
 								<input type="hidden" id="ITP_FORM_STINFO07010_POP_BRAND_ID" name="brandId" value="">

+ 48 - 35
src/main/webapp/app/stinfo/STINFO05010.html

@@ -99,11 +99,10 @@
99 99
 									<div class="itp_form_in border-top">
100 100
 										<div class="form-group">
101 101
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
102
-												<div class="col-xs-4 itp_ip fnBrandNm">
103
-												</div>
102
+												<div class="col-xs-4 itp_ip fnBrandNm"></div>
104 103
 											<label class="col-xs-2 itp_lb">상태 *</label>
105 104
 											<div class="col-xs-4 itp_ip">
106
-												<div class="col-xs-10 itp_in">
105
+												<div class="col-xs-5 itp_in">
107 106
 									                <select id="ITP_FORM_STINFO05010_DETAIL_UNIT_ST_CD" data-select-code="UNIT_ST_CD" data-check-required="empty" class="form-control itp_input" name="unitStCd"></select>
108 107
 								                </div>
109 108
 											</div>
@@ -117,12 +116,16 @@
117 116
 													<div class="col-xs-3 itp_in">
118 117
 														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SCH_ITEM_ID" class="form-control itp_input" value="" maxlength="100" readonly>
119 118
 									                </div>
120
-													<div class="col-xs-3 itp_in" style="padding-left: 5px;">
121
-														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SCH_ITEM_NM" class="form-control itp_input" value="" maxlength="100" readonly>
122
-									                </div>
119
+									                <div class="col-xs-3 itp_in">
120
+														<div class="input-group">
121
+															<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SCH_ITEM_NM" class="form-control itp_input" value="" maxlength="100" readonly>
122
+															<span class="input-group-btn">
123
+																<button id="ITP_BTN_STINFO05010_DETAIL_ITEM_DELETE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
124
+															</span>
125
+														</div>
126
+													</div>
123 127
 													<div class="col-xs-2 itp_in" style="padding-left: 5px;">
124 128
 														<button type="button" id="ITP_BTN_STINFO05010_DETAIL_ITEM_SRH_" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
125
-														<button type="button" id="ITP_BTN_STINFO05010_DETAIL_ITEM_DELETE" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
126 129
 									                </div>
127 130
 												</div>
128 131
 											</div>
@@ -132,14 +135,18 @@
132 135
 													<div class="col-xs-3 itp_in">
133 136
 														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SCH_SPPLY_ID" class="form-control itp_input"  value="공급업체번호" maxlength="100" readonly>
134 137
 									                </div>
135
-													<div class="col-xs-3 itp_in" style="padding-left: 5px;">
138
+									                 <div class="col-xs-3 itp_in">
139
+														<div class="input-group">
136 140
 														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SCH_SPPLY_NM" class="form-control itp_input" value="공급업체명" maxlength="100" readonly>
137
-									                </div>
138
-													<div class="col-xs-2 itp_in" style="padding-left: 5px;">
141
+															<span class="input-group-btn">
142
+																<button id="ITP_BTN_STINFO05010_DETAIL_SPPLY_DELETE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
143
+															</span>
144
+														</div>
145
+													</div>
146
+													<div class="col-xs-a itp_in" style="padding-left: 5px;">
139 147
 														<button type="button" id="ITP_BTN_STINFO05010_DETAIL_SPPLY_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
140
-														<button type="button" id="ITP_BTN_STINFO05010_DETAIL_SPPLY_DELETE" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
141 148
 									                </div>
142
-									                <div class="col-xs-3 itp_in" style="padding-left: 5px; left:-40px;">
149
+									                <div class="col-xs-3 itp_in" style="padding-left: 5px;">
143 150
 														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SPPLY_ITEM_ID" class="form-control itp_input" name="spplyItemId" value="" placeholder="공급업체 품번" maxlength="100">
144 151
 									                </div>
145 152
 												</div>
@@ -168,51 +175,57 @@
168 175
 											</div>
169 176
 										</div>
170 177
 									</div>
171
-									<div class="itp_form_ip">	
178
+									<div class="itp_form_in">	
172 179
 										<div class="form-group">
173 180
 											<label class="col-xs-2 itp_lb">계약기간 *</label>
174
-											<div class="col-xs-3 itp_ip itp_noMar">
175
-												<div class="input-daterange input-group date">
176
-													<input type="text" id="ITP_FORM_STINFO05010_DETAIL_CONT_STT_DT" data-check-required="empty" class="form-control itp_input" name="contSttDt" value="" readonly>
177
-													<span class="input-group-addon itp_date_to">~</span>
178
-													<input type="text" id="ITP_FORM_STINFO05010_DETAIL_CONT_END_DT" data-check-required="empty" class="form-control itp_input" name="contEndDt" value="" readonly>
181
+											<div class="col-xs-4 itp_ip">
182
+												<div class="col-xs-10 itp_in">
183
+													<div class="input-daterange input-group date">
184
+														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_CONT_STT_DT" data-check-required="empty" class="form-control itp_input" name="contSttDt" value="" readonly>
185
+														<span class="input-group-addon itp_date_to">~</span>
186
+														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_CONT_END_DT" data-check-required="empty" class="form-control itp_input" name="contEndDt" value="" readonly>
187
+													</div>
179 188
 												</div>
180 189
 											</div>
181
-											<div class="col-xs-1 itp_ip"></div>
182 190
 											<label class="col-xs-2 itp_lb">리드타임</label>
183
-											<div class="col-xs-2 itp_ip noMar">
184
-												<input type="text" id="ITP_FORM_STINFO05010_DETAIL_LEAD_TIME" class="form-control itp_input" name="leadTime" value="" maxlength="100">
191
+											<div class="col-xs-4 itp_ip">
192
+												<div class="col-xs-5 itp_in">
193
+													<input type="text" id="ITP_FORM_STINFO05010_DETAIL_LEAD_TIME" class="form-control itp_input" name="leadTime" value="" maxlength="100">
194
+												</div>
195
+												<label>(Day)</label>
185 196
 											</div>
186
-											<label class="itp_ip">(Day)</label>
187
-											<div class="col-xs-1 itp_ip"></div>
188 197
 										</div>								
189 198
 									</div>
190 199
 									<div class="itp_form_in">	
191 200
 										<div class="form-group">
192 201
 											<label class="col-xs-2 itp_lb">단위 *</label>
193
-											<div class="col-xs-2 itp_ip itp_noMar">
194
-								                <select id="ITP_FORM_STINFO05010_DETAIL_UNIT" data-select-code="DSTRBT_COST_UNIT" data-check-required="empty" class="form-control itp_input" name="unit" disabled></select>
202
+											<div class="col-xs-4 itp_ip">
203
+												<div class="col-xs-5 itp_in">
204
+								                	<select id="ITP_FORM_STINFO05010_DETAIL_UNIT" data-select-code="DSTRBT_COST_UNIT" data-check-required="empty" class="form-control itp_input" name="unit" disabled></select>
205
+												</div>
195 206
 											</div>
196
-											<div class="col-xs-2 itp_ip"></div>
197 207
 											<label class="col-xs-2 itp_lb">단가</label>
198
-											<div class="col-xs-3 itp_ip noMar">
199
-												<input type="text" id="ITP_FORM_STINFO05010_DETAIL_UNIT_AMT" class="form-control itp_input" name="unitAmt" value="" maxlength="100">
208
+											<div class="col-xs-4 itp_ip">
209
+												<div class="col-xs-5 itp_in">
210
+													<input type="text" id="ITP_FORM_STINFO05010_DETAIL_UNIT_AMT" class="form-control itp_input" name="unitAmt" value="" maxlength="100">
211
+												</div>
200 212
 											</div>
201
-											<label class="itp_in">&nbsp;</label>
202 213
 										</div>								
203 214
 									</div>
204 215
 									<div class="itp_form_in">	
205 216
 										<div class="form-group">
206 217
 											<label class="col-xs-2 itp_lb">통화 *</label>
207
-											<div class="col-xs-2 itp_ip itp_noMar">
208
-						                		<select id="ITP_FORM_STINFO05010_DETAIL_CURR" data-select-code="CURR" data-check-required="empty" class="form-control itp_input" name="curr"></select>
218
+											<div class="col-xs-4 itp_ip">
219
+												<div class="col-xs-5 itp_in">
220
+							                		<select id="ITP_FORM_STINFO05010_DETAIL_CURR" data-select-code="CURR" data-check-required="empty" class="form-control itp_input" name="curr"></select>
221
+						                		</div>
209 222
 					                		</div>
210
-											<div class="col-xs-2 itp_ip"></div>
211 223
 											<label class="col-xs-2 itp_lb">매장판매단가</label>
212
-											<div class="col-xs-2 itp_ip noMar">
213
-												<input type="text" id="ITP_FORM_STINFO05010_DETAIL_STORE_SALE_UNIT_AMT" class="form-control itp_input" name="storeSaleUnitAmt" value="" maxlength="100">
224
+											<div class="col-xs-4 itp_ip">
225
+												<div class="col-xs-5 itp_in">
226
+													<input type="text" id="ITP_FORM_STINFO05010_DETAIL_STORE_SALE_UNIT_AMT" class="form-control itp_input" name="storeSaleUnitAmt" value="" maxlength="100">
227
+												</div>
214 228
 											</div>
215
-											<label class="col-xs-3 itp_in">&nbsp;</label>
216 229
 										</div>								
217 230
 									</div>
218 231
 									<div class="itp_form_info">	

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

@@ -49,12 +49,22 @@
49 49
 							  <input type="hidden" id="ITP_FORM_STINFO06010_DETAIL_STORE_ID" name="storeId" value="">
50 50
 							  <input type="hidden" id="ITP_FORM_STINFO06010_DETAIL_VIEW_CD" name="viewCd" value="R">
51 51
 				             <div class="form-group">
52
-				                <div class="col-xs-3 itp_ip itp_noMar">
52
+				                <div class="col-xs-3 itp_ip itp_noMar" style="display: none;">
53 53
 				                	<input type="text" id="ITP_FORM_STINFO06010_DETAIL_STORE_NM" data-check-required="empty" class="form-control itp_input" name="storeNm" placeholder="매장명" disabled />
54
+				               		<span class="input-group-btn">
55
+										<button id="ITP_BTN_STINFO06010_DETAIL_DELETE_STORE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-search"></i></button>
56
+									</span>
54 57
 				                </div>
58
+				                <div class="col-xs-3 itp_ip">
59
+									<div class="input-group">
60
+				                		<input type="text" id="ITP_FORM_STINFO06010_DETAIL_STORE_NM" class="form-control itp_input" name="storeNm" placeholder="매장명" disabled />
61
+										<span class="input-group-btn">
62
+											<button id="ITP_BTN_STINFO06010_DETAIL_DELETE_STORE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-search"></i></button>
63
+										</span>
64
+									</div>
65
+								</div>
55 66
 				                <div class="col-xs-2 itp_ip itp_noMar" style="width:10%;">
56 67
 									<button type="button" id="ITP_BTN_STINFO06010_DETAIL_SEARCH_STORE" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
57
-									<button type="button" id="ITP_BTN_STINFO06010_DETAIL_DELETE_STORE" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
58 68
 				                </div>
59 69
 								 <div class="contDt">
60 70
 									 <label class="col-xs-1 itp_ip itp_noMar" style="top:6px;">계약기간</label>

+ 3 - 5
src/main/webapp/app/vendinfo/VENDINFO02010.html

@@ -17,13 +17,11 @@
17 17
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID" name="sspplyId">
18 18
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_SEARCH_BRAND_ID" name="sbrandId">
19 19
 									<div class="form-group">
20
+										<div class="col-xs-2 itp_ip itp_noMar"></div>
20 21
 										<div class="col-xs-2 itp_ip itp_noMar">
21
-											<input type="text" id="ITP_FORM_VENDINFO02010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체 선택" data-check-required="empty" readonly/>
22
-										</div>
23
-										<div class="col-xs-2 itp_ip itp_noMar">
24
-											<!-- <select id="ITP_FORM_VENDINFO02010_SERVICE_ST_CD" data-select-code="ST_CD" class="form-control itp_input" name="sitemStCd">
22
+											<select id="ITP_FORM_VENDINFO02010_SEARCH_ITEM_ST_CD" data-select-code="ITEM_ST_CD" class="form-control itp_input" name="sitemStCd">
25 23
 												<option value="N"></option>
26
-											</select>	 -->									
24
+											</select>										
27 25
 										</div>
28 26
 										<div class="col-xs-2 itp_ip itp_noMar">
29 27
 											<select id="ITP_FORM_VENDINFO02010_SEARCH_PODR_PSSBL_DVSN" data-select-code="PODR_PSSBL_DVSN" class="form-control itp_input" name="spodrPssblDvsn">

File diff suppressed because it is too large
+ 2 - 2
src/main/webapp/bootstrap/dist/css/bootstrap.min.css


+ 5 - 4
src/main/webapp/css/style.css

@@ -557,12 +557,12 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
557 557
 #ITP_ASIDE .itp_modal .modal-title {font-size:16px; color:#fff;}
558 558
 #ITP_ASIDE .itp_modal .itp_alert_txt {font-size:15px; padding:15px 0 10px 0;}
559 559
 #ITP_ASIDE .itp_modal .itp_form {padding:0 15px 0 15px;}
560
-#ITP_ASIDE .itp_modal .itp_form .form-group {margin-bottom:10px;}
560
+#ITP_ASIDE .itp_modal .itp_form .form-group {margin-bottom:0px; height:60px; border-bottom:1px solid #aaa;}
561 561
 #ITP_ASIDE .itp_modal .itp_form .form-group.border {border-bottom:1px solid #ddd;}
562 562
 #ITP_ASIDE .itp_modal .itp_form .form-control {font-size:13px; color:#333;}
563
-#ITP_ASIDE .itp_modal .itp_form .itp_lb {font-size:13px; padding-top:5px; padding-right:0; color:#333; position:relative;}
563
+#ITP_ASIDE .itp_modal .itp_form .itp_lb {top:0; font-size:13px; margin:0; padding:13px 12px; height:58px; background:#eee; width:100px; min-width:100px; border-right:1px solid #aaa;}
564 564
 #ITP_ASIDE .itp_modal .itp_form .itp_lb.itp_normal {font-weight:normal; padding-left:19px;}
565
-#ITP_ASIDE .itp_modal .itp_form .itp_ip {padding-left:0; padding-right:0;}
565
+#ITP_ASIDE .itp_modal .itp_form .itp_ip {padding:9px 0 0 10px;;}
566 566
 #ITP_ASIDE .itp_modal .itp_form .itp_ip.itp_pr {margin-right:0; padding-right:10px;}
567 567
 #ITP_ASIDE .itp_modal .itp_form .itp_ip.itp_noMar {margin-right:0; padding-right:0px;}
568 568
 #ITP_ASIDE .itp_modal .itp_form .itp_ip_offset {padding-left:15px;}
@@ -615,7 +615,8 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
615 615
     -o-transform:translate(0, calc(50vh - 50%));
616 616
     transform:translate(0, 50vh) translate(0, -50%);
617 617
 }
618
-#ITP_ASIDE .itp_modal .itp_form.itp_type1 {padding-left:0;}
618
+#ITP_ASIDE .itp_modal .itp_form.itp_type1 {padding:0; border:1px solid #aaa;}
619
+#ITP_ASIDE .itp_modal .itp_madal_header {padding-left:15px; border-bottom:1px solid #aaa;}
619 620
 #ITP_ASIDE .itp_modal .itp_form.itp_type1 .itp_help {font-size:12px; padding-top:6px;}
620 621
 #ITP_ASIDE .itp_modal .itp_form.itp_type1 .itp_txt {font-size:13px; width:auto; padding:5px 10px 0 0;}
621 622
 #ITP_ASIDE .itp_modal .itp_form.itp_type1 .itp_text {font-size:13px; padding-top:5px; display:block;}

+ 2 - 2
src/main/webapp/css/ui.jqgrid-bootstrap.css

@@ -232,7 +232,7 @@ div.tablediv > .table-bordered {
232 232
 .ui-jqgrid tr.jqfoot td {
233 233
 	white-space: nowrap;
234 234
 }
235
-.ui-jqgrid tr.ui-row-ltr td {font-size:13px;color:#333; font-weight:bold;}
235
+.ui-jqgrid tr.ui-row-ltr td {font-size:13px;color:#333;}
236 236
 .ui-jqgrid tr.ui-row-rtl td {font-size:13px;color:#333;}
237 237
 .ui-jqgrid .ui-jqgrid-resize-mark {
238 238
 	width:2px;
@@ -1039,4 +1039,4 @@ td.menu_text {
1039 1039
 
1040 1040
 .ui-jqgrid .jqgrid-rownum {background-color: transparent !important;}
1041 1041
 .table>tbody>tr.active .jqgrid-rownum {background:#e8e8e8 !important; z-index:1}
1042
-.table>tbody>tr.success .jqgrid-rownum {background:#FDFDF5 !important;}
1042
+.table>tbody>tr.success .jqgrid-rownum {background:#E3FEE4 !important;}

+ 21 - 43
src/main/webapp/js/app/collmng/ITP_COLLMNG01010.js

@@ -35,7 +35,7 @@ const gridColModel = {
35 35
 		{
36 36
 			index: 'BRAND_NM', name: 'brandNm',
37 37
 			label: ITP_MSG_LOCALE.label.brandNm, 			// 브랜드명
38
-			width: '10', fixed: false, align: 'center',
38
+			width: '10', fixed: false, align: 'left',
39 39
 			sortable: false, hidden: false
40 40
 		},
41 41
 		{
@@ -47,7 +47,7 @@ const gridColModel = {
47 47
 		{
48 48
 			index: 'RTN_ODR_STNM', name: 'rtnOdrStNm',
49 49
 			label: ITP_MSG_LOCALE.label.rtnOdrStNm, 		// 번품발주상태명
50
-			width: '8', fixed: false, align: 'center',
50
+			width: '8', fixed: false, align: 'left',
51 51
 			sortable: false, hidden: false
52 52
 		},
53 53
 		{
@@ -65,7 +65,7 @@ const gridColModel = {
65 65
 		{
66 66
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
67 67
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, 			// 수거장소
68
-			width: '10', fixed: false, align: 'center',
68
+			width: '10', fixed: false, align: 'left',
69 69
 			sortable: false, hidden: false
70 70
 		},
71 71
 		{
@@ -78,13 +78,13 @@ const gridColModel = {
78 78
 		{
79 79
 			index: 'RTN_DODR_ITEM_QTY', name: 'rtnDodrItemQty',
80 80
 			label: ITP_MSG_LOCALE.label.rtnDodrItemQty, 	// 수거품목수
81
-			width: '6', fixed: false, align: 'center',
81
+			width: '6', fixed: false, align: 'right',
82 82
 			sortable: false, hidden: false
83 83
 		},
84 84
 		{
85 85
 			index: 'RTN_MGR_NM', name: 'rtnMgrNm',
86 86
 			label: ITP_MSG_LOCALE.label.rtnMgrNm, 			// 수거 담당자
87
-			width: '7', fixed: false, align: 'center',
87
+			width: '7', fixed: false, align: 'left',
88 88
 			sortable: false, hidden: false
89 89
 		}
90 90
 	],
@@ -93,48 +93,50 @@ const gridColModel = {
93 93
 		{
94 94
 			index: 'RTN_PODR_DTL_NO', name: 'rtnPodrDtlNo',
95 95
 			label: ITP_MSG_LOCALE.label.rtnPodrDtlNo, 		// 반품발주항번
96
-			width: '10', fixed: false, align: 'center',
96
+			width: '8', fixed: false, align: 'center',
97 97
 			sortable: false, hidden: false
98 98
 		},
99 99
 		{
100 100
 			index: 'ITEM_ID', name: 'itemId',
101 101
 			label: ITP_MSG_LOCALE.label.itemId, 			// 품목번호
102
-			width: '10', fixed: false, align: 'center',
102
+			width: '12', fixed: false, align: 'center',
103 103
 			sortable: false, hidden: false
104 104
 		},
105 105
 		{
106 106
 			index: 'ITEM_NM', name: 'itemNm',
107 107
 			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
108
-			width: '10', fixed: false, align: 'center',
108
+			width: '8', fixed: false, align: 'left',
109 109
 			sortable: false, hidden: false
110 110
 		},
111 111
 		{
112 112
 			index: 'UNIT_AMT', name: 'unitAmt',
113 113
 			label: ITP_MSG_LOCALE.label.unitAmt, 			// 단가
114
-			width: '10', fixed: false, align: 'center',
115
-			sortable: false, hidden: false
114
+			width: '5', fixed: false, align: 'right',
115
+			sortable: false, hidden: false,
116
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
116 117
 		},
117 118
 		{
118 119
 			index: 'UNIT', name: 'unit',
119 120
 			label: ITP_MSG_LOCALE.label.unit, 				// 기본단위
120
-			width: '10', fixed: false, align: 'center',
121
+			width: '7', fixed: false, align: 'center',
121 122
 			sortable: false, hidden: false
122 123
 		},
123 124
 		{
124 125
 			index: 'RTN_REQ_QTY', name: 'rtnReqQty',
125 126
 			label: ITP_MSG_LOCALE.label.rtnReqQty, 			// 수거수량
126
-			width: '10', fixed: false, align: 'center',
127
+			width: '5', fixed: false, align: 'right',
127 128
 			sortable: false, hidden: false
128 129
 		},
129 130
 		{
130 131
 			index: 'RTN_AMT', name: 'rtnAmt',
131 132
 			label: ITP_MSG_LOCALE.label.rtnAmt, 			// 수거금액
132
-			width: '10', fixed: false, align: 'center',
133
-			sortable: false, hidden: false
133
+			width: '5', fixed: false, align: 'right',
134
+			sortable: false, hidden: false,
135
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
134 136
 		},
135 137
 		{
136 138
 			index: 'COL_REQ_DT', name: 'colReqDt',
137
-			label: ITP_MSG_LOCALE.label.colReqDt, 			// 반품발주항번
139
+			label: ITP_MSG_LOCALE.label.colReqDt, 			// 수거요청일
138 140
 			width: '10', fixed: false, align: 'center',
139 141
 			sortable: false, hidden: false
140 142
 		}
@@ -173,7 +175,6 @@ let pageObj = {
173 175
 		},
174 176
 		grid: function() {
175 177
 			itp_fn_jqgrid_resize(COLLMNG01010_GRID_ID, COLLMNG01010_GRID_LIST, 'lg');
176
-			listObj.empty.init();
177 178
 			itp_fn_fire_window_resize();
178 179
 		},
179 180
 		ready: function() {
@@ -278,39 +279,23 @@ let listObj = {
278 279
 			let param = $('#ITP_FORM_COLLMNG01010_SEARCH').serializeObject();
279 280
 			param.gridSize = $.jgrid.defaults.rowNum;
280 281
             param.gridPage = $.jgrid.defaults.page;
281
-            //param.sbrandId = 'BRD221100002';            
282
-            //param.sspplyId = 'SPY221100004';
283
-            console.log(JSON.stringify(param));
284 282
             $(COLLMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
285 283
         }
286 284
 	},
287 285
 	empty: {
288 286
 		init: function() {
289
-            var _this = this;
290
-            this.push();
291
-            $(COLLMNG01010_GRID_EMPTY).on('click', function() {
292
-                _this.back();
293
-                listObj.itp_COLLMNG01010_param.gridSize = $.jgrid.defaults.rowNum;
294
-                $(COLLMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(listObj.itp_COLLMNG01010_param)}).trigger('reloadGrid');
295
-            });
287
+           
296 288
         },
297 289
         push: function() {
298
-            let param = $('#ITP_FORM_COLLMNG01010_SEARCH').serializeObject();
299
-            listObj.itp_COLLMNG01010_param = param;
300
-            //listObj.itp_COLLMNG01010_param.sbrandId = 'BRD221100002';            
301
-            //listObj.itp_COLLMNG01010_param.sspplyId = 'SPY221100004';
290
+          
302 291
         },
303 292
         back: function() {
304
-            $('#ITP_FORM_COLLMNG01010_SERVICE_BRAND_TYPE').val(listObj.itp_COLLMNG01010_param.brandType);
305
-            $('#ITP_FORM_COLLMNG01010_SERVICE_ST_CD').val(listObj.itp_COLLMNG01010_param.stCd);
306
-            $('#ITP_FORM_COLLMNG01010_SEARCH_BRAND_NM').val(listObj.itp_COLLMNG01010_param.brandNm);
307
-        	console.log(listObj.itp_COLLMNG01010_param);            
293
+          
308 294
         }
309 295
 	},
310 296
 	grid: {
311 297
 		init: function() {
312 298
 			// 데이터 없을때
313
-            listObj.empty.push();
314 299
             this.search();
315 300
 		},
316 301
 		colModel: gridColModel.list,
@@ -322,9 +307,6 @@ let listObj = {
322 307
 		load: function() {
323 308
             let param = $('#ITP_FORM_COLLMNG01010_SEARCH').serializeObject();
324 309
             param.gridSize = $.jgrid.defaults.rowNum;
325
-            //param.sbrandId = 'BRD221100002';            
326
-            //param.sspplyId = 'SPY221100004';
327
-            console.log(JSON.stringify(param));
328 310
             var option = {
329 311
             	gridId: COLLMNG01010_GRID_ID,
330 312
             	colModel: gridColModel.list,
@@ -344,7 +326,6 @@ let listObj = {
344 326
                     }
345 327
 				},
346 328
 				loadComplete: function(data) {
347
-					console.log(data);
348 329
                     itp_fn_grid_load_complete(data, COLLMNG01010_GRID_ID, true, 'number', 'COLLMNG01010', listObj.itp_COLLMNG01010_search, listObj.empty, true, data.gridRecords, true);
349 330
                     var ids = $(COLLMNG01010_GRID_ID).getDataIDs();
350 331
                     $.each(ids, function(idx, rowId) {
@@ -431,9 +412,7 @@ let viewObj = {
431 412
 	load: function(param) {
432 413
 		fn_ajax_call(API_RTNMNG_RTN_INFO_INFO_RTNODR, param, this.callback, 'GET');
433 414
 	},
434
-	callback: function(result) {
435
-		console.log(result);
436
-		
415
+	callback: function(result) {		
437 416
 		pageObj.switchScreen('MODIFY');
438 417
 		$('#ITP_FORM_COLLMNG01010_DETAIL .fnBrandNm').text(result.brandNm);							// 브랜드명
439 418
 		$('#ITP_FORM_COLLMNG01010_DETAIL .fnRtnPodrUnqNo').text(result.rtnPodrUnqNo);				// 발주번호
@@ -469,7 +448,6 @@ let viewObj = {
469 448
 				data: gridData,
470 449
 				multiselect: true,
471 450
 				loadComplete: function(data) {
472
-					console.log(data);
473 451
 					itp_fn_grid_load_complete(data, COLLMNG01010_DETAIL_GRID_ID, true, 'number', 'COLLMNG01010', viewObj.itp_COLLMNG01010_search, viewObj.empty, true, data.gridRecords, true);
474 452
 				}
475 453
 			};

+ 5 - 18
src/main/webapp/js/app/collmng/ITP_COLLMNG02010.js

@@ -48,7 +48,7 @@ const gridColModel = {
48 48
 		{
49 49
 			index: 'BRAND_NM', name: 'brandNm',
50 50
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
51
-			width: '10', fixed: false, align: 'center',
51
+			width: '10', fixed: false, align: 'left',
52 52
 			sortable: false, hidden: false
53 53
 		},
54 54
 		{
@@ -172,7 +172,7 @@ const gridColModel = {
172 172
 		{
173 173
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
174 174
 			label: ITP_MSG_LOCALE.label.rtnRsnDvsnNm, //반품사유
175
-			width: '10', fixed: false, align: 'center',
175
+			width: '10', fixed: false, align: 'left',
176 176
 			sortable: false, hidden: false
177 177
 		},
178 178
 		{
@@ -230,7 +230,6 @@ let pageObj = {
230 230
 		},
231 231
 		grid: function() {
232 232
 			itp_fn_jqgrid_resize(COLLMNG02010_GRID_ID, COLLMNG02010_GRID_LIST, 'lg');
233
-			listObj.empty.init();
234 233
 			itp_fn_fire_window_resize();
235 234
 		},
236 235
 		ready: function() {
@@ -404,31 +403,19 @@ let listObj = {
404 403
 	},
405 404
 	empty: {
406 405
 		init: function() {
407
-			var _this = this;
408
-			this.push();
409
-			$(COLLMNG02010_GRID_EMPTY).on('click', function() {
410
-				_this.back();
411
-				_this.itp_COLLMNG02010_param.gridSize = $.jgrid.defaults.rowNum;
412
-				$(COLLMNG02010_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_COLLMNG02010_param)}).trigger('reloadGrid');
413
-			});
406
+		
414 407
 		},
415 408
 		itp_COLLMNG02010_param: {},
416 409
 		push: function() {
417
-			let param = $('#ITP_FORM_COLLMNG02010_SEARCH').serializeObject();
418
-			listObj.itp_COLLMNG02010_param = param;
410
+			
419 411
 		},
420 412
 		back: function() {
421
-			$('#ITP_FORM_COLLMNG02010_SEARCH_FROM_DT').val(this.itp_COLLMNG02010_param.fromDt);
422
-			$('#ITP_FORM_COLLMNG02010_SEARCH_TO_DT').val(this.itp_COLLMNG02010_param.toDt);
423
-			$('#ITP_FORM_COLLMNG02010_SEARCH_SRTN_WHS_NM').val(this.itp_COLLMNG02010_param.ssrtnWhsNm);
424
-			$('#ITP_FORM_COLLMNG02010_SEARCH_SRTN_WHS_ID').val(this.itp_COLLMNG02010_param.ssrtnWhsId);
425
-			$('#ITP_FORM_COLLMNG02010_SEARCH_ITEM_NM').val(this.itp_COLLMNG02010_param.sItemNm);
413
+			
426 414
 		}
427 415
 	},
428 416
 	grid: {
429 417
 		init: function () {
430 418
 			// 데이터 없을때
431
-			listObj.empty.push();
432 419
 			itp_fn_jqgrid_resize(COLLMNG02010_GRID_ID, COLLMNG02010_GRID_LIST, 'lg');
433 420
 			itp_fn_fire_window_resize();
434 421
 			this.search();

+ 10 - 38
src/main/webapp/js/app/collmng/ITP_COLLMNG03010.js

@@ -35,7 +35,7 @@ const gridColModel = {
35 35
 		{
36 36
 			index: 'BRAND_NM', name: 'brandNm',
37 37
 			label: ITP_MSG_LOCALE.label.brandNm,			// 브랜드명
38
-			width: '10', fixed: false, align: 'center',
38
+			width: '10', fixed: false, align: 'left',
39 39
 			sortable: false, hidden: false
40 40
 		},
41 41
 		{
@@ -47,7 +47,7 @@ const gridColModel = {
47 47
 		{
48 48
 			index: 'PICK_ST_NM', name: 'pickStNm',
49 49
 			label: ITP_MSG_LOCALE.label.pickStNm,			// 수거서상태
50
-			width: '6', fixed: false, align: 'center',
50
+			width: '6', fixed: false, align: 'left',
51 51
 			sortable: false, hidden: false
52 52
 		},
53 53
 		{
@@ -77,13 +77,13 @@ const gridColModel = {
77 77
 		{
78 78
 			index: 'ITEM_NM', name: 'itemNm',
79 79
 			label: ITP_MSG_LOCALE.label.itemNm,				// 품목명
80
-			width: '8', fixed: false, align: 'center',
80
+			width: '8', fixed: false, align: 'left',
81 81
 			sortable: false, hidden: false
82 82
 		},
83 83
 		{
84 84
 			index: 'COL_REQ_QTY', name: 'colReqQty',
85 85
 			label: ITP_MSG_LOCALE.label.colReqQty,			// 수거수량
86
-			width: '5', fixed: false, align: 'center',
86
+			width: '5', fixed: false, align: 'right',
87 87
 			sortable: false, hidden: false
88 88
 		},		
89 89
 		{
@@ -109,13 +109,13 @@ const gridColModel = {
109 109
 		{
110 110
 			index: 'WHS_NM', name: 'whsNm',
111 111
 			label: ITP_MSG_LOCALE.label.whsNm,				// 납품장소
112
-			width: '10', fixed: false, align: 'center',
112
+			width: '10', fixed: false, align: 'left',
113 113
 			sortable: false, hidden: false
114 114
 		},
115 115
 		{
116 116
 			index: 'PICK_MGR_NM', name: 'pickMgrNm',
117 117
 			label: ITP_MSG_LOCALE.label.pickMgrNm,			// 수거담당자
118
-			width: '10', fixed: false, align: 'center',
118
+			width: '10', fixed: false, align: 'left',
119 119
 			sortable: false, hidden: false
120 120
 		},
121 121
 		{
@@ -163,7 +163,6 @@ let pageObj = {
163 163
 		},
164 164
 		grid: function() {
165 165
 			itp_fn_jqgrid_resize(COLLMNG03010_GRID_ID, COLLMNG03010_GRID_LIST, 'lg');
166
-			listObj.empty.init();
167 166
 			itp_fn_fire_window_resize();
168 167
 		},
169 168
 		ready: function() {
@@ -229,7 +228,6 @@ let pageObj = {
229 228
 			selRowData = $(COLLMNG03010_GRID_ID).jqGrid('getRowData', selectedIds[i]);		//cell 선택
230 229
 		}
231 230
 		const key = {brandId: selRowData.brandId, colPickUnqNo: selRowData.colPickUnqNo};		// popup key 값 설정
232
-		console.log(key);
233 231
 		fn_call_popup('biz', 'BIZPOP_COL_STTMT_PRN', '#ITP_ASIDE', null, key, 'S');
234 232
 	}
235 233
 };
@@ -249,35 +247,23 @@ let listObj = {
249 247
 			let param = $('#ITP_FORM_COLLMNG03010_SEARCH').serializeObject();
250 248
 			param.gridSize = $.jgrid.defaults.rowNum;
251 249
             param.gridPage = $.jgrid.defaults.page;
252
-            console.log(1234);
253
-            console.log(JSON.stringify(param));
254 250
             $(COLLMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
255 251
         }
256 252
 	},
257 253
 	empty: {
258 254
 		init: function() {
259
-			var _this = this;
260
-            this.push();
261
-            $(COLLMNG03010_GRID_EMPTY).on('click', function() {
262
-                _this.back();
263
-                listObj.itp_COLLMNG03010_param.gridSize = $.jgrid.defaults.rowNum;
264
-                $(COLLMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(listObj.itp_COLLMNG03010_param)}).trigger('reloadGrid');
265
-            });
255
+			
266 256
 		},
267 257
 		push: function() {
268
-            let param = $('#ITP_FORM_COLLMNG03010_SEARCH').serializeObject();
269
-            listObj.itp_COLLMNG03010_param = param;
258
+           
270 259
         },
271 260
         back: function() {
272
-            $('#ITP_FORM_COLLMNG03010_SERVICE_BRAND_TYPE').val(listObj.itp_COLLMNG03010_param.brandType);
273
-            $('#ITP_FORM_COLLMNG03010_SERVICE_ST_CD').val(listObj.itp_COLLMNG03010_param.stCd);
274
-            $('#ITP_FORM_COLLMNG03010_SEARCH_BRAND_NM').val(listObj.itp_COLLMNG03010_param.brandNm);
261
+           
275 262
         }
276 263
 	},
277 264
 	grid: {
278 265
 		init: function() {
279 266
 			// 데이터 없을때
280
-            listObj.empty.push();
281 267
             this.search();
282 268
 		},
283 269
 		colModel: gridColModel.list,
@@ -289,7 +275,6 @@ let listObj = {
289 275
 		load: function() {
290 276
             let param = $('#ITP_FORM_COLLMNG03010_SEARCH').serializeObject();
291 277
             param.gridSize = $.jgrid.defaults.rowNum;
292
-            console.log(JSON.stringify(param));
293 278
             var option = {
294 279
             	gridId: COLLMNG03010_GRID_ID,
295 280
             	colModel: gridColModel.list,
@@ -298,20 +283,8 @@ let listObj = {
298 283
             	pager: COLLMNG03010_GRID_PAGER,
299 284
             	multiselect: true,
300 285
 				multiboxonly : false,
301
-				rownumbers: false,/*
302
-            	onCellSelect: function(rowId, cellIdx, cellValue) {
303
-                    var cm = $(this).jqGrid('getGridParam', 'colModel');
304
-                    var colNm = cm[cellIdx].name;
305
-                    if (colNm === 'pchPodrUnqNo') {
306
-                        const pchPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'pchPodrUnqNo');
307
-                        const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
308
-                        const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal};
309
-                        var param = $.param(key);
310
-                        modifyObj.init(param);
311
-                    }
312
-				},*/
286
+				rownumbers: false,
313 287
 				loadComplete: function(data) {
314
-					console.log(data);
315 288
                     itp_fn_grid_load_complete(data, COLLMNG03010_GRID_ID, true, 'number', 'COLLMNG03010', listObj.itp_COLLMNG03010_search, listObj.empty, true, data.gridRecords, true);
316 289
 				},
317 290
 				onPaging: function(action) {
@@ -350,7 +323,6 @@ let listObj = {
350 323
 	},
351 324
 	callback: {
352 325
 		create: function(rowDataPop) {
353
-			console.log(rowDataPop);
354 326
 			$('#ITP_FORM_COLLMNG03010_SEARCH_WHS_ID').val(rowDataPop.whsId);
355 327
 			$('#ITP_FORM_COLLMNG03010_SEARCH_WHS_NM').val(rowDataPop.whsNm);
356 328
 		}

+ 8 - 17
src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js

@@ -49,7 +49,7 @@ const gridColModel = {
49 49
 		{
50 50
 			index: 'BRAND_NM', name: 'brandNm',
51 51
 			label: ITP_MSG_LOCALE.label.brandNm, 		// 브랜드명
52
-			width: '7', fixed: false, align: 'center',
52
+			width: '7', fixed: false, align: 'left',
53 53
 			sortable: false, hidden: false
54 54
 		},
55 55
 		{
@@ -61,7 +61,7 @@ const gridColModel = {
61 61
 		{
62 62
 			index: 'PCH_ORD_ST_CD', name: 'pchOdrStCd',
63 63
 			label: ITP_MSG_LOCALE.label.pchOdrStNm, 	// 발주상태
64
-			width: '5', fixed: false, align: 'center',
64
+			width: '5', fixed: false, align: 'left',
65 65
 			sortable: false, formatter: 'select',
66 66
 			editoptions: {value: ITP_COMMON_PCH_ODR_ST_CD}
67 67
 		},
@@ -80,7 +80,7 @@ const gridColModel = {
80 80
 		{
81 81
 			index: 'WHS_NM', name: 'whsNm',
82 82
 			label: ITP_MSG_LOCALE.label.whsNm, 			// 납품장소
83
-			width: '10', fixed: false, align: 'center',
83
+			width: '10', fixed: false, align: 'left',
84 84
 			sortable: false, hidden: false
85 85
 		},
86 86
 		{
@@ -93,7 +93,7 @@ const gridColModel = {
93 93
 		{
94 94
 			index: 'SPPLY_ITME_ID', name: 'podrItemQty',
95 95
 			label: ITP_MSG_LOCALE.label.podrItemQty, 	// 발주품목수
96
-			width: '4', fixed: false, align: 'center',
96
+			width: '4', fixed: false, align: 'right',
97 97
 			sortable: false, hidden: false
98 98
 		},
99 99
 		{
@@ -119,13 +119,13 @@ const gridColModel = {
119 119
 		{
120 120
 			index: 'ITEM_NM', name: 'itemNm',
121 121
 			label: ITP_MSG_LOCALE.label.itemNm, 		// 품목명
122
-			width: '8', fixed: false, align: 'center',
122
+			width: '8', fixed: false, align: 'left',
123 123
 			sortable: false, hidden: false
124 124
 		},
125 125
 		{
126 126
 			index: 'UNIT_AMT', name: 'unitAmt',
127 127
 			label: ITP_MSG_LOCALE.label.unitAmt, 		// 단가
128
-			width: '8', fixed: false, align: 'center',
128
+			width: '8', fixed: false, align: 'right',
129 129
 			sortable: false, hidden: false,
130 130
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
131 131
 		},
@@ -138,13 +138,13 @@ const gridColModel = {
138 138
 		{
139 139
 			index: 'PODR_QTY', name: 'podrQty',
140 140
 			label: ITP_MSG_LOCALE.label.podrQty, 		// 발주수량
141
-			width: '8', fixed: false, align: 'center',
141
+			width: '8', fixed: false, align: 'right',
142 142
 			sortable: false, hidden: false
143 143
 		},
144 144
 		{
145 145
 			index: 'PODR_AMT', name: 'podrAmt',
146 146
 			label: ITP_MSG_LOCALE.label.podrAmt, 		// 발주금액
147
-			width: '8', fixed: false, align: 'center',
147
+			width: '8', fixed: false, align: 'right',
148 148
 			sortable: false, hidden: false,
149 149
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
150 150
 		}
@@ -294,9 +294,7 @@ let listObj = {
294 294
 			let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
295 295
 			param.gridSize = $.jgrid.defaults.rowNum;
296 296
             param.gridPage = $.jgrid.defaults.page;
297
-            //param.sspplyId = LOGIN_USER_INFO.spplyId;
298 297
             param.sidx = '0';
299
-            console.log(JSON.stringify(param));
300 298
             $(ORDMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
301 299
         }
302 300
 	},
@@ -311,7 +309,6 @@ let listObj = {
311 309
 	grid: {
312 310
 		init: function() {
313 311
 			// 데이터 없을때
314
-            //listObj.empty.push();
315 312
             this.search();
316 313
 		},
317 314
 		colModel: gridColModel.list,
@@ -323,9 +320,7 @@ let listObj = {
323 320
 		load: function() {
324 321
             let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
325 322
             param.gridSize = $.jgrid.defaults.rowNum;
326
-            //param.sspplyId = LOGIN_USER_INFO.spplyId;
327 323
             param.sidx = '0';
328
-            console.log(JSON.stringify(param));
329 324
             var option = {
330 325
             	gridId: ORDMNG01010_GRID_ID,
331 326
             	colModel: gridColModel.list,
@@ -345,7 +340,6 @@ let listObj = {
345 340
                     }
346 341
 				},
347 342
 				loadComplete: function(data) {
348
-					console.log(data);
349 343
                     itp_fn_grid_load_complete(data, ORDMNG01010_GRID_ID, true, 'number', 'ORDMNG01010', listObj.itp_ORDMNG01010_search, listObj.empty, true, data.gridRecords, true);
350 344
                     var ids = $(ORDMNG01010_GRID_ID).getDataIDs();
351 345
                     $.each(ids, function(idx, rowId) {
@@ -432,8 +426,6 @@ let viewObj = {
432 426
 		fn_ajax_call(API_POMNG_PO_INFO_SPPLY_PCHORD, param, this.callback, 'GET');
433 427
 	},
434 428
 	callback: function(result) {
435
-		console.log(result);
436
-
437 429
 		// 그리드 전화번호 '-' 함수
438 430
 		function convertTel(value){
439 431
 			answer = (value.startsWith('0')) ? value.replace(/[^0-9]/g, "")
@@ -476,7 +468,6 @@ let viewObj = {
476 468
 				data: gridData,
477 469
 				multiselect: true,
478 470
 				loadComplete: function(data) {
479
-					console.log(data);
480 471
 					itp_fn_grid_load_complete(data, ORDMNG01010_VIEW_GRID_ID, true, 'number', 'ORDMNG01010', viewObj.itp_ORDMNG01010_search, viewObj.empty, true, data.gridRecords, true);
481 472
 				}
482 473
 			};

+ 10 - 28
src/main/webapp/js/app/ordmng/ITP_ORDMNG02010.js

@@ -48,7 +48,7 @@ const gridColModel = {
48 48
 		{
49 49
 			index: 'BRAND_NM', name: 'brandNm',
50 50
 			label: ITP_MSG_LOCALE.label.brandNm, 			//브랜드명
51
-			width: '6', fixed: false, align: 'center',
51
+			width: '6', fixed: false, align: 'left',
52 52
 			sortable: false, hidden: false
53 53
 		},
54 54
 		{
@@ -72,7 +72,7 @@ const gridColModel = {
72 72
 		{
73 73
 			index: 'WHS_NM', name: 'whsNm',
74 74
 			label: ITP_MSG_LOCALE.label.whsNm, 				//납품장소
75
-			width: '11', fixed: false, align: 'center',
75
+			width: '11', fixed: false, align: 'left',
76 76
 			sortable: false, hidden: false
77 77
 		},
78 78
 		{
@@ -84,13 +84,13 @@ const gridColModel = {
84 84
 		{
85 85
 			index: 'ITEM_NM', name: 'itemNm',
86 86
 			label: ITP_MSG_LOCALE.label.itemNm, 			//품목명
87
-			width: '6', fixed: false, align: 'center',
87
+			width: '6', fixed: false, align: 'left',
88 88
 			sortable: false, hidden: false
89 89
 		},
90 90
 		{
91 91
 			index: 'PODR_QTY', name: 'podrQty',
92 92
 			label: ITP_MSG_LOCALE.label.podrQty, 			//발주수량
93
-			width: '4', fixed: false, align: 'center',
93
+			width: '4', fixed: false, align: 'right',
94 94
 			sortable: false, hidden: false
95 95
 		},
96 96
 		{
@@ -148,7 +148,6 @@ let pageObj = {
148 148
 		},
149 149
 		grid: function() {
150 150
 			itp_fn_jqgrid_resize(ORDMNG02010_GRID_ID, ORDMNG02010_GRID_LIST, 'lg');
151
-			listObj.empty.init();
152 151
 			itp_fn_fire_window_resize();
153 152
 		},
154 153
 		ready: function() {
@@ -229,7 +228,6 @@ let listObj = {
229 228
 			let param = $('#ITP_FORM_ORDMNG02010_SEARCH').serializeObject();
230 229
 			param.gridSize = $.jgrid.defaults.rowNum;
231 230
             param.gridPage = $.jgrid.defaults.page;
232
-            console.log(JSON.stringify(param));
233 231
             $(ORDMNG02010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
234 232
         },
235 233
         create: function() {
@@ -251,28 +249,18 @@ let listObj = {
251 249
 	},
252 250
 	empty: {
253 251
 		init: function() {
254
-			var _this = this;
255
-            this.push();
256
-            $(ORDMNG02010_GRID_EMPTY).on('click', function() {
257
-                _this.back();
258
-                listObj.itp_ORDMNG02010_param.gridSize = $.jgrid.defaults.rowNum;
259
-                $(ORDMNG02010_GRID_ID).setGridParam({'postData': JSON.stringify(listObj.itp_ORDMNG02010_param)}).trigger('reloadGrid');
260
-            });
252
+			
261 253
 		},
262 254
 		push: function() {
263
-            let param = $('#ITP_FORM_ORDMNG02010_SEARCH').serializeObject();
264
-            listObj.itp_ORDMNG02010_param = param;
255
+         
265 256
         },
266 257
         back: function() {
267
-            $('#ITP_FORM_ORDMNG02010_SERVICE_BRAND_TYPE').val(listObj.itp_ORDMNG02010_param.brandType);
268
-            $('#ITP_FORM_ORDMNG02010_SERVICE_ST_CD').val(listObj.itp_ORDMNG02010_param.stCd);
269
-            $('#ITP_FORM_ORDMNG02010_SEARCH_BRAND_NM').val(listObj.itp_ORDMNG02010_param.brandNm);
258
+       
270 259
         }
271 260
 	},
272 261
 	grid: {
273 262
 		init: function() {
274 263
 			// 데이터 없을때
275
-            listObj.empty.push();
276 264
             this.search();
277 265
 		},
278 266
 		colModel: gridColModel.list,
@@ -284,7 +272,6 @@ let listObj = {
284 272
 		load: function() {
285 273
             let param = $('#ITP_FORM_ORDMNG02010_SEARCH').serializeObject();
286 274
             param.gridSize = $.jgrid.defaults.rowNum;
287
-            console.log(JSON.stringify(param));
288 275
             var option = {
289 276
             	gridId: ORDMNG02010_GRID_ID,
290 277
             	colModel: gridColModel.list,
@@ -295,7 +282,6 @@ let listObj = {
295 282
 				multiboxonly : false,
296 283
 				rownumbers: false,
297 284
 				loadComplete: function(data) {
298
-					console.log(data);
299 285
                     itp_fn_grid_load_complete(data, ORDMNG02010_GRID_ID, true, 'number', 'ORDMNG02010', listObj.itp_ORDMNG02010_search, listObj.empty, true, data.gridRecords, true);
300 286
 				},
301 287
 				onPaging: function(action) {
@@ -334,7 +320,6 @@ let listObj = {
334 320
 	},
335 321
 	callback: {
336 322
 		create: function(rowDataPop) {
337
-			console.log(rowDataPop);
338 323
 			$('#ITP_FORM_ORDMNG02010_SEARCH_WHS_ID').val(rowDataPop.whsId);
339 324
 			$('#ITP_FORM_ORDMNG02010_SEARCH_WHS_NM').val(rowDataPop.whsNm);
340 325
 		}
@@ -371,7 +356,6 @@ let modifyObj = {
371 356
 			var modalFn = {
372 357
 				callBack: (args) => {
373 358
 					param.gridInsertData = rowData;
374
-					console.log(param);
375 359
 					var searhFn = function () {
376 360
 						ITP_FORM_OPER03010_DETAIL_IS_WRITING = false;
377 361
 						listObj.grid.search();
@@ -427,7 +411,6 @@ let modifyObj = {
427 411
 		fn_ajax_call(API_POMNG_INOUTMNG_INIT_SPPLY_INV, param, this.callback, 'GET');
428 412
 	},
429 413
 	callback: function(result) {
430
-		console.log(result);
431 414
 		pageObj.switchScreen('MODIFY');
432 415
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnBrandNm').text(result.brandNm);										// 브랜드
433 416
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnPchPodrUnqNo').text(result.invPoInfoList[0].pchPodrUnqNo);			// 발주번호		
@@ -510,7 +493,7 @@ let modifyObj = {
510 493
 					{
511 494
 						index: 'ITEM_NM', name: 'itemNm',
512 495
 						label: ITP_MSG_LOCALE.label.itemNm,  			//품목명
513
-						width: '10', fixed: false, align: 'center',
496
+						width: '10', fixed: false, align: 'left',
514 497
 						sortable: false, hidden: false, edittype: 'text',
515 498
 						editable: false
516 499
 					},
@@ -531,14 +514,14 @@ let modifyObj = {
531 514
 					{
532 515
 						index: 'PODR_QTY', name: 'podrQty',
533 516
 						label: ITP_MSG_LOCALE.label.podrQty,  			//발주수량
534
-						width: '8', fixed: false, align: 'center',
517
+						width: '8', fixed: false, align: 'right',
535 518
 						sortable: false, hidden: false, edittype: 'text',
536 519
 						editable: false
537 520
 					},
538 521
 					{
539 522
 						index: 'SHMT_QTY', name: 'shmtQty',
540 523
 						label: ITP_MSG_LOCALE.label.shmtQty, 	 		//출하수량
541
-						width: '8', fixed: false, align: 'center',
524
+						width: '8', fixed: false, align: 'right',
542 525
 						sortable: false, hidden: false, edittype: 'text',
543 526
 						editable: true, editrules: {number: true, custom: true, custom_func: shmtQtyValue}
544 527
 					},
@@ -576,7 +559,6 @@ let modifyObj = {
576 559
 				data: gridData,
577 560
 				multiselect: true,
578 561
 				loadComplete: function(data) {
579
-					console.log(data);
580 562
 					itp_fn_grid_load_complete(data, ORDMNG02010_DETAIL_GRID_ID, true, 'number', 'ORDMNG02010', modifyObj.itp_ORDMNG02010_search, modifyObj.empty, true, data.gridRecords, true);
581 563
 				},
582 564
 				onCellSelect: function(rowId, cellIdx, cellValue) {

+ 12 - 21
src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -36,7 +36,7 @@ const gridColModel = {
36 36
 			{
37 37
 				index: 'Brand_Nm', name: 'brandNm',			//정렬가능 여부,화면표시 여부
38 38
 				label: ITP_MSG_LOCALE.label.brandNm, 		//브랜드이름
39
-				width: '10', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
39
+				width: '10', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
40 40
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부	
41 41
 			},
42 42
 			{
@@ -46,9 +46,9 @@ const gridColModel = {
46 46
 				sortable: false, hidden: false					//정렬가능 여부,화면표시 여부
47 47
 			},
48 48
 			{
49
-				index: 'ITEM_ST_CD', name: 'dlvStCd',		//서버로 전송시 데이터 명 , 데이터명
50
-				label: '납품상태', 								//납품서상태
51
-				width: '12', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
49
+				index: 'DLV_ST_NM', name: 'dlvStNm',		//서버로 전송시 데이터 명 , 데이터명
50
+				label: '납품상태', 							//납품서상태
51
+				width: '12', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
52 52
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
53 53
 			},
54 54
 			{
@@ -84,19 +84,19 @@ const gridColModel = {
84 84
 			{
85 85
 				index: 'PODR_PSSBLDVSN_NM', name: 'itemNm',	//서버로 전송시 데이터 명 , 데이터명
86 86
 				label: ITP_MSG_LOCALE.label.itemNm, 		//품목명
87
-				width: '10', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
87
+				width: '10', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
88 88
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
89 89
 			},
90 90
 			{
91 91
 				index: 'PODR_QTY', name: 'podrQty',			//서버로 전송시 데이터 명 , 데이터명
92 92
 				label: ITP_MSG_LOCALE.label.podrQty, 		//수주수량
93
-				width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
93
+				width: '6', fixed: false, align: 'right',	// cell가로넓이,고정 여부 ,text정렬 
94 94
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
95 95
 			},
96 96
 			{
97 97
 				index: 'SALE_ITEM_YN', name: 'dlvQty',		//서버로 전송시 데이터 명 , 데이터명
98 98
 				label: ITP_MSG_LOCALE.label.dlvQty, 		//납품수량
99
-				width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
99
+				width: '6', fixed: false, align: 'right',	// cell가로넓이,고정 여부 ,text정렬 
100 100
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
101 101
 			},
102 102
 			{
@@ -108,20 +108,20 @@ const gridColModel = {
108 108
 			{
109 109
 				index: 'PCH_ITEM_YN', name: 'unitAmt',		//서버로 전송시 데이터 명 , 데이터명
110 110
 				label: ITP_MSG_LOCALE.label.unitAmt, 		//납품금액
111
-				width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
111
+				width: '6', fixed: false, align: 'right ',	// cell가로넓이,고정 여부 ,text정렬 
112 112
 				sortable: false, hidden: false,				//정렬가능 여부,화면표시 여부
113 113
 				formatter: 'integer', formatoptions: {thousandsSeparator: ','}
114 114
 			},
115 115
 			{
116 116
 				index: 'SALE_ITEM_YN', name: 'whsNm',		//서버로 전송시 데이터 명 , 데이터명
117 117
 				label: ITP_MSG_LOCALE.label.whsNm, 			//납품장소
118
-				width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
118
+				width: '6', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
119 119
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
120 120
 			},
121 121
 			{
122 122
 				index: 'PCH_ITEM_YN', name: 'dlvMgrNm',		//서버로 전송시 데이터 명 , 데이터명
123 123
 				label: ITP_MSG_LOCALE.label.dlvMgrNm, 		//납품담당자
124
-				width: '8', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
124
+				width: '8', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
125 125
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
126 126
 			},
127 127
 			{
@@ -244,25 +244,16 @@ let listObj = {
244 244
 	},
245 245
 	empty: {
246 246
 		init: function() {
247
-			var _this = this; //_this = this
248
-			this.push(); //push 부르기
249
-			
250
-			/*물어봐야할것들*/
251
-			$(ORDMNG03010_GRID_EMPTY).on('click', function() {
252
-					_this.itp_ORDMNG03010_param.gridSize = $.jgrid.defaults.rowNum; 
253
-					$(ORDMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_ORDMNG03010_param)}).trigger('reloadGrid');
254
-			});
247
+		
255 248
 		},
256 249
 		itp_ORDMNG03010_param: {},//현재 정보는 없음
257 250
 		push: function() {
258
-			let param = $('#ITP_FORM_ORDMNG03010_SEARCH').serializeObject(); //param 값 선언
259
-			listObj.itp_ORDMNG03010_param = param;//두개의 값은 같다
251
+		
260 252
 		}
261 253
 	},
262 254
 	grid: {
263 255
 		init: function () {
264 256
 				// 데이터 없을때
265
-			listObj.empty.push();//listObj 에서 empty 에서 push 불러오기
266 257
 			this.search();//search 불러오기
267 258
 		},
268 259
 		colModel: gridColModel.list,	//컬럼정보

+ 4 - 6
src/main/webapp/js/app/vendinfo/ITP_VENDINFO01010.js

@@ -54,20 +54,20 @@ const gridColModel = {
54 54
 		{
55 55
 			index: 'ASSGN_TASK_NM', name: 'spplyMgrNm',
56 56
 			label: ITP_MSG_LOCALE.label.spplyMgrNm, 	//담당자명
57
-			width: '20', fixed: false, align: 'center',
57
+			width: '10', fixed: false, align: 'left',
58 58
 			sortable: false, editable: true, edittype: 'text',
59 59
 			editrules: {required: true}
60 60
 		},
61 61
         {
62 62
             index: 'POSITION', name: 'position',
63 63
             label: ITP_MSG_LOCALE.label.position,		// 직위
64
-            width: '10', fixed: false, align: 'center',
64
+            width: '10', fixed: false, align: 'left',
65 65
             sortable: false, hidden: false, editable: true, edittype: 'text'
66 66
         },
67 67
         {
68 68
             index: 'RPRST_EMAL', name: 'rprstEmal',
69 69
             label: ITP_MSG_LOCALE.label.rprstEmal,		// 이메일
70
-            width: '10', fixed: false, align: 'center',
70
+            width: '10', fixed: false, align: 'left',
71 71
             sortable: false, hidden: false, editable: true, edittype: 'text'
72 72
         },
73 73
         {
@@ -80,7 +80,7 @@ const gridColModel = {
80 80
         {
81 81
             index: 'ASSGN_TASK', name: 'assgnTask',
82 82
             label: ITP_MSG_LOCALE.label.assgnTaskNm,	// 담당업무
83
-            width: '10', fixed: false, align: 'center',
83
+            width: '10', fixed: false, align: 'left',
84 84
             sortable: false, editable: true, formatter: 'select', edittype: 'select',
85 85
 			editoptions: {value: ITP_COMMON_ASSGN_TASK},
86 86
 			editrules: {required: false}
@@ -255,7 +255,6 @@ let pageObj = {
255 255
 				data: gridData,
256 256
 				multiselect: (this.mode !== 'VIEW'),
257 257
 				loadComplete: function(data) {
258
-					console.log(data);
259 258
 					itp_fn_grid_load_complete(data, VENDINFO01010_DETAIL_GRID_ID, true, 'number', 'VENDINFO01010', modifyObj.itp_VENDINFO01010_search, modifyObj.empty, true, data.gridRecords, true);
260 259
 					let gridList = VENDINFO01010_DETAIL_GRID_LIST;
261 260
 					$(gridList).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
@@ -331,7 +330,6 @@ let modifyObj = {
331 330
 						param.gridUpdateData = gridUpdateData;
332 331
 						param.gridDeleteData = gridDeleteData;
333 332
 						param.brandId = LOGIN_USER_INFO.brandId;
334
-						console.log(JSON.stringify(param));
335 333
 						var searhFn = function() {
336 334
 							ITP_FORM_VENDINFO01010_DETAIL_IS_WRITING = false;
337 335
 							modifyObj.init();

+ 6 - 11
src/main/webapp/js/app/vendinfo/ITP_VENDINFO02010.js

@@ -32,37 +32,37 @@ const gridColModel = {
32 32
 			{
33 33
 				index: 'ITEM_ID', name: 'itemId',  			//서버로 전송시 데이터 명 , 데이터명
34 34
 				label: ITP_MSG_LOCALE.label.itemId, 		//품목번호
35
-				width: '12', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
35
+				width: '12', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
36 36
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
37 37
 			},
38 38
 			{
39 39
 				index: 'ITEM_NM', name: 'itemNm',			//서버로 전송시 데이터 명 , 데이터명
40 40
 				label: ITP_MSG_LOCALE.label.itemNm, 		//품목명
41
-				width: '13', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
41
+				width: '13', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
42 42
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
43 43
 			},
44 44
 			{
45 45
 				index: 'ITEM_TYPE_NM', name: 'itemTypeNm',	//서버로 전송시 데이터 명 , 데이터명
46 46
 				label: ITP_MSG_LOCALE.label.itemTypeNm, 	//품목유형
47
-				width: '10', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
47
+				width: '10', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
48 48
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
49 49
 			},
50 50
 			{
51 51
 				index: 'ITEM_CLASS_NM', name: 'itemClassNm',//서버로 전송시 데이터 명 , 데이터명
52 52
 				label: ITP_MSG_LOCALE.label.itemClassNm, 	//품목분류
53
-				width: '12', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
53
+				width: '12', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
54 54
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
55 55
 			},
56 56
 			{
57 57
 				index: 'ITEM_ST_NM', name: 'itemStNm',		//서버로 전송시 데이터 명 , 데이터명
58 58
 				label: "상태", 								//상태
59
-				width: '8', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
59
+				width: '8', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
60 60
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
61 61
 			},
62 62
 			{
63 63
 				index: 'PODR_PSSBLDVSN_NM', name: 'podrPssblDvsnNm',//서버로 전송시 데이터 명 , 데이터명
64 64
 				label: ITP_MSG_LOCALE.label.podrPssblDvsnNm, //발주여부
65
-				width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
65
+				width: '6', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
66 66
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
67 67
 			},
68 68
 			{
@@ -175,7 +175,6 @@ let listObj = {
175 175
 	grid: {
176 176
 		init: function () {
177 177
 				// 데이터 없을때
178
-				//listObj.empty.push();//listObj 에 empty 에 push 불러오기
179 178
 				this.search(); //search 불러오기
180 179
 		},
181 180
 		colModel: gridColModel.list,//컬럼정보
@@ -201,7 +200,6 @@ let listObj = {
201 200
 					}
202 201
 				},	
203 202
 				loadComplete: function(data) {
204
-					console.log(data); //콘솔 data 출력
205 203
 					if(data && data.length > 0) {
206 204
 						itp_fn_grid_load_complete(data, VENDINFO02010_GRID_ID, true, 'number', 'VENDINFO02010', listObj.itp_VENDINFO02010_search, listObj.empty, true, data.gridRecords, true);
207 205
 						var ids = $(VENDINFO02010_GRID_ID).getDataIDs();
@@ -238,7 +236,6 @@ let listObj = {
238 236
 							}
239 237
 					},
240 238
 					loadComplete: function(data) {
241
-							console.log(data);
242 239
 							itp_fn_grid_load_complete(data, VENDINFO02010_GRID_ID, true, 'number', 'VENDINFO02010', listObj.itp_VENDINFO02010_search, listObj.empty, true, data.gridRecords, true);
243 240
 							var ids = $(VENDINFO02010_GRID_ID).getDataIDs();
244 241
 							$.each(ids, function(idx, rowId) {
@@ -333,5 +330,3 @@ let viewObj = {
333 330
 	}
334 331
 };
335 332
 
336
-
337
-

+ 3 - 6
src/main/webapp/js/app/vendinfo/ITP_VENDINFO03010.js

@@ -29,7 +29,7 @@ const gridColModel = {
29 29
 		{
30 30
 			index: 'ITEM_NM', name: 'itemNm',
31 31
 			label: ITP_MSG_LOCALE.label.itemNm, 	//품목명
32
-			width: '8', fixed: false, align: 'center',
32
+			width: '8', fixed: false, align: 'left',
33 33
 			sortable: false, hidden: false
34 34
 		},
35 35
 		{
@@ -66,13 +66,13 @@ const gridColModel = {
66 66
 		{
67 67
 			index: 'LEAD_TIME', name: 'leadTime',
68 68
 			label: ITP_MSG_LOCALE.label.leadTime, 	//리드타임 (Day)
69
-			width: '7', fixed: false, align: 'center',
69
+			width: '7', fixed: false, align: 'right',
70 70
 			sortable: false, hidden: false
71 71
 		},
72 72
 		{
73 73
 			index: 'UNIT_ST_NM', name: 'unitStNm',
74 74
 			label: ITP_MSG_LOCALE.label.status, 	//상태
75
-			width: '7', fixed: false, align: 'center',
75
+			width: '5', fixed: false, align: 'left',
76 76
 			sortable: false, hidden: false
77 77
 		},
78 78
 		{
@@ -116,7 +116,6 @@ let pageObj = {
116 116
 		},
117 117
 		grid: function() {
118 118
 			itp_fn_jqgrid_resize(VENDINFO03010_GRID_ID, VENDINFO03010_GRID_LIST, 'lg');
119
-			//listObj.empty.init();
120 119
 			itp_fn_fire_window_resize();
121 120
 		},
122 121
 		ready: function() {
@@ -192,7 +191,6 @@ let listObj = {
192 191
     grid: {
193 192
         init: function () {
194 193
             // 데이터 없을때
195
-            //listObj.empty.push();
196 194
             this.search();
197 195
 
198 196
         },
@@ -214,7 +212,6 @@ let listObj = {
214 212
                 pager: VENDINFO03010_GRID_PAGER,
215 213
                 rownumbers: false,
216 214
                 loadComplete: function(data) {
217
-                    console.log(data);
218 215
                     itp_fn_grid_load_complete(data, VENDINFO03010_GRID_ID, true, 'number', 'VENDINFO03010', listObj.itp_VENDINFO03010_search, listObj.empty, true, data.gridRecords, true);
219 216
                     var ids = $(VENDINFO03010_GRID_ID).getDataIDs();
220 217
                     $.each(ids, function(idx, rowId) {

+ 119 - 188
src/main/webapp/mobile/app/main.html

@@ -24,206 +24,137 @@
24 24
 	<script src="../js/properties.js"></script>
25 25
 	<script src="../../js/require.min.js" data-main="../js/config.js"></script>
26 26
 </head>
27
-	<body>
28
-		<div id="ITP_WRAPPER">
29
-			<header>
30
-				<div class="header_wrap">
31
-					<div class="menu_logo">
32
-						<button id="ITP_MOBILE_BTN_MENU"><img src="../img/menu.png" alt=""></button>
33
-						<button id="ITP_MOBILE_BTN_HOME"><img src="../img/home.png" alt=""></button>
34
-					</div>
35
-					<div class="logout">
36
-						<button id="ITP_MOBILE_BTN_LOGOUT">로그<br>아웃</button>
37
-					</div>
38
-					<div class="name_info">
39
-						<label>
40
-							<div class="fnBrnadNm">브랜드명</div>
41
-						</label>
42
-						<label class="fnLblDash">
43
-							<div>-</div>
44
-						</label>
45
-						<label class="fnLblStoreNm">
46
-							<div class="fnStoreNm">매장명</div>
47
-						</label>
48
-					</div>
49
-				</div>
50
-			</header>
27
+<body>
28
+<div id="ITP_WRAPPER">
29
+	<header>
30
+		<div class="header_wrap">
31
+			<div class="menu_logo">
32
+				<button id="ITP_MOBILE_BTN_MENU"><img src="../img/menu.png" alt=""></button>
33
+				<button id="ITP_MOBILE_BTN_HOME"><img src="../img/home.png" alt=""></button>
34
+			</div>
35
+			<div class="logout">
36
+				<button id="ITP_MOBILE_BTN_LOGOUT">로그<br>아웃</button>
37
+			</div>
38
+			<div class="name_info">
39
+				<label>
40
+					<div class="fnMenuNm"></div>
41
+				</label>
42
+				<label>
43
+					<div class="fnBrnadNm">브랜드명</div>
44
+				</label>
45
+				<label class="fnLblDash">
46
+					<div>-</div>
47
+				</label>
48
+				<label class="fnLblStoreNm">
49
+					<div class="fnStoreNm">매장명</div>
50
+				</label>
51
+			</div>
52
+		</div>
53
+	</header>
51 54
 
52
-			<div id="ITP_MENU" style="display: none;">
53
-				<div class="menu_area">
54
-					<button class="ITP_BTN_CLOSE"><img src="../img/close2.png"></button>
55
+	<div id="ITP_MENU" style="display: none;">
56
+		<div class="menu_area">
57
+			<button class="ITP_BTN_NAV_CLOSE"><img src="../img/close2.png"></button>
58
+		</div>
59
+		<div class="menu_bar">
60
+			<div class="menu_header">
61
+				<div class="brand_img">
62
+					<img src="../img/naver.png">
63
+				</div>
64
+				<div class="user_info">
65
+					<div id="ITP_LOGIN_USER_NM" class=""></div>
66
+					<label>사장님</label>
67
+					<div id="ITP_LOGIN_USER_ID" class="id"></div>
55 68
 				</div>
56
-				<div class="menu_bar">
57
-					<div class="menu_header">
58
-						<div class="brand_img">
59
-							<img src="../img/naver.png">
69
+				<div class="setting">
70
+					<button id="ITP_MOBILE_BTN_SETTING"><img src="../img/gear.png"></button>
71
+				</div>
72
+			</div>
73
+			<nav id="ITP_SIDEBAR" class="itp_open_nav">
74
+				<ul class="panel-group itp_nav"></ul>
75
+				<textarea id="ITP_AJAX_MAIN_SIDE_LEVEL2_ROWCOPY" rows="0" cols="0" style="display:none;">
76
+				<li class="panel panel-default">
77
+					<div class="panel-heading">
78
+						<div class="panel-title">
79
+							<a class="accordion-toggle" data-toggle="collapse" href="">
80
+								<span class="fnMenuNm">메뉴명</span>
81
+								<i class="indicator glyphicon glyphicon-chevron-down pull-right"></i>
82
+							</a>
60 83
 						</div>
61
-						<div class="user_info">
62
-							<div id="ITP_LOGIN_USER_NM" class=""></div>
63
-							<label>사장님</label>
64
-							<div id="ITP_LOGIN_USER_ID" class="id">asdf1234</div>
84
+					</div>
85
+					<div class="panel-collapse collapse" id="">
86
+						<div class="panel-body itp_svgs_body">
87
+							<ul class="itp_svgs fnLevelBottomList"></ul>
65 88
 						</div>
66
-						<div class="setting">
67
-							<button id="ITP_MOBILE_BTN_SETTING"><img src="../img/gear.png"></button>
89
+					</div>
90
+				</li>
91
+				</textarea>
92
+				<textarea id="ITP_AJAX_MAIN_SIDE_LEVEL3_ROWCOPY" rows="0" cols="0" style="display:none;">
93
+				<li>
94
+					<div class="itp_svg_in">
95
+						<a href="javascript:void(0)" data-itp-nav-id="" data-conn-url="" id="" class="itp_nav_link fix">
96
+							<i class="glyphicon glyphicon-chevron-right"></i>
97
+							<span class="itp_tt fnMenuNm">메뉴명</span>
98
+						</a>
99
+					</div>
100
+				</li>
101
+				</textarea>
102
+				<ul class="nav_bottom">
103
+					<li>
104
+						<div class="panel-heading">
105
+							<span class="fnMenuNm">버전</span>
106
+							<span class="fnVersion ver">1.0.3</span>
107
+							<!--<span class="show">최신버전</span>-->
68 108
 						</div>
109
+					</li>
110
+				</ul>
111
+			</nav>
112
+		</div>
113
+	</div>
114
+
115
+	<div id="ITP_CONTAINER" class="fix">
116
+		<div class="itp_mobile_contents">
117
+
118
+		</div>
119
+	</div>
120
+	<footer id="ITP_FOOTER">
121
+		<div id="ITP_MODAL_ALERT" class="modal itp_modal">
122
+			<div class="modal-dialog modal-sm">
123
+				<div class="modal-content">
124
+					<div class="modal-header">
125
+						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
126
+						<h5 class="modal-title">알림</h5>
127
+					</div>
128
+					<div class="modal-body">
129
+						<div class="text-center itp_alert_txt"></div>
69 130
 					</div>
70
-					<div id="ITP_SIDEBAR" class="menu_select" style="overflow:auto;">
71
-						<ul class="panel-group itp_nav"></ul>
72
-						<ul>
73
-							<textarea id="ITP_AJAX_MAIN_SLIDE_LEVEL2_ROWCOPY" rows="0" cols="0" style="display:none;">
74
-								<li class="panel_list">
75
-									<div class="panel_heading accordion-toggle">
76
-										<span data-toggle="collapse" href="" class="fnMenuNm"></span>
77
-									</div>
78
-									<div class="panel_body">
79
-										<ul class="fnLevelBottomList"></ul>
80
-									</div>
81
-								</li>
82
-							</textarea>
83
-							<textarea id="ITP_AJAX_MAIN_SLIDE_LEVEL3_ROWCOPY" rows="0" cols="0" style="display:none;">
84
-								<li>
85
-									<div data-itp-nav-id="" data-conn-url="" id="" class="itp_svg_in itp_nav_link fix">
86
-										<i><img src="../img/arrow_right.png"></i>
87
-										<span class="fnMenuNm"></span>
88
-									</div>
89
-								</li>
90
-							</textarea>
91
-							<!--<li class="panel_list">
92
-								<div class="panel_heading">
93
-									<span class="fnMenuNm">발주관리</span>
94
-								</div>
95
-								<div class="panel_body">
96
-									<ul>
97
-										<li>
98
-											<div class="itp_svg_in">
99
-												<i><img src="../img/arrow_right.png"></i>
100
-												<span class="fnMenuNm">구매요청생성</span>
101
-											</div>
102
-										</li>
103
-										<li>
104
-											<div class="itp_svg_in">
105
-												<i><img src="../img/arrow_right.png"></i>
106
-												<span class="fnMenuNm">구매요청현황</span>
107
-											</div>
108
-										</li>
109
-										<li>
110
-											<div class="itp_svg_in">
111
-												<i><img src="../img/arrow_right.png"></i>
112
-												<span class="fnMenuNm">입고처리</span>
113
-											</div>
114
-										</li>
115
-										<li>
116
-											<div class="itp_svg_in">
117
-												<i><img src="../img/arrow_right.png"></i>
118
-												<span class="fnMenuNm">입고현황</span>
119
-											</div>
120
-										</li>
121
-									</ul>
122
-								</div>
123
-							</li>
124
-							<li class="panel_list">
125
-								<div class="panel_heading">
126
-									<span class="fnMenuNm">반품관리</span>
127
-								</div>
128
-								<div class="panel_body">
129
-									<ul>
130
-										<li>
131
-											<div class="itp_svg_in">
132
-												<i><img src="../img/arrow_right.png"></i>
133
-												<span class="fnMenuNm">반품요청</span>
134
-											</div>
135
-										</li>
136
-										<li>
137
-											<div class="itp_svg_in">
138
-												<i><img src="../img/arrow_right.png"></i>
139
-												<span class="fnMenuNm">반품요청현황</span>
140
-											</div>
141
-										</li>
142
-										<li>
143
-											<div class="itp_svg_in">
144
-												<i><img src="../img/arrow_right.png"></i>
145
-												<span class="fnMenuNm">반품발주현황</span>
146
-											</div>
147
-										</li>
148
-										<li>
149
-											<div class="itp_svg_in">
150
-												<i><img src="../img/arrow_right.png"></i>
151
-												<span class="fnMenuNm">반품처리</span>
152
-											</div>
153
-										</li>
154
-										<li>
155
-											<div class="itp_svg_in">
156
-												<i><img src="../img/arrow_right.png"></i>
157
-												<span class="fnMenuNm">반품현황</span>
158
-											</div>
159
-										</li>
160
-									</ul>
161
-								</div>
162
-							</li>
163
-							<li class="panel_list">
164
-								<div class="panel_heading">
165
-									<span class="fnMenuNm">여신관리</span>
166
-								</div>
167
-							</li>
168
-							<li class="panel_list">
169
-								<div class="panel_heading">
170
-									<span class="fnMenuNm">재고관리</span>
171
-								</div>
172
-							</li>-->
173
-							<li class="panel_list">
174
-								<div class="panel_heading">
175
-									<span class="fnMenuNm">버전</span>
176
-									<span class="fnVersion ver">1.0.3</span>
177
-									<span class="show">최신버전</span>
178
-								</div>
179
-							</li>
180
-						</ul>
131
+					<div class="modal-footer">
132
+						<button type="button" class="btn btn-default" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
133
+						<button type="button" class="btn btn-primary" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
181 134
 					</div>
182 135
 				</div>
183 136
 			</div>
184
-			<div id="ITP_CONTAINER" class="fix">
185
-				<div class="itp_mobile_contents">
137
+		</div>
186 138
 
187
-				</div>
188
-			</div>
189
-			<footer id="ITP_FOOTER">
190
-				<div id="ITP_MODAL_ALERT" class="modal itp_modal">
191
-					<div class="modal-dialog modal-sm">
192
-						<div class="modal-content">
193
-							<div class="modal-header">
194
-								<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
195
-								<h5 class="modal-title">알림</h5>
196
-							</div>
197
-							<div class="modal-body">
198
-								<div class="text-center itp_alert_txt"></div>
199
-							</div>
200
-							<div class="modal-footer">
201
-								<button type="button" class="btn btn-default" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
202
-								<button type="button" class="btn btn-primary" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
203
-							</div>
204
-						</div>
139
+		<div id="ITP_MODAL_ALERT_AJAX" class="modal itp_modal">
140
+			<div class="modal-dialog modal-sm">
141
+				<div class="modal-content">
142
+					<div class="modal-header">
143
+						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
144
+						<h5 class="modal-title">알림</h5>
205 145
 					</div>
206
-				</div>
207
-
208
-				<div id="ITP_MODAL_ALERT_AJAX" class="modal itp_modal">
209
-					<div class="modal-dialog modal-sm">
210
-						<div class="modal-content">
211
-							<div class="modal-header">
212
-								<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
213
-								<h5 class="modal-title">알림</h5>
214
-							</div>
215
-							<div class="modal-body">
216
-								<div class="text-center itp_alert_txt"></div>
217
-							</div>
218
-							<div class="modal-footer">
219
-								<button type="button" class="btn btn-primary" id="ITP_MODAL_ALERT_AJAX_CONFIRM">확인</button>
220
-							</div>
221
-						</div>
146
+					<div class="modal-body">
147
+						<div class="text-center itp_alert_txt"></div>
148
+					</div>
149
+					<div class="modal-footer">
150
+						<button type="button" class="btn btn-primary" id="ITP_MODAL_ALERT_AJAX_CONFIRM">확인</button>
222 151
 					</div>
223 152
 				</div>
224
-			</footer>
225
-
226
-			<aside id="ITP_ASIDE"></aside>
153
+			</div>
227 154
 		</div>
228
-	</body>
155
+	</footer>
156
+
157
+	<aside id="ITP_ASIDE"></aside>
158
+</div>
159
+</body>
229 160
 </html>

+ 0 - 3
src/main/webapp/mobile/app/mcollmng/MCOLLMNG01010.html

@@ -53,9 +53,6 @@
53 53
 			  <ul id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWS" class="panel-group"></ul>
54 54
 			  <div id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWCOPY" style="display:none;">
55 55
 				<li class="history_list list-row">
56
-				  <div class="scroll_btn">
57
-			  		<input type="checkbox">
58
-			  	  </div>
59 56
 				  <div class="btn_check">
60 57
 					<div class="left">
61 58
 					  <div class="nomal">

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

@@ -46,7 +46,7 @@
46 46
 			  <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
47 47
 				<li class="history_list3 list-row">
48 48
 				  <div class="scroll_btn">
49
-			  		<input type="checkbox">
49
+			  		<input type="checkbox" id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_CHECKBOX">
50 50
 			  	  </div>
51 51
 				  <div class="btn_check">
52 52
 					<div class="left">

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

@@ -47,7 +47,7 @@
47 47
 			  <div id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWCOPY" style="display: block;">
48 48
 				<li class="history_list3 list-row">
49 49
 				  <div class="scroll_btn">
50
-			  		<input type="checkbox">
50
+			  		<input type="checkbox" id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_CHECKBOX">
51 51
 			  	  </div>
52 52
 				  <div class="btn_check">
53 53
 					<div class="left">

+ 0 - 3
src/main/webapp/mobile/app/mordmng/MORDMNG01010.html

@@ -55,9 +55,6 @@
55 55
 			  <ul id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWS" class="panel-group"></ul>
56 56
 			  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
57 57
 				<li class="history_list list-row">
58
-				  <div class="scroll_btn">
59
-			  		<input type="checkbox">
60
-			  	  </div>
61 58
 				  <div class="btn_check">
62 59
 					<div class="left">
63 60
 					  <div class="nomal">

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

@@ -49,10 +49,10 @@
49 49
 		  </div>
50 50
 		   <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
51 51
 			  <ul id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWS" class="panel-group"></ul>
52
-			  <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
52
+			  <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
53 53
 				<li class="history_list3 list-row">
54 54
 			 	  <div class="scroll_btn">
55
-				  	<input type="checkbox">
55
+				  	<input type="checkbox" id="ITP_LIST_MORDMNG02010_LIST_ITEM_CHECKBOX">
56 56
 				  </div>
57 57
 				  <div class="btn_check">
58 58
 					<div class="left">

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

@@ -46,7 +46,7 @@
46 46
 				<div id="ITP_LIST_MORDMNG03010_LIST_ITEM_ROWCOPY" style="display:none;">
47 47
 					<li class="history_list3 list-row">
48 48
 					<div class="scroll_btn">
49
-				  		<input type="checkbox">
49
+				  		<input type="checkbox" id="ITP_LIST_MORDMNG03010_LIST_ITEM_CHECKBOX">
50 50
 				  	</div>
51 51
 						<div class="btn_check">
52 52
 							<div class="left">

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

@@ -172,7 +172,7 @@
172 172
         <div class="line">
173 173
           <label>구매요청금액</label>
174 174
           <div class="line_right">
175
-            <div class="fnPchReqTotalAmt">0원</div>
175
+            <div class="fnPchReqAmtTot">0원</div>
176 176
           </div>
177 177
         </div>
178 178
         <div class="line">

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

@@ -113,31 +113,31 @@
113 113
 				<div class="line">
114 114
 					<label>발주일자</label>
115 115
 					<div class="line_right">
116
-						<div class="fnPodrDt">2022.10.10</div>
116
+						<div class="fnPodrDt"></div>
117 117
 					</div>
118 118
 				</div>
119 119
 				<div class="line">
120 120
 					<label>발주금액</label>
121 121
 					<div class="line_right">
122
-						<div class="fnPodrTotalAmt">424,000원</div>
122
+						<div class="fnPodrTotalAmt"></div>
123 123
 					</div>
124 124
 				</div>
125 125
 				<div class="line">
126 126
 					<label>납품장소</label>
127 127
 					<div class="line_right">
128
-						<div class="fnShmtWhsDvsnNm">A매장내</div>
128
+						<div class="fnShmtWhsDvsnNm"></div>
129 129
 					</div>
130 130
 				</div>
131 131
 				<div class="line">
132 132
 					<label>공급업체</label>
133 133
 					<div class="line_right">
134
-						<div class="fnSpplyNm">A공급업체</div>
134
+						<div class="fnSpplyNm"></div>
135 135
 					</div>
136 136
 				</div>
137 137
 				<div class="line">
138 138
 					<label>납기요청일</label>
139 139
 					<div class="line_right">
140
-						<div class="fnDlvReqDt">2022.10.10</div>
140
+						<div class="fnDlvReqDt"></div>
141 141
 					</div>
142 142
 				</div>
143 143
 				<div class="table_header">

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

@@ -6,7 +6,7 @@
6 6
 			<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_IDX" name="sidx" value="0">
7 7
 			<div class="content">
8 8
 				<div class="line">
9
-					<select class="label" name="dtlGubun" id="ITP_FORM_MPOMNG05010_LIST_DTL_GUBUN">
9
+					<select name="dtlGubun" id="ITP_FORM_MPOMNG05010_LIST_DTL_GUBUN">
10 10
 						<option value="1">발주생성일</option>
11 11
 						<option value="2">납품요청일</option>
12 12
 						<option value="3">납품예정일</option>

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

@@ -103,8 +103,8 @@
103 103
 							<div class="nomal">
104 104
 								<label>반품발주일자 &nbsp;:</label>
105 105
 								<div class="history">
106
-									<div class="fnRtnOdrRegDt">2022.10.01</div>
107
-									(<div class="fnRtnOdrMgrNm"></div>)
106
+									<div class="fnRtnOdrRegDt"></div>
107
+									(<div class="fnColDvsnNm"></div>)
108 108
 								</div>
109 109
 							</div>
110 110
 						</div>
@@ -112,11 +112,11 @@
112 112
 							<div class="nomal">
113 113
 								<label>반품발주상태 &nbsp;:</label>
114 114
 								<div class="history">
115
-									<div class="fnRtnOdrStNm">대기</div>
115
+									<div class="fnRtnOdrStNm"></div>
116 116
 								</div>
117 117
 								<label>납품장소명&nbsp;:</label>
118 118
 								<div class="history">
119
-									<div class="fnWhsNm">A매장내</div>
119
+									<div class="fnWhsNm"></div>
120 120
 								</div>
121 121
 							</div>
122 122
 						</div>
@@ -126,7 +126,7 @@
126 126
 								<div class="history">
127 127
 									<div class="fnRtnDodrItemQty">품목수($)</div>
128 128
 									<i>-</i>
129
-									<div class="fnRtnDodrTotalAmt">1,200,000</div>
129
+									<div class="fnRtnDodrTotalAmt"></div>
130 130
 								</div>
131 131
 							</div>
132 132
 						</div>
@@ -134,7 +134,7 @@
134 134
 							<div class="nomal">
135 135
 								<label>반품입고장소 &nbsp;:</label>
136 136
 								<div class="history">
137
-									<div class="fnRtnWhsNm">A공급업체</div>
137
+									<div class="fnRtnWhsNm"></div>
138 138
 								</div>
139 139
 							</div>
140 140
 						</div>
@@ -184,15 +184,15 @@
184 184
 								<div class="thick">
185 185
 									<div class="fnItemNm">품목명</div>
186 186
 									<i>-</i>
187
-									<div class="fnRtnQty"></div>
187
+									<div class="fnRtnOdrQty"></div>
188 188
 								</div>
189 189
 							</div>
190 190
 							<div class="left_info col-6">
191 191
 								<div class="thick">
192 192
 									<label>수량/금액</label>
193
-									<div class="fnRtnReqQty">2</div>
193
+									<div class="fnRtnReqQty"></div>
194 194
 									<i>/</i>
195
-									<div class="fnUnitAmt">24,000</div>
195
+									<div class="fnUnitAmt"></div>
196 196
 								</div>
197 197
 							</div>
198 198
 							<div class="left_info col-4">

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

@@ -25,7 +25,7 @@
25 25
 					<label>반품입고장소</label>
26 26
 					<div class="search_wrap">
27 27
 						<div class="float_left">
28
-							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="매장명">
28
+							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="매장명" readonly>
29 29
 							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
30 30
 						</div>
31 31
 						<div class="float_left_btn">

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

@@ -196,7 +196,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
196 196
 #ITP_MENU .menu_area {position: fixed; width: 100%; height: 100%; top: 0; left: -0%; background: #000; opacity: 0.7; z-index: 12; transition: all 0.5s;}
197 197
 #ITP_MENU .menu_area button {float: right; width: 20px; height: 20px; padding: 0; background: transparent; border: none;}
198 198
 #ITP_MENU .menu_area button img {float: right; width: 40px; height: 40px; margin: 7px;}
199
-#ITP_MENU .menu_bar {position: fixed; width: 80%; height: 100%; left: -0%; top: 0; background: #fff; opacity: 1; z-index: 13; transition: all 0.5s;}
199
+#ITP_MENU .menu_bar {position: fixed; width: 70%; height: 100%; left: -0%; top: 0; background: #fff; opacity: 1; z-index: 13; transition: all 0.5s;}
200 200
 #ITP_MENU .menu_bar .menu_header {width: 100%; height: 100px; border-bottom: 1px solid #000 ;}
201 201
 #ITP_MENU .menu_bar .menu_header .brand_img {position: absolute; width: 50px; height: 50px; margin: 20px 0 0 20px;}
202 202
 #ITP_MENU .menu_bar .menu_header .brand_img img {width: 50px; height: 50px; border: 1px solid #000; border-radius: 5px;}
@@ -216,6 +216,35 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
216 216
 #ITP_MENU .menu_bar .menu_select ul .panel_list .panel_body .itp_svg_in i {width: 30px; height: 30px;}
217 217
 #ITP_MENU .menu_bar .menu_select ul .panel_list .panel_body .itp_svg_in i img{width: 15px; height: 15px;}
218 218
 
219
+
220
+/* ITP_SIDEBAR */
221
+#ITP_SIDEBAR {width:0px; float:left; margin-left:-2px; height:calc(100vh - 68px); background:#ddd; transition:all .25s ease; border-style:solid; border-color:#ddd; border-width:0 1px 1px 1px;}
222
+#ITP_SIDEBAR.itp_open_nav {width: 100%; height: 100%;}
223
+#ITP_SIDEBAR .itp_nav {list-style:none; margin:0; padding:0; height:80%; overflow-y:scroll; overflow-x:hidden; visibility:hidden;}
224
+#ITP_SIDEBAR.itp_open_nav .itp_nav {visibility:visible;}
225
+#ITP_SIDEBAR.itp_open_nav .itp_nav::-webkit-scrollbar{display:none;}
226
+#ITP_SIDEBAR .itp_nav.panel-group .panel+.panel {margin-top:0;}
227
+#ITP_SIDEBAR .itp_nav .panel-heading {padding:0;}
228
+#ITP_SIDEBAR .itp_nav .panel-title {line-height:1.1; border-bottom:1px solid #ddd;}
229
+#ITP_SIDEBAR .itp_nav .panel-title a {font-size:20px; display:block; padding:13px 15px; color:#333;}
230
+#ITP_SIDEBAR .itp_nav .panel-title a:hover{text-decoration: none;}
231
+#ITP_SIDEBAR .itp_nav .panel-title a .glyphicon {font-size:12px;}
232
+#ITP_SIDEBAR .itp_nav .panel-default {margin-bottom:0; border:none;}
233
+#ITP_SIDEBAR .itp_nav * {border-radius:0; border-width:1px 0 1px 0;}
234
+#ITP_SIDEBAR .itp_nav .itp_svgs_body {padding:0; border-top:0; border-bottom:1px solid #ddd;}
235
+#ITP_SIDEBAR .itp_nav .itp_svgs {display:flex; align-content:flex-start; flex-direction:column; flex-wrap:wrap; overflow:auto;}
236
+#ITP_SIDEBAR .itp_nav .itp_svgs .itp_svg_in {position:relative;}
237
+#ITP_SIDEBAR .itp_nav .itp_svgs li a {display:block; width:100%; color:#333; padding:5px 10px 5px 17px;}
238
+#ITP_SIDEBAR .itp_nav .itp_svgs li:first-child a {padding-top:10px;}
239
+#ITP_SIDEBAR .itp_nav .itp_svgs li:last-child a {padding-bottom:10px;}
240
+#ITP_SIDEBAR .itp_nav .itp_svgs li a:hover, #ITP_SIDEBAR .itp_nav .itp_svgs li a:active {color:#000; font-weight:bold;}
241
+#ITP_SIDEBAR .itp_nav .itp_svgs li a .glyphicon {font-size:9px; float:left; margin:4px 6px 0 0;}
242
+#ITP_SIDEBAR .itp_nav .itp_svgs li a .itp_icon {font-size:9px; float:left; margin:4px 6px 0 15px;}
243
+#ITP_SIDEBAR .itp_nav .itp_svgs li a .itp_icon_5 {font-size:9px; float:left; margin:4px 6px 0 25px;}
244
+#ITP_SIDEBAR .itp_nav .itp_svgs li a .itp_tt {float:left;}
245
+
246
+#ITP_SIDEBAR.itp_open_nav .nav_bottom {visibility:visible;}
247
+
219 248
 /* 컨텐츠 화면 */
220 249
 
221 250
 

+ 3 - 14
src/main/webapp/mobile/js/app/main.js

@@ -12,20 +12,9 @@ require(['config'], function() {
12 12
 
13 13
 var mobMainObj = {
14 14
 	init: function () {
15
-
16
-	}
17
-};
18
-
19
-var itp_fn_barcode = {
20
-	init: function () {
21
-		this.event();
22
-	},
23
-	event: function () {
24
-		$('#ITP_BTN_BARCODE').on('click', function() {
25
-			$(location).attr('href', 'app:scan');
15
+		$('#ITP_BTN_CLOSE').on('click', function() {
16
+			console.log('ITP_BTN_CLOSE clicked!!!');
26 17
 		});
27 18
 	},
28
-	callback: function (barcode) {
29
-		alert(barcode);
30
-	}
19
+
31 20
 };

+ 7 - 7
src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG01010.js

@@ -181,17 +181,17 @@ let mobContentObj = {
181 181
 			var _this = this;
182 182
 			var id = '#ITP_AJAX_MCOLLMNG01010_VIEW_CONTAINER';
183 183
 			$(id).find('.fnBrandNm').text(result.brandNm);
184
-			$(id).find('.fnRtnPodrUnqNo').text(result.rtnPodrUnqNo);
185
-			$(id).find('.fnRtnOdrRegDt').text(result.rtnOdrRegDt);
186
-			$(id).find('.fnRtnOdrStNm').text(result.rtnOdrStNm);
187
-			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
188
-			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
189
-			$(id).find('.fnRtnMgrNm').text(result.rtnMgrNm);
184
+			$(id).find('.fnPchPodrUnqNo').text(result.pchPodrUnqNo);
185
+			$(id).find('.fnPodrDt').text(result.podrDt);
186
+			$(id).find('.fnPchOdrStNm').text(result.pchOdrStNm);
187
+			$(id).find('.fnWhsNm').text(result.whsNm);
188
+			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrItemQty));
189
+			$(id).find('.fnPodrMgrNm').text(result.podrMgrNm);
190 190
 			$.each(result.rtnOdrDtlList, function (i, item) {
191 191
 				$('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWCOPY').html());
192 192
 				var $li = $('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group > .list-row:last');
193 193
 				$li.find('.fnRtnPodrDtlNo').text(item.rtnPodrDtlNo);
194
-				$li.find('.fnItemId').text(item.itemId);
194
+				$li.find('.fnItemid').text(item.itemId);
195 195
 				$li.find('.fnItemNm').text(item.itemNm);
196 196
 				$li.find('.fnUnitQty').text(item.unitQty);
197 197
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));

+ 22 - 10
src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG02010.js

@@ -69,9 +69,15 @@ let mobPageObj = {
69 69
 				return false;
70 70
 			});
71 71
 
72
-			$(document).on('click', '#ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS li button', function() {
73
-				var item = mobContentObj.list.rows[$(this).index()];
74
-				mobContentObj.view.init(item);
72
+			// $(document).on('click', '#ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS li button', function() {
73
+			// 	var item = mobContentObj.list.rows[$(this).index()];
74
+			// 	mobContentObj.view.init(item);
75
+			// });
76
+			$(document).on('click', 'input[type="checkbox"][id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_CHECKBOX"]', function() {
77
+				if($(this).prop('checked')) {
78
+					$('input[type="checkbox"][id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_CHECKBOX"]').prop('checked', false);
79
+					$(this).prop('checked', true);
80
+				}
75 81
 			});
76 82
 
77 83
 			$(document).on('click', '#ITP_LIST_MCOLLMNG02010_POP_WHS_ROWS li button', function() {
@@ -120,7 +126,6 @@ let mobContentObj = {
120 126
 		totPage: 0,
121 127
 		isSearch: false,
122 128
 		rows: [],
123
-		iChoice: -1,
124 129
 		init: function() {
125 130
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
126 131
 			this.search();
@@ -129,7 +134,6 @@ let mobContentObj = {
129 134
 			this.listPage = 0;
130 135
 			this.totPage = 0;
131 136
 			this.rows.length = 0;
132
-			this.iChoice = -1;
133 137
 			$('#ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS').empty();
134 138
 			this.load();
135 139
 		},
@@ -166,11 +170,18 @@ let mobContentObj = {
166 170
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
167 171
 		},
168 172
 		colPrint: function() {
169
-			if(this.iChoice < 0) {
173
+			var iChoice = -1;
174
+			$('input[type="checkbox"][id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_CHECKBOX"]').each(function(index) {
175
+				if($(this).is(":checked")) {
176
+					iChoice = index;
177
+					return false;
178
+				}
179
+			});
180
+			if(iChoice === -1) {
170 181
 				alert("수거서를 선택해주세요 (대표 수거서번호)");
171 182
 				return;
172 183
 			}
173
-			mobContentObj.view.init(this.rows[this.iChoice]);
184
+			mobContentObj.view.init(this.rows[iChoice]);
174 185
 		}
175 186
 	},
176 187
 	view: {
@@ -243,15 +254,15 @@ let mobContentObj = {
243 254
 				var item = {
244 255
 					'rtnPodrDtlNo': row.rtnPodrDtlNo,
245 256
 					'rtnPodrUnqNo': row.rtnPodrUnqNo,
246
-					'colQty': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(),
257
+					'coltQty': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY').val(),
247 258
 					'rtnRsnDvsn': $(this).find("#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN option:selected").val(),
248 259
 					'rtnRsn': $(this).find('#ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN').val()
249 260
 				};
250
-				if(item.colQty.length < 1) {
261
+				if(item.coltQty.length < 1) {
251 262
 					alert('수거수량을 입력해 주세요.');
252 263
 					return false;
253 264
 				}
254
-				if(item.colQty > row.rtnOdrQty) {
265
+				if(item.coltQty > row.rtnOdrQty) {
255 266
 					alert('수거수량은 수거요청수량을 초과할 수 없습니다.');
256 267
 					return false;
257 268
 				}
@@ -259,6 +270,7 @@ let mobContentObj = {
259 270
 					alert('수거사유를 선택해 주세요.');
260 271
 					return false;
261 272
 				}
273
+				item.expryDate = item.expryDate.replace(/-/g, ".");
262 274
 				gridInsertData.push(item);
263 275
 				isValid = true;
264 276
 			});

+ 18 - 12
src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG03010.js

@@ -62,16 +62,20 @@ let mobPageObj = {
62 62
 			$('button[id^="ITP_BTN_MCOLLMNG03010_VIEW"]').on('click', function() {
63 63
 				var id = $(this).attr('id');
64 64
 				switch (id) {
65
-					case 'ITP_BTN_MCOLLMNG03010_VIEW_ADD'			: mobContentObj.view.add();		break;
65
+					case 'ITP_BTN_MCOLLMNG03010_VIEW_ADD'			: mobContentObj.view.add();	break;
66 66
 					case 'ITP_BTN_MCOLLMNG03010_VIEW_CONFIRM'		: mobContentObj.view.cancel();	break;
67 67
 				}
68 68
 				return false;
69 69
 			});
70 70
 
71
-			$(document).on('click', '#ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS li', function() {
72
-				// var item = mobContentObj.list.rows[$(this).index()];
73
-				// mobContentObj.view.init(item);
74
-				mobContentObj.list.iChoice = $(this).index();
71
+			// $(document).on('click', '#ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS li', function() {
72
+			// 	mobContentObj.list.iChoice = $(this).index();
73
+			// });
74
+			$(document).on('click', 'input[type="checkbox"][id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_CHECKBOX"]', function() {
75
+				if($(this).prop('checked')) {
76
+					$('input[type="checkbox"][id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_CHECKBOX"]').prop('checked', false);
77
+					$(this).prop('checked', true);
78
+				}
75 79
 			});
76 80
 
77 81
 			$(document).on('click', '#ITP_LIST_MCOLLMNG03010_POP_WHS_ROWS li button', function() {
@@ -120,7 +124,6 @@ let mobContentObj = {
120 124
 		totPage: 0,
121 125
 		isSearch: false,
122 126
 		rows: [],
123
-		iChoice: -1,
124 127
 		init: function() {
125 128
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
126 129
 			this.search();
@@ -129,7 +132,6 @@ let mobContentObj = {
129 132
 			this.listPage = 0;
130 133
 			this.totPage = 0;
131 134
 			this.rows.length = 0;
132
-			this.iChoice = -1;
133 135
 			$('#ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS').empty();
134 136
 			this.load();
135 137
 		},
@@ -165,11 +167,18 @@ let mobContentObj = {
165 167
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
166 168
 		},
167 169
 		colPrint: function() {
168
-			if(this.iChoice < 0) {
170
+			var iChoice = -1;
171
+			$('input[type="checkbox"][id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_CHECKBOX"]').each(function(index) {
172
+				if($(this).is(":checked")) {
173
+					iChoice = index;
174
+					return false;
175
+				}
176
+			});
177
+			if(iChoice === -1) {
169 178
 				alert("수거서를 선택해주세요 (대표 수거서번호)");
170 179
 				return;
171 180
 			}
172
-			mobContentObj.view.init(this.rows[this.iChoice]);
181
+			mobContentObj.view.init(this.rows[iChoice]);
173 182
 		}
174 183
 	},
175 184
 	view: {
@@ -221,9 +230,6 @@ let mobContentObj = {
221 230
 				$li.find('.fnRtnRsnDvsnNm').text(item.rtnRsnDvsnNm);
222 231
 				_this.rows.push(item);
223 232
 			});
224
-			$.each(result.fileLogNoList, function (i, item) {
225
-				$(id).find('.detail_logo').appendChild('<img src="' + item.filePath + '" />');
226
-			});
227 233
 		},
228 234
 		reset: function() {
229 235
 			var id = '#ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER';

+ 19 - 10
src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG02010.js

@@ -40,8 +40,8 @@ let mobPageObj = {
40 40
 			// $('#ITP_FORM_MORDMNG02010_LIST_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
41 41
 			// $('#ITP_FORM_MORDMNG02010_LIST_SEARCH_TO_DT').datepicker('setDate', new Date());
42 42
 
43
-			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
44
-			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
43
+			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', 0));
44
+			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 1));
45 45
 		},
46 46
 		info: function() {
47 47
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -74,10 +74,14 @@ let mobPageObj = {
74 74
 				return false;
75 75
 			});
76 76
 
77
-			$(document).on('click', '#ITP_LIST_MORDMNG02010_LIST_ITEM_ROWS li', function() {
78
-				// var item = mobContentObj.list.rows[$(this).index()];
79
-				// mobContentObj.view.init(item);
80
-				mobContentObj.list.iChoice = $(this).index();
77
+			// $(document).on('click', '#ITP_LIST_MORDMNG02010_LIST_ITEM_ROWS li', function() {
78
+			// 	mobContentObj.list.iChoice = $(this).index();
79
+			// });
80
+			$(document).on('click', 'input[type="checkbox"][id="ITP_LIST_MORDMNG02010_LIST_ITEM_CHECKBOX"]', function() {
81
+				if($(this).prop('checked')) {
82
+					$('input[type="checkbox"][id="ITP_LIST_MORDMNG02010_LIST_ITEM_CHECKBOX"]').prop('checked', false);
83
+					$(this).prop('checked', true);
84
+				}
81 85
 			});
82 86
 
83 87
 			$(document).on('click', '#ITP_LIST_MORDMNG02010_POP_WHS_ROWS li button', function() {
@@ -126,7 +130,6 @@ let mobContentObj = {
126 130
 		totPage: 0,
127 131
 		isSearch: false,
128 132
 		rows: [],
129
-		iChoice: -1,
130 133
 		init: function() {
131 134
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
132 135
 			this.search();
@@ -135,7 +138,6 @@ let mobContentObj = {
135 138
 			this.listPage = 0;
136 139
 			this.totPage = 0;
137 140
 			this.rows.length = 0;
138
-			this.iChoice = -1;
139 141
 			$('#ITP_LIST_MORDMNG02010_LIST_ITEM_ROWS').empty();
140 142
 			this.load();
141 143
 		},
@@ -172,11 +174,18 @@ let mobContentObj = {
172 174
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
173 175
 		},
174 176
 		dlvPrint: function() {
175
-			if(this.iChoice < 0) {
177
+			var iChoice = -1;
178
+			$('input[type="checkbox"][id="ITP_LIST_MORDMNG02010_LIST_ITEM_CHECKBOX"]').each(function(index) {
179
+				if($(this).is(":checked")) {
180
+					iChoice = index;
181
+					return false;
182
+				}
183
+			});
184
+			if(iChoice ===  -1) {
176 185
 				alert("납품서를 선택해주세요 (대표 납품서번호)");
177 186
 				return;
178 187
 			}
179
-			mobContentObj.view.init(this.rows[this.iChoice]);
188
+			mobContentObj.view.init(this.rows[iChoice]);
180 189
 		}
181 190
 	},
182 191
 	view: {

+ 18 - 10
src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG03010.js

@@ -62,16 +62,20 @@ let mobPageObj = {
62 62
 			$('button[id^="ITP_BTN_MORDMNG03010_VIEW"]').on('click', function() {
63 63
 				var id = $(this).attr('id');
64 64
 				switch (id) {
65
-					case 'ITP_BTN_MORDMNG03010_VIEW_ADD'			: mobContentObj.view.add();		break;
65
+					case 'ITP_BTN_MORDMNG03010_VIEW_ADD'			: mobContentObj.view.add();	break;
66 66
 					case 'ITP_BTN_MORDMNG03010_VIEW_CONFIRM'		: mobContentObj.view.cancel();	break;
67 67
 				}
68 68
 				return false;
69 69
 			});
70 70
 
71
-			$(document).on('click', '#ITP_LIST_MORDMNG03010_LIST_ITEM_ROWS li', function() {
72
-				// var item = mobContentObj.list.rows[$(this).index()];
73
-				// mobContentObj.view.init(item);
74
-				mobContentObj.list.iChoice = $(this).index();
71
+			// $(document).on('click', '#ITP_LIST_MORDMNG03010_LIST_ITEM_ROWS li', function() {
72
+			// 	mobContentObj.list.iChoice = $(this).index();
73
+			// });
74
+			$(document).on('click', 'input[type="checkbox"][id="ITP_LIST_MORDMNG03010_LIST_ITEM_CHECKBOX"]', function() {
75
+				if($(this).prop('checked')) {
76
+					$('input[type="checkbox"][id="ITP_LIST_MORDMNG03010_LIST_ITEM_CHECKBOX"]').prop('checked', false);
77
+					$(this).prop('checked', true);
78
+				}
75 79
 			});
76 80
 
77 81
 			$(document).on('click', '#ITP_LIST_MORDMNG03010_POP_WHS_ROWS li button', function() {
@@ -83,7 +87,6 @@ let mobPageObj = {
83 87
 		$('#ITP_MOBILE_MORDMNG03010').find('div[id$="_CONTAINER"]').each(function(i) {
84 88
 			$(this).hide();
85 89
 		});
86
-		console.log(mode);
87 90
 		if(mode === PAGE_MODE_LIST) {
88 91
 			$('#ITP_AJAX_MORDMNG03010_LIST_CONTAINER').show();
89 92
 			this.moreView(true);
@@ -121,7 +124,6 @@ let mobContentObj = {
121 124
 		totPage: 0,
122 125
 		isSearch: false,
123 126
 		rows: [],
124
-		iChoice: -1,
125 127
 		init: function() {
126 128
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
127 129
 			this.search();
@@ -130,7 +132,6 @@ let mobContentObj = {
130 132
 			this.listPage = 0;
131 133
 			this.totPage = 0;
132 134
 			this.rows.length = 0;
133
-			this.iChoice = -1;
134 135
 			$('#ITP_LIST_MORDMNG03010_LIST_ITEM_ROWS').empty();
135 136
 			this.load();
136 137
 		},
@@ -166,11 +167,18 @@ let mobContentObj = {
166 167
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
167 168
 		},
168 169
 		dlvPrint: function() {
169
-			if(this.iChoice < 0) {
170
+			var iChoice = -1;
171
+			$('input[type="checkbox"][id="ITP_LIST_MORDMNG03010_LIST_ITEM_CHECKBOX"]').each(function(index) {
172
+				if($(this).is(":checked")) {
173
+					iChoice = index;
174
+					return false;
175
+				}
176
+			});
177
+			if(iChoice === -1) {
170 178
 				alert("납품서를 선택해주세요 (대표 납품서번호)");
171 179
 				return;
172 180
 			}
173
-			mobContentObj.view.init(this.rows[this.iChoice]);
181
+			mobContentObj.view.init(this.rows[iChoice]);
174 182
 		}
175 183
 	},
176 184
 	view: {

+ 52 - 28
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -33,6 +33,8 @@ let mobPageObj = {
33 33
 		info: function() {
34 34
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
35 35
 			$('input:hidden[id$="_STORE_ID"]').val(fn_make_user_info.get('storeId'));
36
+
37
+			$('#ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT').val(itp_fn_date_add('M', 0));
36 38
 		}
37 39
 	},
38 40
 	event: {
@@ -298,51 +300,68 @@ let mobPopObj = {
298 300
 	},
299 301
 	popReqConfirm: {
300 302
 		init: function (parentId) {
303
+			this.formId = '#ITP_FORM_MPOMNG01010_DETAIL';
301 304
 			this.pchReqStCd = (parentId === 'ITP_BTN_MPOMNG01010_DETAIL_REQ_ORDER') ? PCH_REQ_ST_CD_REQUEST_SAVE : PCH_REQ_ST_CD_TEMP_SAVE;
302 305
 			this.view();
303 306
 			this.action();
304 307
 		},
305 308
 		view: function() {
309
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT').val());
310
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContObj.list.rows.length, '개'));
311
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add($('#ITP_FORM_MPOMNG01010_DETAIL .fnPchReqAmtTot').text()));
306 312
 			if(this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE) {
307
-				$('#ITP_POP_MPOMNG01010_REQ_AREA .msg_save').text('구매요청 하시겠습니까?');
313
+				var popMsg = '구매요청 하시겠습니까?';
314
+				let param = $(this.formId).serializeObject();
315
+				var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG01010_DETAIL .fnOrdUseAmt').text());
316
+				var pchReqAmtTot = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG01010_DETAIL .fnPchReqAmtTot').text());
317
+				if (parseInt(ordUseAmt) < parseInt(pchReqAmtTot)) {
318
+					popMsg = (param.loanDvsn !== 'LD03' && param.loanDvsn === 'LD01') ? ITP_MSG_LOCALE.message.ajax.lackReqAmt : ITP_MSG_LOCALE.message.ajax.lackReqAmt;
319
+					$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('결제');
320
+					this.saveMode = 'PAY';
321
+				}
322
+				$('#ITP_POP_MPOMNG01010_REQ_AREA .msg_save').text(popMsg);
308 323
 			} else {
324
+				this.saveMode = 'SAVE';
309 325
 				$('#ITP_POP_MPOMNG01010_REQ_AREA .msg_save').text('임시저장 하시겠습니까?');
326
+				$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
310 327
 			}
311
-			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT').val());
312
-			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContObj.list.rows.length, '개'));
313
-			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add($('#ITP_FORM_MPOMNG01010_DETAIL .fnPchReqAmtTot').text()));
314 328
 		},
315 329
 		action: function() {
316 330
 			var _this = this;
317 331
 			$('#ITP_POP_MPOMNG01010_REQ_AREA button[id="ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM"]').off('click').on('click', function() {
318 332
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD').val(_this.pchReqStCd);
319
-				_this.save('#ITP_FORM_MPOMNG01010_DETAIL');
333
+				_this.save();
320 334
 			});
321 335
 		},
322
-		save: function(formId) {
323
-			let param = $(formId).serializeObject();
336
+		save: function() {
337
+			let param = $(this.formId).serializeObject();
338
+			console.log(JSON.stringify(param));
324 339
 
325
-			if (param.loanDvsn !== 'LD03' && this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE ) {
326
-				var pchActAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text();
327
-				var pchReqAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text();
340
+			// if (param.loanDvsn !== 'LD03' && this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE ) {
341
+			// 	var pchActAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text();
342
+			// 	var pchReqAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text();
343
+			//
344
+			// 	if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
345
+			// 		alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
346
+			// 		return;
347
+			// 	}
348
+			// }
328 349
 
329
-				if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
330
-					alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
331
-					return;
332
-				}
350
+			if(this.saveMode === 'PAY') {
351
+				alert('결제 페이지 이동!!!');
352
+			} else {
353
+				$.each(mobContObj.list.rows, function(index, item) {
354
+					item['viewCd'] = 'C';
355
+				});
356
+				param.gridInsertData = mobContObj.list.rows;
357
+				param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
358
+				console.log(JSON.stringify(param));
359
+				var saveFn = function (result) {
360
+					console.log(result);
361
+					mobPopObj.hide('ITP_POP_MPOMNG01010_REQ_AREA');
362
+				};
363
+				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
333 364
 			}
334
-
335
-			$.each(mobContObj.list.rows, function(index, item) {
336
-				item['viewCd'] = 'C';
337
-			});
338
-			param.gridInsertData = mobContObj.list.rows;
339
-			param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
340
-			console.log(JSON.stringify(param));
341
-			var saveFn = function (result) {
342
-				console.log(result);
343
-				mobPopObj.hide('ITP_POP_MPOMNG01010_REQ_AREA');
344
-			};
345
-			fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
346 365
 		}
347 366
 	},
348 367
 	show: function(popId, parentId) {
@@ -357,8 +376,13 @@ let mobPopObj = {
357 376
 			var formId = '#ITP_FORM_MPOMNG01010_DETAIL';
358 377
 			itp_fn_form_clear_validate(null, formId);
359 378
 			if (itp_fn_form_event.isValid(formId)) {
360
-				$('#' + popId).show();
361
-				mobPopObj.init(popId, parentId);
379
+				if($('#ITP_LIST_MPOMNG01010_DETAIL_ROWS > li').size() < 1) {
380
+					alert('품목추가 버튼을 이용하여 품목을 추가해 주세요.');
381
+					return false;
382
+				} else {
383
+					$('#' + popId).show();
384
+					mobPopObj.init(popId, parentId);
385
+				}
362 386
 			}
363 387
 		} else {
364 388
 			$('#' + popId).show();

+ 45 - 39
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG02010.js

@@ -345,7 +345,7 @@ let mobContentObj = {
345 345
 					var amt = item.unitAmt;
346 346
 					reqAmt += Number(qty) * amt;
347 347
 				});
348
-				$('#ITP_AJAX_MPOMNG02010_LIST_CONTAINER').find('.fnPchReqAmtTot').text(CommonObj.currency.add(reqAmt));
348
+				$('#ITP_AJAX_MPOMNG02010_MODIFY_CONTAINER').find('.fnPchReqAmtTot').text(CommonObj.currency.add(reqAmt));
349 349
 			}
350 350
 		},
351 351
 		cancel: function () {
@@ -515,20 +515,32 @@ let mobPopObj = {
515 515
 		popId: 'ITP_POP_MPOMNG02010_REQ_AREA',
516 516
 		pchReqStCd: '',
517 517
 		init: function (pchReqStCd) {
518
+			this.formId = '#ITP_FORM_MPOMNG02010_MODIFY';
518 519
 			this.pchReqStCd = pchReqStCd;
519 520
 			mobPopObj.show(this.popId);
520 521
 			this.view();
521 522
 			this.action();
522 523
 		},
523 524
 		view: function() {
525
+			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT').val());
526
+			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContentObj.modify.list.rows.length, '개'));
527
+			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnOrdAmt').text($('#ITP_FORM_MPOMNG02010_MODIFY .fnPchReqAmtTot').text());
524 528
 			if(this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE) {
525
-				$('#ITP_POP_MPOMNG02010_REQ_AREA .msg_save').text('구매요청 하시겠습니까?');
529
+				var popMsg = '구매요청 하시겠습니까?';
530
+				let param = $(this.formId).serializeObject();
531
+				var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG02010_DETAIL .fnOrdUseAmt').text());
532
+				var pchReqAmtTot = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG02010_DETAIL .fnPchReqAmtTot').text());
533
+				if (parseInt(ordUseAmt) < parseInt(pchReqAmtTot)) {
534
+					popMsg = (param.loanDvsn !== 'LD03' && param.loanDvsn === 'LD01') ? ITP_MSG_LOCALE.message.ajax.lackReqAmt : ITP_MSG_LOCALE.message.ajax.lackReqAmt;
535
+					$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('결제');
536
+					this.saveMode = 'PAY';
537
+				}
538
+				$('#ITP_POP_MPOMNG02010_REQ_AREA .msg_save').text(popMsg);
526 539
 			} else {
540
+				this.saveMode = 'SAVE';
527 541
 				$('#ITP_POP_MPOMNG02010_REQ_AREA .msg_save').text('임시저장 하시겠습니까?');
542
+				$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
528 543
 			}
529
-			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT').val());
530
-			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContentObj.modify.list.rows.length, '개'));
531
-			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add($('#ITP_FORM_MPOMNG02010_MODIFY .fnPchReqTotalAmt').text()));
532 544
 		},
533 545
 		action: function() {
534 546
 			var _this = this;
@@ -541,41 +553,35 @@ let mobPopObj = {
541 553
 			var _this = this;
542 554
 			let param = $(formId).serializeObject();
543 555
 
544
-			if (param.loanDvsn !== 'LD03' && this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE ) {
545
-				var ordUseAmt = $('#ITP_FORM_MPOMNG02010_MODIFY .fnOrdUseAmt').text();
546
-				var pchReqTotalAmt = $('#ITP_FORM_MPOMNG02010_VIEW .fnPchReqTotalAmt').text();
547
-
548
-				if (parseInt(CommonObj.onlyNumber(ordUseAmt)) < parseInt(CommonObj.onlyNumber(pchReqTotalAmt))) {
549
-					alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
550
-					return;
551
-				}
556
+			if(this.saveMode === 'PAY') {
557
+				alert('결제 페이지 이동!!!');
558
+			} else {
559
+				var gridInsertData = [];
560
+				var gridUpdateData = [];
561
+				var gridDeleteData = [];
562
+				$.each(mobContentObj.modify.list.rows, function(index, item) {
563
+					item['pchReqUnqNo'] = param.pchReqUnqNo;
564
+					if(item.viewCd === 'R' || item.viewCd === 'C' ) {
565
+						item['viewCd'] = 'C';
566
+						gridInsertData.push(item);
567
+					} else if(item.viewCd === 'U') {
568
+						gridUpdateData.push(item);
569
+					} else if(item.viewCd === 'D') {
570
+						gridDeleteData.push(item);
571
+					}
572
+				});
573
+				param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
574
+				param.gridInsertData = gridInsertData;
575
+				param.gridUpdateData = gridUpdateData;
576
+				param.gridDeleteData = gridDeleteData;
577
+				console.log(JSON.stringify(param));
578
+				var saveFn = function (result) {
579
+					console.log(result);
580
+					mobPopObj.hide(_this.popId);
581
+					mobContentObj.list.init();
582
+				};
583
+				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
552 584
 			}
553
-
554
-			var gridInsertData = [];
555
-			var gridUpdateData = [];
556
-			var gridDeleteData = [];
557
-			$.each(mobContentObj.modify.list.rows, function(index, item) {
558
-				item['pchReqUnqNo'] = param.pchReqUnqNo;
559
-				if(item.viewCd === 'R' || item.viewCd === 'C' ) {
560
-					item['viewCd'] = 'C';
561
-					gridInsertData.push(item);
562
-				} else if(item.viewCd === 'U') {
563
-					gridUpdateData.push(item);
564
-				} else if(item.viewCd === 'D') {
565
-					gridDeleteData.push(item);
566
-				}
567
-			});
568
-			param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
569
-			param.gridInsertData = gridInsertData;
570
-			param.gridUpdateData = gridUpdateData;
571
-			param.gridDeleteData = gridDeleteData;
572
-			console.log(JSON.stringify(param));
573
-			var saveFn = function (result) {
574
-				console.log(result);
575
-				mobPopObj.hide(_this.popId);
576
-				mobContentObj.list.init();
577
-			};
578
-			fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
579 585
 		}
580 586
 	},
581 587
 	show: function(popId) {

+ 3 - 2
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG01010.js

@@ -37,7 +37,7 @@ let mobPageObj = {
37 37
 		},
38 38
 		view: function() {
39 39
 			// 조회일자 지정
40
-			$('#ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT').val(itp_fn_date_add('M', 0));
40
+			$('#ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT').val(itp_fn_date_add('M', 1));
41 41
 		}
42 42
 	},
43 43
 	event: {
@@ -316,7 +316,7 @@ let mobPopObj = {
316 316
 			}
317 317
 			$('#ITP_POP_MRTNMNG01010_RTN_AREA .fnRtnReqDt').text($('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT').val());
318 318
 			$('#ITP_POP_MRTNMNG01010_RTN_AREA .fnItemQty').text(CommonObj.currency.add(mobContObj.list.rows.length, '개'));
319
-			$('#ITP_POP_MRTNMNG01010_RTN_AREA .fnRtnAmt').text(CommonObj.currency.add($('#ITP_FORM_MRTNMNG01010_DETAIL .fnRtnReqAmt').text()));
319
+			$('#ITP_POP_MRTNMNG01010_RTN_AREA .fnRtnAmt').text($('#ITP_FORM_MRTNMNG01010_DETAIL .fnRtnReqAmt').text());
320 320
 			$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_RTN_REQ_ST_CD').val(this.rtnReqStCd);
321 321
 		},
322 322
 		action: function() {
@@ -354,6 +354,7 @@ let mobPopObj = {
354 354
 			var saveFn = function (result) {
355 355
 				console.log(result);
356 356
 				mobPopObj.hide('ITP_POP_MRTNMNG01010_RTN_AREA');
357
+				$('#ITP_LIST_MRTNMNG01010_DETAIL_ROWS').empty();
357 358
 			};
358 359
 			fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
359 360
 		}

+ 5 - 5
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG04010.js

@@ -37,8 +37,8 @@ let mobPageObj = {
37 37
 			});
38 38
 
39 39
 			// 조회일자 지정
40
-			$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
41
-			$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
40
+			$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', 0));
41
+			$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 1));
42 42
 		},
43 43
 		info: function() {
44 44
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -144,7 +144,7 @@ let mobContentObj = {
144 144
 					$('#ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWCOPY').html());
145 145
 					var $li = $('#ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA .panel-group > .list-row:last');
146 146
 					$li.find('.fnRtnOdrRegDt').text(item.rtnOdrRegDt);
147
-					$li.find('.fnRtnOdrMgrNm').text(item.rtnOdrMgrNm);
147
+					$li.find('.fnColDvsnNm').text(item.colDvsnNm);
148 148
 					$li.find('.fnRtnOdrStNm').text(item.rtnOdrStNm);
149 149
 					$li.find('.fnWhsNm').text(item.whsNm);
150 150
 					$li.find('.fnRtnDodrItemQty').text($li.find('.fnRtnDodrItemQty').text().replace('$', item.rtnDodrItemQty));
@@ -182,7 +182,7 @@ let mobContentObj = {
182 182
 		view: function(result) {
183 183
 			var _this = this;
184 184
 			var id = '#ITP_AJAX_MRTNMNG04010_VIEW_CONTAINER';
185
-			$('#ITP_BTN_MRTNMNG04010_VIEW_RTN_PO_CANCEL').prop('disabled', (result.rtnOdrStCd !== 'RO20'));
185
+			$('#ITP_BTN_MRTNMNG04010_VIEW_RTN_PO_CANCEL').prop('disabled', (result.rtnRsnDvsn !== 'RR00'));
186 186
 			$(id).find('.fnRtnOdrRegDt').text(result.rtnOdrRegDt);
187 187
 			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
188 188
 			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
@@ -192,7 +192,7 @@ let mobContentObj = {
192 192
 				var $li = $('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA .panel-group > .list-row:last');
193 193
 				console.log(item);
194 194
 				$li.find('.fnItemNm').text(item.itemNm);
195
-				$li.find('.fnRtnQty').text(item.rtnQty + item.unit);
195
+				$li.find('.fnRtnOdrQty').text(item.rtnOdrQty + item.unit);
196 196
 				$li.find('.fnRtnReqQty').text(CommonObj.comma.set(item.rtnReqQty));
197 197
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
198 198
 				$li.find('.fnRtnOdrAmt').text(CommonObj.currency.add(item.rtnOdrAmt));

+ 13 - 5
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG06010.js

@@ -117,11 +117,19 @@ let mobContentObj = {
117 117
 			// this.search();
118 118
 		},
119 119
 		search: function() {
120
-			this.listPage = 0;
121
-			this.totPage = 0;
122
-			this.rows.length = 0;
123
-			$('#ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS').empty();
124
-			this.load();
120
+			if($('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM').val().length < 1) {
121
+				alert('수거창고를 지정해주세요!');
122
+				return;
123
+			}
124
+			var formId = '#ITP_FORM_MRTNMNG05010_LIST_SEARCH';
125
+			itp_fn_form_clear_validate(null, formId);
126
+			if (itp_fn_form_event.isValid(formId)) {
127
+				this.listPage = 0;
128
+				this.totPage = 0;
129
+				this.rows.length = 0;
130
+				$('#ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS').empty();
131
+				this.load();
132
+			}
125 133
 		},
126 134
 		load: function() {
127 135
 			var _this = this;

+ 17 - 9
src/main/webapp/mobile/js/config.js

@@ -61,6 +61,10 @@ require([
61 61
 		$('#ITP_MENU').toggle();
62 62
 	});
63 63
 
64
+	$('#ITP_BTN_NAV_CLOSE').on('click', function() {
65
+		$('#ITP_MENU').toggle();
66
+	});
67
+
64 68
 	// 로그아웃 버튼
65 69
 	$('#ITP_MOBILE_BTN_LOGOUT').click(function() {
66 70
 		fnLogout();
@@ -160,29 +164,31 @@ var fn_make_slide_menu = {
160 164
 		this.make();
161 165
 	},
162 166
 	make: function() {
163
-		var selector = '.menu_select .panel-group > .panel_list:last';
167
+		var selector = '#ITP_SIDEBAR .panel-group > .panel-default:last';
168
+		$('#ITP_SIDEBAR .panel-group').empty();
164 169
 		$.each(AUTH_MENU_LIST, function(key, value) {
165 170
 			if(value.level === 2) { // LEVEL2
166
-				$('.menu_select .panel-group').append($('#ITP_AJAX_MAIN_SLIDE_LEVEL2_ROWCOPY').val());
171
+				$('#ITP_SIDEBAR .panel-group').append($('#ITP_AJAX_MAIN_SIDE_LEVEL2_ROWCOPY').val());
167 172
 				$(selector).find('.fnMenuNm').text(value.menuNm);
168 173
 				$(selector).find('.accordion-toggle').attr('href', '#ITP_NAV_'+value.menuNo);
169 174
 				$(selector).find('.panel-collapse').attr('id', 'ITP_NAV_'+value.menuNo);
170 175
 				$(selector).find('.fnLevelBottomList').empty();
171 176
 			} else if(value.level === 3) { // LEVEL3
172
-				$(selector).find('.fnLevelBottomList').append($('#ITP_AJAX_MAIN_SLIDE_LEVEL3_ROWCOPY').val());
177
+				$(selector).find('.fnLevelBottomList').append($('#ITP_AJAX_MAIN_SIDE_LEVEL3_ROWCOPY').val());
173 178
 				$(selector + ' .fnLevelBottomList .itp_svg_in:last').find('.fnMenuNm').text(value.menuNm);
174
-				$(selector + ' .fnLevelBottomList .itp_svg_in:last').attr('data-itp-nav-id', value.menuId);
175
-				$(selector + ' .fnLevelBottomList .itp_svg_in:last').attr('data-conn-url', value.connUrl);
176
-				$(selector + ' .fnLevelBottomList .itp_svg_in:last').attr('data-open-cd', value.openCd);
177
-				$(selector + ' .fnLevelBottomList .itp_svg_in:last').attr('id', value.menuId + '_PAGE_NO');
179
+				$(selector + ' .fnLevelBottomList .itp_svg_in:last').find('.itp_nav_link').attr('data-itp-nav-id', value.menuId);
180
+				$(selector + ' .fnLevelBottomList .itp_svg_in:last').find('.itp_nav_link').attr('data-conn-url', value.connUrl);
181
+				$(selector + ' .fnLevelBottomList .itp_svg_in:last').find('.itp_nav_link').attr('data-open-cd', value.openCd);
182
+				$(selector + ' .fnLevelBottomList .itp_svg_in:last').find('.itp_nav_link').attr('id', value.menuId + '_PAGE_NO');
178 183
 			}
179 184
 		});
185
+
180 186
 		this.action();
181 187
 	},
182 188
 	action: function() {
183 189
 		var _this = this;
184
-		$('#ITP_SIDEBAR .accordion-toggle').off('click').on('click', function() {
185
-			console.log('accordion-toggle');
190
+		$('#ITP_SIDEBAR .accordion-toggle').off('click').on('click', function(e) {
191
+			$(this).find('i.indicator').toggleClass('glyphicon-chevron-down glyphicon-chevron-up');
186 192
 		});
187 193
 		$('#ITP_SIDEBAR .itp_nav_link').off('click').on('click', function() {
188 194
 			const id = $(this).attr('data-itp-nav-id');
@@ -194,8 +200,10 @@ var fn_make_slide_menu = {
194 200
 				const href = MOBILE_CONTEXTPATH + connUrl;
195 201
 				_this.loadPage(id, href);
196 202
 				$('#ITP_MENU').toggle();
203
+				$('.name_info .fnMenuNm').text($(this).find('.fnMenuNm').text() + '|');
197 204
 			}
198 205
 		});
206
+		$('#ITP_SIDEBAR .panel-group > .panel-default:first').find('.accordion-toggle').trigger('click');
199 207
 	},
200 208
 	loadPage: function(id, href, param) {
201 209
 		//로그인체크