Browse Source

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

dwkim 2 years ago
parent
commit
83da4b47f5
49 changed files with 426 additions and 554 deletions
  1. 12 10
      src/main/webapp/app/collmng/COLLMNG01010.html
  2. 15 11
      src/main/webapp/app/collmng/COLLMNG02010.html
  3. 12 6
      src/main/webapp/app/collmng/COLLMNG03010.html
  4. 10 30
      src/main/webapp/app/loanmng/LOANMNG01010.html
  5. 6 20
      src/main/webapp/app/loanmng/LOANMNG02010.html
  6. 9 27
      src/main/webapp/app/loanmng/LOANMNG03010.html
  7. 13 9
      src/main/webapp/app/ordmng/ORDMNG01010.html
  8. 16 12
      src/main/webapp/app/ordmng/ORDMNG02010.html
  9. 11 5
      src/main/webapp/app/ordmng/ORDMNG03010.html
  10. 1 1
      src/main/webapp/app/pomng/POMNG01010.html
  11. 10 6
      src/main/webapp/app/pomng/POMNG02010.html
  12. 15 14
      src/main/webapp/app/pomng/POMNG03010.html
  13. 2 2
      src/main/webapp/app/pomng/POMNG04010.html
  14. 2 2
      src/main/webapp/app/pomng/POMNG05010.html
  15. 2 2
      src/main/webapp/app/pomng/POMNG06010.html
  16. 2 2
      src/main/webapp/app/pomng/POMNG07010.html
  17. 8 24
      src/main/webapp/app/settmng/SETTMNG01010.html
  18. 8 26
      src/main/webapp/app/settmng/SETTMNG02010.html
  19. 14 42
      src/main/webapp/app/settmng/SETTMNG03010.html
  20. 13 13
      src/main/webapp/app/stinfo/STINFO04010.html
  21. 3 5
      src/main/webapp/app/stockmng/STOCKMNG01010.html
  22. 3 5
      src/main/webapp/app/stockmng/STOCKMNG03010.html
  23. 22 27
      src/main/webapp/app/vendinfo/VENDINFO01010.html
  24. 26 85
      src/main/webapp/app/vendinfo/VENDINFO02010.html
  25. 20 45
      src/main/webapp/app/vsettmng/VSETTMNG01010.html
  26. 21 46
      src/main/webapp/app/vsettmng/VSETTMNG02010.html
  27. 2 1
      src/main/webapp/css/style.css
  28. 2 1
      src/main/webapp/js/app/collmng/ITP_COLLMNG01010.js
  29. 5 1
      src/main/webapp/js/app/collmng/ITP_COLLMNG02010.js
  30. 14 2
      src/main/webapp/js/app/collmng/ITP_COLLMNG03010.js
  31. 1 0
      src/main/webapp/js/app/oper/ITP_OPER02010.js
  32. 2 0
      src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js
  33. 7 0
      src/main/webapp/js/app/ordmng/ITP_ORDMNG02010.js
  34. 14 1
      src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js
  35. 2 0
      src/main/webapp/js/app/pomng/ITP_POMNG03010.js
  36. 1 1
      src/main/webapp/js/app/pomng/ITP_POMNG05010.js
  37. 1 1
      src/main/webapp/js/app/pomng/ITP_POMNG06010.js
  38. 3 0
      src/main/webapp/js/app/settmng/ITP_SETTMNG01010.js
  39. 15 3
      src/main/webapp/js/app/stinfo/ITP_STINFO04010.js
  40. 5 0
      src/main/webapp/js/app/vendinfo/ITP_VENDINFO01010.js
  41. 5 5
      src/main/webapp/js/app/vendinfo/ITP_VENDINFO02010.js
  42. 1 1
      src/main/webapp/js/app/vendinfo/ITP_VENDINFO03010.js
  43. 22 13
      src/main/webapp/js/app/vsettmng/ITP_VSETTMNG01010.js
  44. 21 15
      src/main/webapp/js/app/vsettmng/ITP_VSETTMNG02010.js
  45. 4 4
      src/main/webapp/mobile/app/mpomng/MPOMNG01010.html
  46. 3 3
      src/main/webapp/mobile/app/mpomng/MPOMNG02010.html
  47. 15 13
      src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js
  48. 4 11
      src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG02010.js
  49. 1 1
      src/main/webapp/mobile/js/config.js

+ 12 - 10
src/main/webapp/app/collmng/COLLMNG01010.html

@@ -19,7 +19,9 @@
19
 								<input type="hidden" id="ITP_FORM_COLLMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
19
 								<input type="hidden" id="ITP_FORM_COLLMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
20
 									<div class="form-group">
20
 									<div class="form-group">
21
 										<div class="col-xs-2 itp_ip itp_noMar">
21
 										<div class="col-xs-2 itp_ip itp_noMar">
22
-											<label>수거 일자 *</label>
22
+											<select id="ITP_FORM_COLLMNG01010_SEARCH_" class="form-control itp_input" name="service">
23
+												<option value="A">수거 일자</option>											
24
+											</select>
23
 										</div>											
25
 										</div>											
24
 										<div class="col-xs-3 itp_ip itp_noMar">
26
 										<div class="col-xs-3 itp_ip itp_noMar">
25
 											<div class="input-daterange input-group date">
27
 											<div class="input-daterange input-group date">
@@ -36,12 +38,16 @@
36
 											</select>
38
 											</select>
37
 										</div>
39
 										</div>
38
 										<div class="col-xs-3 itp_ip itp_noMar">
40
 										<div class="col-xs-3 itp_ip itp_noMar">
41
+											<div class="input-group">
39
 											<input type="text" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_NM" class="form-control itp_input" name="sDlvPlace" placeholder="수거장소 (매장/창고)" readonly/>
42
 											<input type="text" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_NM" class="form-control itp_input" name="sDlvPlace" placeholder="수거장소 (매장/창고)" readonly/>
40
 											<input type="hidden" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_ID" class="form-control itp_input" name="srtnWhsId"/>
43
 											<input type="hidden" id="ITP_FORM_COLLMNG01010_DETAIL_RTN_WHS_ID" class="form-control itp_input" name="srtnWhsId"/>
41
-										</div>
44
+												<span class="input-group-btn">
45
+													<button id="ITP_BTN_COLLMNG01010_DELETE_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
46
+												</span>
47
+											</div>
48
+										</div>	
42
 										<div class="col-xs-1 itp_in" style="padding-left: 5px; width:10%;">
49
 										<div class="col-xs-1 itp_in" style="padding-left: 5px; width:10%;">
43
 											<button type="button" id="ITP_BTN_COLLMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
50
 											<button type="button" id="ITP_BTN_COLLMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
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
 						                </div>
51
 						                </div>
46
 										<div class="col-xs-5 itp_ip itp_noMar">
52
 										<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="발주번호/품목번호/품목명" />
53
 											<input type="text" id="ITP_FORM_COLLMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호/품목명" />
@@ -67,8 +73,7 @@
67
 								<input type="hidden" id="ITP_FORM_COLLMNG01010_DETAIL_VIEW_CD" name="viewCd" value="C">
73
 								<input type="hidden" id="ITP_FORM_COLLMNG01010_DETAIL_VIEW_CD" name="viewCd" value="C">
68
 								
74
 								
69
 								<section class="itp_form_sec">
75
 								<section class="itp_form_sec">
70
-									<h4 class="itp_form_tit">수거 발주 상세</h4>
71
-									<div class="itp_form_in">	
76
+									<div class="itp_form_in border-top">	
72
 										<div class="form-group">
77
 										<div class="form-group">
73
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
78
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
74
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
79
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
@@ -87,9 +92,7 @@
87
 									<div class="itp_form_in">	
92
 									<div class="itp_form_in">	
88
 										<div class="form-group">
93
 										<div class="form-group">
89
 											<label class="col-xs-2 itp_lb">수거장소</label>
94
 											<label class="col-xs-2 itp_lb">수거장소</label>
90
-											<div class="col-xs-4 itp_ip">
91
-												<div class="col-xs-3 itp_in fnRtnWhsNm"></div>
92
-											</div>
95
+											<div class="col-xs-4 itp_ip fnRtnWhsNm"></div>
93
 											<label class="col-xs-2 itp_lb">수거 총 금액</label>
96
 											<label class="col-xs-2 itp_lb">수거 총 금액</label>
94
 											<div class="col-xs-4 itp_ip fnRtnDodrTotalAmt"></div>
97
 											<div class="col-xs-4 itp_ip fnRtnDodrTotalAmt"></div>
95
 										</div>
98
 										</div>
@@ -103,11 +106,10 @@
103
 										</div>
106
 										</div>
104
 									</div>
107
 									</div>
105
 									<div class="itp_form_in">
108
 									<div class="itp_form_in">
106
-										<div class="itp_table_head fix" style="background:#f5f5f5;">
109
+										<div class="itp_table_head fix" style="background:#fff;">
107
 											<h4 class="itp_table_tit">발주 품목</h4>
110
 											<h4 class="itp_table_tit">발주 품목</h4>
108
 										</div>
111
 										</div>
109
 										<div id="ITP_COLLMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
112
 										<div id="ITP_COLLMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
110
-											<div id="ITP_COLLMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
111
 											<table id="ITP_COLLMNG01010_DETAIL_jqGrid"></table>
113
 											<table id="ITP_COLLMNG01010_DETAIL_jqGrid"></table>
112
 											<div id="ITP_COLLMNG01010_DETAIL_jqGridPager"></div>
114
 											<div id="ITP_COLLMNG01010_DETAIL_jqGridPager"></div>
113
 											<div id="ITP_COLLMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
115
 											<div id="ITP_COLLMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

+ 15 - 11
src/main/webapp/app/collmng/COLLMNG02010.html

@@ -21,7 +21,9 @@
21
 								
21
 								
22
 									<div class="form-group">
22
 									<div class="form-group">
23
 										<div class="col-xs-2 itp_ip itp_noMar">
23
 										<div class="col-xs-2 itp_ip itp_noMar">
24
-											<label>수거 요청일 *</label>
24
+											<select id="ITP_FORM_COLLMNG02010_SEARCH_" class="form-control itp_input" name="service">
25
+												<option value="A">수거 요청일</option>											
26
+											</select>
25
 										</div>									
27
 										</div>									
26
 										<div class="col-xs-3 itp_ip itp_noMar">
28
 										<div class="col-xs-3 itp_ip itp_noMar">
27
 											<div class="input-daterange input-group date">
29
 											<div class="input-daterange input-group date">
@@ -30,13 +32,17 @@
30
 												<input type="text" id="ITP_FORM_COLLMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
32
 												<input type="text" id="ITP_FORM_COLLMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
31
 											</div>
33
 											</div>
32
 										</div>
34
 										</div>
33
-										<div class="col-xs-2 itp_in itp_noMar">
34
-											<input type="text" id="ITP_FORM_COLLMNG02010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm" placeholder="수거창고" readonly/>
35
-											<input type="hidden" id="ITP_FORM_COLLMNG02010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId"  />
36
-										</div>
35
+										<div class="col-xs-2 itp_ip itp_noMar">
36
+											<div class="input-group">
37
+												<input type="text" id="ITP_FORM_COLLMNG02010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" name="srtnWhsNm" placeholder="수거창고" readonly/>
38
+												<input type="hidden" id="ITP_FORM_COLLMNG02010_SEARCH_SRTN_WHS_ID" class="form-control itp_input" name="srtnWhsId"  />
39
+												<span class="input-group-btn">
40
+													<button id="ITP_BTN_COLLMNG02010_DELETE_RTN_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
41
+												</span>
42
+											</div>
43
+										</div>	
37
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
44
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
38
 											<button type="button" id="ITP_BTN_COLLMNG02010_SEARCH_RTN_WHS_ID" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
45
 											<button type="button" id="ITP_BTN_COLLMNG02010_SEARCH_RTN_WHS_ID" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
39
-											<button type="button" id="ITP_BTN_COLLMNG02010_DELETE_RTN_WHS_ID" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
40
 						                </div>
46
 						                </div>
41
 										<div class="col-xs-4 itp_ip itp_noMar">
47
 										<div class="col-xs-4 itp_ip itp_noMar">
42
 											<input type="text" id="ITP_FORM_COLLMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
48
 											<input type="text" id="ITP_FORM_COLLMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
@@ -65,8 +71,7 @@
65
 								<input type="hidden" id="ITP_FORM_COLLMNG02010_DETAIL_RTN_lOCATION" class="form-control itp_input" name="rtnLocation"  />
71
 								<input type="hidden" id="ITP_FORM_COLLMNG02010_DETAIL_RTN_lOCATION" class="form-control itp_input" name="rtnLocation"  />
66
 								<input type="hidden" id="ITP_FORM_COLLMNG02010_DETAIL_SPPLY_ID" class="form-control itp_input" name="spplyId"  />
72
 								<input type="hidden" id="ITP_FORM_COLLMNG02010_DETAIL_SPPLY_ID" class="form-control itp_input" name="spplyId"  />
67
 								<section class="itp_form_sec">
73
 								<section class="itp_form_sec">
68
-									<h4 class="itp_form_tit">반품 발주 상세</h4>
69
-									<div class="itp_form_in">	
74
+									<div class="itp_form_in border-top">	
70
 										<div class="form-group">
75
 										<div class="form-group">
71
 											<label class="col-xs-2 itp_lb">브랜드</label>
76
 											<label class="col-xs-2 itp_lb">브랜드</label>
72
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
77
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
@@ -80,7 +85,7 @@
80
 											<div class="input-daterange input-group date">
85
 											<div class="input-daterange input-group date">
81
 												<div class="col-xs-4 itp_ip">
86
 												<div class="col-xs-4 itp_ip">
82
 													<div class="col-xs-7 itp_in">
87
 													<div class="col-xs-7 itp_in">
83
-														<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_COL_SCH_DT" data-check-required="empty" class="form-control itp_input" name="colSchDt" value="">
88
+														<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_COL_SCH_DT" data-check-required="empty" class="form-control itp_input" name="colSchDt" value="" readonly>
84
 													</div>
89
 													</div>
85
 												</div>
90
 												</div>
86
 											</div>
91
 											</div>
@@ -113,11 +118,10 @@
113
 										</div>
118
 										</div>
114
 									</div>
119
 									</div>
115
 									<div class="itp_form_in">
120
 									<div class="itp_form_in">
116
-										<div class="itp_table_head fix" style="background:#f5f5f5;">
121
+										<div class="itp_table_head fix" style="background:#fff;">
117
 											<h4 class="itp_table_tit">발주 품목</h4>
122
 											<h4 class="itp_table_tit">발주 품목</h4>
118
 										</div>
123
 										</div>
119
 										<div id="ITP_COLLMNG02010_DETAIL_jqGrid_list" class="itp_tb_list">
124
 										<div id="ITP_COLLMNG02010_DETAIL_jqGrid_list" class="itp_tb_list">
120
-										  <div id="ITP_COLLMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>
121
 										  <table id="ITP_COLLMNG02010_DETAIL_jqGrid"></table>
125
 										  <table id="ITP_COLLMNG02010_DETAIL_jqGrid"></table>
122
 										  <div id="ITP_COLLMNG02010_DETAIL_jqGridPager"></div>
126
 										  <div id="ITP_COLLMNG02010_DETAIL_jqGridPager"></div>
123
 										  <div id="ITP_COLLMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
127
 										  <div id="ITP_COLLMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

+ 12 - 6
src/main/webapp/app/collmng/COLLMNG03010.html

@@ -20,8 +20,10 @@
20
 								<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_SPPLY_ID" name="sspplyId" value="">
20
 								<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_SPPLY_ID" name="sspplyId" value="">
21
 									<div class="form-group">
21
 									<div class="form-group">
22
 										<div class="col-xs-2 itp_ip itp_noMar">
22
 										<div class="col-xs-2 itp_ip itp_noMar">
23
- 											<label>수거일자 *</label>
24
-										</div>										
23
+ 											<select id="ITP_FORM_COLLMNG03010_SEARCH_" class="form-control itp_input" name="service">
24
+												<option value="A">수거 일자</option>											
25
+											</select>
26
+										</div>								
25
 										<div class="col-xs-3 itp_ip itp_noMar">
27
 										<div class="col-xs-3 itp_ip itp_noMar">
26
 											<div class="input-daterange input-group date">
28
 											<div class="input-daterange input-group date">
27
 												<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
29
 												<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
@@ -29,13 +31,17 @@
29
 												<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
31
 												<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
30
 											</div>
32
 											</div>
31
 										</div>
33
 										</div>
32
-										<div class="col-xs-2 itp_in itp_noMar">
33
-											<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="수거장소(매장/창고)" readonly/>
34
-											<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId" />
34
+										<div class="col-xs-2 itp_ip itp_noMar">
35
+											<div class="input-group">
36
+												<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="수거장소(매장/창고)" readonly/>
37
+												<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId" />
38
+												<span class="input-group-btn">
39
+													<button id="ITP_BTN_COLLMNG03010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
40
+												</span>
41
+											</div>
35
 										</div>
42
 										</div>
36
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
43
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
37
 											<button type="button" id="ITP_BTN_COLLMNG03010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
44
 											<button type="button" id="ITP_BTN_COLLMNG03010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
38
-											<button type="button" id="ITP_BTN_COLLMNG03010_DELETE_WHS_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
39
 						                </div>
45
 						                </div>
40
 										<div class="col-xs-4 itp_ip itp_noMar">
46
 										<div class="col-xs-4 itp_ip itp_noMar">
41
 											<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
47
 											<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />

+ 10 - 30
src/main/webapp/app/loanmng/LOANMNG01010.html

@@ -67,53 +67,33 @@
67
 									<div class="itp_form_in border-top">
67
 									<div class="itp_form_in border-top">
68
 										<div class="form-group">
68
 										<div class="form-group">
69
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
69
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
70
-												<div class="col-xs-4 itp_ip">
71
-													<div class="col-xs-9 itp_in fnBrandNm"></div>												
72
-												</div>
70
+												<div class="col-xs-4 itp_ip fnBrandNm"></div>
73
 											<label class="col-xs-2 itp_lb">매장*</label>
71
 											<label class="col-xs-2 itp_lb">매장*</label>
74
-											<div class="col-xs-4 itp_ip">
75
-												<div class="col-xs-10 itp_in fnStoreNm"></div>
76
-											</div>
72
+											<div class="col-xs-4 itp_ip fnStoreNm"></div>
77
 										</div>
73
 										</div>
78
 										<div class="form-group">
74
 										<div class="form-group">
79
 											<label class="col-xs-2 itp_lb">정산타입</label>
75
 											<label class="col-xs-2 itp_lb">정산타입</label>
80
-											<div class="col-xs-4 itp_ip">
81
-												<div class="col-xs-10 itp_in fnLoanDvsn"></div>
82
-											</div>
76
+											<div class="col-xs-4 itp_ip fnLoanDvsn"></div>
83
 											<label class="col-xs-2 itp_lb">한도금액</label>
77
 											<label class="col-xs-2 itp_lb">한도금액</label>
84
-											<div class="col-xs-4 itp_ip">
85
-												<div class="col-xs-8 itp_in fnCredtLimitAmt"></div>
86
-											</div>
78
+											<div class="col-xs-4 itp_ip fnCredtLimitAmt"></div>
87
 										</div>
79
 										</div>
88
 										<div class="form-group">
80
 										<div class="form-group">
89
 											<label class="col-xs-2 itp_lb">계약기간</label>
81
 											<label class="col-xs-2 itp_lb">계약기간</label>
90
-											<div class="col-xs-4 itp_ip">
91
-												<div class="col-xs-8 itp_in fnContDt"></div>
92
-											</div>
82
+											<div class="col-xs-4 itp_ip fnContDt"></div>
93
 											<label class="col-xs-2 itp_lb">사용여부</label>
83
 											<label class="col-xs-2 itp_lb">사용여부</label>
94
-											<div class="col-xs-4 itp_ip">
95
-												<div class="col-xs-8 itp_in fnUseYn"></div>
96
-											</div>
84
+											<div class="col-xs-4 itp_ip fnUseYn"></div>
97
 										</div>
85
 										</div>
98
 										<div class="form-group">
86
 										<div class="form-group">
99
 											<label class="col-xs-2 itp_lb">가용한도금액</label>
87
 											<label class="col-xs-2 itp_lb">가용한도금액</label>
100
-											<div class="col-xs-4 itp_ip">
101
-												<div class="col-xs-10 itp_in fnPosbLimitAmt"></div>
102
-											</div>
88
+											<div class="col-xs-4 itp_ip fnPosbLimitAmt"></div>
103
 											<label class="col-xs-2 itp_lb">가수금</label>
89
 											<label class="col-xs-2 itp_lb">가수금</label>
104
-											<div class="col-xs-4 itp_ip">
105
-												<div class="col-xs-8 itp_in fnTmpRcvAcctTotal"></div>
106
-											</div>
90
+											<div class="col-xs-4 itp_ip fnTmpRcvAcctTotal"></div>
107
 										</div>
91
 										</div>
108
 										<div class="form-group border">
92
 										<div class="form-group border">
109
 											<label class="col-xs-2 itp_lb">사용금액</label>
93
 											<label class="col-xs-2 itp_lb">사용금액</label>
110
-											<div class="col-xs-4 itp_ip">
111
-												<div class="col-xs-10 itp_in fnUseAmtTotal"></div>
112
-											</div>
94
+											<div class="col-xs-4 itp_ip fnUseAmtTotal"></div>
113
 											<label class="col-xs-2 itp_lb">최종 수정자/일시</label>
95
 											<label class="col-xs-2 itp_lb">최종 수정자/일시</label>
114
-											<div class="col-xs-4 itp_ip">
115
-												<div class="col-xs-10 itp_in fnLastModify"></div>
116
-											</div>
96
+											<div class="col-xs-4 itp_ip fnLastModify"></div>
117
 										</div>
97
 										</div>
118
 									</div>
98
 									</div>
119
 								</section>								
99
 								</section>								

+ 6 - 20
src/main/webapp/app/loanmng/LOANMNG02010.html

@@ -81,15 +81,9 @@
81
 									<div class="itp_form_in border-top">
81
 									<div class="itp_form_in border-top">
82
 										<div class="form-group">
82
 										<div class="form-group">
83
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
83
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
84
-												<div class="col-xs-4 itp_ip">
85
-													<div class="col-xs-9 itp_in fnBrandNm"></div>												
86
-												</div>
84
+												<div class="col-xs-4 itp_ip fnBrandNm"></div>
87
 											<label class="col-xs-2 itp_lb">매장*</label>
85
 											<label class="col-xs-2 itp_lb">매장*</label>
88
-											<div class="col-xs-4 itp_ip">
89
-												<div class="col-xs-10 itp_in">
90
-													<div class="col-xs-6 itp_in fnStoreNm"></div>
91
-												</div>
92
-											</div>
86
+											<div class="col-xs-4 itp_ip fnStoreNm"></div>
93
 										</div>
87
 										</div>
94
 										<div class="form-group">
88
 										<div class="form-group">
95
 											<label class="col-xs-2 itp_lb">입금금액</label>
89
 											<label class="col-xs-2 itp_lb">입금금액</label>
@@ -162,23 +156,15 @@
162
 									<div class="itp_form_in border-top">
156
 									<div class="itp_form_in border-top">
163
 										<div class="form-group">
157
 										<div class="form-group">
164
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
158
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
165
-											<div class="col-xs-4 itp_ip">
166
-												<div class="col-xs-9 itp_in fnBrandNm"></div>												
167
-											</div>
159
+											<div class="col-xs-4 itp_ip fnBrandNm"></div>
168
 											<label class="col-xs-2 itp_lb">매장*</label>
160
 											<label class="col-xs-2 itp_lb">매장*</label>
169
-											<div class="col-xs-4 itp_ip">
170
-												<div class="col-xs-10 itp_in fnStoreNm"></div>
171
-											</div>
161
+											<div class="col-xs-4 itp_ip fnStoreNm"></div>
172
 										</div>
162
 										</div>
173
 										<div class="form-group">
163
 										<div class="form-group">
174
 											<label class="col-xs-2 itp_lb">입금금액</label>
164
 											<label class="col-xs-2 itp_lb">입금금액</label>
175
-											<div class="col-xs-4 itp_ip">
176
-												<div class="col-xs-10 itp_in fnDpstAmt"></div>
177
-											</div>
165
+											<div class="col-xs-4 itp_ip fnDpstAmt"></div>
178
 											<label class="col-xs-2 itp_lb">입금일자</label>
166
 											<label class="col-xs-2 itp_lb">입금일자</label>
179
-											<div class="col-xs-4 itp_ip">
180
-												<div class="col-xs-8 itp_in fnDpstDt"></div>
181
-											</div>
167
+											<div class="col-xs-4 itp_ip fnDpstDt"></div>
182
 										</div>
168
 										</div>
183
 										<div class="form-group">
169
 										<div class="form-group">
184
 											<label class="col-xs-2 itp_lb">입금자명</label>
170
 											<label class="col-xs-2 itp_lb">입금자명</label>

+ 9 - 27
src/main/webapp/app/loanmng/LOANMNG03010.html

@@ -73,49 +73,31 @@
73
 				                    <div class="itp_form_in border-top">
73
 				                    <div class="itp_form_in border-top">
74
 				                        <div class="form-group">
74
 				                        <div class="form-group">
75
 				                            <label class="col-xs-2 itp_lb">브랜드</label>
75
 				                            <label class="col-xs-2 itp_lb">브랜드</label>
76
-				                                <div class="col-xs-4 itp_ip">
77
-				                                    <div class="col-xs-9 itp_in fnBrandNm"></div>												
78
-				                                </div>
76
+			                                <div class="col-xs-4 itp_ip fnBrandNm"></div>
79
 				                            <label class="col-xs-2 itp_lb">매장</label>
77
 				                            <label class="col-xs-2 itp_lb">매장</label>
80
-				                            <div class="col-xs-4 itp_ip">
81
-				                                <div class="col-xs-8 itp_in fnStoreNm"></div>
82
-				                            </div>
78
+				                            <div class="col-xs-4 itp_ip fnStoreNm"></div>
83
 				                        </div>
79
 				                        </div>
84
 				                        <div class="form-group">
80
 				                        <div class="form-group">
85
 				                            <label class="col-xs-2 itp_lb">매장 계좌잔액</label>
81
 				                            <label class="col-xs-2 itp_lb">매장 계좌잔액</label>
86
-				                            <div class="col-xs-4 itp_ip">
87
-				                                <div class="col-xs-8 itp_in fnAcctBal"></div>
88
-				                            </div>
82
+				                            <div class="col-xs-4 itp_ip fnAcctBal"></div>
89
 				                            <label class="col-xs-2 itp_lb">매장 사용가능한도금액</label>
83
 				                            <label class="col-xs-2 itp_lb">매장 사용가능한도금액</label>
90
-				                            <div class="col-xs-4 itp_ip">
91
-				                                <div class="col-xs-8 itp_in fnUseAmtTotal"></div>
92
-				                            </div>
84
+				                            <div class="col-xs-4 itp_ip fnUseAmtTotal"></div>
93
 				                        </div>
