瀏覽代碼

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

juney 2 年之前
父節點
當前提交
07cdf224e7
共有 29 個文件被更改,包括 507 次插入276 次删除
  1. 3 7
      src/main/webapp/app/loanmng/LOANMNG04010.html
  2. 1 1
      src/main/webapp/app/pomng/POMNG01010.html
  3. 1 1
      src/main/webapp/app/pomng/POMNG02010.html
  4. 17 9
      src/main/webapp/app/pomng/POMNG03010.html
  5. 18 11
      src/main/webapp/app/pomng/POMNG04010.html
  6. 15 7
      src/main/webapp/app/pomng/POMNG05010.html
  7. 17 10
      src/main/webapp/app/pomng/POMNG06010.html
  8. 22 24
      src/main/webapp/app/popup/biz/BIZPOP_PO_PAYMENT.html
  9. 23 15
      src/main/webapp/css/style.css
  10. 125 29
      src/main/webapp/js/app/loanmng/ITP_LOANMNG04010.js
  11. 31 15
      src/main/webapp/js/app/main.js
  12. 7 0
      src/main/webapp/js/app/oper/ITP_OPER01010.js
  13. 11 8
      src/main/webapp/js/app/oper/ITP_OPER02010.js
  14. 7 7
      src/main/webapp/js/app/oper/ITP_OPER03010.js
  15. 2 2
      src/main/webapp/js/app/oper/ITP_OPER04010.js
  16. 3 3
      src/main/webapp/js/app/oper/ITP_OPER06010.js
  17. 2 2
      src/main/webapp/js/app/pomng/ITP_POMNG01010.js
  18. 14 6
      src/main/webapp/js/app/pomng/ITP_POMNG02010.js
  19. 12 5
      src/main/webapp/js/app/pomng/ITP_POMNG03010.js
  20. 17 17
      src/main/webapp/js/app/pomng/ITP_POMNG04010.js
  21. 21 19
      src/main/webapp/js/app/pomng/ITP_POMNG05010.js
  22. 16 3
      src/main/webapp/js/app/pomng/ITP_POMNG06010.js
  23. 7 6
      src/main/webapp/js/app/stinfo/ITP_STINFO02010.js
  24. 5 5
      src/main/webapp/js/app/stinfo/ITP_STINFO03010.js
  25. 3 3
      src/main/webapp/js/app/stinfo/ITP_STINFO04010.js
  26. 13 3
      src/main/webapp/js/app/stinfo/ITP_STINFO05010.js
  27. 8 12
      src/main/webapp/js/app/stinfo/ITP_STINFO06010.js
  28. 1 1
      src/main/webapp/js/app/stinfo/ITP_STINFO07010.js
  29. 85 45
      src/main/webapp/main.html

+ 3 - 7
src/main/webapp/app/loanmng/LOANMNG04010.html

@@ -3,11 +3,7 @@
3 3
 		<article class="itp_detail">
4 4
 			<div class="itp_det_head fix">
5 5
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>여신현황</strong></h2>
6
-				<div class="pull-right itp_cicon">
7
-					<button type="button" id="ITP_BTN_LOANMNG04010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
8
-					<button type="button" id="ITP_BTN_LOANMNG04010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon"></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
9
-					<button type="button" id="ITP_BTN_LOANMNG04010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon"></i>&nbsp;&nbsp;목록&nbsp;&nbsp;</button>
10
-				</div>				
6
+				<div class="pull-right itp_cicon"></div>				
11 7
 			</div>
12 8
 			<div class="itp_det_in">
13 9
 				<div id="ITP_AJAX_LOANMNG04010_VIEW_CONTAINER">
@@ -90,9 +86,9 @@
90 86
 												</div>
91 87
 												<div class="col-xs-2 itp_ip itp_noMar">
92 88
 													<div class="input-daterange input-group date">
93
-														<input type="text" id="ITP_FORM_LOANMNG04010_SEARCH_FROM" class="form-control itp_input" name="fromDt" value="">
89
+														<input type="text" id="ITP_FORM_LOANMNG04010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
94 90
 														<span class="input-group-addon itp_date_to">~</span>
95
-														<input type="text" id="ITP_FORM_LOANMNG04010_SEARCH_TO" class="form-control itp_input" name="toDt" value="">
91
+														<input type="text" id="ITP_FORM_LOANMNG04010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
96 92
 													</div>
97 93
 												</div>
98 94
 												<div class="col-xs-2 itp_in itp_noMar">

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

@@ -114,7 +114,7 @@
114 114
 											</div>
115 115
 										</div>
116 116
 										<div id="ITP_POMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
117
-										    <div id="ITP_POMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
117
+										    <!-- <div id="ITP_POMNG01010_DETAIL_jqGridView" class="itp_views fix"></div> -->
118 118
 										    <table id="ITP_POMNG01010_DETAIL_jqGrid"></table>
119 119
 										    <div id="ITP_POMNG01010_DETAIL_jqGridPager"></div>
120 120
 										    <div id="ITP_POMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

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

@@ -272,7 +272,7 @@
272 272
 											<h4 class="itp_table_tit">요청 품목</h4>
273 273
 										</div>
274 274
 										<div id="ITP_POMNG02010_VIEW_jqGrid_list" class="itp_tb_list">
275
-										    <div id="ITP_POMNG02010_VIEW_jqGridView" class="itp_views fix"></div>
275
+										    <!-- <div id="ITP_POMNG02010_VIEW_jqGridView" class="itp_views fix"></div> -->
276 276
 										    <table id="ITP_POMNG02010_VIEW_jqGrid"></table>
277 277
 									     	<div id="ITP_POMNG02010_VIEW_jqGridPager"></div>
278 278
 										    <div id="ITP_POMNG02010_VIEW_jqGridEmpty" class="itp_no_data"></div>

+ 17 - 9
src/main/webapp/app/pomng/POMNG03010.html

@@ -204,12 +204,16 @@
204 204
 										<div class="form-group">
205 205
 											<label class="col-xs-2 itp_lb">공급업체명*</label>
206 206
 											<div class="col-xs-4 itp_ip">
207
-												<div class="col-xs-5 itp_in">
208
-													<input type="text" id="ITP_FORM_POMNG03010_NDETAIL_SPPLY_NM" data-check-required="empty" class="form-control itp_input" name="spplyNm" readonly="readonly" />
207
+												<div class="col-xs-8 itp_in">
208
+													<div class="input-group">
209
+														<input type="text" id="ITP_FORM_POMNG03010_NDETAIL_SPPLY_NM" data-check-required="empty" class="form-control itp_input" name="spplyNm" readonly="readonly" />
210
+														<span class="input-group-btn">
211
+															<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>
212
+														</span>
213
+													</div>
209 214
 												</div>
210
-												<div class="col-xs-4 itp_in" style="padding-left: 3px;">
215
+												<div class="col-xs-a itp_in" style="padding-left: 3px;">
211 216
 													<button type="button" id="ITP_BTN_POMNG03010_NDETAIL_SEARCH_SPPLY_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
212
-													<button type="button" id="ITP_BTN_POMNG03010_NDETAIL_DELETE_SPPLY_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
213 217
 								                </div>
214 218
 											</div>
215 219
 											<label class="col-xs-2 itp_lb">발주일자</label>
@@ -220,12 +224,16 @@
220 224
 										<div class="form-group">
221 225
 											<label class="col-xs-2 itp_lb">납품장소 *</label>
222 226
 											<div class="col-xs-4 itp_ip">
223
-												<div class="col-xs-5 itp_in">
224
-													<input type="text" id="ITP_FORM_POMNG03010_NDETAIL_WHS_NM" data-check-required="empty" class="form-control itp_input" name="whsNm" readonly="readonly" />
227
+												<div class="col-xs-8 itp_in">
228
+													<div class="input-group">
229
+														<input type="text" id="ITP_FORM_POMNG03010_NDETAIL_WHS_NM" data-check-required="empty" class="form-control itp_input" name="whsNm" readonly="readonly" />
230
+														<span class="input-group-btn">
231
+															<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>
232
+														</span>
233
+													</div>
225 234
 												</div>
226
-												<div class="col-xs-4 itp_in" style="padding-left: 3px;">
235
+												<div class="col-xs-a itp_in" style="padding-left: 3px;">
227 236
 													<button type="button" id="ITP_BTN_POMNG03010_SEARCH_WHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
228
-													<button type="button" id="ITP_BTN_POMNG03010_DELETE_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
229 237
 								                </div>
230 238
 											</div>
231 239
 											<label class="col-xs-2 itp_lb">발주 총 금액</label>
@@ -263,7 +271,7 @@
263 271
 											</div>
264 272
 										</div>
265 273
 										<div id="ITP_POMNG03010_NDETAIL_jqGrid_list" class="itp_tb_list">
266
-										  <div id="ITP_POMNG03010_NDETAIL_jqGridView" class="itp_views fix"></div>
274
+										  <!-- <div id="ITP_POMNG03010_NDETAIL_jqGridView" class="itp_views fix"></div> -->
267 275
 										  <table id="ITP_POMNG03010_NDETAIL_jqGrid"></table>
268 276
 										  <div id="ITP_POMNG03010_NDETAIL_jqGridPager"></div>
269 277
 										  <div id="ITP_POMNG03010_NDETAIL_jqGridEmpty" class="itp_no_data"></div>

+ 18 - 11
src/main/webapp/app/pomng/POMNG04010.html

@@ -23,9 +23,9 @@
23 23
 										</div>										
24 24
 										<div class="col-xs-3 itp_ip itp_noMar">
25 25
 											<div class="input-daterange input-group date">
26
-												<input type="text" id="ITP_FORM_POMNG04010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
26
+												<input type="text" id="ITP_FORM_POMNG04010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
27 27
 												<span class="input-group-addon itp_date_to">~</span>
28
-												<input type="text" id="ITP_FORM_POMNG04010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
28
+												<input type="text" id="ITP_FORM_POMNG04010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
29 29
 											</div>
30 30
 										</div>
31 31
 										<div class="col-xs-2 itp_ip itp_noMar">
@@ -35,21 +35,29 @@
35 35
 										</div>
36 36
 									</div>
37 37
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
38
-										<div class="col-xs-2 itp_ip itp_noMar">
39
-											<input type="text" id="ITP_FORM_POMNG04010_DETAIL_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
40
-											<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
38
+						                <div class="col-xs-2 itp_ip itp_noMar">
39
+											<div class="input-group">
40
+												<input type="text" id="ITP_FORM_POMNG04010_DETAIL_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
41
+												<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
42
+												<span class="input-group-btn">
43
+													<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>
44
+												</span>
45
+											</div>
41 46
 										</div>
42 47
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
43 48
 											<button type="button" id="ITP_BTN_POMNG04010_SEARCH_SPPLY_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_POMNG04010_DELETE_SPPLY_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
45 49
 						                </div>
46 50
 										<div class="col-xs-2 itp_ip itp_noMar">
51
+											<div class="input-group">
47 52
 											<input type="text" id="ITP_FORM_POMNG04010_DETAIL_WHS_NM" class="form-control itp_input" name="sdlvPlace" placeholder="매장/창고" readonly/>
48 53
 											<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />											
54
+												<span class="input-group-btn">
55
+													<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>
56
+												</span>
57
+											</div>
49 58
 										</div>
50 59
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:10%;">
51 60
 											<button type="button" id="ITP_BTN_POMNG04010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
52
-											<button type="button" id="ITP_BTN_POMNG04010_DELETE_WHS_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
53 61
 						                </div>
54 62
 										<div class="col-xs-4 itp_ip itp_noMar">
55 63
 											<input type="text" id="ITP_FORM_POMNG04010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호 / 품목번호 / 품목명" />
@@ -75,8 +83,7 @@
75 83
 								<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_VIEW_CD" name="viewCd" value="C">
76 84
 								<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_STORE_ID" name="storeId" value="">
77 85
 								<section class="itp_form_sec">
78
-									<h4 class="itp_form_tit">구매발주상세</h4>
79
-									<div class="itp_form_in">	
86
+									<div class="itp_form_in border-top">	
80 87
 										<div class="form-group">
81 88
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
82 89
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
@@ -134,11 +141,11 @@
134 141
 										</div>
135 142
 									</div>
136 143
 									<div class="itp_form_in">
137
-										<div class="itp_table_head fix" style="background:#f5f5f5;">
144
+										<div class="itp_table_head fix" style="background:#fff;">
138 145
 											<h4 class="itp_table_tit">발주 품목</h4>
139 146
 										</div>
140 147
 										<div id="ITP_POMNG04010_DETAIL_jqGrid_list" class="itp_tb_list">
141
-											<div id="ITP_POMNG04010_DETAIL_jqGridView" class="itp_views fix"></div>
148
+											<!-- <div id="ITP_POMNG04010_DETAIL_jqGridView" class="itp_views fix"></div> -->
142 149
 											<table id="ITP_POMNG04010_DETAIL_jqGrid"></table>