85
 				                        </div>
94
 				                        <div class="form-group">
86
 				                        <div class="form-group">
95
 				                            <label class="col-xs-2 itp_lb">정산요청일자</label>
87
 				                            <label class="col-xs-2 itp_lb">정산요청일자</label>
96
-				                            <div class="col-xs-4 itp_ip">
97
-				                                <div class="col-xs-8 itp_in fnSttlReqDt"></div>
98
-				                            </div>
88
+				                            <div class="col-xs-4 itp_ip fnSttlReqDt"></div>
99
 				                            <label class="col-xs-2 itp_lb">정산상태</label>
89
 				                            <label class="col-xs-2 itp_lb">정산상태</label>
100
-				                            <div class="col-xs-4 itp_ip">
101
-				                                <div class="col-xs-8 itp_in fnSttlStNm"></div>
102
-				                            </div>
90
+				                            <div class="col-xs-4 itp_ip fnSttlStNm"></div>
103
 				                        </div>
91
 				                        </div>
104
 				                        <div class="form-group">
92
 				                        <div class="form-group">
105
 				                            <label class="col-xs-2 itp_lb">정산요청금액</label>
93
 				                            <label class="col-xs-2 itp_lb">정산요청금액</label>
106
-				                            <div class="col-xs-4 itp_ip">
107
-				                                <div class="col-xs-8 itp_in fnSttlReqAmt"></div>
108
-				                            </div>
94
+				                            <div class="col-xs-4 itp_ip fnSttlReqAmt"></div>
109
 				                            <label class="col-xs-2 itp_lb">미납금액</label>
95
 				                            <label class="col-xs-2 itp_lb">미납금액</label>
110
-				                            <div class="col-xs-4 itp_ip">
111
-				                                <div class="col-xs-8 itp_in fnUnpaidAmt"></div>
112
-				                            </div>
96
+				                            <div class="col-xs-4 itp_ip fnUnpaidAmt"></div>
113
 				                        </div>
97
 				                        </div>
114
 				                        <div class="form-group">
98
 				                        <div class="form-group">
115
 				                            <label class="col-xs-2 itp_lb">정산확정일자</label>
99
 				                            <label class="col-xs-2 itp_lb">정산확정일자</label>
116
-				                            <div class="col-xs-4 itp_ip">
117
-				                                <div class="col-xs-5 itp_in fnSttlDt"></div>
118
-				                            </div>
100
+				                            <div class="col-xs-4 itp_ip fnSttlDt"></div>
119
 				                            <label class="col-xs-2 itp_lb">등록정보</label>
101
 				                            <label class="col-xs-2 itp_lb">등록정보</label>
120
 				                            <div class="col-xs-4 itp_ip fnSysRegNm"></div>
102
 				                            <div class="col-xs-4 itp_ip fnSysRegNm"></div>
121
 				                        </div>
103
 				                        </div>

+ 13 - 9
src/main/webapp/app/ordmng/ORDMNG01010.html

@@ -22,7 +22,9 @@
22
 								<input type="hidden" id="ITP_FORM_ORDMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
22
 								<input type="hidden" id="ITP_FORM_ORDMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
23
 									<div class="form-group">
23
 									<div class="form-group">
24
 										<div class="col-xs-2 itp_ip itp_noMar">
24
 										<div class="col-xs-2 itp_ip itp_noMar">
25
-											<label>수주일지</label>
25
+											<select id="ITP_FORM_ORDMNG01010_SEARCH_" class="form-control itp_input" name="service">
26
+												<option value="A">수주일자</option>											
27
+											</select>
26
 										</div>											
28
 										</div>											
27
 										<div class="col-xs-3 itp_ip itp_noMar">
29
 										<div class="col-xs-3 itp_ip itp_noMar">
28
 											<div class="input-daterange input-group date">
30
 											<div class="input-daterange input-group date">
@@ -39,12 +41,16 @@
39
 											</select>
41
 											</select>
40
 										</div>
42
 										</div>
41
 										<div class="col-xs-3 itp_ip itp_noMar">
43
 										<div class="col-xs-3 itp_ip itp_noMar">
42
-											<input type="text" id="ITP_FORM_ORDMNG01010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품장소 (매장/창고)" readonly/>
43
-											<input type="hidden" id="ITP_FORM_ORDMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId"/>
44
-										</div>
44
+											<div class="input-group">
45
+												<input type="text" id="ITP_FORM_ORDMNG01010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품장소 (매장/창고)" readonly/>
46
+												<input type="hidden" id="ITP_FORM_ORDMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId"/>
47
+												<span class="input-group-btn">
48
+													<button id="ITP_BTN_ORDMNG01010_DELETE_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
49
+												</span>
50
+											</div>
51
+										</div>	
45
 										<div class="col-xs-1 itp_in" style="padding-left: 5px; width:10%;">
52
 										<div class="col-xs-1 itp_in" style="padding-left: 5px; width:10%;">
46
 											<button type="button" id="ITP_BTN_ORDMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
53
 											<button type="button" id="ITP_BTN_ORDMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
47
-											<button type="button" id="ITP_BTN_ORDMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
48
 						                </div>
54
 						                </div>
49
 										<div class="col-xs-5 itp_ip itp_noMar">
55
 										<div class="col-xs-5 itp_ip itp_noMar">
50
 											<input type="text" id="ITP_FORM_ORDMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호/품목명" />
56
 											<input type="text" id="ITP_FORM_ORDMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호/품목명" />
@@ -70,8 +76,7 @@
70
 								<input type="hidden" id="ITP_FORM_ORDMNG01010_VIEW_VIEW_CD" name="viewCd" value="C">
76
 								<input type="hidden" id="ITP_FORM_ORDMNG01010_VIEW_VIEW_CD" name="viewCd" value="C">
71
 					
77
 					
72
 								<section class="itp_form_sec">
78
 								<section class="itp_form_sec">
73
-									<h4 class="itp_form_tit">구매 발주 상세</h4>
74
-									<div class="itp_form_in">	
79
+									<div class="itp_form_in border-top">	
75
 										<div class="form-group">
80
 										<div class="form-group">
76
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
81
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
77
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
82
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
@@ -106,11 +111,10 @@
106
 										</div>
111
 										</div>
107
 									</div>
112
 									</div>
108
 									<div class="itp_form_in">
113
 									<div class="itp_form_in">
109
-										<div class="itp_table_head fix" style="background:#f5f5f5;">
114
+										<div class="itp_table_head fix" style="background:#fff;">
110
 											<h4 class="itp_table_tit">발주 품목</h4>
115
 											<h4 class="itp_table_tit">발주 품목</h4>
111
 										</div>
116
 										</div>
112
 										<div id="ITP_ORDMNG01010_VIEW_jqGrid_list" class="itp_tb_list">
117
 										<div id="ITP_ORDMNG01010_VIEW_jqGrid_list" class="itp_tb_list">
113
-										  <div id="ITP_ORDMNG01010_VIEW_jqGridView" class="itp_views fix"></div>
114
 										  <table id="ITP_ORDMNG01010_VIEW_jqGrid"></table>
118
 										  <table id="ITP_ORDMNG01010_VIEW_jqGrid"></table>
115
 										  <div id="ITP_ORDMNG01010_VIEW_jqGridPager"></div>
119
 										  <div id="ITP_ORDMNG01010_VIEW_jqGridPager"></div>
116
 										  <div id="ITP_ORDMNG01010_VIEW_jqGridEmpty" class="itp_no_data"></div>
120
 										  <div id="ITP_ORDMNG01010_VIEW_jqGridEmpty" class="itp_no_data"></div>

+ 16 - 12
src/main/webapp/app/ordmng/ORDMNG02010.html

@@ -22,7 +22,9 @@
22
 								<input type="hidden" id="ITP_FORM_ORDMNG02010_SEARCH_SPPLY_ID" name="sspplyId" value="">
22
 								<input type="hidden" id="ITP_FORM_ORDMNG02010_SEARCH_SPPLY_ID" name="sspplyId" value="">
23
 									<div class="form-group">
23
 									<div class="form-group">
24
 										<div class="col-xs-2 itp_ip itp_noMar">
24
 										<div class="col-xs-2 itp_ip itp_noMar">
25
-											<label>납품요청일 *</label>
25
+											<select id="ITP_FORM_ORDMNG02010_SEARCH_" class="form-control itp_input" name="service">
26
+												<option value="A">납품요청일</option>											
27
+											</select>
26
 										</div>										
28
 										</div>										
27
 										<div class="col-xs-3 itp_ip itp_noMar">
29
 										<div class="col-xs-3 itp_ip itp_noMar">
28
 											<div class="input-daterange input-group date">
30
 											<div class="input-daterange input-group date">
@@ -31,13 +33,17 @@
31
 												<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
33
 												<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
32
 											</div>
34
 											</div>
33
 										</div>
35
 										</div>
34
-										<div class="col-xs-2 itp_in itp_noMar">
35
-											<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="수거창고/매장" readonly/>
36
-											<input type="hidden" id="ITP_FORM_ORDMNG02010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
37
-										</div>
38
-										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
36
+										<div class="col-xs-2 itp_ip itp_noMar">
37
+											<div class="input-group">
38
+												<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="수거창고/매장" readonly/>
39
+												<input type="hidden" id="ITP_FORM_ORDMNG02010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
40
+												<span class="input-group-btn">
41
+													<button id="ITP_BTN_ORDMNG02010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
42
+												</span>
43
+											</div>
44
+										</div>	
45
+										<div class="col-xs-1 itp_in" style="padding: 0px; width:5%;">
39
 											<button type="button" id="ITP_BTN_ORDMNG02010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
46
 											<button type="button" id="ITP_BTN_ORDMNG02010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
40
-											<button type="button" id="ITP_BTN_ORDMNG02010_DELETE_WHS_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
41
 						                </div>
47
 						                </div>
42
 										<div class="col-xs-4 itp_ip itp_noMar">
48
 										<div class="col-xs-4 itp_ip itp_noMar">
43
 											<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
49
 											<input type="text" id="ITP_FORM_ORDMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
@@ -64,8 +70,7 @@
64
 								<input type="hidden" id="ITP_FORM_ORDMNG02010_DETAIL_SEARCH_BRAND_ID" name="brandId" value="">
70
 								<input type="hidden" id="ITP_FORM_ORDMNG02010_DETAIL_SEARCH_BRAND_ID" name="brandId" value="">
65
 								<input type="hidden" id="ITP_FORM_ORDMNG02010_DETAIL_SEARCH_SPPLY_ID" name="spplyId" value="">
71
 								<input type="hidden" id="ITP_FORM_ORDMNG02010_DETAIL_SEARCH_SPPLY_ID" name="spplyId" value="">
66
 								<section class="itp_form_sec">
72
 								<section class="itp_form_sec">
67
-									<h4 class="itp_form_tit">구매 발주 상세</h4>
68
-									<div class="itp_form_in">	
73
+									<div class="itp_form_in border-top">	
69
 										<div class="form-group">
74
 										<div class="form-group">
70
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
75
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
71
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
76
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
@@ -97,7 +102,7 @@
97
 											<div class="input-daterange input-group date">
102
 											<div class="input-daterange input-group date">
98
 												<div class="col-xs-4 itp_ip">
103
 												<div class="col-xs-4 itp_ip">
99
 													<div class="col-xs-7 itp_in">
104
 													<div class="col-xs-7 itp_in">
100
-														<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT" data-check-required="empty" class="form-control itp_input" name="dlvSchDt" value="">
105
+														<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT" data-check-required="empty" class="form-control itp_input" name="dlvSchDt" value="" readonly>
101
 													</div>
106
 													</div>
102
 												</div>
107
 												</div>
103
 											</div>											
108
 											</div>											
@@ -122,11 +127,10 @@
122
 										</div>
127
 										</div>
123
 									</div>
128
 									</div>
124
 									<div class="itp_form_in">
129
 									<div class="itp_form_in">
125
-										<div class="itp_table_head fix" style="background:#f5f5f5;">
130
+										<div class="itp_table_head fix" style="background:#fff;">
126
 											<h4 class="itp_table_tit">발주 품목</h4>
131
 											<h4 class="itp_table_tit">발주 품목</h4>
127
 										</div>
132
 										</div>
128
 										<div id="ITP_ORDMNG02010_DETAIL_jqGrid_list" class="itp_tb_list">
133
 										<div id="ITP_ORDMNG02010_DETAIL_jqGrid_list" class="itp_tb_list">
129
-											<div id="ITP_ORDMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>
130
 											<table id="ITP_ORDMNG02010_DETAIL_jqGrid"></table>
134
 											<table id="ITP_ORDMNG02010_DETAIL_jqGrid"></table>
131
 											<div id="ITP_ORDMNG02010_DETAIL_jqGridPager"></div>
135
 											<div id="ITP_ORDMNG02010_DETAIL_jqGridPager"></div>
132
 											<div id="ITP_ORDMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
136
 											<div id="ITP_ORDMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

+ 11 - 5
src/main/webapp/app/ordmng/ORDMNG03010.html

@@ -18,7 +18,9 @@
18
 								<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
18
 								<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
19
 									<div class="form-group">
19
 									<div class="form-group">
20
 										<div class="col-xs-2 itp_ip itp_noMar">
20
 										<div class="col-xs-2 itp_ip itp_noMar">
21
-											<label>납품예정일자</label>
21
+											<select id="ITP_FORM_ORDMNG03010_SEARCH_" class="form-control itp_input" name="service">
22
+												<option value="A">납품예정일자</option>											
23
+											</select>
22
 										</div>										
24
 										</div>										
23
 										<div class="col-xs-3 itp_ip itp_noMar">
25
 										<div class="col-xs-3 itp_ip itp_noMar">
24
 											<div class="input-daterange input-group date">
26
 											<div class="input-daterange input-group date">
@@ -27,15 +29,19 @@
27
 												<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT" class="form-control itp_input" name="toDt" value="2022.12.31" readonly>
29
 												<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT" class="form-control itp_input" name="toDt" value="2022.12.31" readonly>
28
 											</div>
30
 											</div>
29
 										</div>
31
 										</div>
30
-										<div class="col-xs-2 itp_in itp_noMar">
32
+										<div class="col-xs-3 itp_ip itp_noMar">
33
+											<div class="input-group">
31
 											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품장소(매장/창고)" readonly/>
34
 											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품장소(매장/창고)" readonly/>
32
 											<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId" />
35
 											<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId" />
33
-										</div>
36
+												<span class="input-group-btn">
37
+													<button id="ITP_FORM_ORDMNG03010_SDELETE_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
38
+												</span>
39
+											</div>
40
+										</div>	
34
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
41
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
35
 											<button type="button" id="ITP_FORM_ORDMNG03010_SSEARCH_SWHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
42
 											<button type="button" id="ITP_FORM_ORDMNG03010_SSEARCH_SWHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
36
-											<button type="button" id="ITP_FORM_ORDMNG03010_SDELETE_SWHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
37
 						                </div>
43
 						                </div>
38
-										<div class="col-xs-4 itp_ip itp_noMar">
44
+										<div class="col-xs-3 itp_ip itp_noMar">
39
 											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
45
 											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
40
 										</div>
46
 										</div>
41
 									</div>
47
 									</div>

+ 1 - 1
src/main/webapp/app/pomng/POMNG01010.html

@@ -77,7 +77,7 @@
77
 														<input type="text" id="ITP_FORM_POMNG01010_DETAIL_LOCATION_NM" data-check-required="empty" class="form-control itp_input" name="locationNm" value="" />
77
 														<input type="text" id="ITP_FORM_POMNG01010_DETAIL_LOCATION_NM" data-check-required="empty" class="form-control itp_input" name="locationNm" value="" />
78
 														<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
78
 														<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
79
 														<span class="input-group-btn">
79
 														<span class="input-group-btn">
80
-															<button id="ITP_FORM_POMNG01010_DELETE_WHS_NM" class="btn btn-default btn-sm itp_btn UPB SHOW" type="button"><i class="glyphicon glyphicon-erase"></i></button>
80
+															<button id="ITP_FORM_POMNG01010_DELETE_WHS_NM" class="btn btn-default btn-sm itp_btn UPB SHOW" type="button"><i class="glyphicon glyphicon-remove"></i></button>
81
 														</span>
81
 														</span>
82
 													</div>
82
 													</div>
83
 												</div>
83
 												</div>

+ 10 - 6
src/main/webapp/app/pomng/POMNG02010.html

@@ -38,7 +38,7 @@
38
 												<input type="text" id="ITP_FORM_POMNG02010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품창고" readonly />
38
 												<input type="text" id="ITP_FORM_POMNG02010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품창고" readonly />
39
 												<input type="hidden" id="ITP_FORM_POMNG02010_SEARCH_SWHS_ID" name="swhsId" value="">
39
 												<input type="hidden" id="ITP_FORM_POMNG02010_SEARCH_SWHS_ID" name="swhsId" value="">
40
 												<span class="input-group-btn">
40
 												<span class="input-group-btn">
41
-													<button id="ITP_FORM_POMNG02010_SDELETE_SWHS_NM" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
41
+													<button id="ITP_FORM_POMNG02010_SDELETE_SWHS_NM" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-remove"></i></button>
42
 												</span>
42
 												</span>
43
 											</div>
43
 											</div>
44
 										</div>
44
 										</div>
@@ -133,13 +133,17 @@
133
 													<input type="text" id="ITP_FORM_POMNG02010_DETAIL_WHS_NM" data-check-required="empty" class="form-control itp_input" name="whsNm" value="" readonly="readonly" />
133
 													<input type="text" id="ITP_FORM_POMNG02010_DETAIL_WHS_NM" data-check-required="empty" class="form-control itp_input" name="whsNm" value="" readonly="readonly" />
134
 													<input type="hidden" id="ITP_FORM_POMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
134
 													<input type="hidden" id="ITP_FORM_POMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
135
 												</div>
135
 												</div>
136
-												<div class="col-xs-4 itp_in">
137
-													<input type="text" id="ITP_FORM_POMNG02010_DETAIL_LOCATION_NM" data-check-required="empty" class="form-control itp_input" name="locationNm" value=""  readonly="readonly" />
138
-													<input type="hidden" id="ITP_FORM_POMNG02010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
136
+												<div class="col-xs-5 itp_in">
137
+													<div class="input-group">
138
+														<input type="text" id="ITP_FORM_POMNG02010_DETAIL_LOCATION_NM" data-check-required="empty" class="form-control itp_input" name="locationNm" value=""  readonly="readonly" />
139
+														<input type="hidden" id="ITP_FORM_POMNG02010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
140
+														<span class="input-group-btn">
141
+															<button id="ITP_FORM_POMNG02010_DELETE_WHS_NM" class="btn btn-default btn-sm itp_btn UPB SHOW" type="button"><i class="glyphicon glyphicon-remove"></i></button>
142
+														</span>
143
+													</div>
139
 												</div>
144
 												</div>
140
-												<div class="col-xs-1 itp_in" style="width:23%; padding:0px;">
145
+												<div class="col-xs-a itp_in">
141
 													<button type="button" id="ITP_FORM_POMNG02010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
146
 													<button type="button" id="ITP_FORM_POMNG02010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
142
-													<button type="button" id="ITP_FORM_POMNG02010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
143
 								                </div>		
147
 								                </div>		
144
 											</div>
148
 											</div>
145
 										</div>
149
 										</div>

+ 15 - 14
src/main/webapp/app/pomng/POMNG03010.html

@@ -40,7 +40,7 @@
40
 											<input type="text" id="ITP_FORM_POMNG03010_SEARCH_SSPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
40
 											<input type="text" id="ITP_FORM_POMNG03010_SEARCH_SSPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
41
 											<input type="hidden" id="ITP_FORM_POMNG03010_SEARCH_SSPPLY_ID" class="form-control itp_input" name="sspplyId" />
41
 											<input type="hidden" id="ITP_FORM_POMNG03010_SEARCH_SSPPLY_ID" class="form-control itp_input" name="sspplyId" />
42
 												<span class="input-group-btn">
42
 												<span class="input-group-btn">
43
-													<button id="ITP_FORM_POMNG03010_SDELETE_SSPPLY_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
43
+													<button id="ITP_FORM_POMNG03010_SDELETE_SSPPLY_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
44
 												</span>
44
 												</span>
45
 											</div>
45
 											</div>
46
 										</div>
46
 										</div>
@@ -53,7 +53,7 @@
53
 											<input type="text" id="ITP_FORM_POMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
53
 											<input type="text" id="ITP_FORM_POMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
54
 											<input type="hidden" id="ITP_FORM_POMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
54
 											<input type="hidden" id="ITP_FORM_POMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId"  />
55
 												<span class="input-group-btn">
55
 												<span class="input-group-btn">
56
-													<button id="ITP_FORM_POMNG03010_SDELETE_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
56
+													<button id="ITP_FORM_POMNG03010_SDELETE_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
57
 												</span>
57
 												</span>
58
 											</div>
58
 											</div>
59
 										</div>
59
 										</div>
@@ -92,14 +92,13 @@
92
 								<input type="hidden" id="ITP_FORM_POMNG03010_DETAIL_SHMT_LOCATION" name="shmtLocation" value="">
92
 								<input type="hidden" id="ITP_FORM_POMNG03010_DETAIL_SHMT_LOCATION" name="shmtLocation" value="">
93
 								<input type="hidden" id="ITP_FORM_POMNG03010_DETAIL_PODR_MGR_ID" name="podrMgrId" value="">
93
 								<input type="hidden" id="ITP_FORM_POMNG03010_DETAIL_PODR_MGR_ID" name="podrMgrId" value="">
94
 								<input type="hidden" id="ITP_FORM_POMNG03010_DETAIL_PODR_MGR_TEL_NO" name="podrMgrTelNo" value="">
94
 								<input type="hidden" id="ITP_FORM_POMNG03010_DETAIL_PODR_MGR_TEL_NO" name="podrMgrTelNo" value="">
95
-								<input type="text" id="ITP_FORM_POMNG03010_DETAIL_DLV_DVSN" name="dlvDvsn" value="">
95
+								<input type="hidden" id="ITP_FORM_POMNG03010_DETAIL_DLV_DVSN" name="dlvDvsn" value="">
96
 								
96
 								
97
 								
97
 								
98
 								
98
 								
99
 					
99
 					
100
 								<section class="itp_form_sec">
100
 								<section class="itp_form_sec">
101
-									<h4 class="itp_form_tit">구매발주상세</h4>
102
-									<div class="itp_form_in">	
101
+									<div class="itp_form_in border-top">	
103
 										<div class="form-group">
102
 										<div class="form-group">
104
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
103
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
105
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
104
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
@@ -146,23 +145,26 @@
146
 											</div>
145
 											</div>
147
 											<label class="col-xs-2 itp_lb">출하창고</label>
146
 											<label class="col-xs-2 itp_lb">출하창고</label>
148
 											<div class="col-xs-4 itp_ip">
147
 											<div class="col-xs-4 itp_ip">
149
-												<div class="col-xs-5 itp_in">
148
+												<div class="col-xs-6 itp_in">
149
+													<div class="input-group">
150
 													<input type="text" id="ITP_FORM_POMNG03010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="shmtWhsNm" readonly="readonly"/>
150
 													<input type="text" id="ITP_FORM_POMNG03010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="shmtWhsNm" readonly="readonly"/>
151
+														<span class="input-group-btn">
152
+															<button id="ITP_BTN_POMNG03010_DELETE_SHMT_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
153
+														</span>
154
+													</div>
151
 												</div>
155
 												</div>
152
 												<div class="col-xs-4 itp_in" style="padding-left: 3px;">
156
 												<div class="col-xs-4 itp_in" style="padding-left: 3px;">
153
 													<button type="button" id="ITP_BTN_POMNG03010_SEARCH_SHMT_WHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
157
 													<button type="button" id="ITP_BTN_POMNG03010_SEARCH_SHMT_WHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
154
-													<button type="button" id="ITP_BTN_POMNG03010_DELETE_SHMT_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
155
 								                </div>
158
 								                </div>
156
 											</div>
159
 											</div>
157
 										</div>
160
 										</div>
158
 									</div>
161
 									</div>
159
 									<div class="itp_form_in">
162
 									<div class="itp_form_in">
160
-										<div class="itp_table_head fix" style="background:#f5f5f5;">
163
+										<div class="itp_table_head fix" style="background:#fff;">
161
 											<h4 class="itp_table_tit">발주 품목</h4>
164
 											<h4 class="itp_table_tit">발주 품목</h4>
162
 										</div>
165
 										</div>
163
 									</div>
166
 									</div>
164
 									<div id="ITP_POMNG03010_DETAIL_jqGrid_list" class="itp_tb_list">
167
 									<div id="ITP_POMNG03010_DETAIL_jqGrid_list" class="itp_tb_list">
165
-									  <div id="ITP_POMNG03010_DETAIL_jqGridView" class="itp_views fix"></div>
166
 									  <table id="ITP_POMNG03010_DETAIL_jqGrid"></table>
168
 									  <table id="ITP_POMNG03010_DETAIL_jqGrid"></table>
167
 									  <div id="ITP_POMNG03010_DETAIL_jqGridPager"></div>
169
 									  <div id="ITP_POMNG03010_DETAIL_jqGridPager"></div>
168
 									  <div id="ITP_POMNG03010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
170
 									  <div id="ITP_POMNG03010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
@@ -188,8 +190,7 @@
188
 								<input type="hidden" id="ITP_FORM_POMNG03010_NDETAIL_DLV_DVSN" name="dlvDvsn" value="">
190
 								<input type="hidden" id="ITP_FORM_POMNG03010_NDETAIL_DLV_DVSN" name="dlvDvsn" value="">
189
 					
191
 					
190
 								<section class="itp_form_sec">
192
 								<section class="itp_form_sec">
191
-									<h4 class="itp_form_tit">구매발주상세-신규발주생성</h4>
192
-									<div class="itp_form_in">	
193
+									<div class="itp_form_in border-top">	
193
 										<div class="form-group">
194
 										<div class="form-group">
194
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
195
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
195
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
196
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
@@ -205,7 +206,7 @@
205
 													<div class="input-group">
206
 													<div class="input-group">
206
 														<input type="text" id="ITP_FORM_POMNG03010_NDETAIL_SPPLY_NM" data-check-required="empty" class="form-control itp_input" name="spplyNm" readonly="readonly" />
207
 														<input type="text" id="ITP_FORM_POMNG03010_NDETAIL_SPPLY_NM" data-check-required="empty" class="form-control itp_input" name="spplyNm" readonly="readonly" />
207
 														<span class="input-group-btn">
208
 														<span class="input-group-btn">
208
-															<button id="ITP_BTN_POMNG03010_NDETAIL_DELETE_SPPLY_NM" class="btn btn-default btn-sm itp_btn UPB SHOW" type="button"><i class="glyphicon glyphicon-erase"></i></button>
209
+															<button id="ITP_BTN_POMNG03010_NDETAIL_DELETE_SPPLY_NM" class="btn btn-default btn-sm itp_btn UPB SHOW" type="button"><i class="glyphicon glyphicon-remove"></i></button>
209
 														</span>