143 150
 											<div id="ITP_POMNG04010_DETAIL_jqGridPager"></div>
144 151
 											<div id="ITP_POMNG04010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

+ 15 - 7
src/main/webapp/app/pomng/POMNG05010.html

@@ -38,20 +38,28 @@
38 38
 											</select>
39 39
 										</div>
40 40
 										<div class="col-xs-2 itp_ip itp_noMar">
41
-											<input type="text" id="ITP_FORM_POMNG05010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
42
-											<input type="hidden" id="ITP_FORM_POMNG05010_SEARCH_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
43
-										</div>
41
+											<div class="input-group">
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" />
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>
46
+												</span>
47
+											</div>
48
+										</div>	
44 49
 										<div class="col-xs-1 itp_in" style="padding:0px; width:8%;">
45 50
 											<button type="button" id="ITP_BTN_POMNG05010_SEARCH_SPPLY_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
46
-											<button type="button" id="ITP_BTN_POMNG05010_DELETE_SPPLY_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
47 51
 										</div>
48 52
 										<div class="col-xs-2 itp_ip itp_noMar">
49
-											<input type="text" id="ITP_FORM_POMNG05010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
50
-											<input type="hidden" id="ITP_FORM_POMNG05010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"  />
53
+											<div class="input-group">
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"  />
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>
58
+												</span>
59
+											</div>
51 60
 										</div>
52 61
 										<div class="col-xs-1 itp_in" style="padding:0px; width:10%;">
53 62
 											<button type="button" id="ITP_BTN_POMNG05010_SEARCH_SWHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
54
-											<button type="button" id="ITP_BTN_POMNG05010_DELETE_SWHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
55 63
 										</div>
56 64
 										
57 65
 										<div class="col-xs-3 itp_ip itp_noMar">

+ 17 - 10
src/main/webapp/app/pomng/POMNG06010.html

@@ -22,30 +22,37 @@
22 22
 										</div>										
23 23
 										<div class="col-xs-3 itp_ip itp_noMar">
24 24
 											<div class="input-daterange input-group date">
25
-												<input type="text" id="ITP_FORM_POMNG06010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
25
+												<input type="text" id="ITP_FORM_POMNG06010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value=""readonly>
26 26
 												<span class="input-group-addon itp_date_to">~</span>
27
-												<input type="text" id="ITP_FORM_POMNG06010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
27
+												<input type="text" id="ITP_FORM_POMNG06010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value=""readonly>
28 28
 											</div>
29 29
 										</div>
30 30
 										<div class="col-xs-2 itp_ip itp_noMar">
31
+											<div class="input-group">
32
+											<input type="text" id="ITP_FORM_POMNG06010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="입고창고*" readonly/>
31 33
 											<input type="hidden" id="ITP_FORM_POMNG06010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId" placeholder="입고창고" />
32
-											<input type="text" id="ITP_FORM_POMNG06010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="입고창고*" />
33
-										</div>
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>
36
+												</span>
37
+											</div>
38
+										</div>	
34 39
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:10%;">
35 40
 											<button type="button" id="ITP_BTN_POMNG06010_SEARCH_WHS_ID" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
36
-											<button type="button" id="ITP_BTN_POMNG06010_DELETE_WHS_ID" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
37 41
 										</div>
38
-										
39 42
 									</div>
40 43
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
41 44
 										<div class="col-xs-2 itp_ip itp_noMar">
42
-											<input type="text" id="ITP_FORM_POMNG06010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" />
45
+											<div class="input-group">
46
+											<input type="text" id="ITP_FORM_POMNG06010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
43 47
 											<input type="hidden" id="ITP_FORM_POMNG06010_SEARCH_SPPLY_ID" class="form-control itp_input" name="sspplyId" placeholder="공급업체" />
44
-										</div>
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>
50
+												</span>
51
+											</div>
52
+										</div>	
45 53
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
46 54
 											<button type="button" id="ITP_BTN_POMNG06010_SEARCH_SPPLY_ID" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
47
-											<button type="button" id="ITP_BTN_POMNG06010_DELETE_SPPLY_ID" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
48
-														</div>
55
+										</div>
49 56
 										<div class="col-xs-4 itp_ip itp_noMar">
50 57
 											<input type="text" id="ITP_FORM_POMNG06010_SEARCH_DLV_STTMT_UNQ_NO" class="form-control itp_input" name="sdlvSttmtUnqNo" placeholder="납품서번호" />
51 58
 										</div>

+ 22 - 24
src/main/webapp/app/popup/biz/BIZPOP_PO_PAYMENT.html

@@ -8,7 +8,7 @@
8 8
 			<div class="modal-body">
9 9
 			
10 10
 				<div class="itp_form itp_type1 fix">
11
-					<div class="col-xs-12">
11
+					<div class="col-xs-12 itp_ip">
12 12
 					수발주 <b><span id="ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM"></span></b>을 위해 아래 항목을 입력을 한 후에 결제 버튼을 클릭하여 PG사 결제 절차에 따라 결재을 진행해 주시기 바랍니다.
13 13
 					<br>
14 14
 					<br>
@@ -36,44 +36,42 @@
36 36
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_KICC_ACTION_MOBILE_URL" name="kiccActionMobileUrl" value="" />
37 37
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_MALL_ID" name="mallId" value="" />
38 38
 							
39
-								<div class="form-group">
40
-									<label class="col-xs-2 itp_lb">주문번호</label>
41
-									<div class="col-xs-10 itp_ip fnPoOrdNo"></div>									
39
+								<div class="form-group shot">
40
+									<label class="col-xs-2 itp_lb shot">주문번호</label>
41
+									<div class="col-xs-9 itp_ip fnPoOrdNo"></div>									
42 42
 								</div>
43
-								<div class="form-group">
44
-									<label class="col-xs-2 itp_lb">구매자명</label>
45
-									<div class="col-xs-10 itp_ip fnOrdNm"></div>									
43
+								<div class="form-group shot">
44
+									<label class="col-xs-2 itp_lb shot">구매자명</label>
45
+									<div class="col-xs-9 itp_ip fnOrdNm"></div>									
46 46
 								</div>
47
-								<div class="form-group">
48
-									<label class="col-xs-2 itp_lb">상품명</label>
49
-									<div class="col-xs-10 itp_ip fnGoodsNm"></div>									
47
+								<div class="form-group shot">
48
+									<label class="col-xs-2 itp_lb shot">상품명</label>
49
+									<div class="col-xs-9 itp_ip fnGoodsNm"></div>									
50 50
 								</div>
51 51
 								<div class="form-group">
52 52
 									<label class="col-xs-2 itp_lb">결제금액*</label>
53
-									<div class="col-xs-10 itp_ip">
53
+									<div class="col-xs-9 itp_ip">
54 54
 									<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT" class="form-control itp_input" name="goodsAmt" />
55 55
 									</div>									
56 56
 								</div>
57
-								<div class="form-group">
58
-									<label class="col-xs-2 itp_lb">결제방법*</label>
59
-									<div class="col-xs-10 itp_ip">
60
-										<div class="col-xs-5 itp_ip">
61
-											<select id="ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD" class="form-control itp_input" name="payMethod">
62
-												<option value="11">신용카드</option>
63
-												<option value="21">계좌이체</option>
64
-											</select>
65
-										</div>
57
+								<div class="form-group shot">
58
+									<label class="col-xs-2 itp_lb shot">결제방법*</label>
59
+									<div class="col-xs-3 itp_ip">
60
+										<select id="ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD" class="form-control itp_input" name="payMethod">
61
+											<option value="11">신용카드</option>
62
+											<option value="21">계좌이체</option>
63
+										</select>
66 64
 									</div>									
67 65
 								</div>								
68 66
 								<div class="form-group">
69 67
 									<label class="col-xs-2 itp_lb">휴대폰번호*</label>
70
-									<div class="col-xs-10 itp_ip">
68
+									<div class="col-xs-9 itp_ip">
71 69
 									<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL" class="form-control itp_input" name="ordTel" placeholder="010-0000-0000" />
72 70
 									</div>									
73 71
 								</div>
74
-								<div class="form-group">
75
-									<label class="col-xs-2 itp_lb">이메일</label>
76
-									<div class="col-xs-10 itp_ip">
72
+								<div class="form-group shot">
73
+									<label class="col-xs-2 itp_lb shot">이메일</label>
74
+									<div class="col-xs-9 itp_ip">
77 75
 									<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL" class="form-control itp_input" name="ordEmail" />
78 76
 									</div>									
79 77
 								</div>								

+ 23 - 15
src/main/webapp/css/style.css

@@ -122,21 +122,28 @@ a, button {outline:none !important; text-decoration:none !important;}
122 122
 #ITP_LOGIN .itp_login_input:not(:placeholder-shown) ~ label{top:0px; font-size:12px;}
123 123
 
124 124
 /* 메인화면 */
125
-#ITP_MAIN_HEADER { width:80%; height:100px; display:inline-block;}
126
-#ITP_MAIN_HEADER .col_3 {background:#eee; width:27%; height:80px; display:inline-block; margin:5px 23px; border-radius:8px;}
127
-#ITP_MAIN_HEADER .col_3 .itp_header_label {padding:12px 18px 3px 18px; font-size:17px; font-weight:700;}
128
-#ITP_MAIN_HEADER .col_3 .itp_header_result {font-size:18px; font-weight:700; color:blue; text-align: right; padding:4px 18px;}
129
-
130
-#ITP_MAIN_HEADER .col_4 {background:#eee; width:22%; height:80px; display:inline-block; margin:5px 11px; border-radius:8px;}
131
-#ITP_MAIN_HEADER .col_4 .itp_header_label {padding:12px 18px 3px 18px; font-size:17px; font-weight:700;}
132
-#ITP_MAIN_HEADER .col_4 .itp_header_result {font-size:18px; font-weight:700; color:blue; text-align: right; padding:4px 18px;}
133
-
134
-#ITP_SIDE_BAR {background:#eee; width:20%; height:100%; float:right; border-radius:15px;}
135
-#ITP_SIDE_BAR .itp_side_bar_header {padding-top:15px; text-align:center; font-size:17px;}
136
-#ITP_SIDE_BAR .itp_side_bar_note {padding:15px;}
137
-#ITP_SIDE_BAR .itp_side_bar_note label {width:100%; margin-bottom:8px;}
138
-#ITP_MAIN_GRAPH_AREA {width:80%; height:770px;}
139
-#ITP_MAIN_GRAPH_AREA .itp_graph_area {width:49.8%; height:380px; display:inline-block;}
125
+#ITP_MAIN_HEADER { width:100%; height:60px; display:inline-block;}
126
+#ITP_MAIN_HEADER .col_3 {background:#eee; width:26%; height:50px; display:inline-block; margin:5px 48px; border-radius:8px;}
127
+#ITP_MAIN_HEADER .col_3 .itp_header_label {width:160px; padding:13px 16px; font-size:17px; font-weight:700; display:inline-block;}
128
+#ITP_MAIN_HEADER .col_3 .itp_header_result {width:auto; float: right; display:inline-block; font-size:18px; font-weight:700; color:blue; text-align: right; padding:12px;}
129
+
130
+#ITP_MAIN_HEADER .col_4 {background:#eee; width:22%; height:50px; display:inline-block; margin:5px 11px; border-radius:8px;}
131
+#ITP_MAIN_HEADER .col_4 .itp_header_label {width:125px; padding:13px 16px; font-size:17px; font-weight:700; display:inline-block;}
132
+#ITP_MAIN_HEADER .col_4 .itp_header_result {width:auto; float: right; display:inline-block; font-size:18px; font-weight:700; color:blue; text-align: right; padding:12px;}
133
+
134
+#ITP_NOTE_BAR {background:#eee; width:100%; height:160px; float:right; border-radius:15px;}
135
+#ITP_NOTE_BAR .itp_side_bar_header {padding-top:12px; text-align:center; font-size:17px;}
136
+#ITP_NOTE_BAR .itp_side_bar_note {padding:0 15px;}
137
+#ITP_NOTE_BAR .itp_side_bar_note label {width:15%; margin-bottom:8px;}
138
+#ITP_NOTE_BAR .itp_side_bar_note label.date {width:10%;}
139
+#ITP_NOTE_BAR .itp_side_bar_note div {position:relative; top:7px; width:74%; display:inline-block; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
140
+#ITP_MAIN_GRAPH_AREA {width:100%; height:1200px;}
141
+#ITP_MAIN_GRAPH_AREA .itp_graph_box {width:49.8%; height:400px; display:inline-block;}
142
+#ITP_MAIN_GRAPH_AREA .itp_graph_box .itp_graph_area {width:75%; height:400px; display:inline-block; float:right;}
143
+#ITP_MAIN_GRAPH_AREA .itp_graph_box .itp_graph_side {width:24%; height:400px; display:inline-block; }
144
+#ITP_MAIN_GRAPH_AREA .itp_graph_box .itp_graph_side select {width:88%; margin:12px; height:30px;}
145
+#ITP_MAIN_GRAPH_AREA .itp_graph_box .itp_graph_info_bar {width:50%; height:300px; margin:0 auto;}
146
+#ITP_MAIN_GRAPH_AREA .itp_graph_box .itp_graph_info_bar .itp_graph_info {margin-top:40px; padding: 24px 26px; background:#eee; width:80px; font-size:26px; height:205px; display:inline-block; border:1px solid #ccc; border-radius:15px;}
140 147
 /* ITP_HEADER */