210
 														</span>
210
 													</div>
211
 													</div>
211
 												</div>
212
 												</div>
@@ -225,7 +226,7 @@
225
 													<div class="input-group">
226
 													<div class="input-group">
226
 														<input type="text" id="ITP_FORM_POMNG03010_NDETAIL_WHS_NM" data-check-required="empty" class="form-control itp_input" name="whsNm" readonly="readonly" />
227
 														<input type="text" id="ITP_FORM_POMNG03010_NDETAIL_WHS_NM" data-check-required="empty" class="form-control itp_input" name="whsNm" readonly="readonly" />
227
 														<span class="input-group-btn">
228
 														<span class="input-group-btn">
228
-															<button id="ITP_BTN_POMNG03010_DELETE_WHS_NM" class="btn btn-default btn-sm itp_btn UPB SHOW" type="button"><i class="glyphicon glyphicon-erase"></i></button>
229
+															<button id="ITP_BTN_POMNG03010_DELETE_WHS_NM" class="btn btn-default btn-sm itp_btn UPB SHOW" type="button"><i class="glyphicon glyphicon-remove"></i></button>
229
 														</span>
230
 														</span>
230
 													</div>
231
 													</div>
231
 												</div>
232
 												</div>
@@ -260,7 +261,7 @@
260
 										</div>
261
 										</div>
261
 									</div>
262
 									</div>
262
 									<div class="itp_form_in">
263
 									<div class="itp_form_in">
263
-										<div class="itp_table_head fix" style="background:#f5f5f5;">
264
+										<div class="itp_table_head fix" style="background:#fff;">
264
 											<h4 class="itp_table_tit">발주 품목</h4>
265
 											<h4 class="itp_table_tit">발주 품목</h4>
265
 											<div class="pull-right itp_cicon">
266
 											<div class="pull-right itp_cicon">
266
 												<button type="button" id="ITP_BTN_POMNG03010_NDETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
267
 												<button type="button" id="ITP_BTN_POMNG03010_NDETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>

+ 2 - 2
src/main/webapp/app/pomng/POMNG04010.html

@@ -42,7 +42,7 @@
42
 												<input type="text" id="ITP_FORM_POMNG04010_DETAIL_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
42
 												<input type="text" id="ITP_FORM_POMNG04010_DETAIL_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
43
 												<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
43
 												<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
44
 												<span class="input-group-btn">
44
 												<span class="input-group-btn">
45
-													<button id="ITP_BTN_POMNG04010_DELETE_SPPLY_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
45
+													<button id="ITP_BTN_POMNG04010_DELETE_SPPLY_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
46
 												</span>
46
 												</span>
47
 											</div>
47
 											</div>
48
 										</div>
48
 										</div>
@@ -54,7 +54,7 @@
54
 											<input type="text" id="ITP_FORM_POMNG04010_DETAIL_WHS_NM" class="form-control itp_input" name="sdlvPlace" placeholder="매장/창고" readonly/>
54
 											<input type="text" id="ITP_FORM_POMNG04010_DETAIL_WHS_NM" class="form-control itp_input" name="sdlvPlace" placeholder="매장/창고" readonly/>
55
 											<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />											
55
 											<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />											
56
 												<span class="input-group-btn">
56
 												<span class="input-group-btn">
57
-													<button id="ITP_BTN_POMNG04010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
57
+													<button id="ITP_BTN_POMNG04010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
58
 												</span>
58
 												</span>
59
 											</div>
59
 											</div>
60
 										</div>
60
 										</div>

+ 2 - 2
src/main/webapp/app/pomng/POMNG05010.html

@@ -42,7 +42,7 @@
42
 												<input type="text" id="ITP_FORM_POMNG05010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
42
 												<input type="text" id="ITP_FORM_POMNG05010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
43
 												<input type="hidden" id="ITP_FORM_POMNG05010_SEARCH_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
43
 												<input type="hidden" id="ITP_FORM_POMNG05010_SEARCH_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
44
 												<span class="input-group-btn">
44
 												<span class="input-group-btn">
45
-													<button id="ITP_BTN_POMNG05010_DELETE_SPPLY_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
45
+													<button id="ITP_BTN_POMNG05010_DELETE_SPPLY_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
46
 												</span>
46
 												</span>
47
 											</div>
47
 											</div>
48
 										</div>	
48
 										</div>	
@@ -54,7 +54,7 @@
54
 												<input type="text" id="ITP_FORM_POMNG05010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
54
 												<input type="text" id="ITP_FORM_POMNG05010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
55
 												<input type="hidden" id="ITP_FORM_POMNG05010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"  />
55
 												<input type="hidden" id="ITP_FORM_POMNG05010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"  />
56
 												<span class="input-group-btn">
56
 												<span class="input-group-btn">
57
-													<button id="ITP_BTN_POMNG05010_DELETE_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
57
+													<button id="ITP_BTN_POMNG05010_DELETE_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
58
 												</span>
58
 												</span>
59
 											</div>
59
 											</div>
60
 										</div>
60
 										</div>

+ 2 - 2
src/main/webapp/app/pomng/POMNG06010.html

@@ -32,7 +32,7 @@
32
 											<input type="text" id="ITP_FORM_POMNG06010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="입고창고*" readonly/>
32
 											<input type="text" id="ITP_FORM_POMNG06010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="입고창고*" readonly/>
33
 											<input type="hidden" id="ITP_FORM_POMNG06010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId" placeholder="입고창고" />
33
 											<input type="hidden" id="ITP_FORM_POMNG06010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId" placeholder="입고창고" />
34
 												<span class="input-group-btn">
34
 												<span class="input-group-btn">
35
-													<button id="ITP_BTN_POMNG06010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
35
+													<button id="ITP_BTN_POMNG06010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
36
 												</span>
36
 												</span>
37
 											</div>
37
 											</div>
38
 										</div>	
38
 										</div>	
@@ -46,7 +46,7 @@
46
 											<input type="text" id="ITP_FORM_POMNG06010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
46
 											<input type="text" id="ITP_FORM_POMNG06010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
47
 											<input type="hidden" id="ITP_FORM_POMNG06010_SEARCH_SPPLY_ID" class="form-control itp_input" name="sspplyId" placeholder="공급업체" />
47
 											<input type="hidden" id="ITP_FORM_POMNG06010_SEARCH_SPPLY_ID" class="form-control itp_input" name="sspplyId" placeholder="공급업체" />
48
 												<span class="input-group-btn">
48
 												<span class="input-group-btn">
49
-													<button id="ITP_BTN_POMNG06010_DELETE_SPPLY_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
49
+													<button id="ITP_BTN_POMNG06010_DELETE_SPPLY_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
50
 												</span>
50
 												</span>
51
 											</div>
51
 											</div>
52
 										</div>	
52
 										</div>	

+ 2 - 2
src/main/webapp/app/pomng/POMNG07010.html

@@ -39,7 +39,7 @@
39
 											<input type="text" id="ITP_FORM_POMNG07010_DETAIL_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
39
 											<input type="text" id="ITP_FORM_POMNG07010_DETAIL_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
40
 											<input type="hidden" id="ITP_FORM_POMNG07010_DETAIL_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
40
 											<input type="hidden" id="ITP_FORM_POMNG07010_DETAIL_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
41
 												<span class="input-group-btn">
41
 												<span class="input-group-btn">
42
-													<button id="ITP_BTN_POMNG07010_DELETE_SPPLY_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
42
+													<button id="ITP_BTN_POMNG07010_DELETE_SPPLY_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
43
 												</span>
43
 												</span>
44
 											</div>
44
 											</div>
45
 										</div>	
45
 										</div>	
@@ -51,7 +51,7 @@
51
 											<input type="text" id="ITP_FORM_POMNG07010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
51
 											<input type="text" id="ITP_FORM_POMNG07010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
52
 											<input type="hidden" id="ITP_FORM_POMNG07010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />
52
 											<input type="hidden" id="ITP_FORM_POMNG07010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />
53
 												<span class="input-group-btn">
53
 												<span class="input-group-btn">
54
-													<button id="ITP_BTN_POMNG07010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
54
+													<button id="ITP_BTN_POMNG07010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
55
 												</span>
55
 												</span>
56
 											</div>
56
 											</div>
57
 										</div>
57
 										</div>

+ 8 - 24
src/main/webapp/app/settmng/SETTMNG01010.html

@@ -75,15 +75,9 @@
75
 									<div class="itp_form_in border-top">
75
 									<div class="itp_form_in border-top">
76
 										<div class="form-group">
76
 										<div class="form-group">
77
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
77
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
78
-												<div class="col-xs-4 itp_ip">
79
-													<div class="col-xs-9 itp_in fnBrandNm"></div>												
80
-												</div>
78
+												<div class="col-xs-4 itp_ip fnBrandNm"></div>
81
 											<label class="col-xs-2 itp_lb">매장*</label>
79
 											<label class="col-xs-2 itp_lb">매장*</label>
82
-											<div class="col-xs-4 itp_ip">
83
-												<div class="col-xs-10 itp_in">
84
-													<div class="col-xs-6 itp_in fnStoreNm"></div>
85
-												</div>
86
-											</div>
80
+											<div class="col-xs-4 itp_ip fnStoreNm"></div>
87
 										</div>
81
 										</div>
88
 										<div class="form-group">
82
 										<div class="form-group">
89
 											<label class="col-xs-2 itp_lb">정산요청일자</label>
83
 											<label class="col-xs-2 itp_lb">정산요청일자</label>
@@ -98,29 +92,19 @@
98
 												</div>
92
 												</div>
99
 											</div>
93
 											</div>
100
 											<label class="col-xs-2 itp_lb">정산상태</label>
94
 											<label class="col-xs-2 itp_lb">정산상태</label>
101
-											<div class="col-xs-4 itp_ip">
102
-												<div class="col-xs-8 itp_in fnSttlStNm"></div>
103
-											</div>
95
+											<div class="col-xs-4 itp_ip fnSttlStNm"></div>
104
 										</div>
96
 										</div>
105
 										<div class="form-group">
97
 										<div class="form-group">
106
 											<label class="col-xs-2 itp_lb">정산요청금액</label>
98
 											<label class="col-xs-2 itp_lb">정산요청금액</label>
107
-											<div class="col-xs-4 itp_ip">
108
-												<div class="col-xs-10 itp_in fnSttlReqAmt"></div>
109
-											</div>
99
+											<div class="col-xs-4 itp_ip fnSttlReqAmt"></div>
110
 											<label class="col-xs-2 itp_lb">잔금</label>
100
 											<label class="col-xs-2 itp_lb">잔금</label>
111
-											<div class="col-xs-4 itp_ip">
112
-												<div class="col-xs-8 itp_in fnAcctBal"></div>
113
-											</div>
101
+											<div class="col-xs-4 itp_ip fnAcctBal"></div>
114
 										</div>
102
 										</div>
115
-										<div class="form-group border">
103
+										<div class="form-group">
116
 											<label class="col-xs-2 itp_lb">등록일</label>
104
 											<label class="col-xs-2 itp_lb">등록일</label>
117
-											<div class="col-xs-4 itp_ip">
118
-												<div class="col-xs-10 itp_in fnSysRegDttm"></div>
119
-											</div>
105
+											<div class="col-xs-4 itp_ip fnSysRegDttm"></div>
120
 											<label class="col-xs-2 itp_lb">등록자</label>
106
 											<label class="col-xs-2 itp_lb">등록자</label>
121
-											<div class="col-xs-4 itp_ip">
122
-												<div class="col-xs-8 itp_in fnSysRegNm"></div>
123
-											</div>
107
+											<div class="col-xs-4 itp_ip fnSysRegNm"></div>
124
 										</div>
108
 										</div>
125
 									</div>
109
 									</div>
126
 								</section>								
110
 								</section>								

+ 8 - 26
src/main/webapp/app/settmng/SETTMNG02010.html

@@ -76,15 +76,9 @@
76
 									<div class="itp_form_in border-top">
76
 									<div class="itp_form_in border-top">
77
 										<div class="form-group">
77
 										<div class="form-group">
78
 											<label class="col-xs-2 itp_lb">브랜드</label>
78
 											<label class="col-xs-2 itp_lb">브랜드</label>
79
-												<div class="col-xs-4 itp_ip">
80
-													<div class="col-xs-9 itp_in fnBrandNm"></div>												
81
-												</div>
79
+											<div class="col-xs-4 itp_ip fnBrandNm"></div>
82
 											<label class="col-xs-2 itp_lb">공급업체</label>
80
 											<label class="col-xs-2 itp_lb">공급업체</label>
83
-											<div class="col-xs-4 itp_ip">
84
-												<div class="col-xs-10 itp_in">
85
-													<div class="col-xs-6 itp_in fnSupplyNm"></div>
86
-												</div>
87
-											</div>
81
+											<div class="col-xs-4 itp_ip fnSupplyNm"></div>
88
 										</div>
82
 										</div>
89
 										<div class="form-group">
83
 										<div class="form-group">
90
 											<label class="col-xs-2 itp_lb">정산상태</label>
84
 											<label class="col-xs-2 itp_lb">정산상태</label>
@@ -98,33 +92,21 @@
98
 										</div>
92
 										</div>
99
 										<div class="form-group">
93
 										<div class="form-group">
100
 											<label class="col-xs-2 itp_lb">정산요청일자</label>
94
 											<label class="col-xs-2 itp_lb">정산요청일자</label>
101
-											<div class="col-xs-4 itp_ip">
102
-												<div class="col-xs-8 itp_in fnSttlReqDt"></div>
103
-											</div>
95
+											<div class="col-xs-4 itp_ip fnSttlReqDt"></div>
104
 											<label class="col-xs-2 itp_lb">정산요청금액</label>
96
 											<label class="col-xs-2 itp_lb">정산요청금액</label>
105
-											<div class="col-xs-4 itp_ip">
106
-												<div class="col-xs-10 itp_in fnSttlReqAmt"></div>
107
-											</div>											
97
+											<div class="col-xs-4 itp_ip fnSttlReqAmt"></div>
108
 										</div>										
98
 										</div>										
109
 										<div class="form-group">
99
 										<div class="form-group">
110
 											<label class="col-xs-2 itp_lb">정산일자</label>
100
 											<label class="col-xs-2 itp_lb">정산일자</label>
111
-											<div class="col-xs-4 itp_ip">
112
-												<div class="col-xs-8 itp_in fnSttlDt"></div>
113
-											</div>
101
+											<div class="col-xs-4 itp_ip fnSttlDt"></div>
114
 											<label class="col-xs-2 itp_lb">정산금액</label>
102
 											<label class="col-xs-2 itp_lb">정산금액</label>
115
-											<div class="col-xs-4 itp_ip">
116
-												<div class="col-xs-10 itp_in fnSttlAmt"></div>
117
-											</div>
103
+											<div class="col-xs-4 itp_ip fnSttlAmt"></div>
118
 										</div>										
104
 										</div>										
119
 										<div class="form-group">
105
 										<div class="form-group">
120
 											<label class="col-xs-2 itp_lb">등록일</label>
106
 											<label class="col-xs-2 itp_lb">등록일</label>
121
-											<div class="col-xs-4 itp_ip">
122
-												<div class="col-xs-10 itp_in fnSysRegDttm"></div>
123
-											</div>
107
+											<div class="col-xs-4 itp_ip fnSysRegDttm"></div>
124
 											<label class="col-xs-2 itp_lb">등록자</label>
108
 											<label class="col-xs-2 itp_lb">등록자</label>
125
-											<div class="col-xs-4 itp_ip">
126
-												<div class="col-xs-8 itp_in fnSysRegNm"></div>
127
-											</div>
109
+											<div class="col-xs-4 itp_ip fnSysRegNm"></div>
128
 										</div>
110
 										</div>
129
 									</div>
111
 									</div>
130
 								</section>							
112
 								</section>							

+ 14 - 42
src/main/webapp/app/settmng/SETTMNG03010.html

@@ -77,75 +77,47 @@
77
 									<div class="itp_form_in border-top">
77
 									<div class="itp_form_in border-top">
78
 										<div class="form-group">
78
 										<div class="form-group">
79
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
79
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
80
-												<div class="col-xs-4 itp_ip">
81
-													<div class="col-xs-9 itp_in fnBrandNm"></div>												
82
-												</div>
80
+												<div class="col-xs-4 itp_ip fnBrandNm"></div>
83
 											<label class="col-xs-2 itp_lb">매장*</label>
81
 											<label class="col-xs-2 itp_lb">매장*</label>
84
 											<div class="col-xs-4 itp_ip">
82
 											<div class="col-xs-4 itp_ip">
85
-												<div class="col-xs-10 itp_in">
86
-													<div class="col-xs-6 itp_in fnStoreNm"></div>
87
-												</div>
83
+												<div class="col-xs-10 itp_in fnStoreNm"></div>
88
 											</div>
84
 											</div>
89
 										</div>
85
 										</div>
90
 										<div class="form-group">
86
 										<div class="form-group">
91
 											<label class="col-xs-2 itp_lb">매장 정산타입</label>
87
 											<label class="col-xs-2 itp_lb">매장 정산타입</label>
92
-											<div class="col-xs-4 itp_ip">
93
-												<div class="col-xs-8 itp_in fnLoanDvsnNm"></div>
94
-											</div>
88
+											<div class="col-xs-4 itp_ip fnLoanDvsnNm"></div>
95
 											<label class="col-xs-2 itp_lb">매장 계좌잔액</label>
89
 											<label class="col-xs-2 itp_lb">매장 계좌잔액</label>
96
-											<div class="col-xs-4 itp_ip">
97
-												<div class="col-xs-8 itp_in fnAcctBal"></div>
98
-											</div>											
90
+											<div class="col-xs-4 itp_ip fnAcctBal"></div>
99
 										</div>
91
 										</div>
100
 										<div class="form-group">
92
 										<div class="form-group">
101
 											<label class="col-xs-2 itp_lb">정산상태</label>
93
 											<label class="col-xs-2 itp_lb">정산상태</label>
102
-											<div class="col-xs-4 itp_ip">
103
-												<div class="col-xs-8 itp_in fnSttlStNm"></div>
104
-											</div>
94
+											<div class="col-xs-4 itp_ip fnSttlStNm"></div>
105
 											<label class="col-xs-2 itp_lb">반려사유</label>
95
 											<label class="col-xs-2 itp_lb">반려사유</label>
106
-											<div class="col-xs-4 itp_ip">
107
-												<div class="col-xs-8 itp_in fnSttlRjctRsn"></div>
108
-											</div>											
96
+											<div class="col-xs-4 itp_ip fnSttlRjctRsn"></div>
109
 										</div>
97
 										</div>
110
 										<div class="form-group">
98
 										<div class="form-group">
111
 											<label class="col-xs-2 itp_lb">정산요청일자</label>
99
 											<label class="col-xs-2 itp_lb">정산요청일자</label>
112
-											<div class="col-xs-4 itp_ip">
113
-												<div class="col-xs-8 itp_in fnSttlReqDt"></div>
114
-											</div>
100
+											<div class="col-xs-4 itp_ip fnSttlReqDt"></div>
115
 											<label class="col-xs-2 itp_lb">정산요청금액</label>
101
 											<label class="col-xs-2 itp_lb">정산요청금액</label>
116
-											<div class="col-xs-4 itp_ip">
117
-												<div class="col-xs-10 itp_in fnSttlReqAmt"></div>
118
-											</div>											
102
+											<div class="col-xs-4 itp_ip fnSttlReqAmt"></div>
119
 										</div>
103
 										</div>
120
 										<div class="form-group">
104
 										<div class="form-group">
121
 											<label class="col-xs-2 itp_lb">정산확정일자</label>
105
 											<label class="col-xs-2 itp_lb">정산확정일자</label>
122
-											<div class="col-xs-4 itp_ip">
123
-												<div class="col-xs-8 itp_in fnSttlDt"></div>
124
-											</div>
106
+											<div class="col-xs-4 itp_ip fnSttlDt"></div>
125
 											<label class="col-xs-2 itp_lb">정산확정금액</label>
107
 											<label class="col-xs-2 itp_lb">정산확정금액</label>
126
-											<div class="col-xs-4 itp_ip">
127
-												<div class="col-xs-10 itp_in fnSttlAmt"></div>
128
-											</div>
108
+											<div class="col-xs-4 itp_ip fnSttlAmt"></div>
129
 										</div>
109
 										</div>
130
 										<div class="form-group">
110
 										<div class="form-group">
131
 											<label class="col-xs-2 itp_lb">수납완료여부(수납완료일자)</label>
111
 											<label class="col-xs-2 itp_lb">수납완료여부(수납완료일자)</label>
132
-											<div class="col-xs-4 itp_ip">
133
-												<div class="col-xs-8 itp_in fnRcptYnDate"></div>
134
-											</div>
112
+											<div class="col-xs-4 itp_ip fnRcptYnDate"></div>
135
 											<label class="col-xs-2 itp_lb">미납금액</label>
113
 											<label class="col-xs-2 itp_lb">미납금액</label>
136
-											<div class="col-xs-4 itp_ip">
137
-												<div class="col-xs-10 itp_in fnUnpaidAmt"></div>
138
-											</div>
114
+											<div class="col-xs-4 itp_ip fnUnpaidAmt"></div>
139
 										</div>
115
 										</div>
140
 										<div class="form-group">
116
 										<div class="form-group">
141
 											<label class="col-xs-2 itp_lb">등록일</label>
117
 											<label class="col-xs-2 itp_lb">등록일</label>
142
-											<div class="col-xs-4 itp_ip">
143
-												<div class="col-xs-10 itp_in fnSysRegDttm"></div>
144
-											</div>
118
+											<div class="col-xs-4 itp_ip fnSysRegDttm"></div>
145
 											<label class="col-xs-2 itp_lb">등록자</label>
119
 											<label class="col-xs-2 itp_lb">등록자</label>
146
-											<div class="col-xs-4 itp_ip">
147
-												<div class="col-xs-8 itp_in fnSysRegNm"></div>
148
-											</div>
120
+											<div class="col-xs-4 itp_ip fnSysRegNm"></div>
149
 										</div>
121
 										</div>
150
 									</div>
122
 									</div>
151
 								</section>								
123
 								</section>								

+ 13 - 13
src/main/webapp/app/stinfo/STINFO04010.html

@@ -234,7 +234,7 @@
234
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WEIGHT"  class="form-control itp_input" name="weight" value="">
234
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WEIGHT"  class="form-control itp_input" name="weight" value="">
235
 												</div>
235
 												</div>
236
 												<div class="col-xs-4 itp_in">
236
 												<div class="col-xs-4 itp_in">
237
-	              									<select id="ITP_FORM_STINFO04010_DETAIL_WEIGHT_UNIT" data-select-code="WEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="weight_unit"></select>
237
+	              									<select id="ITP_FORM_STINFO04010_DETAIL_WEIGHT_UNIT" data-select-code="WEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="weightUnit"></select>
238
 												</div>
238
 												</div>
239
 											</div>
239
 											</div>
240
 											<label class="col-xs-2 itp_lb">부피</label>
240
 											<label class="col-xs-2 itp_lb">부피</label>
@@ -243,7 +243,7 @@
243
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_VOLUME" class="form-control itp_input" name="volume" value="">
243
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_VOLUME" class="form-control itp_input" name="volume" value="">
244
 												</div>
244
 												</div>
245
 												<div class="col-xs-4 itp_in">
245
 												<div class="col-xs-4 itp_in">
246
-	              									<select id="ITP_FORM_STINFO04010_DETAIL_VOLUME_UNIT" data-select-code="VOLUME_UNIT" class="form-control itp_input detail_item_unit" name="volume_unit"></select>
246
+	              									<select id="ITP_FORM_STINFO04010_DETAIL_VOLUME_UNIT" data-select-code="VOLUME_UNIT" class="form-control itp_input detail_item_unit" name="volumeUnit"></select>
247
 												</div>
247
 												</div>
248
 											</div>
248
 											</div>
249
 										</div>
249
 										</div>
@@ -256,7 +256,7 @@
256
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WIDTH" class="form-control itp_input" name="width" value="">
256
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WIDTH" class="form-control itp_input" name="width" value="">
257
 												</div>
257
 												</div>
258
 												<div class="col-xs-4 itp_in">
258
 												<div class="col-xs-4 itp_in">
259
-	              									<select id="ITP_FORM_STINFO04010_DETAIL_WIDTH_UNIT" data-select-code="WIDTH_UNIT" class="form-control itp_input detail_item_unit" name="width_unit"></select>
259
+	              									<select id="ITP_FORM_STINFO04010_DETAIL_WIDTH_UNIT" data-select-code="WIDTH_UNIT" class="form-control itp_input detail_item_unit" name="widthUnit"></select>
260
 												</div>
260
 												</div>
261
 											</div>
261
 											</div>
262
 											<label class="col-xs-2 itp_lb">세로</label>
262
 											<label class="col-xs-2 itp_lb">세로</label>
@@ -265,7 +265,7 @@
265
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HEIGHT" class="form-control itp_input" name="height" value="">
265
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HEIGHT" class="form-control itp_input" name="height" value="">
266
 												</div>
266
 												</div>
267
 												<div class="col-xs-4 itp_in">
267
 												<div class="col-xs-4 itp_in">
268
-	              									<select id="ITP_FORM_STINFO04010_DETAIL_HEIGHT_UNIT" data-select-code="HEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="height_unit"></select>
268
+	              									<select id="ITP_FORM_STINFO04010_DETAIL_HEIGHT_UNIT" data-select-code="HEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="heightUnit"></select>
269
 												</div>
269
 												</div>
270
 											</div>
270
 											</div>
271
 										</div>
271
 										</div>
@@ -278,7 +278,7 @@
278
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HIGH" class="form-control itp_input" name="high" value="">
278
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HIGH" class="form-control itp_input" name="high" value="">
279
 												</div>
279
 												</div>
280
 												<div class="col-xs-4 itp_in">
280
 												<div class="col-xs-4 itp_in">
281
-	              									<select id="ITP_FORM_STINFO04010_DETAIL_HIGH_UNIT" data-select-code="HIGH_UNIT" class="form-control itp_input detail_item_unit" name="high_unit"></select>
281
+	              									<select id="ITP_FORM_STINFO04010_DETAIL_HIGH_UNIT" data-select-code="HIGH_UNIT" class="form-control itp_input detail_item_unit" name="highUnit"></select>
282
 												</div>
282
 												</div>
283
 											</div>
283
 											</div>
284
 											<label class="col-xs-2 itp_lb">1Box수량</label>
284
 											<label class="col-xs-2 itp_lb">1Box수량</label>
@@ -411,7 +411,7 @@
411
 												</div>
411
 												</div>
412
 											<label class="col-xs-2 itp_lb">품목유형 *</label>
412
 											<label class="col-xs-2 itp_lb">품목유형 *</label>
413
 											<div class="col-xs-5 itp_ip">
413
 											<div class="col-xs-5 itp_ip">
414
-												<div class="col-xs-9 itp_in fnItemType">
414
+												<div class="col-xs-9 itp_in fnItemTypeNm">
415
 												</div>
415
 												</div>
416
 											</div>
416
 											</div>
417
 										</div>
417
 										</div>
@@ -434,7 +434,7 @@
434
 										<div class="form-group">
434
 										<div class="form-group">
435
 											<label class="col-xs-2 itp_lb">발주여부 *</label>
435
 											<label class="col-xs-2 itp_lb">발주여부 *</label>
436
 											<div class="col-xs-5 itp_ip">
436
 											<div class="col-xs-5 itp_ip">
437
-												<div class="col-xs-6 itp_in fnPodrPssblDvsn">
437
+												<div class="col-xs-6 itp_in fnPodrPssblDvsnNm">
438
 												</div>
438
 												</div>
439
 											</div>
439
 											</div>
440
 											<label class="col-xs-2 itp_lb">기본단위 *</label>
440
 											<label class="col-xs-2 itp_lb">기본단위 *</label>
@@ -477,13 +477,13 @@
477
 											<label class="col-xs-2 itp_lb">중량</label>
477
 											<label class="col-xs-2 itp_lb">중량</label>
478
 											<div class="col-xs-5 itp_ip">
478
 											<div class="col-xs-5 itp_ip">
479
 												<div class="col-xs-3 itp_in fnWeight" style="width:auto;"></div>
479
 												<div class="col-xs-3 itp_in fnWeight" style="width:auto;"></div>
480
-												<div class="col-xs-4 itp_in fnUnit"></div>
480
+												<div class="col-xs-4 itp_in fnWeightUnit"></div>
481
 											</div>
481
 											</div>
482
 											<label class="col-xs-2 itp_lb">부피</label>
482
 											<label class="col-xs-2 itp_lb">부피</label>
483
 											<div class="col-xs-3 itp_ip">
483
 											<div class="col-xs-3 itp_ip">
484
 												<div class="col-xs-3 itp_in fnVolume" style="width:auto;">
484
 												<div class="col-xs-3 itp_in fnVolume" style="width:auto;">
485
 												</div>
485
 												</div>
486
-												<div class="col-xs-4 itp_in fnUnit">
486
+												<div class="col-xs-4 itp_in fnVolumeUnit">
487
 												</div>
487
 												</div>
488
 											</div>
488
 											</div>
489
 										</div>
489
 										</div>
@@ -494,14 +494,14 @@
494
 											<div class="col-xs-5 itp_ip">
494
 											<div class="col-xs-5 itp_ip">
495
 												<div class="col-xs-3 itp_in fnWidth" style="width:auto;">
495
 												<div class="col-xs-3 itp_in fnWidth" style="width:auto;">
496
 												</div>
496
 												</div>
497
-												<div class="col-xs-4 itp_in fnUnit">
497
+												<div class="col-xs-4 itp_in fnWidthUnit">
498
 												</div>
498
 												</div>
499
 											</div>
499
 											</div>
500
 											<label class="col-xs-2 itp_lb">세로</label>
500
 											<label class="col-xs-2 itp_lb">세로</label>
501
 											<div class="col-xs-3 itp_ip">
501
 											<div class="col-xs-3 itp_ip">
502
 												<div class="col-xs-3 itp_in fnHeight" style="width:auto;">
502
 												<div class="col-xs-3 itp_in fnHeight" style="width:auto;">
503
 												</div>
503
 												</div>
504
-												<div class="col-xs-4 itp_in fnUnit">
504
+												<div class="col-xs-4 itp_in fnHeightUnit">
505
 												</div>
505
 												</div>
506
 											</div>
506
 											</div>
507
 										</div>
507
 										</div>
@@ -512,7 +512,7 @@
512
 											<div class="col-xs-5 itp_ip">
512
 											<div class="col-xs-5 itp_ip">
513
 												<div class="col-xs-3 itp_in fnHigh" style="width:auto;">
513
 												<div class="col-xs-3 itp_in fnHigh" style="width:auto;">
514
 												</div>
514
 												</div>
515
-												<div class="col-xs-4 itp_in fnUnit">
515
+												<div class="col-xs-4 itp_in fnHighUnit">
516
 												</div>
516
 												</div>
517
 											</div>
517
 											</div>
518
 											<label class="col-xs-2 itp_lb">1Box수량</label>
518
 											<label class="col-xs-2 itp_lb">1Box수량</label>
@@ -545,7 +545,7 @@
545
 											</div>
545
 											</div>
546
 											<label class="col-xs-2 itp_lb">반품구분</label>
546
 											<label class="col-xs-2 itp_lb">반품구분</label>
547
 											<div class="col-xs-5 itp_ip">
547
 											<div class="col-xs-5 itp_ip">
548
-												<div class="col-xs-9 itp_in fnRtnDvsn">
548
+												<div class="col-xs-9 itp_in fnRtnDvsnNm">
549
 												</div>
549
 												</div>
550
 											</div>
550
 											</div>
551
 										</div>
551
 										</div>

+ 3 - 5
src/main/webapp/app/stockmng/STOCKMNG01010.html

@@ -57,11 +57,9 @@
57
 							</div>
57
 							</div>
58
 						</div>
58
 						</div>
59
 					</div>
59
 					</div>
60
-					<div class="fix" style="padding-right:16px;">
61
-						<div class="pull-right itp_cicon">
62
-							<button type="button" id="ITP_BTN_STOCKMNG01010_ADDROW" class="btn btn-primary btn-sm IPS" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;재고처리&nbsp;&nbsp;</button>
63
-							<button type="button" id="ITP_BTN_STOCKMNG01010_DELROW" class="btn btn-primary btn-sm IPS"><i class="glyphicon"></i>&nbsp;&nbsp;재고이력&nbsp;&nbsp;</button>									
64
-						</div>
60
+					<div class="pull-right itp_cicon itp_gird_btn">
61
+						<button type="button" id="ITP_BTN_STOCKMNG01010_ADDROW" class="btn btn-primary btn-sm IPS" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;재고처리&nbsp;&nbsp;</button>
62
+						<button type="button" id="ITP_BTN_STOCKMNG01010_DELROW" class="btn btn-primary btn-sm IPS"><i class="glyphicon"></i>&nbsp;&nbsp;재고이력&nbsp;&nbsp;</button>									
65
 					</div>
63
 					</div>
66
 					<div class="itp_table fix">
64
 					<div class="itp_table fix">
67
 						<div id="ITP_STOCKMNG01010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
65
 						<div id="ITP_STOCKMNG01010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">

+ 3 - 5
src/main/webapp/app/stockmng/STOCKMNG03010.html

@@ -65,11 +65,9 @@
65
 							</div>
65
 							</div>
66
 						</div>
66
 						</div>
67
 					</div>
67
 					</div>
68
-					<div class="fix" style="padding-right:15px;margin-bottom: 13px;">
69
-						<div class="pull-right itp_cicon">
70
-							<button type="button" id="ITP_BTN_STOCKMNG03010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
71
-							<button type="button" id="ITP_BTN_STOCKMNG03010_DETAIL_DELROW" class="btn btn-primary btn-sm DRB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;품목삭제&nbsp;&nbsp;</button>
72
-						</div>
68
+					<div class="pull-right itp_cicon itp_gird_btn">
69
+						<button type="button" id="ITP_BTN_STOCKMNG03010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
70
+						<button type="button" id="ITP_BTN_STOCKMNG03010_DETAIL_DELROW" class="btn btn-primary btn-sm DRB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;품목삭제&nbsp;&nbsp;</button>
73
 					</div>
71
 					</div>
74
 					<div class="itp_table fix">
72
 					<div class="itp_table fix">
75
 						<div id="ITP_STOCKMNG03010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
73
 						<div id="ITP_STOCKMNG03010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">

+ 22 - 27
src/main/webapp/app/vendinfo/VENDINFO01010.html

@@ -26,17 +26,13 @@
26
 								<input type="hidden" id="ITP_FORM_VENDINFO01010_DETAIL_CORP_FILE_NO" name="bsnsRegFileNo" value="">
26
 								<input type="hidden" id="ITP_FORM_VENDINFO01010_DETAIL_CORP_FILE_NO" name="bsnsRegFileNo" value="">
27
 					
27
 					
28
 								<section class="itp_form_sec">
28
 								<section class="itp_form_sec">
29
-									<h4 class="itp_form_tit">공급업체정보-신규</h4>
30
-									<div class="itp_form_in">
29
+									<div class="itp_form_in border-top">
31
 										<div class="form-group">
30
 										<div class="form-group">
32
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
31
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
33
-											<div class="col-xs-4 itp_ip">
34
-												<div class="col-xs-10 itp_in fnBrandNm">
35
-												</div>
36
-											</div>
32
+											<div class="col-xs-4 itp_ip fnBrandNm"></div>
37
 											<label class="col-xs-2 itp_lb">상태 *</label>
33
 											<label class="col-xs-2 itp_lb">상태 *</label>
38
 											<div class="4 itp_ip">
34
 											<div class="4 itp_ip">
39
-												<div class="col-xs-8 itp_in fnStCd">
35
+												<div class="col-xs-6 itp_in fnStCd">
40
 													<select id="ITP_FORM_VENDINFO01010_DETAIL_ST_CD" data-check-required="empty" data-select-code="ST_CD" class="form-control itp_input" name="stCd">
36
 													<select id="ITP_FORM_VENDINFO01010_DETAIL_ST_CD" data-check-required="empty" data-select-code="ST_CD" class="form-control itp_input" name="stCd">
41
 													</select>
37
 													</select>
42
 												</div>
38
 												</div>
@@ -48,14 +44,14 @@
48
 											<label class="col-xs-2 itp_lb">공급엄체번호</label>
44
 											<label class="col-xs-2 itp_lb">공급엄체번호</label>
49
 											<div class="col-xs-4 itp_ip">
45
 											<div class="col-xs-4 itp_ip">
50
 												<div class="itp_form_change">
46
 												<div class="itp_form_change">
51
-													<div class="col-xs-7 itp_in">
47
+													<div class="col-xs-6 itp_in">
52
 									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_SPPLY_ID" data-check-required="empty" class="form-control itp_input" name="spplyId" value="" readonly="readonly">
48
 									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_SPPLY_ID" data-check-required="empty" class="form-control itp_input" name="spplyId" value="" readonly="readonly">
53
 													</div>
49
 													</div>
54
 												</div>
50
 												</div>
55
 											</div>
51
 											</div>
56
 											<label class="col-xs-2 itp_lb">기업형태 *</label>
52
 											<label class="col-xs-2 itp_lb">기업형태 *</label>
57
 											<div class="col-xs-4 itp_ip">
53
 											<div class="col-xs-4 itp_ip">
58
-												<div class="col-xs-8 itp_in">
54
+												<div class="col-xs-6 itp_in">
59
 								                <select id="ITP_FORM_VENDINFO01010_DETAIL_CORP_TYPE" data-check-required="empty" data-select-code="CORP_TYPE" class="form-control itp_input" name="corpType">
55
 								                <select id="ITP_FORM_VENDINFO01010_DETAIL_CORP_TYPE" data-check-required="empty" data-select-code="CORP_TYPE" class="form-control itp_input" name="corpType">
60
 												</select>
56
 												</select>
61
 												</div>
57
 												</div>
@@ -66,13 +62,13 @@
66
 										<div class="form-group">
62
 										<div class="form-group">
67
 											<label class="col-xs-2 itp_lb">공급업체명 *</label>
63
 											<label class="col-xs-2 itp_lb">공급업체명 *</label>
68
 											<div class="col-xs-4 itp_ip">
64
 											<div class="col-xs-4 itp_ip">
69
-												<div class="col-xs-9 itp_in">
65
+												<div class="col-xs-6 itp_in">
70
 													<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_SPPLY_NM" data-check-required="empty" class="form-control itp_input" name="spplyNm" value="">
66
 													<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_SPPLY_NM" data-check-required="empty" class="form-control itp_input" name="spplyNm" value="">
71
 												</div>
67
 												</div>
72
 											</div>
68
 											</div>
73
 											<label class="col-xs-2 itp_lb">업태</label>
69
 											<label class="col-xs-2 itp_lb">업태</label>
74
 											<div class="col-xs-4 itp_ip">
70
 											<div class="col-xs-4 itp_ip">
75
-												<div class="col-xs-8 itp_in">
71
+												<div class="col-xs-6 itp_in">
76
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_BSNS_CNDT" class="form-control itp_input" name="bsnsCndt" value="">
72
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_BSNS_CNDT" class="form-control itp_input" name="bsnsCndt" value="">
77
 												</div>
73
 												</div>
78
 											</div>
74
 											</div>
@@ -83,14 +79,14 @@
83
 											<label class="col-xs-2 itp_lb">사업자번호 *</label>
79
 											<label class="col-xs-2 itp_lb">사업자번호 *</label>
84
 											<div class="col-xs-4 itp_ip">
80
 											<div class="col-xs-4 itp_ip">
85
 												<div class="itp_form_change">
81
 												<div class="itp_form_change">
86
-													<div class="col-xs-7 itp_in">
82
+													<div class="col-xs-6 itp_in">
87
 									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_BSNS_REG_NO" data-check-required="empty" data-key-up="regNo" class="form-control itp_input" name="bsnsRegNo" value="">
83
 									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_BSNS_REG_NO" data-check-required="empty" data-key-up="regNo" class="form-control itp_input" name="bsnsRegNo" value="">
88
 													</div>
84
 													</div>
89
 												</div>
85
 												</div>
90
 											</div>
86
 											</div>
91
 											<label class="col-xs-2 itp_lb">업종</label>
87
 											<label class="col-xs-2 itp_lb">업종</label>
92
 											<div class="col-xs-4 itp_ip">
88
 											<div class="col-xs-4 itp_ip">
93
-												<div class="col-xs-8 itp_in">
89
+												<div class="col-xs-6 itp_in">
94
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_CTGR_BSNS" class="form-control itp_input" name="ctgrBsns" value="">
90
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_CTGR_BSNS" class="form-control itp_input" name="ctgrBsns" value="">
95
 												</div>
91
 												</div>
96
 											</div>
92
 											</div>
@@ -101,14 +97,14 @@
101
 											<label class="col-xs-2 itp_lb">법인번호</label>
97
 											<label class="col-xs-2 itp_lb">법인번호</label>
102
 											<div class="col-xs-4 itp_ip">
98
 											<div class="col-xs-4 itp_ip">
103
 												<div class="itp_form_change">
99
 												<div class="itp_form_change">
104
-													<div class="col-xs-7 itp_in">
100
+													<div class="col-xs-6 itp_in">
105
 									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_CORP_REG_NO" class="form-control itp_input" data-key-up="corpNo" name="corpRegNo" value="">
101
 									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_CORP_REG_NO" class="form-control itp_input" data-key-up="corpNo" name="corpRegNo" value="">
106
 													</div>
102
 													</div>
107
 												</div>
103
 												</div>
108
 											</div>
104
 											</div>
109
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
105
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
110
 											<div class="col-xs-4 itp_ip">
106
 											<div class="col-xs-4 itp_ip">
111
-												<div class="col-xs-8 itp_in">
107
+												<div class="col-xs-6 itp_in">
112
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="mgrTelNo" value="">
108
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="mgrTelNo" value="">
113
 												</div>
109
 												</div>
114
 											</div>
110
 											</div>
@@ -134,13 +130,13 @@
134
 										<div class="form-group">
130
 										<div class="form-group">
135
 											<label class="col-xs-2 itp_lb">이메일</label>
131
 											<label class="col-xs-2 itp_lb">이메일</label>
136
 											<div class="col-xs-4 itp_ip">
132
 											<div class="col-xs-4 itp_ip">
137
-												<div class="col-xs-8 itp_in">
133
+												<div class="col-xs-6 itp_in">
138
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_EMAL_ADDR" class="form-control itp_input" name="mgrEmal" value="">
134
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_EMAL_ADDR" class="form-control itp_input" name="mgrEmal" value="">
139
 												</div>
135
 												</div>
140
 											</div>
136
 											</div>
141
 											<label class="col-xs-2 itp_lb">은행</label>
137
 											<label class="col-xs-2 itp_lb">은행</label>
142
 											<div class="col-xs-4 itp_ip">
138
 											<div class="col-xs-4 itp_ip">
143
-												<div class="col-xs-8 itp_in">
139
+												<div class="col-xs-6 itp_in">
144
 				                             	<select id="ITP_FORM_VENDINFO01010_DETAIL_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd">
140
 				                             	<select id="ITP_FORM_VENDINFO01010_DETAIL_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd">
145
 												</select>
141
 												</select>
146
 												</div>
142
 												</div>
@@ -170,7 +166,7 @@
170
 											</div>
166
 											</div>
171
 											<label class="col-xs-2 itp_lb">예금주</label>
167
 											<label class="col-xs-2 itp_lb">예금주</label>
172
 											<div class="col-xs-4 itp_ip">
168
 											<div class="col-xs-4 itp_ip">
173
-												<div class="col-xs-8 itp_in">
169
+												<div class="col-xs-6 itp_in">
174
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_OWAC_NM" class="form-control itp_input" name="owacNm" value="">
170
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_OWAC_NM" class="form-control itp_input" name="owacNm" value="">
175
 												</div>
171
 												</div>
176
 											</div>
172
 											</div>
@@ -206,7 +202,7 @@
206
 												<div class="col-xs-1 itp_in">
202
 												<div class="col-xs-1 itp_in">
207
 													<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_ZIPNO" data-check-required="empty" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">													
203
 													<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_ZIPNO" data-check-required="empty" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">													
208
 												</div>
204
 												</div>
209
-												<div class="col-xs-2 itp_in" style="width:10%;">
205
+												<div class="col-xs-a itp_in">
210
 													<button type="button" id="ITP_BTN_VENDINFO01010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm FILE_SEARCH" style="margin:0 3px;">&nbsp;&nbsp;주소찾기&nbsp;&nbsp;</button>
206
 													<button type="button" id="ITP_BTN_VENDINFO01010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm FILE_SEARCH" style="margin:0 3px;">&nbsp;&nbsp;주소찾기&nbsp;&nbsp;</button>
211
 												</div>
207
 												</div>
212
 												<div class="col-xs-4 itp_in" style="margin:0 5px;">
208
 												<div class="col-xs-4 itp_in" style="margin:0 5px;">
@@ -222,15 +218,15 @@
222
 										<div class="form-group">
218
 										<div class="form-group">
223
 											<label class="col-xs-2 itp_lb">등록자/등록일</label>
219
 											<label class="col-xs-2 itp_lb">등록자/등록일</label>
224
 											<div class="col-xs-4 itp_ip">
220
 											<div class="col-xs-4 itp_ip">
225
-												<div class="col-xs-4 itp_in fnRegId"></div>
226
-												<label class="col-xs-1 itp_in">/</label>
227
-												<div class="col-xs-5 itp_in fnRegDt"></div>
221
+												<div class="col-xs-a itp_in fnRegId"></div>
222
+												<label class="col-xs-a itp_in">/</label>
223
+												<div class="col-xs-a itp_in fnRegDt"></div>
228
 											</div>
224
 											</div>
229
 											<label class="col-xs-2 itp_lb">수정자/수정일</label>
225
 											<label class="col-xs-2 itp_lb">수정자/수정일</label>
230
 											<div class="4 itp_ip">
226
 											<div class="4 itp_ip">
231
-												<div class="col-xs-4 itp_in fnChgId"></div>
232
-												<label class="col-xs-1 itp_in">/</label>
233
-												<div class="col-xs-5 itp_in fnChgDt"></div>
227
+												<div class="col-xs-a itp_in fnChgId"></div>
228
+												<label class="col-xs-a itp_in">/</label>
229
+												<div class="col-xs-a itp_in fnChgDt"></div>
234
 											</div>
230
 											</div>
235
 										</div>
231
 										</div>
236
 									</div>
232
 									</div>
@@ -239,7 +235,7 @@
239
 						</div>
235
 						</div>
240
 					</div>
236
 					</div>
241
 					<div class="itp_table fix">
237
 					<div class="itp_table fix">
242
-						<div class="itp_table_head fix" style="background:#f5f5f5;">
238
+						<div class="itp_table_head fix" style="background:#fff;">
243
 							<h4 class="itp_table_tit">공급업체 담당자 정보</h4>
239
 							<h4 class="itp_table_tit">공급업체 담당자 정보</h4>
244
 							<div class="pull-right itp_cicon">
240
 							<div class="pull-right itp_cicon">
245
 								<button type="button" id="ITP_BTN_VENDINFO01010_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;추가&nbsp;&nbsp;</button>
241
 								<button type="button" id="ITP_BTN_VENDINFO01010_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;추가&nbsp;&nbsp;</button>
@@ -247,7 +243,6 @@
247
 							</div>
243
 							</div>
248
 						</div>
244
 						</div>
249
 			 				<div id="ITP_VENDINFO01010_DETAIL_jqGrid_list" class="itp_tb_list">
245
 			 				<div id="ITP_VENDINFO01010_DETAIL_jqGrid_list" class="itp_tb_list">
250
-							<div id="ITP_VENDINFO01010_DETAIL_jqGridView" class="itp_views fix"></div>
251
 							<table id="ITP_VENDINFO01010_DETAIL_jqGrid"></table>
246
 							<table id="ITP_VENDINFO01010_DETAIL_jqGrid"></table>
252
 							<div id="ITP_VENDINFO01010_DETAIL_jqGridPager"></div>
247
 							<div id="ITP_VENDINFO01010_DETAIL_jqGridPager"></div>
253
 							<div id="ITP_VENDINFO01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
248
 							<div id="ITP_VENDINFO01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

+ 26 - 85
src/main/webapp/app/vendinfo/VENDINFO02010.html

@@ -17,7 +17,6 @@
17
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID" name="sspplyId">
17
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID" name="sspplyId">
18
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_SEARCH_BRAND_ID" name="sbrandId">
18
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_SEARCH_BRAND_ID" name="sbrandId">
19
 									<div class="form-group">
19
 									<div class="form-group">
20
-										<div class="col-xs-2 itp_ip itp_noMar"></div>
21
 										<div class="col-xs-2 itp_ip itp_noMar">
20
 										<div class="col-xs-2 itp_ip itp_noMar">
22
 											<select id="ITP_FORM_VENDINFO02010_SEARCH_ITEM_ST_CD" data-select-code="ITEM_ST_CD" class="form-control itp_input" name="sitemStCd">
21
 											<select id="ITP_FORM_VENDINFO02010_SEARCH_ITEM_ST_CD" data-select-code="ITEM_ST_CD" class="form-control itp_input" name="sitemStCd">
23
 												<option value="N"></option>
22
 												<option value="N"></option>
@@ -54,104 +53,64 @@
54
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_VIEW_ITEM_ID" name="itemId" value="">
53
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_VIEW_ITEM_ID" name="itemId" value="">
55
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_VIEW_FILE_NO" name="fileNo" value="">
54
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_VIEW_FILE_NO" name="fileNo" value="">
56
 								<section class="itp_form_sec">
55
 								<section class="itp_form_sec">
57
-									<h4 class="itp_form_tit">품목정보-상세</h4>
58
-									<div class="itp_form_in">
56
+									<div class="itp_form_in border-top">
59
 										<div class="form-group">
57
 										<div class="form-group">
60
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
58
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
61
-											<div class="col-xs-12 itp_ip">
62
-												<div class="col-xs-6 itp_in fnBrandNm"></div>
63
-											</div>
64
-											
59
+											<div class="col-xs-12 itp_ip fnBrandNm"></div>
65
 										</div>
60
 										</div>
66
 									</div>
61
 									</div>
67
 									<div class="itp_form_in">
62
 									<div class="itp_form_in">
68
 										<div class="form-group">
63
 										<div class="form-group">
69
 											<label class="col-xs-2 itp_lb">품목분류 *</label>
64
 											<label class="col-xs-2 itp_lb">품목분류 *</label>
70
-											<div class="col-xs-12 itp_ip" style="padding:8px 0 0 15px;">
71
-												<div class="col-xs-a itp_in itp_noMar fnItemClass1Nm"></div>
72
-											</div>
65
+											<div class="col-xs-12 itp_ip fnItemClass1Nm"></div>
73
 										</div>
66
 										</div>
74
 									</div>
67
 									</div>
75
 									<div class="itp_form_in">
68
 									<div class="itp_form_in">
76
 										<div class="form-group">
69
 										<div class="form-group">
77
 											<label class="col-xs-2 itp_lb">품목번호</label>
70
 											<label class="col-xs-2 itp_lb">품목번호</label>
78
-												<div class="col-xs-4 itp_ip fnItemId">
79
-												</div>
71
+											<div class="col-xs-4 itp_ip fnItemId"></div>
80
 											<label class="col-xs-2 itp_lb">품목유형 *</label>
72
 											<label class="col-xs-2 itp_lb">품목유형 *</label>
81
-											<div class="col-xs-4 itp_ip">
82
-												<div class="col-xs-9 itp_in fnItemTypeNm">
83
-												</div>
84
-											</div>
73
+											<div class="col-xs-4 itp_ip fnItemTypeNm"></div>
85
 										</div>
74
 										</div>
86
 									</div>
75
 									</div>
87
 									<div class="itp_form_in">
76
 									<div class="itp_form_in">
88
 										<div class="form-group">
77
 										<div class="form-group">
89
 											<label class="col-xs-2 itp_lb">품목명 *</label>
78
 											<label class="col-xs-2 itp_lb">품목명 *</label>
90
-											<div class="col-xs-4 itp_ip">
91
-												<div class="col-xs-9 itp_in fnItemNm">
92
-												</div>
93
-											</div>
79
+											<div class="col-xs-4 itp_ip fnItemNm"></div>
94
 											<label class="col-xs-2 itp_lb">내외자구분</label>
80
 											<label class="col-xs-2 itp_lb">내외자구분</label>
95
-											<div class="col-xs-4 itp_ip">
96
-												<div class="col-xs-9 itp_in fnImpDvsnNm">
97
-												</div>
98
-											</div>
81
+											<div class="col-xs-4 itp_ip fnImpDvsnNm"></div>
99
 										</div>
82
 										</div>
100
 									</div>
83
 									</div>
101
 									<div class="itp_form_in">
84
 									<div class="itp_form_in">
102
 										<div class="form-group">
85
 										<div class="form-group">
103
 											<label class="col-xs-2 itp_lb">발주여부 *</label>
86
 											<label class="col-xs-2 itp_lb">발주여부 *</label>
104
-											<div class="col-xs-4 itp_ip">
105
-												<div class="col-xs-6 itp_in fnPodrPssblDvsn">
106
-												</div>
107
-											</div>
87
+											<div class="col-xs-4 itp_ip fnPodrPssblDvsn"></div>
108
 											<label class="col-xs-2 itp_lb">기본단위 *</label>