141 148
 #ITP_HEADER .itp_head {font-family: 'GmarketSansMedium';width:100%; height:50px; position:relative; line-height:50px; z-index:100;}
142 149
 #ITP_HEADER .itp_tit {margin:0; padding:0; line-height:50px; font-size:20px;}
@@ -578,6 +585,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
578 585
 #ITP_ASIDE .itp_modal .itp_alert_txt {font-size:15px; padding:15px 0 10px 0;}
579 586
 #ITP_ASIDE .itp_modal .itp_form {padding:0 15px 0 15px;}
580 587
 #ITP_ASIDE .itp_modal .itp_form .form-group {margin-bottom:0px; height:60px; border-bottom:1px solid #aaa;}
588
+#ITP_ASIDE .itp_modal .itp_form .shot{height:43px !important; border-bottom:1px solid #aaa;}
581 589
 #ITP_ASIDE .itp_modal .itp_form .form-group.border {border-bottom:1px solid #ddd;}
582 590
 #ITP_ASIDE .itp_modal .itp_form .form-control {font-size:13px; color:#333;}
583 591
 #ITP_ASIDE .itp_modal .itp_form .itp_lb {top:0; font-size:13px; margin:0; padding:13px 12px; height:58px; background:#eee; width:100px; min-width:100px; border-right:1px solid #aaa;}

+ 125 - 29
src/main/webapp/js/app/loanmng/ITP_LOANMNG04010.js

@@ -38,49 +38,52 @@ const gridColModel = {
38 38
 			index: 'LOAN_REG_DT', name: 'loanRegDt',
39 39
 			label: ITP_MSG_LOCALE.label.loanRegDt,				// 발행일자
40 40
 			width: '10', fixed: false, align: 'center',
41
-			sortable: false, hidden: true
41
+			sortable: false, hidden: false
42 42
 		},
43 43
 		{
44 44
 			index: 'DPST_PAY_DVSN_NM', name: 'dpstPayDvsnNm',
45 45
 			label: ITP_MSG_LOCALE.label.dpstPayDvsnNm,			// 입지구분
46
-			width: '10', fixed: false, align: 'center',
47
-			sortable: false, hidden: true
46
+			width: '7', fixed: false, align: 'left',
47
+			sortable: false, hidden: false
48 48
 		},
49 49
 		{
50 50
 			index: 'MEDIA_DVSN_NM', name: 'mediaDvsnNm',
51 51
 			label: ITP_MSG_LOCALE.label.mediaDvsnNm,			// 매체구분
52
-			width: '10', fixed: false, align: 'center',
53
-			sortable: false, hidden: true
52
+			width: '7', fixed: false, align: 'left',
53
+			sortable: false, hidden: false
54 54
 		},
55 55
 		{
56 56
 			index: 'DPST_AMT', name: 'dpstAmt',
57 57
 			label: ITP_MSG_LOCALE.label.dpstAmt,				// 입금
58
-			width: '10', fixed: false, align: 'center',
59
-			sortable: false, hidden: true
58
+			width: '7', fixed: false, align: 'right',
59
+			sortable: false, hidden: false,
60
+			formatter:'integer', formatoptions: {defaultValue: '', thousandsSeparator: ',' }
60 61
 		},
61 62
 		{
62 63
 			index: 'PAYM_AMT', name: 'paymAmt',
63 64
 			label: ITP_MSG_LOCALE.label.paymAmt,				// 지급
64
-			width: '10', fixed: false, align: 'center',
65
-			sortable: false, hidden: true
65
+			width: '7', fixed: false, align: 'right',
66
+			sortable: false, hidden: false,
67
+			formatter:'integer', formatoptions: {defaultValue: '', thousandsSeparator: ',' }
66 68
 		},
67 69
 		{
68 70
 			index: 'TRSC_AF_BAL', name: 'trscAfBal',
69 71
 			label: '잔액'	,										// 거래 후 잔액
70
-			width: '10', fixed: false, align: 'center',
71
-			sortable: false, hidden: true
72
+			width: '7', fixed: false, align: 'right',
73
+			sortable: false, hidden: false,
74
+			formatter:'integer', formatoptions: {defaultValue: '', thousandsSeparator: ',' }
72 75
 		},
73 76
 		{
74 77
 			index: 'USER', name: 'user',
75 78
 			label: '사용자',										// 사용자
76 79
 			width: '10', fixed: false, align: 'center',
77
-			sortable: false, hidden: true
80
+			sortable: false, hidden: false
78 81
 		},
79 82
 		{
80 83
 			index: 'NO', name: 'no',
81 84
 			label: '관련번호',										// 관련번호
82 85
 			width: '10', fixed: false, align: 'center',
83
-			sortable: false, hidden: true
86
+			sortable: false, hidden: false
84 87
 		},
85 88
 	],
86 89
 	detail: []
@@ -111,13 +114,13 @@ let pageObj = {
111 114
 			// 조회일자 지정	
112 115
 			var now = new Date();
113 116
 			var defaultToDate = new Date(now);
114
-			defaultToDate.setDate(now.getDate() + 7);
117
+			defaultToDate.setDate(now.getDate() - 30);
115 118
 			$('#ITP_TAB_LOANMNG04010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
116
-			$('#ITP_FORM_LOANMNG04010_SEARCH_FROM_DT').datepicker('setDate', '2022.10.01'/*now*/);
117
-			$('#ITP_FORM_LOANMNG04010_SEARCH_TO_DT').datepicker('setDate', '2023.10.01'/*defaultToDate*/);
119
+			$('#ITP_FORM_LOANMNG04010_SEARCH_FROM_DT').datepicker('setDate', defaultToDate);
120
+			$('#ITP_FORM_LOANMNG04010_SEARCH_TO_DT').datepicker('setDate', now);
118 121
 		},
119 122
 		grid: function() {
120
-			itp_fn_jqgrid_resize(LOANMNG04010_GRID_ID, LOANMNG04010_GRID_LIST, 'lg');
123
+			itp_fn_jqgrid_resize(LOANMNG04010_VIEW_GRID_ID, LOANMNG04010_VIEW_GRID_LIST, 'lg');
121 124
 			itp_fn_fire_window_resize();
122 125
 		},
123 126
 		ready: function() {
@@ -136,9 +139,7 @@ let pageObj = {
136 139
 					switch (id) {
137 140
 						case 'ITP_BTN_LOANMNG04010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
138 141
 						case 'ITP_BTN_LOANMNG04010_NEWREG'			: listObj.button.create(); 		break;	// 신규등록 버튼
139
-						case 'ITP_BTN_LOANMNG04010_MODIFY'			: modifyObj.button.modify();	break;	// 수정 버튼
140
-						case 'ITP_BTN_LOANMNG04010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
141
-						case 'ITP_BTN_LOANMNG04010_DELETE'			: modifyObj.button.del();		break;	// 발주 취소 버튼(예정)
142
+						case 'ITP_BTN_LOANMNG04010_VIEW_SEARCH_SRH'	: viewObj.button.history();		break;	// 이력조회
142 143
 					}
143 144
 				});
144 145
 			});
@@ -153,27 +154,122 @@ let pageObj = {
153 154
         });
154 155
         if(mode == 'VIEW') { // 목록
155 156
             fn_show_btn_auth_array(['#ITP_BTN_LOANMNG04010_SRH', '#ITP_BTN_LOANMNG04010_NEWREG']);
156
-            $('#ITP_AJAX_LOANMNG04010_LIST_CONTAINER').show();
157
-            $('#ITP_FORM_LOANMNG04010_SEARCH #ITP_FORM_LOANMNG04010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
157
+            $('#ITP_AJAX_LOANMNG04010_VIEW_CONTAINER').show();
158
+            $('#ITP_AJAX_LOANMNG04010_VIEW_LIST_CONTAINER').show();
159
+            $('#ITP_FORM_LOANMNG04010_SEARCH #ITP_FORM_LOANMNG04010_VIEW_BRAND_ID').val(fn_make_user_info.get('brandId'));
158 160
             if(fn_make_user_info.get('spplyId').length != 0){
159
-            	$('#ITP_FORM_LOANMNG04010_SEARCH #ITP_FORM_LOANMNG04010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
161
+            	$('#ITP_FORM_LOANMNG04010_SEARCH #ITP_FORM_LOANMNG04010_VIEW_STORE_ID').val(fn_make_user_info.get('spplyId'));
160 162
             } else {
161
-            	$('#ITP_FORM_LOANMNG04010_SEARCH #ITP_FORM_LOANMNG04010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('userId'));
163
+            	$('#ITP_FORM_LOANMNG04010_SEARCH #ITP_FORM_LOANMNG04010_VIEW_STORE_ID').val(fn_make_user_info.get('userId'));
162 164
             }
163 165
             $('#ITP_BTN_LOANMNG04010_SRH').show();
164 166
             $('#ITP_BTN_LOANMNG04010_PRINT').show();
165 167
             $('#ITP_BTN_LOANMNG04010_SEARCH_WHS_ID').show();
166 168
             $('#ITP_BTN_LOANMNG04010_DELETE_WHS_ID').show();
169
+            $('#ITP_BTN_LOANMNG04010_VIEW_SEARCH_SRH').show();
167 170
         }
168
-    },
171
+    }
169 172
 };
170 173
 
171 174
 
172 175
 /*상세화면 Object*/