88
 											<label class="col-xs-2 itp_lb">기본단위 *</label>
109
-											<div class="col-xs-4 itp_ip">
110
-												<div class="col-xs-9 itp_in fnUnit">
111
-												</div>
112
-											</div>
89
+											<div class="col-xs-4 itp_ip fnUnit"></div>
113
 										</div>
90
 										</div>
114
 									</div>
91
 									</div>
115
 									<div class="itp_form_in">
92
 									<div class="itp_form_in">
116
 										<div class="form-group">
93
 										<div class="form-group">
117
 											<label class="col-xs-2 itp_lb">구매품목여부 *</label>
94
 											<label class="col-xs-2 itp_lb">구매품목여부 *</label>
118
-											<div class="col-xs-4 itp_ip">
119
-												<div class="col-xs-6 itp_in fnPchItemYn">
120
-												</div>
121
-											</div>
95
+											<div class="col-xs-4 itp_ip fnPchItemYn"></div>
122
 											<label class="col-xs-2 itp_lb">구매단위</label>
96
 											<label class="col-xs-2 itp_lb">구매단위</label>
123
-											<div class="col-xs-4 itp_ip">
124
-												<div class="col-xs-9 itp_in fnViewPchUnit">
125
-												</div>
126
-											</div>
97
+											<div class="col-xs-4 itp_ip fnViewPchUnit"></div>
127
 										</div>
98
 										</div>
128
 									</div>
99
 									</div>
129
 									<div class="itp_form_in">
100
 									<div class="itp_form_in">
130
 										<div class="form-group">
101
 										<div class="form-group">
131
 											<label class="col-xs-2 itp_lb">판매품목여부 *</label>
102
 											<label class="col-xs-2 itp_lb">판매품목여부 *</label>
132
-											<div class="col-xs-4 itp_ip">
133
-												<div class="col-xs-6 itp_in fnSaleItemYn">
134
-												</div>
135
-											</div>
103
+											<div class="col-xs-4 itp_ip fnSaleItemYn"></div>
136
 											<label class="col-xs-2 itp_lb">판매단위</label>
104
 											<label class="col-xs-2 itp_lb">판매단위</label>
137
-											<div class="col-xs-4 itp_ip">
138
-												<div class="col-xs-9 itp_in fnSaleUnit">
139
-												</div>
140
-											</div>
105
+											<div class="col-xs-4 itp_ip fnSaleUnit"></div>
141
 										</div>
106
 										</div>
142
 									</div>
107
 									</div>
143
 									<div class="itp_form_in">
108
 									<div class="itp_form_in">
144
 										<div class="form-group">
109
 										<div class="form-group">
145
 											<label class="col-xs-2 itp_lb">자산정보</label>
110
 											<label class="col-xs-2 itp_lb">자산정보</label>
146
-											<div class="col-xs-4 itp_ip">
147
-												<div class="col-xs-6 itp_in fnAssetInfo">
148
-												</div>
149
-											</div>
111
+											<div class="col-xs-4 itp_ip fnAssetInfo"></div>
150
 											<label class="col-xs-2 itp_lb">재고단위</label>
112
 											<label class="col-xs-2 itp_lb">재고단위</label>
151
-											<div class="col-xs-4 itp_ip">
152
-												<div class="col-xs-9 itp_in fnStckUnit">
153
-												</div>
154
-											</div>
113
+											<div class="col-xs-4 itp_ip fnStckUnit"></div>
155
 										</div>
114
 										</div>
156
 									</div>
115
 									</div>
157
 									<div class="itp_form_in">
116
 									<div class="itp_form_in">
@@ -172,17 +131,13 @@
172
 										<div class="form-group">
131
 										<div class="form-group">
173
 											<label class="col-xs-2 itp_lb">가로</label>
132
 											<label class="col-xs-2 itp_lb">가로</label>
174
 											<div class="col-xs-4 itp_ip">
133
 											<div class="col-xs-4 itp_ip">
175
-												<div class="col-xs-3 itp_in fnWidth" style="width:auto;">
176
-												</div>
177
-												<div class="col-xs-4 itp_in fnWidthUnit">
178
-												</div>
134
+												<div class="col-xs-3 itp_in fnWidth" style="width:auto;"></div>
135
+												<div class="col-xs-4 itp_in fnWidthUnit"></div>
179
 											</div>
136
 											</div>
180
 											<label class="col-xs-2 itp_lb">세로</label>
137
 											<label class="col-xs-2 itp_lb">세로</label>
181
 											<div class="col-xs-4 itp_ip">
138
 											<div class="col-xs-4 itp_ip">
182
-												<div class="col-xs-5 itp_in fnHeight" style="width:auto;">
183
-												</div>
184
-												<div class="col-xs-6 itp_in fnHeightUnit">
185
-												</div>
139
+												<div class="col-xs-5 itp_in fnHeight" style="width:auto;"></div>
140
+												<div class="col-xs-6 itp_in fnHeightUnit"></div>
186
 											</div>
141
 											</div>
187
 										</div>
142
 										</div>
188
 									</div>
143
 									</div>
@@ -190,25 +145,17 @@
190
 										<div class="form-group">
145
 										<div class="form-group">
191
 											<label class="col-xs-2 itp_lb">높이</label>
146
 											<label class="col-xs-2 itp_lb">높이</label>
192
 											<div class="col-xs-4 itp_ip">
147
 											<div class="col-xs-4 itp_ip">
193
-												<div class="col-xs-3 itp_in fnHigh" style="width:auto;">
194
-												</div>
195
-												<div class="col-xs-4 itp_in fnHighUnit">
196
-												</div>
148
+												<div class="col-xs-3 itp_in fnHigh" style="width:auto;"></div>
149
+												<div class="col-xs-4 itp_in fnHighUnit"></div>
197
 											</div>
150
 											</div>
198
 											<label class="col-xs-2 itp_lb">1Box수량</label>
151
 											<label class="col-xs-2 itp_lb">1Box수량</label>
199
-											<div class="col-xs-4 itp_ip">
200
-												<div class="col-xs-9 itp_in fnOneBoxQty">
201
-												</div>
202
-											</div>
152
+											<div class="col-xs-4 itp_ip fnOneBoxQty"></div>
203
 										</div>
153
 										</div>
204
 									</div>
154
 									</div>
205
 									<div class="itp_form_in">
155
 									<div class="itp_form_in">
206
 										<div class="form-group">
156
 										<div class="form-group">
207
 											<label class="col-xs-2 itp_lb">유통기한여부 *</label>
157
 											<label class="col-xs-2 itp_lb">유통기한여부 *</label>
208
-											<div class="col-xs-4 itp_ip">
209
-												<div class="col-xs-6 itp_in fnExpryYn">
210
-												</div>
211
-											</div>
158
+											<div class="col-xs-4 itp_ip fnExpryYn"></div>
212
 											<label class="col-xs-2 itp_lb">유통가능기간</label>
159
 											<label class="col-xs-2 itp_lb">유통가능기간</label>
213
 											<div class="col-xs-4 itp_ip">
160
 											<div class="col-xs-4 itp_ip">
214
 												<div class="col-xs-5 itp_in fnExpryPeriod" style="width:auto;"></div>
161
 												<div class="col-xs-5 itp_in fnExpryPeriod" style="width:auto;"></div>
@@ -216,18 +163,12 @@
216
 											</div>
163
 											</div>
217
 										</div>
164
 										</div>
218
 									</div>
165
 									</div>
219
-											<div class="itp_form_in">
166
+									<div class="itp_form_in">
220
 										<div class="form-group">
167
 										<div class="form-group">
221
 											<label class="col-xs-2 itp_lb">반품기능여부</label>
168
 											<label class="col-xs-2 itp_lb">반품기능여부</label>
222
-											<div class="col-xs-4 itp_ip">
223
-												<div class="col-xs-6 itp_in fnRtnPssblYn">
224
-												</div>
225
-											</div>
169
+											<div class="col-xs-4 itp_ip fnRtnPssblYn"></div>
226
 											<label class="col-xs-2 itp_lb">반품구분</label>
170
 											<label class="col-xs-2 itp_lb">반품구분</label>
227
-											<div class="col-xs-4 itp_ip">
228
-												<div class="col-xs-9 itp_in fnRtnDvsn">
229
-												</div>
230
-											</div>
171
+											<div class="col-xs-4 itp_ip fnRtnDvsn"></div>
231
 										</div>
172
 										</div>
232
 									</div>
173
 									</div>
233
 									<div class="itp_form_in">
174
 									<div class="itp_form_in">

+ 20 - 45
src/main/webapp/app/vsettmng/VSETTMNG01010.html

@@ -22,23 +22,16 @@
22
 									<input type="hidden" id="ITP_FORM_VSETTMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
22
 									<input type="hidden" id="ITP_FORM_VSETTMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
23
 								
23
 								
24
 									<div class="form-group">
24
 									<div class="form-group">
25
-										<!--  
26
-										<div class="col-xs-2 itp_ip itp_noMar">
27
-											<input type="text" id="ITP_FORM_VSETTMNG01010_SEARCH_STORE_NM" class="form-control itp_input" name="sStoreNm" placeholder="매장명" />
28
-										</div>
29
-										<div class="col-xs-1 itp_in" style="padding-left: 5px; width:10%;">
30
-											<button type="button" id="ITP_BTN_VSETTMNG01010_STORE_SEARCH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
31
-											<button type="button" id="ITP_BTN_VSETTMNG01010_STORE_ERASE" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
32
-						                </div>
33
-						                -->
34
-						                <div class="col-xs-2 itp_ip itp_noMar" style="width:11%; top:3px;">
35
-						                	<label>입고/수거일자</label>
25
+						                <div class="col-xs-2 itp_ip itp_noMar">
26
+						                	<select id="ITP_FORM_VSETTMNG01010_SEARCH_" class="form-control itp_input" name="service">
27
+												<option value="A">입고/수거일자</option>											
28
+											</select>
36
 						                </div>
29
 						                </div>
37
 										<div class="col-xs-3 itp_ip itp_noMar">
30
 										<div class="col-xs-3 itp_ip itp_noMar">
38
 											<div class="input-daterange input-group date">
31
 											<div class="input-daterange input-group date">
39
-												<input type="text" id="ITP_FORM_VSETTMNG01010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
32
+												<input type="text" id="ITP_FORM_VSETTMNG01010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
40
 												<span class="input-group-addon itp_date_to">~</span>
33
 												<span class="input-group-addon itp_date_to">~</span>
41
-												<input type="text" id="ITP_FORM_VSETTMNG01010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
34
+												<input type="text" id="ITP_FORM_VSETTMNG01010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
42
 											</div>
35
 											</div>
43
 										</div>
36
 										</div>
44
 										<div class="col-xs-2 itp_ip itp_noMar">
37
 										<div class="col-xs-2 itp_ip itp_noMar">
@@ -69,56 +62,39 @@
69
 								<input type="hidden" id="ITP_FORM_VSETTMNG01010_DETAIL_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
62
 								<input type="hidden" id="ITP_FORM_VSETTMNG01010_DETAIL_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
70
 					
63
 					
71
 								<section class="itp_form_sec">
64
 								<section class="itp_form_sec">
72
-									<h4 class="itp_form_tit">정산 상세정보</h4>
73
-									<div class="itp_form_in">
65
+									<div class="itp_form_in border-top">
74
 										<div class="form-group">
66
 										<div class="form-group">
75
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
67
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
76
-												<div class="col-xs-4 itp_ip">
77
-													<div class="col-xs-9 itp_in fnBrandNm"></div>												
78
-												</div>
68
+											<div class="col-xs-4 itp_ip fnBrandNm"></div>
79
 											<label class="col-xs-2 itp_lb">공급사*</label>
69
 											<label class="col-xs-2 itp_lb">공급사*</label>
80
-											<div class="col-xs-4 itp_ip">
81
-												<div class="col-xs-10 itp_in">
82
-													<div class="col-xs-6 itp_in fnSpplyNm"></div>
83
-												</div>
84
-											</div>
70
+											<div class="col-xs-4 itp_ip fnSpplyNm"></div>
85
 										</div>
71
 										</div>
86
 										<div class="form-group">
72
 										<div class="form-group">
87
 											<label class="col-xs-2 itp_lb">정산요청일자</label>
73
 											<label class="col-xs-2 itp_lb">정산요청일자</label>
88
 											<div class="col-xs-4 itp_ip">
74
 											<div class="col-xs-4 itp_ip">
89
 												<div class="col-xs-5 itp_in">
75
 												<div class="col-xs-5 itp_in">
90
 													<div class="input-group date">
76
 													<div class="input-group date">
91
-													<input type="text" id="ITP_FORM_VSETTMNG01010_DETAIL_STTL_REQ_DT" class="form-control itp_input" name="sttlReqDt" readonly="readonly">
92
-													<span class="input-group-addon itp_input itp_date_to">
93
-														<i class="glyphicon glyphicon-calendar"></i>
94
-													</span>
77
+														<input type="text" id="ITP_FORM_VSETTMNG01010_DETAIL_STTL_REQ_DT" class="form-control itp_input" name="sttlReqDt" readonly="readonly">
78
+														<span class="input-group-addon itp_input itp_date_to">
79
+															<i class="glyphicon glyphicon-calendar"></i>
80
+														</span>
95
 													</div>
81
 													</div>
96
 												</div>
82
 												</div>
97
 											</div>
83
 											</div>
98
 											<label class="col-xs-2 itp_lb">정산상태</label>
84
 											<label class="col-xs-2 itp_lb">정산상태</label>
99
-											<div class="col-xs-4 itp_ip">
100
-												<div class="col-xs-8 itp_in fnSttlStNm"></div>
101
-											</div>
85
+											<div class="col-xs-4 itp_ip fnSttlStNm"></div>
102
 										</div>
86
 										</div>
103
 										<div class="form-group">
87
 										<div class="form-group">
104
 											<label class="col-xs-2 itp_lb">정산요청금액</label>
88
 											<label class="col-xs-2 itp_lb">정산요청금액</label>
105
-											<div class="col-xs-4 itp_ip">
106
-												<div class="col-xs-10 itp_in fnSttlReqAmt"></div>
107
-											</div>
89
+											<div class="col-xs-4 itp_ip fnSttlReqAmt"></div>
108
 											<label class="col-xs-2 itp_lb">잔금</label>
90
 											<label class="col-xs-2 itp_lb">잔금</label>
109
-											<div class="col-xs-4 itp_ip">
110
-												<div class="col-xs-8 itp_in fnAcctBal"></div>
111
-											</div>
91
+											<div class="col-xs-4 itp_ip fnAcctBal"></div>
112
 										</div>
92
 										</div>
113
-										<div class="form-group border">
93
+										<div class="form-group">
114
 											<label class="col-xs-2 itp_lb">등록일</label>
94
 											<label class="col-xs-2 itp_lb">등록일</label>
115
-											<div class="col-xs-4 itp_ip">
116
-												<div class="col-xs-10 itp_in fnSysRegDttm"></div>
117
-											</div>
95
+											<div class="col-xs-4 itp_ip fnSysRegDttm"></div>
118
 											<label class="col-xs-2 itp_lb">등록자</label>
96
 											<label class="col-xs-2 itp_lb">등록자</label>
119
-											<div class="col-xs-4 itp_ip">
120
-												<div class="col-xs-8 itp_in fnSysRegNm"></div>
121
-											</div>
97
+											<div class="col-xs-4 itp_ip fnSysRegNm"></div>
122
 										</div>
98
 										</div>
123
 									</div>
99
 									</div>
124
 								</section>								
100
 								</section>								
@@ -126,11 +102,10 @@
126
 						</div>
102
 						</div>
127
 					</div>
103
 					</div>
128
 					<div class="itp_table fix">
104
 					<div class="itp_table fix">
129
-					    <div class="itp_table_head fix" style="background:#f5f5f5;">
105
+					    <div class="itp_table_head fix" style="background:#fff;">
130
 					        <h4 class="itp_table_tit">정산 대상 내역</h4>
106
 					        <h4 class="itp_table_tit">정산 대상 내역</h4>
131
 					    </div>
107
 					    </div>
132
 					    <div id="ITP_VSETTMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
108
 					    <div id="ITP_VSETTMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
133
-					        <div id="ITP_VSETTMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
134
 					        <table id="ITP_VSETTMNG01010_DETAIL_jqGrid"></table>
109
 					        <table id="ITP_VSETTMNG01010_DETAIL_jqGrid"></table>
135
 					        <div id="ITP_VSETTMNG01010_DETAIL_jqGridPager"></div>
110
 					        <div id="ITP_VSETTMNG01010_DETAIL_jqGridPager"></div>
136
 					        <div id="ITP_VSETTMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
111
 					        <div id="ITP_VSETTMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

+ 21 - 46
src/main/webapp/app/vsettmng/VSETTMNG02010.html

@@ -20,24 +20,21 @@
20
 									<input type="hidden" id="ITP_FORM_VSETTMNG02010_SEARCH_STORE_SPPLY_GUBUN" name="sgubun" value="2">
20
 									<input type="hidden" id="ITP_FORM_VSETTMNG02010_SEARCH_STORE_SPPLY_GUBUN" name="sgubun" value="2">
21
 								
21
 								
22
 									<div class="form-group">
22
 									<div class="form-group">
23
-						                <div class="col-xs-2 itp_ip itp_noMar" style="width:11%; top:3px;">
24
-						                	<label>정산요청일</label>
23
+						                <div class="col-xs-2 itp_ip itp_noMar">
24
+					                		<select id="ITP_FORM_VSETTMNG02010_SEARCH_" class="form-control itp_input" name="service">
25
+												<option value="A">정산요청일</option>											
26
+											</select>
25
 						                </div>
27
 						                </div>
26
 										<div class="col-xs-3 itp_ip itp_noMar">
28
 										<div class="col-xs-3 itp_ip itp_noMar">
27
 											<div class="input-daterange input-group date">
29
 											<div class="input-daterange input-group date">
28
-												<input type="text" id="ITP_FORM_VSETTMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
30
+												<input type="text" id="ITP_FORM_VSETTMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
29
 												<span class="input-group-addon itp_date_to">~</span>
31
 												<span class="input-group-addon itp_date_to">~</span>
30
-												<input type="text" id="ITP_FORM_VSETTMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value=""> 
32
+												<input type="text" id="ITP_FORM_VSETTMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly> 
31
 											</div>
33
 											</div>
32
 										</div>
34
 										</div>
33
 										<div class="col-xs-2 itp_ip itp_noMar">
35
 										<div class="col-xs-2 itp_ip itp_noMar">
34
 											<select id="ITP_FORM_VSETTMNG02010_SEARCH_STTL_ST_CD" data-select-code="STTL_ST_CD" class="form-control itp_input" name="ssttlStCd"></select>
36
 											<select id="ITP_FORM_VSETTMNG02010_SEARCH_STTL_ST_CD" data-select-code="STTL_ST_CD" class="form-control itp_input" name="ssttlStCd"></select>
35
 										</div>
37
 										</div>
36
-										<!--  
37
-										<div class="col-xs-2 itp_ip itp_noMar">
38
-											<input type="text" id="ITP_FORM_VSETTMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목명" />
39
-										</div>
40
-										-->										
41
 									</div>
38
 									</div>
42
 								</form>
39
 								</form>
43
 							</div>
40
 							</div>
@@ -65,59 +62,36 @@
65
 								<input type="hidden" id="ITP_FORM_VSETTMNG02010_DETAIL_STTL_REQ_AMT" name="sttlReqAmt" value="">
62
 								<input type="hidden" id="ITP_FORM_VSETTMNG02010_DETAIL_STTL_REQ_AMT" name="sttlReqAmt" value="">
66
 					
63
 					
67
 								<section class="itp_form_sec">
64
 								<section class="itp_form_sec">
68
-									<h4 class="itp_form_tit">정산 상세정보</h4>
69
-									<div class="itp_form_in">
65
+									<div class="itp_form_in border-top">
70
 										<div class="form-group">
66
 										<div class="form-group">
71
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
67
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
72
-												<div class="col-xs-4 itp_ip">
73
-													<div class="col-xs-9 itp_in fnBrandNm"></div>												
74
-												</div>
68
+											<div class="col-xs-4 itp_ip fnBrandNm"></div>
75
 											<label class="col-xs-2 itp_lb">정산번호</label>
69
 											<label class="col-xs-2 itp_lb">정산번호</label>
76
-											<div class="col-xs-4 itp_ip">
77
-												<div class="col-xs-10 itp_in">
78
-													<div class="col-xs-6 itp_in fnSttlMgntUnqNo"></div>
79
-												</div>
80
-											</div>
70
+											<div class="col-xs-4 itp_ip fnSttlMgntUnqNo"></div>
81
 										</div>
71
 										</div>
82
 										<div class="form-group">
72
 										<div class="form-group">
83
 											<label class="col-xs-2 itp_lb">정산상태</label>
73
 											<label class="col-xs-2 itp_lb">정산상태</label>
84
-											<div class="col-xs-4 itp_ip">
85
-												<div class="col-xs-8 itp_in fnSttlStNm"></div>
86
-											</div>
74
+											<div class="col-xs-4 itp_ip fnSttlStNm"></div>
87
 											<label class="col-xs-2 itp_lb">반려사유</label>
75
 											<label class="col-xs-2 itp_lb">반려사유</label>
88
-											<div class="col-xs-4 itp_ip">
89
-												<div class="col-xs-8 itp_in fnSttlRjctRsn"></div>
90
-											</div>											
76
+											<div class="col-xs-4 itp_ip fnSttlRjctRsn"></div>
91
 										</div>
77
 										</div>
92
 										<div class="form-group">
78
 										<div class="form-group">
93
 											<label class="col-xs-2 itp_lb">정산요청일자</label>
79
 											<label class="col-xs-2 itp_lb">정산요청일자</label>
94
-											<div class="col-xs-4 itp_ip">
95
-												<div class="col-xs-8 itp_in fnSttlReqDt"></div>
96
-											</div>
80
+											<div class="col-xs-4 itp_ip fnSttlReqDt"></div>
97
 											<label class="col-xs-2 itp_lb">정산요청금액</label>
81
 											<label class="col-xs-2 itp_lb">정산요청금액</label>
98
-											<div class="col-xs-4 itp_ip">
99
-												<div class="col-xs-10 itp_in fnSttlReqAmt"></div>
100
-											</div>											
82
+											<div class="col-xs-4 itp_ip fnSttlReqAmt"></div>
101
 										</div>
83
 										</div>
102
 										<div class="form-group">
84
 										<div class="form-group">
103
 											<label class="col-xs-2 itp_lb">정산확정일자</label>
85
 											<label class="col-xs-2 itp_lb">정산확정일자</label>
104
-											<div class="col-xs-4 itp_ip">
105
-												<div class="col-xs-8 itp_in fnSttlDt"></div>
106
-											</div>
86
+											<div class="col-xs-4 itp_ip fnSttlDt"></div>
107
 											<label class="col-xs-2 itp_lb">정산확정금액</label>
87
 											<label class="col-xs-2 itp_lb">정산확정금액</label>
108
-											<div class="col-xs-4 itp_ip">
109
-												<div class="col-xs-10 itp_in fnSttlAmt"></div>
110
-											</div>
88
+											<div class="col-xs-4 itp_ip fnSttlAmt"></div>
111
 										</div>
89
 										</div>
112
 										<div class="form-group">
90
 										<div class="form-group">
113
 											<label class="col-xs-2 itp_lb">등록일</label>
91
 											<label class="col-xs-2 itp_lb">등록일</label>
114
-											<div class="col-xs-4 itp_ip">
115
-												<div class="col-xs-10 itp_in fnSysRegDttm"></div>
116
-											</div>
92
+											<div class="col-xs-4 itp_ip fnSysRegDttm"></div>
117
 											<label class="col-xs-2 itp_lb">등록자</label>
93
 											<label class="col-xs-2 itp_lb">등록자</label>
118
-											<div class="col-xs-4 itp_ip">
119
-												<div class="col-xs-8 itp_in fnSysRegNm"></div>
120
-											</div>
94
+											<div class="col-xs-4 itp_ip fnSysRegNm"></div>
121
 										</div>
95
 										</div>
122
 									</div>
96
 									</div>
123
 								</section>								
97
 								</section>								
@@ -125,9 +99,10 @@
125
 						</div>
99
 						</div>
126
 					</div>
100
 					</div>
127
 					<div class="itp_table fix">
101
 					<div class="itp_table fix">
128
-						<h4 class="itp_form_tit" style="background:#eee; padding:18px 18px; margin:0; border-left:none;">정산 대상 내역</h4>
129
-						<div id="ITP_VSETTMNG02010_DETAIL_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
130
-							<div id="ITP_VSETTMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>
102
+						<div class="itp_table_head fix" style="background:#fff;">
103
+				       	 	<h4 class="itp_table_tit">정산 대상 내역</h4>
104
+				 	   </div>						
105
+				 	   <div id="ITP_VSETTMNG02010_DETAIL_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
131
 							<table id="ITP_VSETTMNG02010_DETAIL_jqGrid"></table>
106
 							<table id="ITP_VSETTMNG02010_DETAIL_jqGrid"></table>
132
 							<div id="ITP_VSETTMNG02010_DETAIL_jqGridPager"></div>
107
 							<div id="ITP_VSETTMNG02010_DETAIL_jqGridPager"></div>
133
 							<div id="ITP_VSETTMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
108
 							<div id="ITP_VSETTMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

+ 2 - 1
src/main/webapp/css/style.css

@@ -269,6 +269,7 @@ a, button {outline:none !important; text-decoration:none !important;}
269
 
269
 
270
 #ITP_CONTAINER .itp_detail .itp_det_in {padding:0px 20px 15px 20px; height:calc(100vh - 180px); overflow-y:scroll;}
270
 #ITP_CONTAINER .itp_detail .itp_det_in {padding:0px 20px 15px 20px; height:calc(100vh - 180px); overflow-y:scroll;}
271
 #ITP_CONTAINER .itp_detail .itp_det_in::-webkit-scrollbar{display:none;}
271
 #ITP_CONTAINER .itp_detail .itp_det_in::-webkit-scrollbar{display:none;}
272
+#ITP_CONTAINER .itp_detail .itp_gird_btn {padding-right:35px; margin-top:-2px !important;}
272
 #ITP_CONTAINER .itp_detail .itp_cicon {line-height:32px; height:32px; margin-top:4px;}
273
 #ITP_CONTAINER .itp_detail .itp_cicon {line-height:32px; height:32px; margin-top:4px;}
273
 #ITP_CONTAINER .itp_detail .itp_cicon .btn-default {color:#fff; background-color:rgb(109, 110, 114); border-color:rgb(109, 110, 114);}
274
 #ITP_CONTAINER .itp_detail .itp_cicon .btn-default {color:#fff; background-color:rgb(109, 110, 114); border-color:rgb(109, 110, 114);}
274
 #ITP_CONTAINER .itp_detail .itp_cicon .itp_store {display:inline-block; vertical-align:middle; font-size:13px; margin-right:10px;}
275
 #ITP_CONTAINER .itp_detail .itp_cicon .itp_store {display:inline-block; vertical-align:middle; font-size:13px; margin-right:10px;}
@@ -382,7 +383,7 @@ html:lang(en) #ITP_CONTAINER .itp_detail .itp_form .itp_thumb_inline .itp_thumb_
382
 #ITP_CONTAINER .itp_tb_list.itp_gType2 .itp_no_data.itp_noSrh {top:51%;}
383
 #ITP_CONTAINER .itp_tb_list.itp_gType2 .itp_no_data.itp_noSrh {top:51%;}
383
 #ITP_CONTAINER .itp_tb_list .itp_no_data u {color:#337ab7; cursor:pointer;}
384
 #ITP_CONTAINER .itp_tb_list .itp_no_data u {color:#337ab7; cursor:pointer;}
384
 
385
 
385
-#ITP_CONTAINER .itp_tb_list .itp_views {font-size:12px; margin-bottom:8px; display:inline-block; width:90%;}
386
+#ITP_CONTAINER .itp_tb_list .itp_views {font-size:12px; margin-bottom:8px; display:inline-block; width:50%;}
386
 #ITP_CONTAINER .itp_tb_list .itp_views .itp_shrv {float:left; width:50%; padding-left:5px;}
387
 #ITP_CONTAINER .itp_tb_list .itp_views .itp_shrv {float:left; width:50%; padding-left:5px;}
387
 #ITP_CONTAINER .itp_tb_list .itp_views .itp_shrv span {float:left;}
388
 #ITP_CONTAINER .itp_tb_list .itp_views .itp_shrv span {float:left;}
388
 #ITP_CONTAINER .itp_tb_list .itp_views .itp_shrv em {font-style:normal;}
389
 #ITP_CONTAINER .itp_tb_list .itp_views .itp_shrv em {font-style:normal;}

+ 2 - 1
src/main/webapp/js/app/collmng/ITP_COLLMNG01010.js

@@ -66,6 +66,7 @@ const gridColModel = {
66
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
66
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
67
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, 			// 수거장소
67
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, 			// 수거장소
68
 			width: '10', fixed: false, align: 'left',
68
 			width: '10', fixed: false, align: 'left',
69
+			minwidth: 240,
69
 			sortable: false, hidden: false
70
 			sortable: false, hidden: false
70
 		},
71
 		},
71
 		{
72
 		{
@@ -84,7 +85,7 @@ const gridColModel = {
84
 		{
85
 		{
85
 			index: 'RTN_MGR_NM', name: 'rtnMgrNm',
86
 			index: 'RTN_MGR_NM', name: 'rtnMgrNm',
86
 			label: ITP_MSG_LOCALE.label.rtnMgrNm, 			// 수거 담당자
87
 			label: ITP_MSG_LOCALE.label.rtnMgrNm, 			// 수거 담당자
87
-			width: '7', fixed: false, align: 'left',
88
+			width: '7', fixed: false, align: 'center',
88
 			sortable: false, hidden: false
89
 			sortable: false, hidden: false
89
 		}
90
 		}
90
 	],
91
 	],

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

@@ -67,6 +67,7 @@ const gridColModel = {
67
 			index: 'ITEM_ID', name: 'itemId',
67
 			index: 'ITEM_ID', name: 'itemId',
68
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
68
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
69
 			width: '10', fixed: false, align: 'center',
69
 			width: '10', fixed: false, align: 'center',
70
+			minwidth: 150,
70
 			sortable: false, hidden: false
71
 			sortable: false, hidden: false
71
 		},
72
 		},
72
 		{
73
 		{
@@ -85,6 +86,7 @@ const gridColModel = {
85
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
86
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
86
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, //수거창고명
87
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, //수거창고명
87
 			width: '15', fixed: false, align: 'left',
88
 			width: '15', fixed: false, align: 'left',
89
+			minwidth: 220,
88
 			sortable: false, hidden: false
90
 			sortable: false, hidden: false
89
 		},
91
 		},
90
 		{
92
 		{
@@ -167,12 +169,13 @@ const gridColModel = {
167
 			width: '10', fixed: false, align: 'right',
169
 			width: '10', fixed: false, align: 'right',
168
 			sortable: true, editable: true, edittype: 'text',
170
 			sortable: true, editable: true, edittype: 'text',
169
 			editrules: { required: true, number: true },
171
 			editrules: { required: true, number: true },
172
+			classes: 'input_color',
170
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
173
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
171
 		},
174
 		},
172
 		{
175
 		{
173
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
176
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
174
 			label: ITP_MSG_LOCALE.label.rtnRsnDvsnNm, //반품사유
177
 			label: ITP_MSG_LOCALE.label.rtnRsnDvsnNm, //반품사유
175
-			width: '10', fixed: false, align: 'left',
178
+			width: '10', fixed: false, align: 'center',
176
 			sortable: false, hidden: false
179
 			sortable: false, hidden: false
177
 		},
180
 		},
178
 		{
181
 		{
@@ -311,6 +314,7 @@ let pageObj = {
311
 		});
314
 		});
312
 		if(mode == 'LIST') { // 목록
315
 		if(mode == 'LIST') { // 목록
313
 			$('#ITP_AJAX_COLLMNG02010_LIST_CONTAINER').show();
316
 			$('#ITP_AJAX_COLLMNG02010_LIST_CONTAINER').show();
317
+			$('#ITP_BTN_COLLMNG02010_DELETE_RTN_WHS_ID').show();
314
 			fn_show_btn_auth_array(['#ITP_BTN_COLLMNG02010_SRH', '#ITP_BTN_COLLMNG02010_CUDW']);
318
 			fn_show_btn_auth_array(['#ITP_BTN_COLLMNG02010_SRH', '#ITP_BTN_COLLMNG02010_CUDW']);
315
 			$('#ITP_FORM_COLLMNG02010_SEARCH_SBRAND_ID').val(fn_make_user_info.get('brandId'));
319
 			$('#ITP_FORM_COLLMNG02010_SEARCH_SBRAND_ID').val(fn_make_user_info.get('brandId'));
316
 			$('#ITP_FORM_COLLMNG02010_SEARCH_SSPPLY_ID').val(fn_make_user_info.get('spplyId'));
320
 			$('#ITP_FORM_COLLMNG02010_SEARCH_SSPPLY_ID').val(fn_make_user_info.get('spplyId'));

+ 14 - 2
src/main/webapp/js/app/collmng/ITP_COLLMNG03010.js

@@ -36,60 +36,70 @@ const gridColModel = {
36
 			index: 'BRAND_NM', name: 'brandNm',
36
 			index: 'BRAND_NM', name: 'brandNm',
37
 			label: ITP_MSG_LOCALE.label.brandNm,			// 브랜드명
37
 			label: ITP_MSG_LOCALE.label.brandNm,			// 브랜드명
38
 			width: '10', fixed: false, align: 'left',
38
 			width: '10', fixed: false, align: 'left',
39
+			minwidth: 120,
39
 			sortable: false, hidden: false
40
 			sortable: false, hidden: false
40
 		},
41
 		},
41
 		{
42
 		{
42
 			index: 'COL_PICK_UNQ_NO', name: 'colPickUnqNo',
43
 			index: 'COL_PICK_UNQ_NO', name: 'colPickUnqNo',
43
 			label: ITP_MSG_LOCALE.label.colPickUnqNo,		// 수거서번호
44
 			label: ITP_MSG_LOCALE.label.colPickUnqNo,		// 수거서번호
44
 			width: '10', fixed: false, align: 'center',
45
 			width: '10', fixed: false, align: 'center',
46
+			minwidth: 160,
45
 			sortable: false, hidden: false
47
 			sortable: false, hidden: false
46
 		},
48
 		},
47
 		{
49
 		{
48
 			index: 'PICK_ST_NM', name: 'pickStNm',
50
 			index: 'PICK_ST_NM', name: 'pickStNm',
49
 			label: ITP_MSG_LOCALE.label.pickStNm,			// 수거서상태
51
 			label: ITP_MSG_LOCALE.label.pickStNm,			// 수거서상태
50
-			width: '6', fixed: false, align: 'left',
52
+			width: '6', fixed: false, align: 'center',
53
+			minwidth: 100,
51
 			sortable: false, hidden: false
54
 			sortable: false, hidden: false
52
 		},
55
 		},
53
 		{
56
 		{
54
 			index: 'COL_REQ_DT', name: 'colRegDt',
57
 			index: 'COL_REQ_DT', name: 'colRegDt',
55
 			label: ITP_MSG_LOCALE.label.colRegDt,			// 수거일자
58
 			label: ITP_MSG_LOCALE.label.colRegDt,			// 수거일자
56
 			width: '10', fixed: false, align: 'center',
59
 			width: '10', fixed: false, align: 'center',
60
+			minwidth: 100,
57
 			sortable: false, hidden: false
61
 			sortable: false, hidden: false
58
 		},
62
 		},
59
 		{
63
 		{
60
 			index: 'COL_REQ_DT', name: 'colReqDt',
64
 			index: 'COL_REQ_DT', name: 'colReqDt',
61
 			label: ITP_MSG_LOCALE.label.colReqDt,			// 수거요청일
65
 			label: ITP_MSG_LOCALE.label.colReqDt,			// 수거요청일
62
 			width: '10', fixed: false, align: 'center',
66
 			width: '10', fixed: false, align: 'center',
67
+			minwidth: 100,
63
 			sortable: false, hidden: false
68
 			sortable: false, hidden: false
64
 		},
69
 		},
65
 		{
70
 		{
66
 			index: 'COL_SCH_DT', name: 'colSchDt',
71
 			index: 'COL_SCH_DT', name: 'colSchDt',
67
 			label: ITP_MSG_LOCALE.label.colSchDt,			// 수거예정일
72
 			label: ITP_MSG_LOCALE.label.colSchDt,			// 수거예정일
68
 			width: '10', fixed: false, align: 'center',
73
 			width: '10', fixed: false, align: 'center',
74
+			minwidth: 100,
69
 			sortable: false, hidden: false
75
 			sortable: false, hidden: false
70
 		},
76
 		},
71
 		{
77
 		{
72
 			index: 'ITEM_ID', name: 'itemId',
78
 			index: 'ITEM_ID', name: 'itemId',
73
 			label: ITP_MSG_LOCALE.label.itemId,				// 품목번호
79
 			label: ITP_MSG_LOCALE.label.itemId,				// 품목번호
74
 			width: '10', fixed: false, align: 'center',
80
 			width: '10', fixed: false, align: 'center',
81
+			minwidth: 140,
75
 			sortable: false, hidden: false
82
 			sortable: false, hidden: false
76
 		},
83
 		},
77
 		{
84
 		{
78
 			index: 'ITEM_NM', name: 'itemNm',
85
 			index: 'ITEM_NM', name: 'itemNm',
79
 			label: ITP_MSG_LOCALE.label.itemNm,				// 품목명
86
 			label: ITP_MSG_LOCALE.label.itemNm,				// 품목명
80
 			width: '8', fixed: false, align: 'left',
87
 			width: '8', fixed: false, align: 'left',
88
+			minwidth: 140,
81
 			sortable: false, hidden: false
89
 			sortable: false, hidden: false
82
 		},
90
 		},
83
 		{
91
 		{
84
 			index: 'COL_REQ_QTY', name: 'colReqQty',
92
 			index: 'COL_REQ_QTY', name: 'colReqQty',
85
 			label: ITP_MSG_LOCALE.label.colReqQty,			// 수거수량
93
 			label: ITP_MSG_LOCALE.label.colReqQty,			// 수거수량
86
 			width: '5', fixed: false, align: 'right',
94
 			width: '5', fixed: false, align: 'right',
95
+			minwidth: 80,
87
 			sortable: false, hidden: false
96
 			sortable: false, hidden: false
88
 		},		
97
 		},		
89
 		{
98
 		{
90
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
99
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
91
 			label: ITP_MSG_LOCALE.label.rtnRsnDvsnNm,		// 반품사유구분
100
 			label: ITP_MSG_LOCALE.label.rtnRsnDvsnNm,		// 반품사유구분
92
 			width: '10', fixed: false, align: 'center',
101
 			width: '10', fixed: false, align: 'center',
102
+			minwidth: 100,
93
 			sortable: false, hidden: false
103
 			sortable: false, hidden: false
94
 		},
104
 		},
95
 		{
105
 		{
@@ -110,18 +120,20 @@ const gridColModel = {
110
 			index: 'WHS_NM', name: 'whsNm',
120
 			index: 'WHS_NM', name: 'whsNm',
111
 			label: ITP_MSG_LOCALE.label.whsNm,				// 납품장소
121
 			label: ITP_MSG_LOCALE.label.whsNm,				// 납품장소
112
 			width: '10', fixed: false, align: 'left',
122
 			width: '10', fixed: false, align: 'left',
123
+			minwidth: 240,
113
 			sortable: false, hidden: false
124
 			sortable: false, hidden: false
114
 		},
125
 		},
115
 		{
126
 		{
116
 			index: 'PICK_MGR_NM', name: 'pickMgrNm',
127
 			index: 'PICK_MGR_NM', name: 'pickMgrNm',
117
 			label: ITP_MSG_LOCALE.label.pickMgrNm,			// 수거담당자
128
 			label: ITP_MSG_LOCALE.label.pickMgrNm,			// 수거담당자
118
-			width: '10', fixed: false, align: 'left',
129
+			width: '10', fixed: false, align: 'center',
119
 			sortable: false, hidden: false
130
 			sortable: false, hidden: false
120
 		},
131
 		},
121
 		{
132
 		{
122
 			index: 'PICK_MGR_TEL_NO', name: 'pickMgrTelNo',
133
 			index: 'PICK_MGR_TEL_NO', name: 'pickMgrTelNo',
123
 			label: ITP_MSG_LOCALE.label.pickMgrTelNo,		// 수거담당자연락처
134
 			label: ITP_MSG_LOCALE.label.pickMgrTelNo,		// 수거담당자연락처
124
 			width: '9', fixed: false, align: 'center',
135
 			width: '9', fixed: false, align: 'center',
136
+			minwidth: 160,
125
 			sortable: false, hidden: false
137
 			sortable: false, hidden: false
126
 		}
138
 		}
127
 	],
139
 	],

+ 1 - 0
src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -278,6 +278,7 @@ let pageObj = {
278
 		});
278
 		});
279
 		if(mode === 'LIST') { // 목록
279
 		if(mode === 'LIST') { // 목록
280
 			$('#ITP_AJAX_OPER02010_LIST_CONTAINER').show();
280
 			$('#ITP_AJAX_OPER02010_LIST_CONTAINER').show();
281
+			$('#ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN').show();
281
 			fn_show_btn_auth_array(['#ITP_BTN_OPER02010_SRH', '#ITP_BTN_OPER02010_NEWREG']);
282
 			fn_show_btn_auth_array(['#ITP_BTN_OPER02010_SRH', '#ITP_BTN_OPER02010_NEWREG']);
282
 			pageObj.ui.afflInfo.init();
283
 			pageObj.ui.afflInfo.init();
283
 		} else if(mode == 'ADD') { // 등록
284
 		} else if(mode == 'ADD') { // 등록

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

@@ -81,12 +81,14 @@ const gridColModel = {
81
 			index: 'WHS_NM', name: 'whsNm',
81
 			index: 'WHS_NM', name: 'whsNm',
82
 			label: ITP_MSG_LOCALE.label.whsNm, 			// 납품장소
82
 			label: ITP_MSG_LOCALE.label.whsNm, 			// 납품장소
83
 			width: '10', fixed: false, align: 'left',
83
 			width: '10', fixed: false, align: 'left',
84
+			minwidth: 240,
84
 			sortable: false, hidden: false
85
 			sortable: false, hidden: false
85
 		},
86
 		},
86
 		{
87
 		{
87
 			index: 'PODR_TOTAL_AMT', name: 'podrTotalAmt',
88
 			index: 'PODR_TOTAL_AMT', name: 'podrTotalAmt',
88
 			label: ITP_MSG_LOCALE.label.podrTotalAmt, 	// 총 발주금액
89
 			label: ITP_MSG_LOCALE.label.podrTotalAmt, 	// 총 발주금액
89
 			width: '4', fixed: false, align: 'right',
90
 			width: '4', fixed: false, align: 'right',
91
+			minwidth: 100,
90
 			sortable: false, hidden: false,
92
 			sortable: false, hidden: false,
91
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
93
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
92
 		},
94
 		},

+ 7 - 0
src/main/webapp/js/app/ordmng/ITP_ORDMNG02010.js

@@ -73,6 +73,7 @@ const gridColModel = {
73
 			index: 'WHS_NM', name: 'whsNm',
73
 			index: 'WHS_NM', name: 'whsNm',
74
 			label: ITP_MSG_LOCALE.label.whsNm, 				//납품장소
74
 			label: ITP_MSG_LOCALE.label.whsNm, 				//납품장소
75
 			width: '11', fixed: false, align: 'left',
75
 			width: '11', fixed: false, align: 'left',
76
+			minwidht: 100,
76
 			sortable: false, hidden: false
77
 			sortable: false, hidden: false
77
 		},
78
 		},
78
 		{
79
 		{
@@ -98,12 +99,14 @@ const gridColModel = {
98
 			label: ITP_MSG_LOCALE.label.unitAmt, 			//단가
99
 			label: ITP_MSG_LOCALE.label.unitAmt, 			//단가
99
 			width: '3', fixed: false, align: 'right',
100
 			width: '3', fixed: false, align: 'right',
100
 			sortable: false, hidden: false,
101
 			sortable: false, hidden: false,
102
+			minwidth:80,
101
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
103
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
102
 		},
104
 		},
103
 		{
105
 		{
104
 			index: 'PODR_AMT', name: 'podrAmt',
106
 			index: 'PODR_AMT', name: 'podrAmt',
105
 			label: ITP_MSG_LOCALE.label.podrAmt, 			//발주금액
107
 			label: ITP_MSG_LOCALE.label.podrAmt, 			//발주금액
106
 			width: '4', fixed: false, align: 'right',
108
 			width: '4', fixed: false, align: 'right',
109
+			minwidth:80,
107
 			sortable: false, hidden: false,
110
 			sortable: false, hidden: false,
108
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
111
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
109
 		}
112
 		}
@@ -487,6 +490,7 @@ let modifyObj = {
487
 						index: 'ITEM_ID', name: 'itemId',
490
 						index: 'ITEM_ID', name: 'itemId',
488
 						label: ITP_MSG_LOCALE.label.itemId, 			//품목번호
491
 						label: ITP_MSG_LOCALE.label.itemId, 			//품목번호
489
 						width: '10', fixed: false, align: 'center',
492
 						width: '10', fixed: false, align: 'center',
493
+						minwidth: 100,
490
 						sortable: false, hidden: false, edittype: 'text',
494
 						sortable: false, hidden: false, edittype: 'text',
491
 						editable: false
495
 						editable: false
492
 					},
496
 					},
@@ -523,6 +527,7 @@ let modifyObj = {
523
 						label: ITP_MSG_LOCALE.label.shmtQty, 	 		//출하수량
527
 						label: ITP_MSG_LOCALE.label.shmtQty, 	 		//출하수량
524
 						width: '8', fixed: false, align: 'right',
528
 						width: '8', fixed: false, align: 'right',
525
 						sortable: false, hidden: false, edittype: 'text',
529
 						sortable: false, hidden: false, edittype: 'text',
530
+						classes: 'input_color',
526
 						editable: true, editrules: {number: true, custom: true, custom_func: shmtQtyValue}
531
 						editable: true, editrules: {number: true, custom: true, custom_func: shmtQtyValue}
527
 					},
532
 					},