173 176
 let viewObj = {
174 177
 	init: function() {
175
-		this.grid.init();
178
+		this.load();
176 179
 	},
177
-	itp_COLLMNG01010_param: {},
178
-	itp_COLLMNG01010_search: false,
179
-}
180
+	itp_LOANMNG04010_param: {},
181
+	itp_LOANMNG04010_search: false,
182
+	button: {
183
+		history: function() {
184
+			let param = $('#ITP_FORM_LOANMNG04010_VIEW_SEARCH').serializeObject();
185
+			param.gridSize = $.jgrid.defaults.rowNum;
186
+			param.gridPage = $.jgrid.defaults.page;
187
+			$(LOANMNG04010_VIEW_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid'); 
188
+		}
189
+	},
190
+	load: function() {
191
+		fn_ajax_call(API_LOAN_STATE_INFO_LOAN_STORE, null, this.callback, 'GET');
192
+	},
193
+	callback: function(result) {
194
+		pageObj.switchScreen('VIEW');
195
+		$('#ITP_FORM_LOANMNG04010_VIEW_BRAND_ID').val(result.brandId);
196
+		$('#ITP_FORM_LOANMNG04010_VIEW_STORE_ID').val(result.storeId);
197
+		$('#ITP_FORM_LOANMNG04010_VIEW_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
198
+		$('#ITP_FORM_LOANMNG04010_VIEW_SEARCH_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
199
+		$('#ITP_FORM_LOANMNG04010_VIEW .fnBrandNm').text(result.brandNm);
200
+		$('#ITP_FORM_LOANMNG04010_VIEW .fnStoreNm').text(result.storeNm);
201
+		$('#ITP_FORM_LOANMNG04010_VIEW .fnLoanDvsn').text(result.loanDvsnNm);
202
+		var limitAmt;
203
+		if(result.loanDvsn == 'LD01') { // 선불(충전)
204
+			limitAmt = result.chrgeLimitAmt;
205
+		} else if(result.loanDvsn == 'LD02') { // 후불(신용)
206
+			limitAmt = result.credtLimitAmt;				
207
+		}
208
+		$('#ITP_FORM_LOANMNG04010_VIEW .fnCredtLimitAmt').text(itp_fn_number_comma(limitAmt));
209
+		$('#ITP_FORM_LOANMNG04010_VIEW .fnContDt').text(''); // TODO 계약기간
210
+		$('#ITP_FORM_LOANMNG04010_VIEW .fnUseYn').text(result.useYnNm);		
211
+		$('#ITP_FORM_LOANMNG04010_VIEW .fnPosbLimitAmt').text(itp_fn_number_comma(limitAmt - result.useAmtTotal)); // TODO 가용한도금액
212
+		$('#ITP_FORM_LOANMNG04010_VIEW .fnTmpRcvAcctTotal').text(itp_fn_number_comma(result.tmpRcvAcctTotal));
213
+		$('#ITP_FORM_LOANMNG04010_VIEW .fnUseAmtTotal').text(itp_fn_number_comma(result.useAmtTotal));
214
+		$('#ITP_FORM_LOANMNG04010_VIEW .fnLastModify').text(result.sysChgNm + ' / ' + result.sysChgDttm);
215
+		
216
+		viewObj.grid.init();
217
+	},
218
+	grid: {
219
+		init: function() {
220
+			this.unload();
221
+			this.load();
222
+		},
223
+		load: function() {
224
+			let param = $('#ITP_FORM_LOANMNG04010_VIEW_SEARCH').serializeObject();
225
+			param.gridSize = $.jgrid.defaults.rowNum;
226
+			param.pagingYn = false; // 페이징안함
227
+			var option = {
228
+				gridId: LOANMNG04010_VIEW_GRID_ID,
229
+				colModel: gridColModel.view,
230
+				param: param,
231
+				url: DOMAIN + API_LOAN_STATE_HIST_GRID_LIST,
232
+				pager: LOANMNG04010_VIEW_GRID_PAGER,
233
+				loadComplete: function(data) {
234
+					itp_fn_grid_load_complete(data, LOANMNG04010_VIEW_GRID_ID, true, undefined, 'LOANMNG04010_VIEW');
235
+				},
236
+				onPaging: function(action) {
237
+					var pagingFn = {
238
+						callBack: function(args) {
239
+							$(args).trigger('reloadGrid');
240
+						}
241
+					};
242
+					if (itp_fn_check_grid_is_writing(LOANMNG04010_VIEW_GRID_ID)) {
243
+						itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, pagingFn, LOANMNG04010_VIEW_GRID_ID);
244
+						return 'stop';
245
+					} else {
246
+						itp_fn_grid_paging(LOANMNG04010_VIEW_GRID_ID, action, param);
247
+					}
248
+				},
249
+				onSortCol: function(index, columnIndex, sortOrder) {
250
+					var sortingFn = {
251
+						callBack: function(args) {
252
+							$(args).trigger('reloadGrid');
253
+						}
254
+					};
255
+					if (itp_fn_check_grid_is_writing(LOANMNG04010_VIEW_GRID_ID)) {
256
+						itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, sortingFn, LOANMNG04010_VIEW_GRID_ID);
257
+						return 'stop';
258
+					} else {
259
+						itp_fn_grid_sorting(LOANMNG04010_VIEW_GRID_ID, index, sortOrder);
260
+					}
261
+				}
262
+			};
263
+			itp_fn_grid_make_remote(option);
264
+		},
265
+		clearData : function() {
266
+			$(LOANMNG04010_VIEW_GRID_ID).jqGrid('clearGridData', true);
267
+			$(LOANMNG04010_VIEW_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
268
+			$(LOANMNG04010_VIEW_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
269
+			$(LOANMNG04010_VIEW_GRID_EMPTY).show();
270
+		},
271
+		unload : function() {
272
+			$.jgrid.gridUnload(LOANMNG04010_VIEW_GRID_ID);
273
+		}
274
+	}
275
+}

+ 31 - 15
src/main/webapp/js/app/main.js

@@ -38,7 +38,7 @@ google.charts.setOnLoadCallback(drawChartReq);
38 38
 google.charts.setOnLoadCallback(drawChartPodr);
39 39
 google.charts.setOnLoadCallback(drawChartReqUp);
40 40
 google.charts.setOnLoadCallback(drawChartcore);
41
-
41
+google.charts.setOnLoadCallback(drawLine);
42 42
 //구매요청 그래프
43 43
 function drawChartReq() {
44 44
   var data = google.visualization.arrayToDataTable([
@@ -47,14 +47,12 @@ function drawChartReq() {
47 47
   ]);
48 48
 
49 49
   var options = {
50
-    chart: {
51
-     legend: { position: 'bottom' }
52
-    }
50
+    	legend: { position: 'left' }
53 51
   };
54 52
 
55 53
   var chart = new google.charts.Bar(document.getElementById('ITP_PCH_REQ_GRAPH'));
56 54
 
57
-  chart.draw(data, google.charts.Bar.convertOptions());
55
+  chart.draw(data, options);
58 56
 }
59 57
 
60 58
 //구매발주 그래프
@@ -65,14 +63,12 @@ function drawChartPodr() {
65 63
 	  ]);
66 64
 
67 65
 	  var options = {
68
-	    chart: {
69
-	    	legend: { position: 'bottom' }
70
-	    }
66
+	    	legend: { position: 'left' }	
71 67
 	  };
72 68
 
73 69
 	  var chart = new google.charts.Bar(document.getElementById('ITP_PCH_PODR_GRAPH'));
74 70
 
75
-	  chart.draw(data, google.charts.Bar.convertOptions());
71
+	  chart.draw(data, options);
76 72
 	}
77 73
 
78 74
 //구매요청 상위 품목 그리드
@@ -83,16 +79,14 @@ function drawChartReqUp() {
83 79
   ]);
84 80
 
85 81
   var options = {
86
-    chart: {
87 82
       title: '구매요청 상위 품목(일주일)',
88
-      legend: { position: 'bottom' }
89
-    },
90
-    bars: 'horizontal' // Required for Material Bar Charts.
83
+	  legend: { position: 'left' },
84
+	  bars: 'horizontal'
91 85
   };
92 86
 
93 87
   var chart = new google.charts.Bar(document.getElementById('ITP_PCH_REQ_UP_ITEM_GRAPH'));
94 88
 
95
-  chart.draw(data, google.charts.Bar.convertOptions(options));
89
+  chart.draw(data, options);
96 90
 }
97 91
 
98 92
 //정산 그래프