528
 					{
533
 					{
@@ -537,6 +542,7 @@ let modifyObj = {
537
 						label: ITP_MSG_LOCALE.label.expryDate,  		//유통기한일자
542
 						label: ITP_MSG_LOCALE.label.expryDate,  		//유통기한일자
538
 						width: '10', fixed: false, align: 'center',
543
 						width: '10', fixed: false, align: 'center',
539
 						sortable: false, hidden: false, 
544
 						sortable: false, hidden: false, 
545
+						classes: 'input_color',
540
 						editable: true, sorttype: 'date',
546
 						editable: true, sorttype: 'date',
541
 				        editoptions: {dataInit: function(e) {$(e).datepicker(ITP_DATE_LANGUAGE);}},
547
 				        editoptions: {dataInit: function(e) {$(e).datepicker(ITP_DATE_LANGUAGE);}},
542
 				        editrules: {custom: true, custom_func: isExpryDate}
548
 				        editrules: {custom: true, custom_func: isExpryDate}
@@ -545,6 +551,7 @@ let modifyObj = {
545
 						index: 'REMARK', name: 'deliDesc',				//API 비고 키
551
 						index: 'REMARK', name: 'deliDesc',				//API 비고 키
546
 						label: ITP_MSG_LOCALE.label.remark,  			//locale-ko 비고 값
552
 						label: ITP_MSG_LOCALE.label.remark,  			//locale-ko 비고 값
547
 						width: '10', fixed: false, align: 'center',
553
 						width: '10', fixed: false, align: 'center',
554
+						classes: 'input_color',
548
 						sortable: false, hidden: false, edittype: 'text',
555
 						sortable: false, hidden: false, edittype: 'text',
549
 						editable: true
556
 						editable: true
550
 					},
557
 					},

+ 14 - 1
src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -37,18 +37,20 @@ const gridColModel = {
37
 				index: 'Brand_Nm', name: 'brandNm',			//정렬가능 여부,화면표시 여부
37
 				index: 'Brand_Nm', name: 'brandNm',			//정렬가능 여부,화면표시 여부
38
 				label: ITP_MSG_LOCALE.label.brandNm, 		//브랜드이름
38
 				label: ITP_MSG_LOCALE.label.brandNm, 		//브랜드이름
39
 				width: '10', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
39
 				width: '10', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
40
+				minwidth: 120,								//최소가로넓이 설정
40
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부	
41
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부	
41
 			},
42
 			},
42
 			{
43
 			{
43
 				index: 'DLV_STTMT_NO', name: 'dlvSttmtUnqNo',	//서버로 전송시 데이터 명 , 데이터명
44
 				index: 'DLV_STTMT_NO', name: 'dlvSttmtUnqNo',	//서버로 전송시 데이터 명 , 데이터명
44
 				label: ITP_MSG_LOCALE.label.dlvSttmtUnqNo, 		//납품서번호
45
 				label: ITP_MSG_LOCALE.label.dlvSttmtUnqNo, 		//납품서번호
45
 				width: '20', fixed: false, align: 'center',		// cell가로넓이,고정 여부 ,text정렬 
46
 				width: '20', fixed: false, align: 'center',		// cell가로넓이,고정 여부 ,text정렬 
47
+				minwidth: 140,
46
 				sortable: false, hidden: false					//정렬가능 여부,화면표시 여부
48
 				sortable: false, hidden: false					//정렬가능 여부,화면표시 여부
47
 			},
49
 			},
48
 			{
50
 			{
49
 				index: 'DLV_ST_NM', name: 'dlvStNm',		//서버로 전송시 데이터 명 , 데이터명
51
 				index: 'DLV_ST_NM', name: 'dlvStNm',		//서버로 전송시 데이터 명 , 데이터명
50
 				label: '납품상태', 							//납품서상태
52
 				label: '납품상태', 							//납품서상태
51
-				width: '12', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
53
+				width: '12', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
52
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
54
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
53
 			},
55
 			},
54
 			{
56
 			{
@@ -78,36 +80,42 @@ const gridColModel = {
78
 			{
80
 			{
79
 				index: 'ITEM_CLASS_NM', name: 'itemId',		//서버로 전송시 데이터 명 , 데이터명
81
 				index: 'ITEM_CLASS_NM', name: 'itemId',		//서버로 전송시 데이터 명 , 데이터명
80
 				label: ITP_MSG_LOCALE.label.itemId, 		//품목번호
82
 				label: ITP_MSG_LOCALE.label.itemId, 		//품목번호
83
+				minwidth: 180,
81
 				width: '11', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
84
 				width: '11', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
82
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
85
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
83
 			},
86
 			},
84
 			{
87
 			{
85
 				index: 'PODR_PSSBLDVSN_NM', name: 'itemNm',	//서버로 전송시 데이터 명 , 데이터명
88
 				index: 'PODR_PSSBLDVSN_NM', name: 'itemNm',	//서버로 전송시 데이터 명 , 데이터명
86
 				label: ITP_MSG_LOCALE.label.itemNm, 		//품목명
89
 				label: ITP_MSG_LOCALE.label.itemNm, 		//품목명
90
+				minwidth: 140,
87
 				width: '10', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
91
 				width: '10', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
88
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
92
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
89
 			},
93
 			},
90
 			{
94
 			{
91
 				index: 'PODR_QTY', name: 'podrQty',			//서버로 전송시 데이터 명 , 데이터명
95
 				index: 'PODR_QTY', name: 'podrQty',			//서버로 전송시 데이터 명 , 데이터명
92
 				label: ITP_MSG_LOCALE.label.podrQty, 		//수주수량
96
 				label: ITP_MSG_LOCALE.label.podrQty, 		//수주수량
97
+				minwidth: 80,
93
 				width: '6', fixed: false, align: 'right',	// cell가로넓이,고정 여부 ,text정렬 
98
 				width: '6', fixed: false, align: 'right',	// cell가로넓이,고정 여부 ,text정렬 
94
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
99
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
95
 			},
100
 			},
96
 			{
101
 			{
97
 				index: 'SALE_ITEM_YN', name: 'dlvQty',		//서버로 전송시 데이터 명 , 데이터명
102
 				index: 'SALE_ITEM_YN', name: 'dlvQty',		//서버로 전송시 데이터 명 , 데이터명
98
 				label: ITP_MSG_LOCALE.label.dlvQty, 		//납품수량
103
 				label: ITP_MSG_LOCALE.label.dlvQty, 		//납품수량
104
+				minwidth: 80,
99
 				width: '6', fixed: false, align: 'right',	// cell가로넓이,고정 여부 ,text정렬 
105
 				width: '6', fixed: false, align: 'right',	// cell가로넓이,고정 여부 ,text정렬 
100
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
106
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
101
 			},
107
 			},
102
 			{
108
 			{
103
 				index: 'UNIT', name: 'unit',				//서버로 전송시 데이터 명 , 데이터명
109
 				index: 'UNIT', name: 'unit',				//서버로 전송시 데이터 명 , 데이터명
104
 				label: ITP_MSG_LOCALE.label.unit, 			//단위
110
 				label: ITP_MSG_LOCALE.label.unit, 			//단위
111
+				minwidth: 80,
105
 				width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
112
 				width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
106
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
113
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
107
 			},
114
 			},
108
 			{
115
 			{
109
 				index: 'PCH_ITEM_YN', name: 'unitAmt',		//서버로 전송시 데이터 명 , 데이터명
116
 				index: 'PCH_ITEM_YN', name: 'unitAmt',		//서버로 전송시 데이터 명 , 데이터명
110
 				label: ITP_MSG_LOCALE.label.unitAmt, 		//납품금액
117
 				label: ITP_MSG_LOCALE.label.unitAmt, 		//납품금액
118
+				minwidth: 80,
111
 				width: '6', fixed: false, align: 'right ',	// cell가로넓이,고정 여부 ,text정렬 
119
 				width: '6', fixed: false, align: 'right ',	// cell가로넓이,고정 여부 ,text정렬 
112
 				sortable: false, hidden: false,				//정렬가능 여부,화면표시 여부
120
 				sortable: false, hidden: false,				//정렬가능 여부,화면표시 여부
113
 				formatter: 'integer', formatoptions: {thousandsSeparator: ','}
121
 				formatter: 'integer', formatoptions: {thousandsSeparator: ','}
@@ -115,18 +123,21 @@ const gridColModel = {
115
 			{
123
 			{
116
 				index: 'SALE_ITEM_YN', name: 'whsNm',		//서버로 전송시 데이터 명 , 데이터명
124
 				index: 'SALE_ITEM_YN', name: 'whsNm',		//서버로 전송시 데이터 명 , 데이터명
117
 				label: ITP_MSG_LOCALE.label.whsNm, 			//납품장소
125
 				label: ITP_MSG_LOCALE.label.whsNm, 			//납품장소
126
+				minwidth: 240,
118
 				width: '6', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
127
 				width: '6', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
119
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
128
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
120
 			},
129
 			},
121
 			{
130
 			{
122
 				index: 'PCH_ITEM_YN', name: 'dlvMgrNm',		//서버로 전송시 데이터 명 , 데이터명
131
 				index: 'PCH_ITEM_YN', name: 'dlvMgrNm',		//서버로 전송시 데이터 명 , 데이터명
123
 				label: ITP_MSG_LOCALE.label.dlvMgrNm, 		//납품담당자
132
 				label: ITP_MSG_LOCALE.label.dlvMgrNm, 		//납품담당자
133
+				minwidth: 100,
124
 				width: '8', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
134
 				width: '8', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
125
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
135
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
126
 			},
136
 			},
127
 			{
137
 			{
128
 				index: 'PCH_ITEM_YN', name: 'dlvMgrTelNo',	//서버로 전송시 데이터 명 , 데이터명
138
 				index: 'PCH_ITEM_YN', name: 'dlvMgrTelNo',	//서버로 전송시 데이터 명 , 데이터명
129
 				label: ITP_MSG_LOCALE.label.dlvMgrTelNo, 	//납품담당연락처
139
 				label: ITP_MSG_LOCALE.label.dlvMgrTelNo, 	//납품담당연락처
140
+				minwidth: 120,
130
 				width: '10', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
141
 				width: '10', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
131
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
142
 				sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
132
 			}
143
 			}
@@ -154,6 +165,7 @@ let pageObj = {
154
 			$('#ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT').datepicker('setDate', new Date());
165
 			$('#ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT').datepicker('setDate', new Date());
155
 		}
166
 		}
156
 	},
167
 	},
168
+	
157
 	action: function () {
169
 	action: function () {
158
 		var _this = this;  //_this 는 this 와 같다
170
 		var _this = this;  //_this 는 this 와 같다
159
 		// 검색 납품장소 클릭
171
 		// 검색 납품장소 클릭
@@ -255,6 +267,7 @@ let listObj = {
255
 		init: function () {
267
 		init: function () {
256
 				// 데이터 없을때
268
 				// 데이터 없을때
257
 			this.search();//search 불러오기
269
 			this.search();//search 불러오기
270
+			itp_fn_jqgrid_resize(ORDMNG03010_GRID_ID, ORDMNG03010_GRID_LIST, 'lg');
258
 		},
271
 		},
259
 		colModel: gridColModel.list,	//컬럼정보
272
 		colModel: gridColModel.list,	//컬럼정보
260
 		search: function() {
273
 		search: function() {

+ 2 - 0
src/main/webapp/js/app/pomng/ITP_POMNG03010.js

@@ -264,6 +264,7 @@ const gridColModel = {
264
 			index: 'PODR_QTY', name: 'podrQty',
264
 			index: 'PODR_QTY', name: 'podrQty',
265
 			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
265
 			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
266
 			width: '10', fixed: false, align: 'right',
266
 			width: '10', fixed: false, align: 'right',
267
+			classes: 'input_color',
267
 			sortable: false, editable: true, edittype: 'text',
268
 			sortable: false, editable: true, edittype: 'text',
268
 			editrules: {required: true}, hidden: false,
269
 			editrules: {required: true}, hidden: false,
269
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
270
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -641,6 +642,7 @@ let pageObj = {
641
 			*/
642
 			*/
642
 		} else if(mode == 'POC') { // 구매요청 발주
643
 		} else if(mode == 'POC') { // 구매요청 발주
643
 			$('#ITP_AJAX_POMNG03010_DETAIL_CONTAINER').show();
644
 			$('#ITP_AJAX_POMNG03010_DETAIL_CONTAINER').show();
645
+			$('#ITP_BTN_POMNG03010_DELETE_SHMT_WHS_NM').show();
644
 			fn_show_btn_auth_array(['#ITP_BTN_POMNG03010_PO', '#ITP_BTN_POMNG03010_CANCELLIST']);
646
 			fn_show_btn_auth_array(['#ITP_BTN_POMNG03010_PO', '#ITP_BTN_POMNG03010_CANCELLIST']);
645
 			$('#ITP_FORM_POMNG03010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
647
 			$('#ITP_FORM_POMNG03010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
646
 			$('#ITP_FORM_POMNG03010_DETAIL_STORE_ID').val(fn_make_user_info.get('storeId'));
648
 			$('#ITP_FORM_POMNG03010_DETAIL_STORE_ID').val(fn_make_user_info.get('storeId'));

+ 1 - 1
src/main/webapp/js/app/pomng/ITP_POMNG05010.js

@@ -74,7 +74,7 @@ const gridColModel = {
74
 			{
74
 			{
75
 				index: 'WHS_NM', name: 'whsNm',				
75
 				index: 'WHS_NM', name: 'whsNm',				
76
 				label: '입고처', 			//납품장소
76
 				label: '입고처', 			//납품장소
77
-				width: '20', fixed: false, align: 'center',	
77
+				width: '20', fixed: false, align: 'left',	
78
 				minwidth:220,
78
 				minwidth:220,
79
 				sortable: false, hidden: false				
79
 				sortable: false, hidden: false				
80
 			},
80
 			},

+ 1 - 1
src/main/webapp/js/app/pomng/ITP_POMNG06010.js

@@ -128,7 +128,7 @@ const gridColModel = {
128
 			index: 'WHS_NM', name: 'whsNm',
128
 			index: 'WHS_NM', name: 'whsNm',
129
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
129
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
130
 			width: '15', fixed: false, align: 'left',
130
 			width: '15', fixed: false, align: 'left',
131
-			minwidth: 160,
131
+			minwidth: 200,
132
 			sortable: false, hidden: false
132
 			sortable: false, hidden: false
133
 		},
133
 		},
134
 		{
134
 		{

+ 3 - 0
src/main/webapp/js/app/settmng/ITP_SETTMNG01010.js

@@ -68,18 +68,21 @@ const gridColModel = {
68
 		{
68
 		{
69
 			index: 'STORE_NM', name: 'storeNm',
69
 			index: 'STORE_NM', name: 'storeNm',
70
 			label: "매장명",
70
 			label: "매장명",
71
+			minwidth: 60,
71
 			width: '10', fixed: false, align: 'left',
72
 			width: '10', fixed: false, align: 'left',
72
 			sortable: false, hidden: false
73
 			sortable: false, hidden: false
73
 		},
74
 		},
74
 		{
75
 		{
75
 			index: 'LOAN_DVSN', name: 'loanDvsn',
76
 			index: 'LOAN_DVSN', name: 'loanDvsn',
76
 			label: "정산타입", 
77
 			label: "정산타입", 
78
+			minwidth: 80,
77
 			width: '8', fixed: false, align: 'center',
79
 			width: '8', fixed: false, align: 'center',
78
 			sortable: false, hidden: true
80
 			sortable: false, hidden: true
79
 		},
81
 		},
80
 		{
82
 		{
81
 			index: 'LOAN_DVSN_NM', name: 'loanDvsnNm',
83
 			index: 'LOAN_DVSN_NM', name: 'loanDvsnNm',
82
 			label: "정산타입", 
84
 			label: "정산타입", 
85
+			minwidth: 70,
83
 			width: '8', fixed: false, align: 'center',
86
 			width: '8', fixed: false, align: 'center',
84
 			sortable: false, hidden: false
87
 			sortable: false, hidden: false
85
 		},
88
 		},

+ 15 - 3
src/main/webapp/js/app/stinfo/ITP_STINFO04010.js

@@ -422,12 +422,12 @@ let viewObj = {
422
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass3').text(result.itemClass3Nm);
422
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass3').text(result.itemClass3Nm);
423
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass4').text(result.itemClass4Nm);
423
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass4').text(result.itemClass4Nm);
424
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClassMgntNo').text(result.itemClassMgntNo);
424
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClassMgntNo').text(result.itemClassMgntNo);
425
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemType').text(result.itemType);
425
+        $('#ITP_FORM_STINFO04010_VIEW .fnItemTypeNm').text(result.itemTypeNm);
426
         
426
         
427
         $('#ITP_FORM_STINFO04010_VIEW .fnItemNm').text(result.itemNm);
427
         $('#ITP_FORM_STINFO04010_VIEW .fnItemNm').text(result.itemNm);
428
         
428
         
429
         $('#ITP_FORM_STINFO04010_VIEW .fnImpDvsn').text(result.impDvsnNm);
429
         $('#ITP_FORM_STINFO04010_VIEW .fnImpDvsn').text(result.impDvsnNm);
430
-        $('#ITP_FORM_STINFO04010_VIEW .fnPodrPssblDvsn').text(result.podrPssblDvsn);
430
+        $('#ITP_FORM_STINFO04010_VIEW .fnPodrPssblDvsnNm').text(result.podrPssblDvsnNm);
431
         $('#ITP_FORM_STINFO04010_VIEW .fnUnit').text(result.unit);
431
         $('#ITP_FORM_STINFO04010_VIEW .fnUnit').text(result.unit);
432
         $('#ITP_FORM_STINFO04010_VIEW .fnPchItemYn').text(result.pchItemYn);
432
         $('#ITP_FORM_STINFO04010_VIEW .fnPchItemYn').text(result.pchItemYn);
433
         //$('#ITP_FORM_STINFO04010_VIEW .fnViewPchUnit').text(result.pchUnit);
433
         //$('#ITP_FORM_STINFO04010_VIEW .fnViewPchUnit').text(result.pchUnit);
@@ -436,15 +436,20 @@ let viewObj = {
436
         $('#ITP_FORM_STINFO04010_VIEW .fnBarcode').text(result.barcode);
436
         $('#ITP_FORM_STINFO04010_VIEW .fnBarcode').text(result.barcode);
437
         //$('#ITP_FORM_STINFO04010_VIEW .fnStckUnit').text(result.stckUnit);
437
         //$('#ITP_FORM_STINFO04010_VIEW .fnStckUnit').text(result.stckUnit);
438
         $('#ITP_FORM_STINFO04010_VIEW .fnWeight').text(result.weight);
438
         $('#ITP_FORM_STINFO04010_VIEW .fnWeight').text(result.weight);
439
+        $('#ITP_FORM_STINFO04010_VIEW .fnWeightUnit').text(result.weightUnitNm);
439
         $('#ITP_FORM_STINFO04010_VIEW .fnVolume').text(result.volume);
440
         $('#ITP_FORM_STINFO04010_VIEW .fnVolume').text(result.volume);
441
+        $('#ITP_FORM_STINFO04010_VIEW .fnVolumeUnit').text(result.volumeUnitNm);
440
         $('#ITP_FORM_STINFO04010_VIEW .fnWidth').text(result.width);
442
         $('#ITP_FORM_STINFO04010_VIEW .fnWidth').text(result.width);
443
+        $('#ITP_FORM_STINFO04010_VIEW .fnWidthUnit').text(result.widthUnitNm);
441
         $('#ITP_FORM_STINFO04010_VIEW .fnHeight').text(result.height);
444
         $('#ITP_FORM_STINFO04010_VIEW .fnHeight').text(result.height);
445
+        $('#ITP_FORM_STINFO04010_VIEW .fnHeightUnit').text(result.heightUnitNm);
442
         $('#ITP_FORM_STINFO04010_VIEW .fnHigh').text(result.high);
446
         $('#ITP_FORM_STINFO04010_VIEW .fnHigh').text(result.high);
447
+        $('#ITP_FORM_STINFO04010_VIEW .fnHighUnit').text(result.highUnitNm);
443
         $('#ITP_FORM_STINFO04010_VIEW .fnOneBoxQty').text(result.oneBoxQty);
448
         $('#ITP_FORM_STINFO04010_VIEW .fnOneBoxQty').text(result.oneBoxQty);
444
         $('#ITP_FORM_STINFO04010_VIEW .fnExpryYn').text(result.expryYn);
449
         $('#ITP_FORM_STINFO04010_VIEW .fnExpryYn').text(result.expryYn);
445
         $('#ITP_FORM_STINFO04010_VIEW .fnExpryPeriod').text(result.expryPeriod);
450
         $('#ITP_FORM_STINFO04010_VIEW .fnExpryPeriod').text(result.expryPeriod);
446
         $('#ITP_FORM_STINFO04010_VIEW .fnRtnPssblYn').text(result.rtnPssblYn);
451
         $('#ITP_FORM_STINFO04010_VIEW .fnRtnPssblYn').text(result.rtnPssblYn);
447
-        $('#ITP_FORM_STINFO04010_VIEW .fnRtnDvsn').text(result.rtnDvsn);
452
+        $('#ITP_FORM_STINFO04010_VIEW .fnRtnDvsnNm').text(result.rtnDvsnNm);
448
 		$('#ITP_FORM_STINFO04010_VIEW .fnOqMenuCd').text(result.oqMenuCd);
453
 		$('#ITP_FORM_STINFO04010_VIEW .fnOqMenuCd').text(result.oqMenuCd);
449
 		$('#ITP_FORM_STINFO04010_VIEWL #ITP_FORM_STINFO04010_VIEW_OQ_BRAND_ID').val(result.oqBrandId);
454
 		$('#ITP_FORM_STINFO04010_VIEWL #ITP_FORM_STINFO04010_VIEW_OQ_BRAND_ID').val(result.oqBrandId);
450
 
455
 
@@ -490,11 +495,16 @@ let modifyObj = {
490
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_BARCODE').val(result.barcode);
495
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_BARCODE').val(result.barcode);
491
         //$('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_STCK_UNIT').val(result.stckUnit);
496
         //$('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_STCK_UNIT').val(result.stckUnit);
492
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WEIGHT').val(result.weight);
497
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WEIGHT').val(result.weight);
498
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WEIGHT_UNIT').val(result.weightUnit);
493
         $('#ITP_FORM_STINFO04010_DETAIL .item_unit').text(result.unit);
499
         $('#ITP_FORM_STINFO04010_DETAIL .item_unit').text(result.unit);
494
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_VOLUME').val(result.volume);
500
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_VOLUME').val(result.volume);
501
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_VOLUME_UNIT').val(result.volumeUnit);        
495
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WIDTH').val(result.width);
502
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WIDTH').val(result.width);
503
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WIDTH_UNIT').val(result.widthUnit);
496
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HEIGHT').val(result.height);
504
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HEIGHT').val(result.height);
505
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HEIGHT_UNIT').val(result.heightUnit);
497
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HIGH').val(result.high);
506
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HIGH').val(result.high);
507
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HIGH_UNIT').val(result.highUnit);
498
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ONE_BOX_QTY').val(result.oneBoxQty);
508
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ONE_BOX_QTY').val(result.oneBoxQty);
499
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_EXPRY_YN').val(result.expryYn);
509
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_EXPRY_YN').val(result.expryYn);
500
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_EXPRY_PERIOD').val(result.expryPeriod);
510
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_EXPRY_PERIOD').val(result.expryPeriod);
@@ -550,6 +560,8 @@ let createObj = {
550
             });
560
             });
551
         },
561
         },
552
         cancel: function() {
562
         cancel: function() {
563
+        	let childrens = $('#ITP_FORM_STINFO04010_VIEW_FILE').children();
564
+        	childrens.remove();
553
             listObj.grid.search();
565
             listObj.grid.search();
554
         },
566
         },
555
         save: function() {
567
         save: function() {

+ 5 - 0
src/main/webapp/js/app/vendinfo/ITP_VENDINFO01010.js

@@ -56,24 +56,28 @@ const gridColModel = {
56
 			label: ITP_MSG_LOCALE.label.spplyMgrNm, 	//담당자명
56
 			label: ITP_MSG_LOCALE.label.spplyMgrNm, 	//담당자명
57
 			width: '10', fixed: false, align: 'left',
57
 			width: '10', fixed: false, align: 'left',
58
 			sortable: false, editable: true, edittype: 'text',
58
 			sortable: false, editable: true, edittype: 'text',
59
+			classes: 'input_color',
59
 			editrules: {required: true}
60
 			editrules: {required: true}
60
 		},
61
 		},
61
         {
62
         {
62
             index: 'POSITION', name: 'position',
63
             index: 'POSITION', name: 'position',
63
             label: ITP_MSG_LOCALE.label.position,		// 직위
64
             label: ITP_MSG_LOCALE.label.position,		// 직위
64
             width: '10', fixed: false, align: 'left',
65
             width: '10', fixed: false, align: 'left',
66
+            classes: 'input_color',
65
             sortable: false, hidden: false, editable: true, edittype: 'text'
67
             sortable: false, hidden: false, editable: true, edittype: 'text'
66
         },
68
         },
67
         {
69
         {
68
             index: 'RPRST_EMAL', name: 'rprstEmal',
70
             index: 'RPRST_EMAL', name: 'rprstEmal',
69
             label: ITP_MSG_LOCALE.label.rprstEmal,		// 이메일
71
             label: ITP_MSG_LOCALE.label.rprstEmal,		// 이메일
70
             width: '10', fixed: false, align: 'left',
72
             width: '10', fixed: false, align: 'left',
73
+            classes: 'input_color',
71
             sortable: false, hidden: false, editable: true, edittype: 'text'
74
             sortable: false, hidden: false, editable: true, edittype: 'text'
72
         },
75
         },
73
         {
76
         {
74
             index: 'RPRST_TEL_NO', name: 'rprstTelNo',
77
             index: 'RPRST_TEL_NO', name: 'rprstTelNo',
75
             label: ITP_MSG_LOCALE.label.rprstTelNo,		// 전화번호
78
             label: ITP_MSG_LOCALE.label.rprstTelNo,		// 전화번호
76
             width: '10', fixed: false, align: 'center',
79
             width: '10', fixed: false, align: 'center',
80
+            classes: 'input_color',
77
             sortable: false, hidden: false, editable: true, edittype: 'text',
81
             sortable: false, hidden: false, editable: true, edittype: 'text',
78
             editoptions: {'data-key-up': 'tel'}
82
             editoptions: {'data-key-up': 'tel'}
79
         },
83
         },
@@ -81,6 +85,7 @@ const gridColModel = {
81
             index: 'ASSGN_TASK', name: 'assgnTask',
85
             index: 'ASSGN_TASK', name: 'assgnTask',
82
             label: ITP_MSG_LOCALE.label.assgnTaskNm,	// 담당업무
86
             label: ITP_MSG_LOCALE.label.assgnTaskNm,	// 담당업무
83
             width: '10', fixed: false, align: 'left',
87
             width: '10', fixed: false, align: 'left',
88
+            classes: 'input_color',
84
             sortable: false, editable: true, formatter: 'select', edittype: 'select',
89
             sortable: false, editable: true, formatter: 'select', edittype: 'select',
85
 			editoptions: {value: ITP_COMMON_ASSGN_TASK},
90
 			editoptions: {value: ITP_COMMON_ASSGN_TASK},
86
 			editrules: {required: false}
91
 			editrules: {required: false}

+ 5 - 5
src/main/webapp/js/app/vendinfo/ITP_VENDINFO02010.js

@@ -32,7 +32,7 @@ const gridColModel = {
32
 			{
32
 			{
33
 				index: 'ITEM_ID', name: 'itemId',  			//서버로 전송시 데이터 명 , 데이터명
33
 				index: 'ITEM_ID', name: 'itemId',  			//서버로 전송시 데이터 명 , 데이터명
34
 				label: ITP_MSG_LOCALE.label.itemId, 		//품목번호
34
 				label: ITP_MSG_LOCALE.label.itemId, 		//품목번호
35
-				width: '12', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
35
+				width: '12', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
36
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
36
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
37
 			},
37
 			},
38
 			{
38
 			{
@@ -44,25 +44,25 @@ const gridColModel = {
44
 			{
44
 			{
45
 				index: 'ITEM_TYPE_NM', name: 'itemTypeNm',	//서버로 전송시 데이터 명 , 데이터명
45
 				index: 'ITEM_TYPE_NM', name: 'itemTypeNm',	//서버로 전송시 데이터 명 , 데이터명
46
 				label: ITP_MSG_LOCALE.label.itemTypeNm, 	//품목유형
46
 				label: ITP_MSG_LOCALE.label.itemTypeNm, 	//품목유형
47
-				width: '10', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
47
+				width: '10', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
48
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
48
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
49
 			},
49
 			},
50
 			{
50
 			{
51
 				index: 'ITEM_CLASS_NM', name: 'itemClassNm',//서버로 전송시 데이터 명 , 데이터명
51
 				index: 'ITEM_CLASS_NM', name: 'itemClassNm',//서버로 전송시 데이터 명 , 데이터명
52
 				label: ITP_MSG_LOCALE.label.itemClassNm, 	//품목분류
52
 				label: ITP_MSG_LOCALE.label.itemClassNm, 	//품목분류
53
-				width: '12', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
53
+				width: '12', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
54
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
54
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
55
 			},
55
 			},
56
 			{
56
 			{
57
 				index: 'ITEM_ST_NM', name: 'itemStNm',		//서버로 전송시 데이터 명 , 데이터명
57
 				index: 'ITEM_ST_NM', name: 'itemStNm',		//서버로 전송시 데이터 명 , 데이터명
58
 				label: "상태", 								//상태
58
 				label: "상태", 								//상태
59
-				width: '8', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
59
+				width: '8', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
60
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
60
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
61
 			},
61
 			},
62
 			{
62
 			{
63
 				index: 'PODR_PSSBLDVSN_NM', name: 'podrPssblDvsnNm',//서버로 전송시 데이터 명 , 데이터명
63
 				index: 'PODR_PSSBLDVSN_NM', name: 'podrPssblDvsnNm',//서버로 전송시 데이터 명 , 데이터명
64
 				label: ITP_MSG_LOCALE.label.podrPssblDvsnNm, //발주여부
64
 				label: ITP_MSG_LOCALE.label.podrPssblDvsnNm, //발주여부
65
-				width: '6', fixed: false, align: 'left',	// cell가로넓이,고정 여부 ,text정렬 
65
+				width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
66
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
66
 				sortable: false, hidden: false 				//정렬가능 여부,화면표시 여부
67
 			},
67
 			},
68
 			{
68
 			{

+ 1 - 1
src/main/webapp/js/app/vendinfo/ITP_VENDINFO03010.js

@@ -72,7 +72,7 @@ const gridColModel = {
72
 		{
72
 		{
73
 			index: 'UNIT_ST_NM', name: 'unitStNm',
73
 			index: 'UNIT_ST_NM', name: 'unitStNm',
74
 			label: ITP_MSG_LOCALE.label.status, 	//상태
74
 			label: ITP_MSG_LOCALE.label.status, 	//상태
75
-			width: '5', fixed: false, align: 'left',
75
+			width: '5', fixed: false, align: 'center',
76
 			sortable: false, hidden: false
76
 			sortable: false, hidden: false
77
 		},
77
 		},
78
 		{
78
 		{

+ 22 - 13
src/main/webapp/js/app/vsettmng/ITP_VSETTMNG01010.js

@@ -62,7 +62,8 @@ const gridColModel = {
62
 		{
62
 		{
63
 			index: 'BRAND_NM', name: 'brandNm',
63
 			index: 'BRAND_NM', name: 'brandNm',
64
 			label: "브랜드",
64
 			label: "브랜드",
65
-			width: '10', fixed: false, align: 'center',
65
+			width: '10', fixed: false, align: 'left',
66
+			minwidth: 120,
66
 			sortable: false, hidden: false
67
 			sortable: false, hidden: false
67
 		},
68
 		},
68
 		{
69
 		{
@@ -99,12 +100,13 @@ const gridColModel = {
99
 			index: 'ITEM_ID', name: 'itemId',
100
 			index: 'ITEM_ID', name: 'itemId',
100
 			label: "품목코드",
101
 			label: "품목코드",
101
 			width: '10', fixed: false, align: 'center',
102
 			width: '10', fixed: false, align: 'center',
103
+			minwidth: 140,
102
 			sortable: false, editable: false, edittype: 'text'
104
 			sortable: false, editable: false, edittype: 'text'
103
 		},
105
 		},
104
 		{
106
 		{
105
 			index: 'ITEM_NM', name: 'itemNm',
107
 			index: 'ITEM_NM', name: 'itemNm',
106
 			label: "품목명",
108
 			label: "품목명",
107
-			width: '10', fixed: false, align: 'center',
109
+			width: '10', fixed: false, align: 'left',
108
 			sortable: false, editable: false, edittype: 'text'
110
 			sortable: false, editable: false, edittype: 'text'
109
 		},
111
 		},
110
 		{
112
 		{
@@ -116,28 +118,31 @@ const gridColModel = {
116
 		{
118
 		{
117
 			index: 'UNIT_AMT', name: 'unitAmt',
119
 			index: 'UNIT_AMT', name: 'unitAmt',
118
 			label: "단가",
120
 			label: "단가",
119
-			width: '7', fixed: false, align: 'center',
121
+			width: '7', fixed: false, align: 'right',
120
 			sortable: false, editable: false, edittype: 'text', 
122
 			sortable: false, editable: false, edittype: 'text', 
121
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
123
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
122
 		},
124
 		},
123
 		{
125
 		{
124
 			index: 'PODR_QTY', name: 'podrQty',
126
 			index: 'PODR_QTY', name: 'podrQty',
125
 			label: "발주수량",
127
 			label: "발주수량",
126
-			width: '7', fixed: false, align: 'center',
128
+			width: '7', fixed: false, align: 'right',
129
+			minwidth: 80,
127
 			sortable: false, editable: false, edittype: 'text', 
130
 			sortable: false, editable: false, edittype: 'text', 
128
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
131
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
129
 		},
132
 		},
130
 		{
133
 		{
131
 			index: 'DLV_QTY', name: 'dlvQty',
134
 			index: 'DLV_QTY', name: 'dlvQty',
132
 			label: "납품수량",
135
 			label: "납품수량",
133
-			width: '7', fixed: false, align: 'center',
136
+			width: '7', fixed: false, align: 'right',
137
+			minwidth: 80,
134
 			sortable: false, editable: false, edittype: 'text', 
138
 			sortable: false, editable: false, edittype: 'text', 
135
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
139
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
136
 		},
140
 		},
137
 		{
141
 		{
138
 			index: 'WHS_COL_QTY', name: 'whsColQty',
142
 			index: 'WHS_COL_QTY', name: 'whsColQty',
139
 			label: "입고/수거수량",
143
 			label: "입고/수거수량",
140
-			width: '10', fixed: false, align: 'center',
144
+			width: '10', fixed: false, align: 'right',
145
+			minwidth: 90,
141
 			sortable: false, editable: false, edittype: 'text', 
146
 			sortable: false, editable: false, edittype: 'text', 
142
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
147
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
143
 		}, 
148
 		}, 
@@ -145,12 +150,14 @@ const gridColModel = {
145
 			index: 'WHS_COL_DT', name: 'whsColDt',
150
 			index: 'WHS_COL_DT', name: 'whsColDt',
146
 			label: "입고/수거일자",
151
 			label: "입고/수거일자",
147
 			width: '10', fixed: false, align: 'center',
152
 			width: '10', fixed: false, align: 'center',
153
+			minwidth: 100,
148
 			sortable: false, editable: false, edittype: 'text'
154
 			sortable: false, editable: false, edittype: 'text'
149
 		},
155
 		},
150
 		{
156
 		{
151
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
157
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
152
 			label: "입고/수거금액",
158
 			label: "입고/수거금액",
153
-			width: '10', fixed: false, align: 'center',
159
+			width: '10', fixed: false, align: 'right',
160
+			minwidth: 100,
154
 			sortable: false, editable: false, edittype: 'text', 
161
 			sortable: false, editable: false, edittype: 'text', 
155
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
162
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
156
 		},
163
 		},
@@ -169,12 +176,14 @@ const gridColModel = {
169
 		{
176
 		{
170
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
177
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
171
 			label: "발주번호",
178
 			label: "발주번호",
179
+			minwidth: 140,
172
 			width: '8', fixed: false, align: 'center',
180
 			width: '8', fixed: false, align: 'center',
173
 			sortable: false, editable: false, edittype: 'text'
181
 			sortable: false, editable: false, edittype: 'text'
174
 		},
182
 		},
175
 		{
183
 		{
176
 			index: 'PODR_DTL_NO', name: 'podrDtlNo',
184
 			index: 'PODR_DTL_NO', name: 'podrDtlNo',
177
 			label: "발주항번",
185
 			label: "발주항번",
186
+			minwidth: 80,
178
 			width: '7', fixed: false, align: 'center',
187
 			width: '7', fixed: false, align: 'center',
179
 			sortable: false, editable: false, edittype: 'text'
188
 			sortable: false, editable: false, edittype: 'text'
180
 		}	
189
 		}	
@@ -213,7 +222,7 @@ const gridColModel = {
213
 		{
222
 		{
214
 			index: 'ITEM_NM', name: 'itemNm',
223
 			index: 'ITEM_NM', name: 'itemNm',
215
 			label: "품목명",
224
 			label: "품목명",
216
-			width: '10', fixed: false, align: 'center',
225
+			width: '10', fixed: false, align: 'left',
217
 			sortable: false, editable: false, edittype: 'text'
226
 			sortable: false, editable: false, edittype: 'text'
218
 		},
227
 		},
219
 		{
228
 		{
@@ -225,28 +234,28 @@ const gridColModel = {
225
 		{
234
 		{
226
 			index: 'UNIT_AMT', name: 'unitAmt',
235
 			index: 'UNIT_AMT', name: 'unitAmt',
227
 			label: "단가",
236
 			label: "단가",
228
-			width: '8', fixed: false, align: 'center',
237
+			width: '8', fixed: false, align: 'right',
229
 			sortable: false, editable: false, edittype: 'text', 
238
 			sortable: false, editable: false, edittype: 'text', 
230
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
239
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
231
 		},
240
 		},
232
 		{
241
 		{
233
 			index: 'PODR_QTY', name: 'podrQty',
242
 			index: 'PODR_QTY', name: 'podrQty',
234
 			label: "발주수량",
243
 			label: "발주수량",
235
-			width: '8', fixed: false, align: 'center',
244
+			width: '8', fixed: false, align: 'right',
236
 			sortable: false, editable: false, edittype: 'text', 
245
 			sortable: false, editable: false, edittype: 'text', 
237
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
246
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
238
 		},
247
 		},
239
 		{
248
 		{
240
 			index: 'DLV_QTY', name: 'dlvQty',
249
 			index: 'DLV_QTY', name: 'dlvQty',
241
 			label: "납품수량",
250
 			label: "납품수량",
242
-			width: '8', fixed: false, align: 'center',
251
+			width: '8', fixed: false, align: 'right',
243
 			sortable: false, editable: false, edittype: 'text', 
252
 			sortable: false, editable: false, edittype: 'text', 
244
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
253
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
245
 		},
254
 		},
246
 		{
255
 		{
247
 			index: 'WHS_COL_QTY', name: 'whsColQty',
256
 			index: 'WHS_COL_QTY', name: 'whsColQty',
248
 			label: "입고/수거수량",
257
 			label: "입고/수거수량",
249
-			width: '8', fixed: false, align: 'center',
258
+			width: '8', fixed: false, align: 'right',
250
 			sortable: false, editable: false, edittype: 'text', 
259
 			sortable: false, editable: false, edittype: 'text', 
251
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
260
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
252
 		}, 
261
 		}, 
@@ -259,7 +268,7 @@ const gridColModel = {
259
 		{
268
 		{
260
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
269
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
261
 			label: "입고/수거금액",
270
 			label: "입고/수거금액",
262
-			width: '8', fixed: false, align: 'center',
271
+			width: '8', fixed: false, align: 'right',
263
 			sortable: false, editable: false, edittype: 'text', 
272
 			sortable: false, editable: false, edittype: 'text', 
264
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
273
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
265
 		},
274
 		},

+ 21 - 15
src/main/webapp/js/app/vsettmng/ITP_VSETTMNG02010.js

@@ -44,7 +44,7 @@ const gridColModel = {
44
 		{
44
 		{
45
 			index: 'BRAND_NM', name: 'brandNm',
45
 			index: 'BRAND_NM', name: 'brandNm',
46
 			label: "브랜드",
46
 			label: "브랜드",
47
-			width: '10', fixed: false, align: 'center',
47
+			width: '10', fixed: false, align: 'left',
48
 			sortable: false, hidden: false
48
 			sortable: false, hidden: false
49
 		},
49
 		},
50
 		{
50
 		{
@@ -68,6 +68,7 @@ const gridColModel = {
68
 		{
68
 		{
69
 			index: 'STTL_MGNT_UNQ_NO', name: 'sttlMgntUnqNo',
69
 			index: 'STTL_MGNT_UNQ_NO', name: 'sttlMgntUnqNo',
70
 			label: "정산번호", 
70
 			label: "정산번호", 
71
+			minwidth: 170,
71
 			width: '10', fixed: false, align: 'center',
72
 			width: '10', fixed: false, align: 'center',
72
 			sortable: false, hidden: false
73
 			sortable: false, hidden: false
73
 		},
74
 		},
@@ -89,30 +90,30 @@ const gridColModel = {
89
 			width: '10', fixed: false, align: 'center',
90
 			width: '10', fixed: false, align: 'center',
90
 			sortable: false, editable: false, edittype: 'text'
91
 			sortable: false, editable: false, edittype: 'text'
91
 		},
92
 		},
92
-		{
93
-			index: 'STTL_REQ_AMT', name: 'sttlReqAmt',
94
-			label: "정산요청금액",
95
-			width: '10', fixed: false, align: 'center',
96
-			sortable: false, editable: false, edittype: 'text', 
97
-			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
98
-		}, 
99
 		{
93
 		{
100
 			index: 'STTL_DT', name: 'sttlDt',
94
 			index: 'STTL_DT', name: 'sttlDt',
101
 			label: "정산확정일",
95
 			label: "정산확정일",
102
 			width: '10', fixed: false, align: 'center',
96
 			width: '10', fixed: false, align: 'center',
103
 			sortable: false, editable: false, edittype: 'text'
97
 			sortable: false, editable: false, edittype: 'text'
104
 		},
98
 		},
99
+		{
100
+			index: 'STTL_REQ_AMT', name: 'sttlReqAmt',
101
+			label: "정산요청금액",
102
+			width: '10', fixed: false, align: 'right',
103
+			sortable: false, editable: false, edittype: 'text', 
104
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
105
+		}, 
105
 		{
106
 		{
106
 			index: 'STTL_REQ_AMT', name: 'sttlAmt',
107
 			index: 'STTL_REQ_AMT', name: 'sttlAmt',
107
 			label: "정산확정금액",
108
 			label: "정산확정금액",
108
-			width: '10', fixed: false, align: 'center',
109
+			width: '10', fixed: false, align: 'right',
109
 			sortable: false, editable: false, edittype: 'text', 
110
 			sortable: false, editable: false, edittype: 'text', 
110
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
111
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
111
 		},
112
 		},
112
 		{
113
 		{
113
 			index: 'UNPAID_AMT', name: 'unpaidAmt',
114
 			index: 'UNPAID_AMT', name: 'unpaidAmt',
114
 			label: "미납금액",
115
 			label: "미납금액",
115
-			width: '10', fixed: false, align: 'center',
116
+			width: '10', fixed: false, align: 'right',
116
 			sortable: false, editable: false, edittype: 'text', 
117
 			sortable: false, editable: false, edittype: 'text', 
117
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
118
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
118
 		}, 
119
 		}, 
@@ -151,6 +152,7 @@ const gridColModel = {
151
 		{
152
 		{
152
 			index: 'ITEM_ID', name: 'itemId',
153
 			index: 'ITEM_ID', name: 'itemId',
153
 			label: "품목코드",
154
 			label: "품목코드",
155
+			minwidth: 140,
154
 			width: '10', fixed: false, align: 'center',
156
 			width: '10', fixed: false, align: 'center',
155
 			sortable: false, editable: false, edittype: 'text'
157
 			sortable: false, editable: false, edittype: 'text'
156
 		},
158
 		},
@@ -169,28 +171,29 @@ const gridColModel = {
169
 		{
171
 		{
170
 			index: 'UNIT_AMT', name: 'unitAmt',
172
 			index: 'UNIT_AMT', name: 'unitAmt',
171
 			label: "단가",
173
 			label: "단가",
172
-			width: '8', fixed: false, align: 'center',
174
+			width: '8', fixed: false, align: 'right',
173
 			sortable: false, editable: false, edittype: 'text', 
175
 			sortable: false, editable: false, edittype: 'text', 
174
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
176
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
175
 		},
177
 		},
176
 		{
178
 		{
177
 			index: 'PODR_QTY', name: 'podrQty',
179
 			index: 'PODR_QTY', name: 'podrQty',
178
 			label: "발주수량",
180
 			label: "발주수량",
179
-			width: '8', fixed: false, align: 'center',
181
+			width: '8', fixed: false, align: 'right',
180
 			sortable: false, editable: false, edittype: 'text', 
182
 			sortable: false, editable: false, edittype: 'text', 
181
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
183
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
182
 		},
184
 		},
183
 		{
185
 		{
184
 			index: 'DLV_QTY', name: 'dlvQty',
186
 			index: 'DLV_QTY', name: 'dlvQty',
185
 			label: "납품수량",
187
 			label: "납품수량",
186
-			width: '8', fixed: false, align: 'center',
188
+			width: '8', fixed: false, align: 'right',
187
 			sortable: false, editable: false, edittype: 'text', 
189
 			sortable: false, editable: false, edittype: 'text', 
188
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
190
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
189
 		},
191
 		},
190
 		{
192
 		{
191
 			index: 'WHS_COL_QTY', name: 'whsColQty',
193
 			index: 'WHS_COL_QTY', name: 'whsColQty',
192
 			label: "입고/수거수량",
194
 			label: "입고/수거수량",
193
-			width: '8', fixed: false, align: 'center',
195
+			width: '8', fixed: false, align: 'right',
196
+			minwidth: 80,
194
 			sortable: false, editable: false, edittype: 'text', 
197
 			sortable: false, editable: false, edittype: 'text', 
195
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
198
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
196
 		}, 
199
 		}, 
@@ -198,13 +201,15 @@ const gridColModel = {
198
 			index: 'WHS_COL_DT', name: 'whsColDt',
201
 			index: 'WHS_COL_DT', name: 'whsColDt',
199
 			label: "입고/수거일자",
202
 			label: "입고/수거일자",
200
 			width: '8', fixed: false, align: 'center',
203
 			width: '8', fixed: false, align: 'center',
204
+			minwidth: 80,
201
 			sortable: false, editable: false, edittype: 'text'
205
 			sortable: false, editable: false, edittype: 'text'
202
 		},
206
 		},
203
 		{
207
 		{
204
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
208
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
205
 			label: "입고/수거금액",
209
 			label: "입고/수거금액",
206
-			width: '8', fixed: false, align: 'center',
210
+			width: '8', fixed: false, align: 'right',
207
 			sortable: false, editable: false, edittype: 'text', 
211
 			sortable: false, editable: false, edittype: 'text', 
212
+			minwidth: 80,
208
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
213
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
209
 		},
214
 		},
210
 		{
215
 		{
@@ -217,6 +222,7 @@ const gridColModel = {
217
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
222
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
218
 			label: "발주번호",
223
 			label: "발주번호",
219
 			width: '8', fixed: false, align: 'center',
224
 			width: '8', fixed: false, align: 'center',
225
+			minwidth: 160,
220
 			sortable: false, editable: false, edittype: 'text'
226
 			sortable: false, editable: false, edittype: 'text'
221
 		},
227
 		},
222
 		{
228
 		{

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

@@ -8,7 +8,7 @@
8
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
8
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
9
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
9
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
10
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
10
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
11
-      <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PG_AFFL_ID" name="pgAfflId" value="">
11
+      <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_MALL_ID" name="mallId" value="">
12
       <div class="content">
12
       <div class="content">
13
         <div class="line">
13
         <div class="line">
14
           <label>납기요청일</label>
14
           <label>납기요청일</label>
@@ -51,7 +51,7 @@
51
       <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-1-1">
51
       <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-1-1">
52
         <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="panel-group"></ul>
52
         <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="panel-group"></ul>
53
         <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display:none;">
53
         <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display:none;">
54
-          <li class="row_2">
54
+          <li class="list-row">
55
             <div class="left_info">
55
             <div class="left_info">
56
               <div class="check_box"><!-- class 변경 -->
56
               <div class="check_box"><!-- class 변경 -->
57
                 <div><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
57
                 <div><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
@@ -67,9 +67,9 @@
67
               </div>
67
               </div>
68
             </div>
68
             </div>
69
             <div class="right">
69
             <div class="right">
70
-              <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS" class="DETAIL_ITEM_MINUS">-</button>
70
+              <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
71
               <div class="num fnPchReqQty">1</div>
71
               <div class="num fnPchReqQty">1</div>
72
-              <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS" class="DETAIL_ITEM_PLUS">+</button>
72
+              <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
73
             </div>
73
             </div>
74
           </li>
74
           </li>
75
         </div>
75
         </div>

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

@@ -164,7 +164,7 @@
164
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_DVSN" name="pchReqDvsn" value="">
164
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_DVSN" name="pchReqDvsn" value="">
165
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
165
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
166
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_ST_CD" name="pchReqStCd" value="">
166
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_ST_CD" name="pchReqStCd" value="">
167
-      <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PG_AFFL_ID" name="pgAfflId" value="">
167
+      <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_MALL_ID" name="mallId" value="">
168
       <div class="content">
168
       <div class="content">
169
         <div class="line">
169
         <div class="line">
170
           <label>납기요청일</label>
170
           <label>납기요청일</label>
@@ -223,9 +223,9 @@
223
               </div>
223
               </div>
224
             </div>
224
             </div>
225
             <div class="right">
225
             <div class="right">
226
-              <button id="ITP_BTN_MPOMNG02010_MODIFY_MINUS" class="DETAIL_ITEM_MINUS">-</button>
226
+              <button id="ITP_BTN_MPOMNG02010_MODIFY_MINUS">-</button>
227
               <div class="num fnPchReqQty">1</div>
227
               <div class="num fnPchReqQty">1</div>
228
-              <button id="ITP_BTN_MPOMNG02010_MODIFY_PLUS" class="DETAIL_ITEM_PLUS">+</button>
228
+              <button id="ITP_BTN_MPOMNG02010_MODIFY_PLUS">+</button>
229
             </div>
229
             </div>
230
           </li>
230
           </li>
231
         </div>
231
         </div>

+ 15 - 13
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -62,6 +62,13 @@ let mobPageObj = {
62
 				}
62
 				}
63
 				return false;
63
 				return false;
64
 			});
64
 			});
65
+			// $(document).on('click', '#ITP_BTN_MPOMNG01010_DETAIL_PLUS', function() {
66
+			// 	console.log('ITP_BTN_MPOMNG01010_DETAIL_PLUS ===> ');
67
+			// 	mobContObj.list.actPlus($(this));
68
+			// });
69
+			// $(document).on('click', '#ITP_BTN_MPOMNG01010_DETAIL_MINUS', function() {
70
+			// 	mobContObj.list.actMinus($(this));
71
+			// });
65
 		}
72
 		}
66
 	},
73
 	},
67
 	ready: function() {
74
 	ready: function() {
@@ -71,18 +78,8 @@ let mobPageObj = {
71
 
78
 
72
 let mobContObj = {
79
 let mobContObj = {
73
 	init: function() {
80
 	init: function() {
74
-		this.button();
75
 		this.data.load();
81
 		this.data.load();
76
 	},
82
 	},
77
-	button: function() {
78
-		var _this = this;
79
-		$(document).on('click', '.DETAIL_ITEM_PLUS', function() {
80
-			_this.list.actPlus($(this));
81
-		});
82
-		$(document).on('click', '.DETAIL_ITEM_MINUS', function() {
83
-			_this.list.actMinus($(this));
84
-		});
85
-	},
86
 	data: {
83
 	data: {
87
 		initPchReq: null,
84
 		initPchReq: null,
88
 		load: function() {
85
 		load: function() {
@@ -95,7 +92,7 @@ let mobContObj = {
95
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_LOAN_DVSN').val(result.loanDvsn);
92
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_LOAN_DVSN').val(result.loanDvsn);
96
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
93
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
97
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_DVSN').val(result.pchReqDvsn);
94
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_DVSN').val(result.pchReqDvsn);
98
-				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PG_AFFL_ID').val(result.pgAfflId);
95
+				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_MALL_ID').val(result.mallId);
99
 
96
 
100
 				$('#ITP_FORM_MPOMNG01010_DETAIL .fnOrdUseAmt').text(CommonObj.currency.add(result.ordUseAmt));
97
 				$('#ITP_FORM_MPOMNG01010_DETAIL .fnOrdUseAmt').text(CommonObj.currency.add(result.ordUseAmt));
101
 				if(result.whsId !== '' && result.location !== '') {
98
 				if(result.whsId !== '' && result.location !== '') {
@@ -117,6 +114,7 @@ let mobContObj = {
117
 		},
114
 		},
118
 		attachRow: function (item) {
115
 		attachRow: function (item) {
119
 			console.log(item);
116
 			console.log(item);
117
+			var _this = this;
120
 			var fnIsExist = function(rows) {
118
 			var fnIsExist = function(rows) {
121
 				var isExist = false;
119
 				var isExist = false;
122
 				$.each(rows, function(i, row) {
120
 				$.each(rows, function(i, row) {
@@ -130,12 +128,14 @@ let mobContObj = {
130
 			if(!fnIsExist(this.rows)) {
128
 			if(!fnIsExist(this.rows)) {
131
 				this.rows.push(item);
129
 				this.rows.push(item);
132
 				$('#ITP_LIST_MPOMNG01010_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY').html());
130
 				$('#ITP_LIST_MPOMNG01010_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY').html());
133
-				var $li = $('#ITP_LIST_MPOMNG01010_ITEM_AREA .panel-group > .row_2:last');
131
+				var $li = $('#ITP_LIST_MPOMNG01010_ITEM_AREA .panel-group > .list-row:last');
134
 				$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
132
 				$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
135
 				$li.find('.fnItemNm').text(item.itemNm);
133
 				$li.find('.fnItemNm').text(item.itemNm);
136
 				$li.find('.fnPchReqQty').text(item.pchReqQty);
134
 				$li.find('.fnPchReqQty').text(item.pchReqQty);
137
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
135
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
138
 				this.pchReqAmtTot();
136
 				this.pchReqAmtTot();
137
+				$('.list-row #ITP_BTN_MPOMNG01010_DETAIL_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
138
+				$('.list-row #ITP_BTN_MPOMNG01010_DETAIL_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
139
 			}
139
 			}
140
 		},
140
 		},
141
 		detachRow: function () {
141
 		detachRow: function () {
@@ -153,6 +153,7 @@ let mobContObj = {
153
 		actPlus: function(elem) {
153
 		actPlus: function(elem) {
154
 			var $div = $(elem).siblings('div');
154
 			var $div = $(elem).siblings('div');
155
 			var num = Number($div.text());
155
 			var num = Number($div.text());
156
+			console.log('actPlus ===> ' + num);
156
 			$($div).text((num + 1).toString());
157
 			$($div).text((num + 1).toString());
157
 			this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
158
 			this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
158
 			this.pchReqAmtTot();
159
 			this.pchReqAmtTot();
@@ -160,6 +161,7 @@ let mobContObj = {
160
 		actMinus: function(elem) {
161
 		actMinus: function(elem) {
161
 			var $div = $(elem).siblings('div');
162
 			var $div = $(elem).siblings('div');
162
 			var num = Number($div.text());
163
 			var num = Number($div.text());
164
+			console.log('actMinus ===> ' + num);
163
 			if(num <= 1) {
165
 			if(num <= 1) {
164
 				alert('주문수량을 확인하세요.');
166
 				alert('주문수량을 확인하세요.');
165
 			} else {
167
 			} else {
@@ -330,7 +332,7 @@ let mobPopObj = {
330
 					$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
332
 					$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
331
 				} else {
333
 				} else {
332
 					if (ordUseAmt < pchReqAmtTot) { // 요청금액이 가능금액보다 클 경우
334
 					if (ordUseAmt < pchReqAmtTot) { // 요청금액이 가능금액보다 클 경우
333
-						if($('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PG_AFFL_ID').val() === '') {	// PG 정보 없음
335
+						if($('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_MALL_ID').val() === '') {	// PG 정보 없음
334
 							this.saveMode = 3;
336
 							this.saveMode = 3;
335
 							popMsg = 	'무통장 입금 후 구매요청해 주세요.<br>' +
337
 							popMsg = 	'무통장 입금 후 구매요청해 주세요.<br>' +
336
 										'임시저장 하시겠습니까?';
338
 										'임시저장 하시겠습니까?';

+ 4 - 11
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG02010.js

@@ -97,15 +97,6 @@ let mobPageObj = {
97
 				}
97
 				}
98
 				return false;
98
 				return false;
99
 			});
99
 			});
100
-
101
-			$(document).off('click', '#ITP_LIST_MPOMNG02010_MODIFY_ROWS li button');
102
-			$(document).on('click', '#ITP_LIST_MPOMNG02010_MODIFY_ROWS li button', function() {
103
-				if($(this).hasClass('DETAIL_ITEM_PLUS')) {
104
-					mobContentObj.modify.list.actPlus($(this));
105
-				} else if($(this).hasClass('DETAIL_ITEM_MINUS')) {
106
-					mobContentObj.modify.list.actMinus($(this));
107
-				}
108
-			});
109
 		}
100
 		}
110
 	},
101
 	},
111
 	switchScreen: function(mode) {
102
 	switchScreen: function(mode) {
@@ -276,7 +267,7 @@ let mobContentObj = {
276
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
267
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
277
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_UNQ_NO').val(result.pchReqUnqNo);
268
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_UNQ_NO').val(result.pchReqUnqNo);
278
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_DVSN').val(result.pchReqDvsn);
269
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_DVSN').val(result.pchReqDvsn);
279
-			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PG_AFFL_ID').val(result.pgAfflId);
270
+			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_MALL_ID').val(result.mallId);
280
 
271
 
281
 			$('#ITP_FORM_MPOMNG02010_MODIFY .fnOrdUseAmt').text(CommonObj.currency.add(result.ordUseAmt));
272
 			$('#ITP_FORM_MPOMNG02010_MODIFY .fnOrdUseAmt').text(CommonObj.currency.add(result.ordUseAmt));
282
 			if(result.whsId !== '' && result.location !== '') {
273
 			if(result.whsId !== '' && result.location !== '') {
@@ -306,6 +297,8 @@ let mobContentObj = {
306
 					$li.find('.fnPchReqQty').text(item.pchReqQty);
297
 					$li.find('.fnPchReqQty').text(item.pchReqQty);
307
 					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
298
 					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
308
 					_this.pchReqAmtTot();
299
 					_this.pchReqAmtTot();
300
+					$('.list-row #ITP_BTN_MPOMNG02010_MODIFY_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
301
+					$('.list-row #ITP_BTN_MPOMNG02010_MODIFY_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
309
 				};
302
 				};
310
 				var fnChkExist = function() {
303
 				var fnChkExist = function() {
311
 					var isExist = false;
304
 					var isExist = false;
@@ -630,7 +623,7 @@ let mobPopObj = {
630
 					$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
623
 					$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
631
 				} else {
624
 				} else {
632
 					if (ordUseAmt < pchReqAmtTot) { // 요청금액이 가능금액보다 클 경우
625
 					if (ordUseAmt < pchReqAmtTot) { // 요청금액이 가능금액보다 클 경우
633
-						if($('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PG_AFFL_ID').val() === '') {	// PG 정보 없음
626
+						if($('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_MALL_ID').val() === '') {	// PG 정보 없음
634
 							this.saveMode = 3;
627
 							this.saveMode = 3;
635
 							popMsg = 	'무통장 입금 후 구매요청해 주세요.<br>' +
628
 							popMsg = 	'무통장 입금 후 구매요청해 주세요.<br>' +
636
 								'임시저장 하시겠습니까?';
629
 								'임시저장 하시겠습니까?';

+ 1 - 1
src/main/webapp/mobile/js/config.js

@@ -42,7 +42,7 @@ require([
42
 	'jquery.bootstrap.datepicker.locale',
42
 	'jquery.bootstrap.datepicker.locale',
43
 	'message.locale'
43
 	'message.locale'
44
 ], function($) {
44
 ], function($) {
45
-	// history.pushState(null, null, location.href);
45
+	history.pushState(null, null, location.href);
46
 
46
 
47
 	CommonObj.init();
47
 	CommonObj.init();
48
 
48