@@ -107,7 +101,7 @@ function drawChartcore() {
107 101
 
108 102
     var options = {
109 103
 		title: '정산',
110
-		legend: { position: 'bottom' }
104
+		legend: { position: 'left' }	
111 105
     };
112 106
 
113 107
     var chart = new google.visualization.PieChart(document.getElementById('ITP_STTL_GRAPH'));
@@ -115,6 +109,28 @@ function drawChartcore() {
115 109
     chart.draw(data, options);
116 110
   }
117 111
 
112
+
113
+function drawLine() {
114
+  var data = google.visualization.arrayToDataTable([
115
+    ['Year', '안전재고수량', '현재재고수량'],
116
+    ['품목1',  1000,      400],
117
+    ['품목2',  1170,      460],
118
+    ['품목3',  660,       1120],
119
+    ['품목4',  1660,      120],
120
+    ['품목5',  660,       520],
121
+  ]);
122
+
123
+  var options = {
124
+    title: '',
125
+    width: 900,
126
+    legend: { position: 'top' }
127
+  };
128
+
129
+  var chart = new google.visualization.LineChart(document.getElementById('ITP_SAFE_STCK_GRAPH'));
130
+
131
+  chart.draw(data, options);
132
+}
133
+
118 134
 var itp_fn_MAIN_NOTICE_grid = {
119 135
 	init: function() {
120 136
 		// 데이터 없을때

+ 7 - 0
src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -54,36 +54,42 @@ const gridColModel = {
54 54
 			index: 'AFFL_SHOP_NM', name: 'afflShopNm',
55 55
 			label: ITP_MSG_LOCALE.label.afflShopNm, //브랜드그룹
56 56
 			width: '10', fixed: false, align: 'left',
57
+			minwidth: 150, maxwidth: 250,
57 58
 			sortable: false, hidden: false
58 59
 		},
59 60
 		{
60 61
 			index: 'BRAND_NM', name: 'brandNm',
61 62
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
62 63
 			width: '13', fixed: false, align: 'left',
64
+			minwidth: 150, maxwidth: 250,
63 65
 			sortable: false, hidden: false
64 66
 		},
65 67
 		{
66 68
 			index: 'USER_ID', name: 'userId',
67 69
 			label: ITP_MSG_LOCALE.label.userId, //사용자ID
68 70
 			width: '10', fixed: false, align: 'left',
71
+			minwidth: 120, maxwidth: 200,
69 72
 			sortable: false, hidden: false
70 73
 		},
71 74
 		{
72 75
 			index: 'USER_NM', name: 'userNm',
73 76
 			label: ITP_MSG_LOCALE.label.userName, //닉네임
74 77
 			width: '13', fixed: false, align: 'left',
78
+			minwidth: 120,
75 79
 			sortable: false, hidden: false
76 80
 		},
77 81
 		{
78 82
 			index: 'EMAIL', name: 'email',
79 83
 			label: ITP_MSG_LOCALE.label.idEmail, //아이디(이메일)
80 84
 			width: '15', fixed: false, align: 'center',
85
+			minwidth: 150, maxwidth: 250,
81 86
 			sortable: false, hidden: false
82 87
 		},
83 88
 		{
84 89
 			index: 'TEL_NO', name: 'telNo',
85 90
 			label: ITP_MSG_LOCALE.label.telephone, //휴대폰 번호
86 91
 			width: '10', fixed: false, align: 'center',
92
+			minwidth: 150, maxwidth: 250,
87 93
 			sortable: false, hidden: false
88 94
 		},
89 95
 		{
@@ -108,6 +114,7 @@ const gridColModel = {
108 114
 			index: 'LAST_LOGIN_DT', name: 'lastLoginDt',
109 115
 			label: ITP_MSG_LOCALE.label.lastLogin, //마지막 로그인
110 116
 			width: '10', fixed: false, align: 'center',
117
+			minwidth: 150, maxwidth: 250,
111 118
 			sortable: false, hidden: false
112 119
 		}
113 120
 	],

+ 11 - 8
src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -37,24 +37,26 @@ const gridColModel = {
37 37
 			index: 'NTICE_NO', name: 'nticeNo',
38 38
 			label: ITP_MSG_LOCALE.label.notiNo, //공지번호
39 39
 			width: '10', fixed: false, align: 'center',
40
+			minwidth: 100, maxwidth: 250,
41
+			sortable: false, hidden: false
42
+		},
43
+		{
44
+			index: 'NTICE_TITL', name: 'nticeTitl',
45
+			label: ITP_MSG_LOCALE.label.titlet, //공지제목
46
+			width: '15', fixed: false, align: 'left',
40 47
 			sortable: false, hidden: false
41 48
 		},
42 49
 		{
43 50
 			index: 'AFFL_SHOP_NM', name: 'afflShopNm',
44 51
 			label: ITP_MSG_LOCALE.label.afflShopNm, //브랜드그룹
45 52
 			width: '10', fixed: false, align: 'center',
53
+			minwidth: 150, maxwidth: 250,
46 54
 			sortable: false, hidden: false
47 55
 		},
48 56
 		{
49 57
 			index: 'BRAND_NM', name: 'brandNm',
50 58
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
51
-			width: '13', fixed: false, align: 'center',
52
-			sortable: false, hidden: false
53
-		},
54
-		{
55
-			index: 'NTICE_TITL', name: 'nticeTitl',
56
-			label: ITP_MSG_LOCALE.label.titlet, //공지제목
57
-			width: '15', fixed: false, align: 'center',
59
+			width: '13', fixed: false, align: 'left',
58 60
 			sortable: false, hidden: false
59 61
 		},
60 62
 		{
@@ -66,13 +68,14 @@ const gridColModel = {
66 68
 		{
67 69
 			index: 'NTICE_STAT_NM', name: 'nticeStatNm',
68 70
 			label: ITP_MSG_LOCALE.label.status, //상태
69
-			width: '6', fixed: false, align: 'center',
71
+			width: '7', fixed: false, align: 'center',
70 72
 			sortable: false, hidden: false
71 73
 		},
72 74
 		{
73 75
 			index: 'NOTI_ST_DAY', name: 'notiStDay',
74 76
 			label: ITP_MSG_LOCALE.label.viewDt, //노출일
75 77
 			width: '12', fixed: false, align: 'center',
78
+			minwidth: 180, maxwidth: 250,
76 79
 			sortable: false, hidden: false
77 80
 		},
78 81
 		{

+ 7 - 7
src/main/webapp/js/app/oper/ITP_OPER03010.js

@@ -59,7 +59,13 @@ const gridColModel = {
59 59
 		{
60 60
 			index: 'AFFL_SHOP_NM', name: 'afflShopNm',
61 61
 			label: '브랜드그룹명',
62
-			width: '10', fixed: false, align: 'center',
62
+			width: '10', fixed: false, align: 'left',
63
+			sortable: false, hidden: false
64
+		},
65
+		{
66
+			index: 'OWNER_NM', name: 'ownerNm',
67
+			label: '대표자명',
68
+			width: '6', fixed: false, align: 'left',
63 69
 			sortable: false, hidden: false
64 70
 		},
65 71
 		{
@@ -74,12 +80,6 @@ const gridColModel = {
74 80
 			width: '6', fixed: false, align: 'center',
75 81
 			sortable: false, hidden: false
76 82
 		},
77
-		{
78
-			index: 'OWNER_NM', name: 'ownerNm',
79
-			label: '대표자명',
80
-			width: '6', fixed: false, align: 'center',
81
-			sortable: false, hidden: false
82
-		},
83 83
 		{
84 84
 			index: 'OWNER_TEL', name: 'rprstTelNo',
85 85
 			label: '대표연락처',

+ 2 - 2
src/main/webapp/js/app/oper/ITP_OPER04010.js

@@ -41,13 +41,13 @@ const gridColModel = {
41 41
         {
42 42
             index: 'SALE_MGR_ID', name: 'saleMgrId',
43 43
             label: '영업담당자ID',
44
-            width: '6', fixed: false, align: 'center',
44
+            width: '6', fixed: false, align: 'left',
45 45
             sortable: false, hidden: false
46 46
         },
47 47
         {
48 48
             index: 'SALE_MGR_NM', name: 'saleMgrNm',
49 49
             label: '영업담당자명',
50
-            width: '10', fixed: false, align: 'center',
50
+            width: '10', fixed: false, align: 'left',
51 51
             sortable: false, hidden: false
52 52
         },
53 53
         {

+ 3 - 3
src/main/webapp/js/app/oper/ITP_OPER06010.js

@@ -61,19 +61,19 @@ const gridColModel = {
61 61
         {
62 62
             index: 'AFFL_SHOP_NM', name: 'afflShopNm',
63 63
             label: ITP_MSG_LOCALE.label.afflShopNm, //브랜드그룹
64
-            width: '10', fixed: false, align: 'center',
64
+            width: '10', fixed: false, align: 'left',
65 65
             sortable: false, hidden: false
66 66
         },
67 67
         {
68 68
             index: 'BRAND_ID', name: 'brandId',
69 69
             label: ITP_MSG_LOCALE.label.brandId,
70
-            width: '10', fixed: false, align: 'center',
70
+            width: '10', fixed: false, align: 'left',
71 71
             sortable: false, hidden: false
72 72
         },
73 73
         {
74 74
             index: 'BRAND_NM', name: 'brandNm',
75 75
             label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
76
-            width: '13', fixed: false, align: 'center',
76
+            width: '13', fixed: false, align: 'left',
77 77
             sortable: false, hidden: false
78 78
         },
79 79
         {

+ 2 - 2
src/main/webapp/js/app/pomng/ITP_POMNG01010.js

@@ -48,7 +48,7 @@ const gridColModel = {
48 48
 		{
49 49
 			index: 'ITEM_NM', name: 'itemNm',
50 50
 			label: ITP_MSG_LOCALE.label.itemNm,
51
-			width: '30', fixed: false, align: 'center',
51
+			width: '30', fixed: false, align: 'left',
52 52
 			sortable: true, editable: false, edittype: 'text',
53 53
 			editrules: { required: true }
54 54
 		},
@@ -61,7 +61,7 @@ const gridColModel = {
61 61
 		{
62 62
 			index: 'UNIT_AMT', name: 'unitAmt',
63 63
 			label: ITP_MSG_LOCALE.label.unitAmt,
64
-			width: '10', fixed: false, align: 'center',
64
+			width: '10', fixed: false, align: 'right',
65 65
 			sortable: false, editable: false, edittype: 'text', hidden: false, 
66 66
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
67 67
 		},

+ 14 - 6
src/main/webapp/js/app/pomng/ITP_POMNG02010.js

@@ -62,7 +62,8 @@ const gridColModel = {
62 62
 		{
63 63
 			index: 'BRAND_NM', name: 'brandNm',
64 64
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
65
-			width: '10', fixed: false, align: 'center',
65
+			width: '10', fixed: false, align: 'left',
66
+			minwidth: 120,
66 67
 			sortable: false, hidden: false
67 68
 		},
68 69
 		{
@@ -73,33 +74,37 @@ const gridColModel = {
73 74
 		},
74 75
 		{
75 76
 			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
76
-			label: ITP_MSG_LOCALE.label.pchReqUnqNo
77
-			, //구매요청번호
77
+			label: ITP_MSG_LOCALE.label.pchReqUnqNo, //구매요청번호
78 78
 			width: '10', fixed: false, align: 'center',
79
+			minwidth: 120,
79 80
 			sortable: false, hidden: false
80 81
 		},
81 82
 		{
82 83
 			index: 'PCH_REQ_NM', name: 'pchReqNm',
83 84
 			label: ITP_MSG_LOCALE.label.pchReqNm, //구매요청명
84 85
 			width: '13', fixed: false, align: 'left',
86
+			minwidth: 160,
85 87
 			sortable: false, hidden: false
86 88
 		},
87 89
 		{
88 90
 			index: 'PCH_REQ_ST_CD', name: 'pchReqStCd',
89 91
 			label: ITP_MSG_LOCALE.label.pchReqStCd, //구매요청상태
90 92
 			width: '15', fixed: false, align: 'center',
93
+			minwidth: 10,
91 94
 			sortable: false, hidden: true
92 95
 		},
93 96
 		{
94 97
 			index: 'PCH_REQ_ST_NM', name: 'pchReqStNm',
95 98
 			label: ITP_MSG_LOCALE.label.pchReqStNm, //구매요청상태명
96 99
 			width: '6', fixed: false, align: 'center',
100
+			minwidth: 100,
97 101
 			sortable: false, hidden: false
98 102
 		},
99 103
 		{
100 104
 			index: 'PCH_REQ_DT', name: 'pchReqDt',
101 105
 			label: ITP_MSG_LOCALE.label.pchReqDt, //구매요청일
102 106
 			width: '10', fixed: false, align: 'center',
107
+			minwidth: 100,
103 108
 			sortable: false, hidden: false
104 109
 		},
105 110
 		{
@@ -131,19 +136,22 @@ const gridColModel = {
131 136
 		{
132 137
 			index: 'PCH_REQ_MGR_NM', name: 'pchReqMgrNm',
133 138
 			label: ITP_MSG_LOCALE.label.pchReqMgrNm, //구매요청자명
134
-			width: '10', fixed: false, align: 'center',
139
+			width: '10', fixed: false, align: 'left',
140
+			minwidth: 100,
135 141
 			sortable: false, hidden: false
136 142
 		},
137 143
 		{
138 144
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
139 145
 			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
140 146
 			width: '10', fixed: false, align: 'center',
147
+			minwidth: 100,
141 148
 			sortable: false, hidden: false
142 149
 		},
143 150
 		{
144 151
 			index: 'WHS_LOCATION_NM', name: 'whsLocationNm',
145 152
 			label: ITP_MSG_LOCALE.label.whsLocationNm, //납품창고
146 153
 			width: '10', fixed: false, align: 'left',
154
+			minwidth: 200,
147 155
 			sortable: false, hidden: false
148 156
 		}
149 157
 	],
@@ -178,7 +186,7 @@ const gridColModel = {
178 186
 		{
179 187
 			index: 'ITEM_NM', name: 'itemNm',
180 188
 			label: ITP_MSG_LOCALE.label.itemNm,
181
-			width: '30', fixed: false, align: 'center',
189
+			width: '30', fixed: false, align: 'left',
182 190
 			sortable: true, editable: false, edittype: 'text',
183 191
 			editrules: { required: true }
184 192
 		},
@@ -191,7 +199,7 @@ const gridColModel = {
191 199
 		{
192 200
 			index: 'UNIT_AMT', name: 'unitAmt',
193 201
 			label: ITP_MSG_LOCALE.label.unitAmt,
194
-			width: '10', fixed: false, align: 'center',
202
+			width: '10', fixed: false, align: 'right',
195 203
 			sortable: false, editable: false, edittype: 'text', hidden: false,
196 204
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
197 205
 		},

+ 12 - 5
src/main/webapp/js/app/pomng/ITP_POMNG03010.js

@@ -66,7 +66,8 @@ const gridColModel = {
66 66
 		{
67 67
 			index: 'BRAND_NM', name: 'brandNm',
68 68
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
69
-			width: '10', fixed: false, align: 'center',
69
+			width: '10', fixed: false, align: 'left',
70
+			minwidth: 120,
70 71
 			sortable: false, hidden: false
71 72
 		},
72 73
 		{
@@ -79,6 +80,7 @@ const gridColModel = {
79 80
 			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
80 81
 			label: ITP_MSG_LOCALE.label.pchReqUnqNo, //구매요청고유번호
81 82
 			width: '10', fixed: false, align: 'center',
83
+			minwidth: 140,
82 84
 			sortable: false, hidden: false
83 85
 		},
84 86
 		{
@@ -109,6 +111,7 @@ const gridColModel = {
109 111
 			index: 'SPPLY_NM', name: 'spplyNm',
110 112
 			label: ITP_MSG_LOCALE.label.spplyNm, //공급사명
111 113
 			width: '6', fixed: false, align: 'left',
114
+			minwidth: 100,
112 115
 			sortable: false, hidden: false
113 116
 		},
114 117
 		{
@@ -121,6 +124,7 @@ const gridColModel = {
121 124
 			index: 'WHS_NM', name: 'whsNm',
122 125
 			label: ITP_MSG_LOCALE.label.whsNm, //창고명
123 126
 			width: '10', fixed: false, align: 'left',
127
+			minwidth: 100,
124 128
 			sortable: false, hidden: false
125 129
 		},
126 130
 		{
@@ -139,12 +143,14 @@ const gridColModel = {
139 143
 			index: 'ITEM_ID', name: 'itemId',
140 144
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
141 145
 			width: '10', fixed: false, align: 'center',
146
+			minwidth: 140,
142 147
 			sortable: false, hidden: false
143 148
 		},
144 149
 		{
145 150
 			index: 'ITEM_NM', name: 'itemNm',
146 151
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
147 152
 			width: '10', fixed: false, align: 'left',
153
+			minwidth: 100,
148 154
 			sortable: false, hidden: false
149 155
 		},
150 156
 		{
@@ -192,6 +198,7 @@ const gridColModel = {
192 198
 			index: 'LEAD_TIME', name: 'leadTime',
193 199
 			label: ITP_MSG_LOCALE.label.leadTime, //리드타임
194 200
 			width: '10', fixed: false, align: 'right',
201
+			minwidth: 100,
195 202
 			sortable: false, hidden: false
196 203
 		}
197 204
 	],
@@ -205,7 +212,7 @@ const gridColModel = {
205 212
 		{
206 213
 			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
207 214
 			label: ITP_MSG_LOCALE.label.pchReqUnqNo,  //구매요청번호
208
-			width: '20', fixed: false, align: 'center',
215
+			width: '16', fixed: false, align: 'center',
209 216
 			sortable: false, hidden: false, edittype: 'text',
210 217
 			 editable: false
211 218
 		},
@@ -219,7 +226,7 @@ const gridColModel = {
219 226
 		{
220 227
 			index: 'ITEM_ID', name: 'itemId',
221 228
 			label: ITP_MSG_LOCALE.label.itemId, // 품목아이디
222
-			width: '10', fixed: false, align: 'center',
229
+			width: '12', fixed: false, align: 'center',
223 230
 			sortable: false, editable: false, edittype: 'text',
224 231
 			hidden: false
225 232
 		},
@@ -233,7 +240,7 @@ const gridColModel = {
233 240
 		{
234 241
 			index: 'UNIT_AMT', name: 'unitAmt',
235 242
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
236
-			width: '10', fixed: false, align: 'right',
243
+			width: '7', fixed: false, align: 'right',
237 244
 			sortable: false, editable: false, edittype: 'text',
238 245
 			hidden: false,
239 246
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -241,7 +248,7 @@ const gridColModel = {
241 248
 		{
242 249
 			index: 'UNIT', name: 'unit',
243 250
 			label: ITP_MSG_LOCALE.label.unit, //단위
244
-			width: '10', fixed: false, align: 'center',
251
+			width: '8', fixed: false, align: 'center',
245 252
 			sortable: false, editable: false, edittype: 'text',
246 253
 			hidden: false
247 254
 		},

+ 17 - 17
src/main/webapp/js/app/pomng/ITP_POMNG04010.js

@@ -38,7 +38,7 @@ const gridColModel = {
38 38
 		{
39 39
 			index: 'BRAND_NM', name: 'brandNm',
40 40
 			label: ITP_MSG_LOCALE.label.brandNm,			// 브랜드명
41
-			width: '10', fixed: false, align: 'center',
41
+			width: '10', fixed: false, align: 'left',
42 42
 			sortable: false, hidden: false
43 43
 		},
44 44
 		{
@@ -68,26 +68,26 @@ const gridColModel = {
68 68
 		{
69 69
 			index: 'SPPLY_NM', name: 'spplyNm',
70 70
 			label: ITP_MSG_LOCALE.label.spplyNm, 			// 공급업체명
71
-			width: '10', fixed: false, align: 'center',
71
+			width: '10', fixed: false, align: 'left',
72 72
 			sortable: false, hidden: false
73 73
 		},
74 74
 		{
75 75
 			index: 'PODR_TOTAL_AMT', name: 'podrTotalAmt',
76 76
 			label: ITP_MSG_LOCALE.label.podrTotalAmt, 		// 총 발주금액
77
-			width: '8', fixed: false, align: 'center',
77
+			width: '8', fixed: false, align: 'right',
78 78
 			sortable: false, hidden: false,
79 79
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
80 80
 		},
81 81
 		{
82 82
 			index: 'PODR_ITEM_QTY', name: 'podrItemQty',
83 83
 			label: ITP_MSG_LOCALE.label.podrItemQty, 		// 발주품목수
84
-			width: '7', fixed: false, align: 'center',
84
+			width: '7', fixed: false, align: 'right',
85 85
 			sortable: false, hidden: false
86 86
 		},
87 87
 		{
88 88
 			index: 'PODR_MGR_NM', name: 'podrMgrNm',
89 89
 			label: ITP_MSG_LOCALE.label.podrMgrNm, 			// 발주담당자
90
-			width: '10', fixed: false, align: 'center',
90
+			width: '10', fixed: false, align: 'left',
91 91
 			sortable: false, hidden: false
92 92
 		}
93 93
 	],
@@ -99,28 +99,22 @@ const gridColModel = {
99 99
 			width: '10', fixed: false, align: 'center',
100 100
 			sortable: false, hidden: true
101 101
 		},
102
-		{
103
-			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
104
-			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, 		// 발주항번
105
-			width: '5', fixed: false, align: 'center',
106
-			sortable: false, hidden: false
107
-		},
108 102
 		{
109 103
 			index: 'ITEM_ID', name: 'itemId',
110 104
 			label: ITP_MSG_LOCALE.label.itemId, 			// 품목번호
111
-			width: '5', fixed: false, align: 'center',
105
+			width: '8', fixed: false, align: 'center',
112 106
 			sortable: false, hidden: false
113 107
 		},
114 108
 		{
115 109
 			index: 'ITEM_NM', name: 'itemNm',
116 110
 			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
117
-			width: '5', fixed: false, align: 'center',
111
+			width: '6', fixed: false, align: 'left',
118 112
 			sortable: false, hidden: false
119 113
 		},
120 114
 		{
121 115
 			index: 'UNIT_AMT', name: 'unitAmt',
122 116
 			label: ITP_MSG_LOCALE.label.unitAmt, 			// 단가
123
-			width: '5', fixed: false, align: 'center',
117
+			width: '3', fixed: false, align: 'right',
124 118
 			sortable: false, hidden: false,
125 119
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
126 120
 		},
@@ -133,20 +127,26 @@ const gridColModel = {
133 127
 		{
134 128
 			index: 'PODR_QTY', name: 'podrQty',
135 129
 			label: ITP_MSG_LOCALE.label.podrQty, 			// 발주수량
136
-			width: '5', fixed: false, align: 'center',
130
+			width: '5', fixed: false, align: 'right',
137 131
 			sortable: false, hidden: false
138 132
 		},
139 133
 		{
140 134
 			index: 'PODR_AMT', name: 'podrAmt',
141 135
 			label: ITP_MSG_LOCALE.label.podrAmt, 			// 발주금액
142
-			width: '5', fixed: false, align: 'center',
136
+			width: '5', fixed: false, align: 'right',
143 137
 			sortable: false, hidden: false,
144 138
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
145 139
 		},
146 140
 		{
147 141
 			index: 'WHS_PASS_QTY', name: 'whsPassQty',
148 142
 			label: ITP_MSG_LOCALE.label.whsPassQty, 		// 출고가능수량
149
-			width: '5', fixed: false, align: 'center',
143
+			width: '5', fixed: false, align: 'right',
144
+			sortable: false, hidden: false
145
+		},
146
+		{
147
+			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
148
+			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, 		// 발주항번
149
+			width: '3', fixed: false, align: 'right',
150 150
 			sortable: false, hidden: false
151 151
 		},
152 152
 		{

+ 21 - 19
src/main/webapp/js/app/pomng/ITP_POMNG05010.js

@@ -39,7 +39,7 @@ const gridColModel = {
39 39
 			{
40 40
 				index: 'Brand_Nm', name: 'brandNm',			
41 41
 				label: ITP_MSG_LOCALE.label.brandNm, 		//브랜드이름
42
-				width: '20', fixed: false, align: 'center',	
42
+				width: '20', fixed: false, align: 'left',	
43 43
 				minwidth:150,
44 44
 				sortable: false, hidden: false					
45 45
 			},
@@ -47,21 +47,21 @@ const gridColModel = {
47 47
 				index: 'DLV_STTMT_NO', name: 'dlvSttmtUnqNo',	
48 48
 				label: ITP_MSG_LOCALE.label.dlvSttmtUnqNo, 		//납품서번호
49 49
 				width: '20', fixed: false, align: 'center',	
50
-				minwidth:120,	
50
+				minwidth:140,	
51 51
 				sortable: false, hidden: false					
52 52
 			},
53 53
 			{
54 54
 				index: 'PODR_REG_DT', name: 'pchPodrUnqNo',	
55 55
 				label: '발주번호', 								//발주번호
56 56
 				width: '14', fixed: false, align: 'center',	
57
-				minwidth:120,
57
+				minwidth:140,
58 58
 				sortable: false, hidden: false				
59 59
 			},
60 60
 			{
61 61
 				index: 'PODR_REG_DT', name: 'spplyNm',	
62 62
 				label: '공급업체', 								//공급업체
63
-				width: '14', fixed: false, align: 'center',	
64
-				minwidth:150,
63
+				width: '14', fixed: false, align: 'left',	
64
+				minwidth:140,
65 65
 				sortable: false, hidden: false				
66 66
 			},
67 67
 			{
@@ -75,42 +75,42 @@ const gridColModel = {
75 75
 				index: 'WHS_NM', name: 'whsNm',				
76 76
 				label: '입고처', 			//납품장소
77 77
 				width: '20', fixed: false, align: 'center',	
78
-				minwidth:200,
78
+				minwidth:220,
79 79
 				sortable: false, hidden: false				
80 80
 			},
81 81
 			{
82 82
 				index: 'PODR_REG_DT', name: 'podrRegDt',	
83 83
 				label: '발주생성일', 							//발주생성일
84 84
 				width: '14', fixed: false, align: 'center',	
85
-				minwidth:80,
85
+				minwidth:90,
86 86
 				sortable: false, hidden: false				
87 87
 			},
88 88
 			{
89 89
 				index: 'DLV_REQ_DT', name: 'dlvReqDt',		
90 90
 				label: ITP_MSG_LOCALE.label.dlvReqDt, 		//납품요청일
91 91
 				width: '14', fixed: false, align: 'center',	
92
-				minwidth:80,
92
+				minwidth:90,
93 93
 				sortable: false, hidden: false				
94 94
 			},
95 95
 			{
96 96
 				index: 'DLV_REG_DT', name: 'dlvRegDt',		
97 97
 				label:	'납품생성일', 							//발주생성일
98 98
 				width: '14', fixed: false, align: 'center',	
99
-				minwidth:80,
99
+				minwidth:90,
100 100
 				sortable: false, hidden: false				
101 101
 			},
102 102
 			{
103 103
 				index: 'DLV_SCH_DT', name: 'dlvSchDt',		
104 104
 				label: ITP_MSG_LOCALE.label.dlvSchDt, 		//납품예정일
105 105
 				width: '14', fixed: false, align: 'center',	
106
-				minwidth:80,
106
+				minwidth:90,
107 107
 				sortable: false, hidden: false				
108 108
 			},
109 109
 			{
110 110
 				index: 'DLV_CMPLT_DT', name: 'dlvCmpltDt',	
111 111
 				label: '납품완료일', 	//납품완료일
112 112
 				width: '10', fixed: false, align: 'center',	
113
-				minwidth:80,
113
+				minwidth:90,
114 114
 				sortable: false, hidden: false				
115 115
 			},
116 116
 			{
@@ -123,34 +123,34 @@ const gridColModel = {
123 123
 			{
124 124
 				index: 'ITEM_NM', name: 'itemNm',			
125 125
 				label: ITP_MSG_LOCALE.label.itemNm, 		//품목명
126
-				width: '10', fixed: false, align: 'center',	
127
-				minwidth:200,
126
+				width: '10', fixed: false, align: 'left',	
127
+				minwidth:180,
128 128
 				sortable: false, hidden: false				
129 129
 			},
130 130
 			{
131 131
 				index: 'PODR_QTY', name: 'podrQty',			
132 132
 				label: ITP_MSG_LOCALE.label.podrQty, 		//수주수량
133
-				width: '6', fixed: false, align: 'center',	
133
+				width: '6', fixed: false, align: 'right',	
134 134
 				minwidth:80,
135 135
 				sortable: false, hidden: false				
136 136
 			},
137 137
 			{
138 138
 				index: 'DLV_QTY', name: 'dlvQty',			
139 139
 				label: ITP_MSG_LOCALE.label.dlvQty, 		//납품수량
140
-				width: '6', fixed: false, align: 'center',	
140
+				width: '6', fixed: false, align: 'right',	
141 141
 				minwidth:80,
142 142
 				sortable: false, hidden: false				
143 143
 			},
144 144
 			{
145 145
 				index: 'UNIT', name: 'unit',				
146 146
 				label: ITP_MSG_LOCALE.label.unit, 			//단가
147
-				width: '6', fixed: false, align: 'center',	
147
+				width: '6', fixed: false, align: 'right',	
148 148
 				sortable: false, hidden: true				
149 149
 			},
150 150
 			{
151 151
 				index: 'UNIT_AMT', name: 'unitAmt',			
152 152
 				label: ITP_MSG_LOCALE.label.unitAmt, 		//단가
153
-				width: '6', fixed: false, align: 'center',	
153
+				width: '6', fixed: false, align: 'right',	
154 154
 				minwidth:80,
155 155
 				sortable: false, hidden: false,
156 156
 				formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }				
@@ -158,7 +158,7 @@ const gridColModel = {
158 158
 			{
159 159
 				index: 'DLV_MGR_NM', name: 'dlvMgrNm',		
160 160
 				label: ITP_MSG_LOCALE.label.dlvMgrNm, 		//납품담당자
161
-				width: '8', fixed: false, align: 'center',	
161
+				width: '8', fixed: false, align: 'left',	
162 162
 				minwidth:100,
163 163
 				sortable: false, hidden: false				
164 164
 			},
@@ -166,7 +166,7 @@ const gridColModel = {
166 166
 				index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',	
167 167
 				label: ITP_MSG_LOCALE.label.dlvMgrTelNo, 	//납품담당연락처
168 168
 				width: '10', fixed: false, align: 'center',	
169
-				minwidth:100,
169
+				minwidth:120,
170 170
 				sortable: false, hidden: false				
171 171
 			}
172 172
 	]
@@ -275,6 +275,8 @@ let pageObj = {
275 275
 	screen: function() {
276 276
 		$('#ITP_FORM_POMNG05010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));//input hidden 값 넣기				
277 277
 		$('#ITP_FORM_POMNG05010_SEARCH_DTL_GUBUN').val('dtlGubun');
278
+		$('#ITP_BTN_POMNG05010_DELETE_SPPLY_NM').show();
279
+		$('#ITP_BTN_POMNG05010_DELETE_SWHS_NM').show();
278 280
 	}
279 281
 };
280 282
 

+ 16 - 3
src/main/webapp/js/app/pomng/ITP_POMNG06010.js

@@ -44,30 +44,34 @@ const gridColModel = {
44 44
 			index: 'BRAND_NM', name: 'brandNm',
45 45
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
46 46
 			width: '10', fixed: false, align: 'left',
47
+			minwidth: 120,
47 48
 			sortable: false, hidden: false
48 49
 		},
49 50
 		{
50 51
 			index: 'DLV_STTMT_UNQ_NO', name: 'dlvSttmtUnqNo',
51 52
 			label: ITP_MSG_LOCALE.label.dlvSttmtUnqNo, //납품서번호
52 53
 			width: '10', fixed: false, align: 'center',
54
+			minwidth: 140,
53 55
 			sortable: false, hidden: false
54 56
 		},
55 57
 		{
56 58
 			index: 'DLV_STTMT_DTL_NO', name: 'dlvSttmtDtlNo',
57 59
 			label: ITP_MSG_LOCALE.label.dlvSttmtDtlNo, //납품서항번
58
-			width: '10', fixed: false, align: 'center',
60
+			width: '10', fixed: false, align: 'right',
59 61
 			sortable: false, hidden: false
60 62
 		},
61 63
 		{
62 64
 			index: 'ITEM_ID', name: 'itemId',
63 65
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
64 66
 			width: '10', fixed: false, align: 'center',
67
+			minwidth: 140,
65 68
 			sortable: false, hidden: false
66 69
 		},
67 70
 		{
68 71
 			index: 'ITEM_NM', name: 'itemNm',
69 72
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
70 73
 			width: '10', fixed: false, align: 'left',
74
+			minwidth: 120,
71 75
 			sortable: false, hidden: false
72 76
 		},
73 77
 		{
@@ -102,13 +106,15 @@ const gridColModel = {
102 106
 			index: 'UNIT_AMT', name: 'unitAmt',
103 107
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
104 108
 			width: '6', fixed: false, align: 'right',
109
+			minwidth: 70,
105 110
 			sortable: false, hidden: false,
106 111
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
107 112
 		},
108 113
 		{
109 114
 			index: 'WHS_ID', name: 'whsId',
110 115
 			label: ITP_MSG_LOCALE.label.whsId, //납품창고아이디
111
-			width: '15', fixed: false, align: 'center',
116
+			width: '15', fixed: false, align: 'left',
117
+			minwidth: 150,
112 118
 			sortable: false, hidden: true
113 119
 		},
114 120
 		{
@@ -121,6 +127,7 @@ const gridColModel = {
121 127
 			index: 'WHS_NM', name: 'whsNm',
122 128
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
123 129
 			width: '15', fixed: false, align: 'left',
130
+			minwidth: 160,
124 131
 			sortable: false, hidden: false
125 132
 		},
126 133
 		{
@@ -144,7 +151,8 @@ const gridColModel = {
144 151
 		{
145 152
 			index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',
146 153
 			label: ITP_MSG_LOCALE.label.dlvMgrTelNo, //납품담당자연락처
147
-			width: '15', fixed: false, align: 'left',
154
+			width: '15', fixed: false, align: 'center',
155
+			minwidth: 120,
148 156
 			sortable: false, hidden: false
149 157
 		},
150 158
 		{
@@ -194,6 +202,7 @@ let listObj = {
194 202
 		this.action();
195 203
 		this.event.init();
196 204
 		this.grid.init();
205
+		this.screen();
197 206
 	},
198 207
 	view: function() {
199 208
 		// 버튼 권한설정
@@ -461,6 +470,10 @@ let listObj = {
461 470
 			$(POMNG06010_GRID_EMPTY).show();
462 471
 		}
463 472
 		
473
+	},
474
+	screen: function() {
475
+		$('#ITP_BTN_POMNG06010_DELETE_WHS_ID').show();
476
+		$('#ITP_BTN_POMNG06010_DELETE_SPPLY_ID').show();
464 477
 	}
465 478
 };
466 479
 

+ 7 - 6
src/main/webapp/js/app/stinfo/ITP_STINFO02010.js

@@ -48,21 +48,21 @@ const gridColModel = {
48 48
 		{
49 49
 			index: 'STORE_ID', name: 'storeId',
50 50
 			label: ITP_MSG_LOCALE.label.storeId, //매장번호
51
-			width: '10', fixed: false, align: 'center',
52
-			minwidth: 400, maxwidth: 500,
51
+			width: '10', fixed: false, align: 'left',
52
+			minwidth: 160,
53 53
 			sortable: false, hidden: false
54 54
 		},
55 55
 		{
56 56
 			index: 'STORE_NM', name: 'storeNm',
57 57
 			label: ITP_MSG_LOCALE.label.storeNm, //매장명
58
-			width: '13', fixed: false, align: 'center',
59
-			minwidth: 400, maxwidth: 500,
58
+			width: '13', fixed: false, align: 'left',
59
+			minwidth: 120,
60 60
 			sortable: false, hidden: false
61 61
 		},
62 62
 		{
63 63
 			index: 'BRAND_ID', name: 'brandId',
64 64
 			label: ITP_MSG_LOCALE.label.brandId, //브랜드ID
65
-			width: '10', fixed: false, align: 'center',
65
+			width: '10', fixed: false, align: 'left',
66 66
 			sortable: false, hidden: true
67 67
 		},
68 68
 		{
@@ -86,7 +86,7 @@ const gridColModel = {
86 86
 		{
87 87
 			index: 'STORE_DVSN_NM', name: 'storeDvsnNm',
88 88
 			label: ITP_MSG_LOCALE.label.storeDvsn, //매장구분명
89
-			width: '15', fixed: false, align: 'center',
89
+			width: '8', fixed: false, align: 'center',
90 90
 			sortable: false, hidden: false
91 91
 		},
92 92
 		{
@@ -99,6 +99,7 @@ const gridColModel = {
99 99
 			index: 'SYS_REG_DTTM', name: 'sysRegDttm',
100 100
 			label: ITP_MSG_LOCALE.label.sysRegDttm, //최초등록일
101 101
 			width: '10', fixed: false, align: 'center',
102
+			minwidth: 160,
102 103
 			sortable: false, hidden: false
103 104
 		},
104 105
 	],

+ 5 - 5
src/main/webapp/js/app/stinfo/ITP_STINFO03010.js

@@ -63,7 +63,7 @@ const gridColModel = {
63 63
 		{
64 64
 			index: 'SFFLY_NM', name: 'spplyNm',
65 65
 			label: ITP_MSG_LOCALE.label.spplyNm, //공급업체명
66
-			width: '13', fixed: false, align: 'center',
66
+			width: '13', fixed: false, align: 'left',
67 67
 			sortable: false, hidden: false
68 68
 		},
69 69
 		{
@@ -125,27 +125,27 @@ const gridColModel = {
125 125
 		{
126 126
 			index: 'ASSGN_TASK_NM', name: 'spplyMgrNm',
127 127
 			label: ITP_MSG_LOCALE.label.spplyMgrNm, //담당자명
128
-			width: '20', fixed: false, align: 'center',
128
+			width: '16', fixed: false, align: 'center',
129 129
 			sortable: false, editable: true, edittype: 'text',
130 130
 			editrules: {required: true}
131 131
 		},
132 132
 		{
133 133
 			index: 'POSITION', name: 'position',
134 134
 			label: ITP_MSG_LOCALE.label.position, //직위
135
-			width: '30', fixed: false, align: 'center',
135
+			width: '10', fixed: false, align: 'center',
136 136
 			sortable: true, editable: true, edittype: 'text',
137 137
 			editrules: {required: true}
138 138
 		},
139 139
 		{
140 140
 			index: 'RPRST_EMAIL', name: 'rprstEmal',
141 141
 			label: ITP_MSG_LOCALE.label.rprstEmal, //이메일
142
-			width: '10', fixed: false, align: 'center',
142
+			width: '20', fixed: false, align: 'center',
143 143
 			sortable: false, editable: true, edittype: 'text'
144 144
 		},
145 145
 		{
146 146
 			index: 'RPRST_TEL_NO', name: 'rprstTelNo',
147 147
 			label: ITP_MSG_LOCALE.label.rprstMblNo, //핸드폰번호
148
-			width: '10', fixed: false, align: 'center',
148
+			width: '20', fixed: false, align: 'center',
149 149
 			sortable: false, editable: true, edittype: 'text'
150 150
 		},
151 151
 		{

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

@@ -61,13 +61,13 @@ const gridColModel = {
61 61
         {
62 62
             index: 'ITEM_ID', name: 'itemId',
63 63
             label: ITP_MSG_LOCALE.label.itemId, //품목번호
64
-            width: '11', fixed: false, align: 'center',
64
+            width: '14', fixed: false, align: 'center',
65 65
             sortable: false, hidden: false
66 66
         },
67 67
         {
68 68
             index: 'ITEM_NM', name: 'itemNm',
69 69
             label: ITP_MSG_LOCALE.label.itemNm, //품목명
70
-            width: '13', fixed: false, align: 'center',
70
+            width: '13', fixed: false, align: 'left',
71 71
             sortable: false, hidden: false
72 72
         },
73 73
         {
@@ -79,7 +79,7 @@ const gridColModel = {
79 79
         {
80 80
             index: 'ITEM_CLASS_NM', name: 'itemClassNm',
81 81
             label: ITP_MSG_LOCALE.label.itemClassNm, //품목분류
82
-            width: '15', fixed: false, align: 'center',
82
+            width: '10', fixed: false, align: 'center',
83 83
             sortable: false, hidden: false
84 84
         },
85 85
         {

+ 13 - 3
src/main/webapp/js/app/stinfo/ITP_STINFO05010.js

@@ -58,6 +58,7 @@ const gridColModel = {
58 58
 			index: 'ITEM_NM', name: 'itemNm',
59 59
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
60 60
 			width: '12', fixed: false, align: 'left',
61
+			minwidth: 120,
61 62
 			sortable: false, hidden: false
62 63
 		},
63 64
 		{
@@ -70,48 +71,56 @@ const gridColModel = {
70 71
 			index: 'UNIT', name: 'unit',
71 72
 			label: ITP_MSG_LOCALE.label.unit, //기본단위
72 73
 			width: '7', fixed: false, align: 'center',
74
+			minwidth: 90,
73 75
 			sortable: false, hidden: false
74 76
 		},
75 77
 		{
76 78
 			index: 'CURR', name: 'curr',
77 79
 			label: ITP_MSG_LOCALE.label.curr, //통화
78 80
 			width: '6', fixed: false, align: 'center',
81
+			minwidth: 80,
79 82
 			sortable: false, hidden: false
80 83
 		},
81 84
 		{
82 85
 			index: 'UNIT_AMT', name: 'unitAmt',
83 86
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
84
-			width: '6', fixed: false, align: 'left',
87
+			width: '6', fixed: false, align: 'right',
88
+			minwidth: 80,
85 89
 			sortable: false, hidden: false
86 90
 		},
87 91
 		{
88 92
 			index: 'CONT_STT_DT', name: 'contSttDt',
89 93
 			label: ITP_MSG_LOCALE.label.contSttDt, //시작일
90 94
 			width: '10', fixed: false, align: 'center',
95
+			minwidth: 100,
91 96
 			sortable: false, hidden: false
92 97
 		},
93 98
 		{
94 99
 			index: 'CONT_END_DT', name: 'contEndDt',
95 100
 			label: ITP_MSG_LOCALE.label.contEndDt, //종료일
96 101
 			width: '10', fixed: false, align: 'center',
102
+			minwidth: 100,
97 103
 			sortable: false, hidden: false
98 104
 		},
99 105
 		{
100 106
 			index: 'LEAD_TIME', name: 'leadTime',
101 107
 			label: ITP_MSG_LOCALE.label.leadTime, //리드타임 (Day)
102
-			width: '10', fixed: false, align: 'center',
108
+			width: '10', fixed: false, align: 'right',
109
+			minwidth: 120,
103 110
 			sortable: false, hidden: false
104 111
 		},
105 112
 		{
106 113
 			index: 'FILE_PATH', name: 'filePath',
107 114
 			label: ITP_MSG_LOCALE.label.itemFilePath, //단가계약파일
108 115
 			width: '10', fixed: false, align: 'center',
116
+			minwidth: 120,
109 117
 			sortable: false, hidden: false
110 118
 		},
111 119
 		{
112 120
 			index: 'SYS_REG_DT', name: 'sysRegDt',
113 121
 			label: ITP_MSG_LOCALE.label.regDt, //등록일
114 122
 			width: '6', fixed: false, align: 'center',
123
+			minwidth: 100,
115 124
 			sortable: false, hidden: false
116 125
 		},
117 126
 		{
@@ -123,7 +132,7 @@ const gridColModel = {
123 132
 		{
124 133
 			index: 'SPPLY_ITEM_ID', name: 'spplyItemId',
125 134
 			label: ITP_MSG_LOCALE.label.spplyItemId, //공급사품번
126
-			width: '10', fixed: false, align: 'center',
135
+			width: '10', fixed: false, align: 'right',
127 136
 			sortable: false, hidden: false
128 137
 		}
129 138
 	]
@@ -578,6 +587,7 @@ var popSearch = {
578 587
 				$('#ITP_FORM_STINFO05010_DETAIL_ITEM_NM').val('');
579 588
 				$('#ITP_FORM_STINFO05010_DETAIL_SCH_ITEM_ID').val('');
580 589
 				$('#ITP_FORM_STINFO05010_DETAIL_SCH_ITEM_NM').val('');
590
+				$('#ITP_FORM_STINFO05010_DETAIL_UNIT').val('');
581 591
 			} else {
582 592
 				$('#ITP_FORM_STINFO05010_DETAIL_SPPLY_ID').val('');
583 593
 				$('#ITP_FORM_STINFO05010_DETAIL_SPPLY_NM').val('');

+ 8 - 12
src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -59,7 +59,7 @@ const gridColModel = {
59 59
 		{
60 60
 			index: 'STORE_NM', name: 'storeNm',
61 61
 			label: ITP_MSG_LOCALE.label.storeNm, //매장명
62
-			width: '15', fixed: false, align: 'center',
62
+			width: '10', fixed: false, align: 'left',
63 63
 			sortable: false, hidden: false
64 64
 		},
65 65
 		{
@@ -83,7 +83,7 @@ const gridColModel = {
83 83
 		{
84 84
 			index: 'ITEM_CNT', name: 'itemCnt',
85 85
 			label: ITP_MSG_LOCALE.label.itemCnt, //계약품목수
86
-			width: '10', fixed: false, align: 'center',
86
+			width: '10', fixed: false, align: 'right',
87 87
 			sortable: false, hidden: false
88 88
 		}
89 89
 	],
@@ -127,7 +127,7 @@ const gridColModel = {
127 127
 		{
128 128
 			index: 'ITEM_NM', name: 'itemNm',
129 129
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
130
-			width: '13', fixed: false, align: 'center',
130
+			width: '13', fixed: false, align: 'left',
131 131
 			sortable: false, hidden: false
132 132
 		},
133 133
 		{
@@ -160,7 +160,7 @@ const gridColModel = {
160 160
 		{
161 161
 			index: 'UNIT_AMT', name: 'unitAmt',
162 162
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
163
-			width: '10', fixed: false, align: 'center',
163
+			width: '10', fixed: false, align: 'right',
164 164
 			sortable: true, editable: true, edittype: 'text',
165 165
 			editrules: {required: true},
166 166
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -176,22 +176,17 @@ const gridColModel = {
176 176
 		{
177 177
 			index: 'SPPLY_UNIT_AMT', name: 'spplyUnitAmt',
178 178
 			label: ITP_MSG_LOCALE.label.spplyUnitAmt, //공급단가
179
-			width: '6', fixed: false, align: 'center',
179
+			width: '6', fixed: false, align: 'right',
180 180
 			sortable: false, hidden: false,
181 181
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
182 182
 			
183 183
 		},
184 184
 		{
185 185
 			index: 'SPPLY_NM', name: 'spplyNm',
186
-			label: ITP_MSG_LOCALE.label.spplyNm, //공급단가
186
+			label: ITP_MSG_LOCALE.label.spplyNm, //공급업체명
187 187
 			width: '6', fixed: false, align: 'left',
188
+			minwidth: 160, maxwidth: 200,
188 189
 			sortable: false, hidden: false
189
-		},
190
-		{
191
-			index: 'SPPLY_ID', name: 'spplyId',
192
-			label: ITP_MSG_LOCALE.label.spplyId, //공급단가
193
-			width: '6', fixed: false, align: 'center',
194
-			sortable: false, hidden: true
195 190
 		}
196 191
 	],
197 192
 	sdetail: [
@@ -228,6 +223,7 @@ const gridColModel = {
228 223
 		{
229 224
 			index: 'ITEM_ID', name: 'itemId',
230 225
 			label: ITP_MSG_LOCALE.label.itemId, //품목번호
226
+			minwidth: 160,
231 227
 			width: '10', fixed: false, align: 'center',
232 228
 			sortable: false, hidden: false
233 229
 		},

+ 1 - 1
src/main/webapp/js/app/stinfo/ITP_STINFO07010.js

@@ -51,7 +51,7 @@ const gridColModel = {
51 51
 		{
52 52
 			index: 'ITEM_CLASS_NM', name: 'itemClassNm',
53 53
 			label: ITP_MSG_LOCALE.label.itemClassNm, //품목분류명
54
-			width: '10', fixed: false, align: 'center',
54
+			width: '10', fixed: false, align: 'left',
55 55
 			sortable: false, hidden: false
56 56
 		},
57 57
 		{

+ 85 - 45
src/main/webapp/main.html

@@ -146,97 +146,137 @@
146 146
 						<article class="itp_detail">
147 147
 							<div id="ITP_AJAX_SUMMARY_DETAIL_CONTAINER" class="itp_det_in">
148 148
 								<!-- 여기는 공급사 매장 로그인 시 나오는 구간 -->
149
+								<div id="ITP_NOTE_BAR">
150
+									<div class="itp_side_bar_header">
151
+										<label>공지사항</label>
152
+									</div>
153
+									<div class="itp_side_bar_note">
154
+										<label class="fn">공지 1제목 조금 긴 제목</label>
155
+										<label class="date fn">2022.11.01</label>
156
+										<div class="fn">공지1 내용 들어가는곳fasdfdddddddddddddddasdfasdfsfdasdasdsadsaasdasdasdadsadaasdasdafddddddddddddddddddddddsdsfsdfdsfsdfddasdsadasdssds </div>
157
+									</div>
158
+									<div class="itp_side_bar_note">
159
+										<label class="fn">공지 2제목</label>
160
+										<label class="date fn">2022.11.01</label>
161
+										<div class="fn">공지 1 내용 가나다라마바상라ㅣㅁㄴ리ㅏㄴ멀ㄴ얾ㅣ;ㅁ너ㅣㅏ런ㅁ이ㅏ;러</div>
162
+									</div>
163
+									<div class="itp_side_bar_note">
164
+										<label class="fn">공지 2제목</label>
165
+										<label class="date fn">2022.11.01</label>
166
+										<div class="fn">공지 1 내용 가나다라마바상라ㅣㅁㄴ리ㅏㄴ멀ㄴ얾ㅣ;ㅁ너ㅣㅏ런ㅁ이ㅏ;러</div>
167
+									</div>
168
+								</div>
149 169
 								<div id="ITP_MAIN_HEADER" style="display: inline-block;">
150
-									<div class="col_4">
151
-										<div class="itp_header_label ">
170
+									<div class="col_4" style="margin-left:0">
171
+										<div class="itp_header_label">
152 172
 										구매요청 
153 173
 										</div>
154
-										<div class="itp_header_result ">
174
+										<div class="itp_header_result fn">
155 175
 										10건
156 176
 										</div>
157 177
 									</div>
158
-									<div class="col_4">
159
-										<div class="itp_header_label ">
178
+									<div class="col_4" style="margin:0 3%;">
179
+										<div class="itp_header_label">
160 180
 										발주진행
161 181
 										</div>
162
-										<div class="itp_header_result ">
182
+										<div class="itp_header_result fn">
163 183
 										10건
164 184
 										</div>
165 185
 									</div>
166 186
 									<div class="col_4">
167
-										<div class="itp_header_label ">
187
+										<div class="itp_header_label">
168 188
 										발주완료
169 189
 										</div>
170
-										<div class="itp_header_result ">
190
+										<div class="itp_header_result fn">
171 191
 										10건
172 192
 										</div>
173 193
 									</div>
174
-									<div class="col_4">
175
-										<div class="itp_header_label ">
194
+									<div class="col_4" style="margin-right:0; float:right;">
195
+										<div class="itp_header_label">
176 196
 										구매가능금액
177 197
 										</div>
178
-										<div class="itp_header_result ">
198
+										<div class="itp_header_result fn">
179 199
 										1,000,000원
180 200
 										</div>
181 201
 									</div>
182 202
 								</div>
183 203
 								<div id="ITP_MAIN_HEADER" style="display: none;">
184
-									<div class="col_3">
185
-										<div class="itp_header_label ">
204
+									<div class="col_3" style="margin-left:0">
205
+										<div class="itp_header_label">
186 206
 										구매요청 건수
187 207
 										</div>
188
-										<div class="itp_header_result ">
208
+										<div class="itp_header_result fn">
189 209
 										10건
190 210
 										</div>
191 211
 									</div>
192
-									<div class="col_3">
193
-									<div class="itp_header_label ">
212
+									<div class="col_3" style="margin:5px 6%;">
213
+										<div class="itp_header_label">
194 214
 										구매요청건수
195 215
 										</div>
196
-										<div class="itp_header_result ">
216
+										<div class="itp_header_result fn">
197 217
 										10건
198 218
 										</div>
199 219
 									</div>
200
-									<div class="col_3">
201
-									<div class="itp_header_label ">
220
+									<div class="col_3" style="margin-right:0; float:right;">
221
+										<div class="itp_header_label">
202 222
 										구매요청건수
203 223
 										</div>
204
-										<div class="itp_header_result ">
224
+										<div class="itp_header_result fn">
205 225
 										10건
206 226
 										</div>
207 227
 									</div>
208 228
 								</div>
209
-								<div id="ITP_SIDE_BAR">
210
-									<div class="itp_side_bar_header">
211
-										<label>공지사항</label>
229
+								<div id="ITP_MAIN_GRAPH_AREA">
230
+									<div class="itp_graph_box">
231
+										<div class="itp_graph_side">
232
+											<select>
233
+												<option>fasdf</option>
234
+											</select>
235
+											<div class="itp_graph_info_bar">
236
+												<div class="itp_graph_info">구매요청</div>
237
+											</div>
238
+										</div>
239
+										<div id="ITP_PCH_REQ_GRAPH" class="itp_graph_area"></div>
212 240
 									</div>
213
-									<div class="itp_side_bar_note">
214
-										<label class="fn">공지 1제목</label>
215
-										<label class="fn">2022.11.01</label>
216
-										<div class="fn">공지1 내용 들어가는곳 </div>
241
+									<div class="itp_graph_box">
242
+										<div class="itp_graph_side">
243
+											<select>
244
+												<option>fasdf</option>
245
+											</select>
246
+											<div class="itp_graph_info_bar">
247
+												<div class="itp_graph_info">구매발주</div>
248
+											</div>
249
+										</div>
250
+										<div id="ITP_PCH_PODR_GRAPH" class="itp_graph_area"></div>
217 251
 									</div>
218
-									<div class="itp_side_bar_note">
219
-										<label class="fn">공지 2제목</label>
220
-										<label class="fn">2022.11.01</label>
221
-										<div class="fn">공지 1 내용 가나다라마바상라ㅣㅁㄴ리ㅏㄴ멀ㄴ얾너ㅣㅏ럼나ㅣ럼니ㅏ;ㅓ리만;ㅓ라ㅣ;ㅁ너라ㅣ;먼리ㅏFASDFASDFASDFASDFASFDASDFASDFASDFASFASDFDASF;머리ㅏ;머라ㅣ;ㅁ너ㅣㅏ런ㅁ이ㅏ;러</div>
252
+									<div class="itp_graph_box">
253
+										<div class="itp_graph_side">
254
+											<select>
255
+												<option>fasdf</option>
256
+											</select>
257
+											<div class="itp_graph_info_bar">
258
+												<div class="itp_graph_info">매출순위</div>
259
+											</div>
260
+										</div>
261
+										<div id="ITP_PCH_REQ_UP_ITEM_GRAPH" class="itp_graph_area"></div>
222 262
 									</div>
223
-									<div class="itp_side_bar_note">
224
-										<label class="fn">공지 3제목</label>
225
-										<label class="fn">2022.11.01</label>
226
-										<div class="fn">SDVASDFASFASDFASFASDFASFDASDFASFASDFSADFSADF</div>
263
+									<div class="itp_graph_box">
264
+										<div class="itp_graph_side">
265
+											<div class="itp_graph_info_bar">
266
+												<div class="itp_graph_info" style="padding-top:8px;">&nbsp;정&nbsp;&nbsp;산</div>
267
+											</div>
268
+										</div>
269
+										<div id="ITP_STTL_GRAPH" class="itp_graph_area"></div>
227 270
 									</div>
228
-									<div class="itp_side_bar_note">
229
-										<label class="fn">공지 4제목</label>
230
-										<label class="fn">2022.11.01</label>
231
-										<div class="fn">ASDFASDFASFDASDFSDFSDAFSDAFSDAFSDFSDFASDFASDFASDFASDFASDFASDFDASF</div>
271
+									<div class="itp_graph_box" style="width:100%">
272
+										<div class="itp_graph_side" style="width:12%;">
273
+											<div class="itp_graph_info_bar">
274
+												<div class="itp_graph_info">안전재고</div>
275
+											</div>
276
+										</div>
277
+										<div id="ITP_SAFE_STCK_GRAPH" class="itp_graph_area" style="width:87%;"></div>
232 278
 									</div>
233 279
 								</div>
234
-								<div id="ITP_MAIN_GRAPH_AREA">
235
-									<div id="ITP_PCH_REQ_GRAPH" class="itp_graph_area"></div>
236
-									<div id="ITP_PCH_PODR_GRAPH" class="itp_graph_area"></div>
237
-									<div id="ITP_PCH_REQ_UP_ITEM_GRAPH" class="itp_graph_area"></div>
238
-									<div id="ITP_STTL_GRAPH" class="itp_graph_area"></div>
239
-								</div>
240 280
 							</div>
241 281
 						</article>
242 282
 					</div>