ソースを参照

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

juney 2 年 前
コミット
752458cb61

+ 1 - 1
src/main/webapp/app/rtnmng/RTNMNG03010.html

@@ -201,7 +201,7 @@
201 201
 											<div class="col-xs-4 itp_ip">
202 202
 												<div class="col-xs-4 itp_in">
203 203
 													<div class="input-daterange input-group date">
204
-														<input type="text" id="ITP_FORM_RTNMNG03010_NDETAIL_COL_REQ_DT" data-check-required="empty" class="form-control itp_input" name="colReqDt" value="">
204
+														<input type="text" id="ITP_FORM_RTNMNG03010_NDETAIL_COL_REQ_DT" data-check-required="empty" class="form-control itp_input" name="colReqDt" value="" readonly>
205 205
 													</div>
206 206
 												</div>											
207 207
 											</div>

+ 7 - 7
src/main/webapp/app/rtnmng/RTNMNG05010.html

@@ -32,11 +32,11 @@
32 32
 											</div>
33 33
 										</div>
34 34
 										<div class="col-xs-2 itp_ip itp_noMar">
35
-											<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
35
+											<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="수거창고" readonly="readonly" />
36 36
 										</div>
37 37
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
38
-											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_POP_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
39
-											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_DEL_SWHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
38
+											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_POP_SRTN_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
39
+											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
40 40
 						                </div>
41 41
 									</div>
42 42
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
@@ -47,12 +47,12 @@
47 47
 											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_POP_SSPPLY_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
48 48
 											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_DEL_SSPPLY_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
49 49
 						                </div>
50
-										<div class="col-xs-2 itp_ip itp_noMar">
51
-											<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="수거창고" readonly="readonly" />
50
+						                <div class="col-xs-2 itp_ip itp_noMar">
51
+											<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
52 52
 										</div>
53 53
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
54
-											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_POP_SRTN_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
55
-											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
54
+											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_POP_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
55
+											<button type="button" id="ITP_BTN_RTNMNG05010_SEARCH_DEL_SWHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
56 56
 						                </div>
57 57
 										<div class="col-xs-5 itp_ip itp_noMar">
58 58
 											<input type="text" id="ITP_FORM_RTNMNG05010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />

+ 7 - 7
src/main/webapp/app/rtnmng/RTNMNG06010.html

@@ -31,11 +31,11 @@
31 31
 											</div>
32 32
 										</div>
33 33
 										<div class="col-xs-2 itp_ip itp_noMar">
34
-											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
34
+											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="매장/창고" readonly="readonly" />
35 35
 										</div>
36 36
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
37
-											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SWHS_NM" 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_RTNMNG06010_SEARCH_DEL_SWHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
37
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SRTN_WHS_NM" 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_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
39 39
 						                </div>
40 40
 									</div>
41 41
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
@@ -46,12 +46,12 @@
46 46
 											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SSPPLY_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
47 47
 											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
48 48
 						                </div>
49
-										<div class="col-xs-2 itp_ip itp_noMar">
50
-											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="매장/창고" readonly="readonly" />
49
+						                <div class="col-xs-2 itp_ip itp_noMar">
50
+											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
51 51
 										</div>
52 52
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
53
-											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SRTN_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
54
-											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
53
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
54
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SWHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
55 55
 						                </div>
56 56
 										<div class="col-xs-5 itp_ip itp_noMar">
57 57
 											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />

+ 134 - 0
src/main/webapp/app/stockmng/STOCKMNG05010.html

@@ -0,0 +1,134 @@
1
+<section id="ITP_TAB_STOCKMNG05010" class="tab-pane active itp_sec">
2
+	<div class="itp_cont">
3
+		<article class="itp_detail">
4
+			<div class="itp_det_head fix">
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_STOCKMNG05010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
8
+				    <button type="button" id="ITP_BTN_STOCKMNG05010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
9
+				</div>				
10
+			</div>
11
+			<div class="itp_det_in">
12
+				<div id="ITP_AJAX_STOCKMNG05010_DETAIL_CONTAINER">
13
+				    <div class="itp_form itp_type1 fix">
14
+				        <div class="col-xs-12">
15
+				            <form id="ITP_FORM_STOCKMNG05010_DETAIL" class="form-horizontal">
16
+				                <input type="hidden" id="ITP_FORM_STOCKMNG05010_DETAIL_VIEW_CD" name="viewCd" value="C">
17
+				                <input type="hidden" id="ITP_FORM_STOCKMNG05010_DETAIL_BRAND_ID" name="brandId" value="">
18
+				                <input type="hidden" id="ITP_FORM_STOCKMNG05010_DETAIL_STORE_ID" name="storeId" value="">
19
+				                <input type="hidden" id="ITP_FORM_STOCKMNG05010_DETAIL_WHS_ID" name="whsId" value="">
20
+				    
21
+				                <section class="itp_form_sec">
22
+				                    <h4 class="itp_form_tit">수요예측 브랜드 정보</h4>
23
+				                    <div class="itp_form_in">
24
+				                        <div class="form-group border">
25
+				                            <label class="col-xs-2 itp_lb">브랜드명</label>
26
+			                                <div class="col-xs-10 itp_ip">
27
+												<div class="col-xs-3 itp_in">
28
+													<select id="ITP_FORM_STOCKMNG05010_DETAIL_BRAND_NM" data-select-code="BRAND_NM" class="form-control itp_input" name="brandNm">
29
+														<option>브랜드</option>
30
+													</select>
31
+												</div>
32
+											</div>
33
+				                        </div>
34
+			                        </div>	
35
+				                </section>
36
+				                 <div class="itp_caption">
37
+				                </div>	
38
+				                <section class="itp_form_sec">
39
+				                    <h4 class="itp_form_tit">수요예측 가중치 정보</h4>
40
+				                    <div class="itp_form_in">
41
+				                        <div class="form-group">
42
+				                            <label class="col-xs-2 itp_lb">가중치 개수</label>
43
+			                                <div class="col-xs-10 itp_ip">
44
+												<div class="col-xs-4 itp_in" style="width:38%;">
45
+													<input type="text" name="" id="ITP_FORM_STOCKMNG05010_DETAIL_" class="form-control itp_input">
46
+												</div>
47
+												<label style="padding-top:3px;">(가중치 입력값과 상관없이 수요예측에 사용할 가중치의 개수 설정)</label>
48
+											</div>
49
+				                        </div>
50
+			                         </div>	
51
+			                         <div class="itp_form_in">
52
+				                        <div class="form-group">
53
+				                            <label class="col-xs-2 itp_lb">가중치 1(w1)</label>
54
+			                                <div class="col-xs-4 itp_ip">
55
+												<div class="col-xs-12 itp_in">
56
+													<input type="text" name="" id="ITP_FORM_STOCKMNG05010_DETAIL_" class="form-control itp_input">
57
+												</div>
58
+											</div>
59
+											<label class="col-xs-2 itp_lb">가중치 2(w2)</label>
60
+			                                <div class="col-xs-4 itp_ip">
61
+												<div class="col-xs-12 itp_in">
62
+													<input type="text" name="" id="ITP_FORM_STOCKMNG05010_DETAIL_" class="form-control itp_input">
63
+												</div>
64
+											</div>
65
+				                        </div>
66
+			                        </div>	
67
+			                         <div class="itp_form_in">
68
+				                        <div class="form-group">
69
+				                            <label class="col-xs-2 itp_lb">가중치 3(w3)</label>
70
+			                                <div class="col-xs-4 itp_ip">
71
+												<div class="col-xs-12 itp_in">
72
+													<input type="text" name="" id="ITP_FORM_STOCKMNG05010_DETAIL_" class="form-control itp_input">
73
+												</div>
74
+											</div>
75
+											<label class="col-xs-2 itp_lb">가중치 4(w4)</label>
76
+			                                <div class="col-xs-4 itp_ip">
77
+												<div class="col-xs-12 itp_in">
78
+													<input type="text" name="" id="ITP_FORM_STOCKMNG05010_DETAIL_" class="form-control itp_input">
79
+												</div>
80
+											</div>
81
+				                        </div>
82
+			                        </div>	
83
+			                         <div class="itp_form_in">
84
+				                        <div class="form-group border">
85
+				                            <label class="col-xs-2 itp_lb">가중치5(w5)</label>
86
+			                                <div class="col-xs-4 itp_ip">
87
+												<div class="col-xs-12 itp_in">
88
+													<input type="text" name="" id="ITP_FORM_STOCKMNG05010_DETAIL_" class="form-control itp_input">
89
+												</div>
90
+											</div>
91
+											<label class="col-xs-2 itp_lb">가중치 6(w6)</label>
92
+			                                <div class="col-xs-4 itp_ip">
93
+												<div class="col-xs-12 itp_in">
94
+													<input type="text" name="" id="ITP_FORM_STOCKMNG05010_DETAIL_" class="form-control itp_input">
95
+												</div>
96
+											</div>
97
+				                        </div>
98
+			                        </div>	
99
+				                </section>	
100
+				                <div class="itp_caption">
101
+				                	<label>※ 가중치 입력 방법[ w1 > w2 > w3 > w4 > w5> w6]</label>
102
+				                	<label>※ 최소 3개 이상 입력하세요.</label>
103
+				                </div>
104
+				                <section class="itp_form_sec">
105
+				                    <h4 class="itp_form_tit">수요예측 브랜드 정보</h4>
106
+				                    <div class="itp_form_in">
107
+				                        <div class="form-group border">
108
+				                            <label class="col-xs-2 itp_lb">평활계수(α)</label>
109
+			                                <div class="col-xs-10 itp_ip">
110
+												<div class="col-xs-4 itp_in" style="width:38%;">
111
+													<input type="text" name="" id="ITP_FORM_STOCKMNG05010_DETAIL_" class="form-control itp_input">
112
+												</div>
113
+												<label style="padding-top:3px;">[단, α(평활계수):0 ≤ a ≤ 1]</label>
114
+											</div>
115
+				                        </div>
116
+			                        </div>	
117
+				                </section>	
118
+				                 <div class="itp_caption">
119
+				                	<label>※ 평활계수의 조정</label>
120
+				                	<label style="padding-left:10px;"> - 제품 수요가 불안정한 경우</label>
121
+				                	<label style="padding-left:24px;"> a:0.7 ~ 0.8(예측의 감응도를 높인다)</label>
122
+		                			<label style="padding-left:10px;"> - 제품 수요가 불안정한 경우</label>
123
+				                	<label style="padding-left:24px;"> a:0.7 ~ 0.8(예측의 감응도를 높인다)</label>
124
+				                </div>
125
+				            </form>
126
+				        </div>
127
+				    </div>
128
+				</div>
129
+								
130
+			</div>
131
+		</article>
132
+	</div>
133
+	<div id="ITP_TAP_JS"></div>	
134
+</section>

+ 77 - 0
src/main/webapp/app/stockmng/STOCKMNG06010.html

@@ -0,0 +1,77 @@
1
+<section id="ITP_TAB_STOCKMNG06010" class="tab-pane active itp_sec">
2
+	<div class="itp_cont">
3
+		<article class="itp_detail">
4
+			<div class="itp_det_head fix">
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_STOCKMNG06010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
8
+				    <button type="button" id="ITP_BTN_STOCKMNG06010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
9
+				</div>				
10
+			</div>
11
+			<div class="itp_det_in">
12
+				<div id="ITP_AJAX_STOCKMNG06010_DETAIL_CONTAINER">
13
+				    <div class="itp_form itp_type1 fix">
14
+				        <div class="col-xs-12">
15
+				            <form id="ITP_FORM_STOCKMNG06010_DETAIL" class="form-horizontal">
16
+				                <input type="hidden" id="ITP_FORM_STOCKMNG06010_DETAIL_VIEW_CD" name="viewCd" value="C">
17
+				                <input type="hidden" id="ITP_FORM_STOCKMNG06010_DETAIL_BRAND_ID" name="brandId" value="">
18
+				                <input type="hidden" id="ITP_FORM_STOCKMNG06010_DETAIL_STORE_ID" name="storeId" value="">
19
+				                <input type="hidden" id="ITP_FORM_STOCKMNG06010_DETAIL_WHS_ID" name="whsId" value="">
20
+				    
21
+				                <section class="itp_form_sec">
22
+				                    <h4 class="itp_form_tit">수요예측 조건 정보</h4>
23
+			                         <div class="itp_form_in">
24
+				                        <div class="form-group">
25
+				                            <label class="col-xs-2 itp_lb">브랜드</label>
26
+			                                <div class="col-xs-4 itp_ip">
27
+												<div class="col-xs-8 itp_in">
28
+													<select id="ITP_FORM_STOCKMNG06010_DETAIL_BRAND_NM" data-select-code="BRAND_NM" class="form-control itp_input" name="brandNm">
29
+														<option>브랜드</option>
30
+													</select>												
31
+												</div>
32
+											</div>
33
+											<label class="col-xs-2 itp_lb">기간선택</label>
34
+			                                <div class="col-xs-4 itp_ip">
35
+												<div class="col-xs-8 itp_in">
36
+													<select id="ITP_FORM_STOCKMNG06010_DETAIL_" data-select-code="" class="form-control itp_input" name="">
37
+														<option>기간선택</option>
38
+													</select>												
39
+												</div>
40
+											</div>
41
+				                        </div>
42
+			                        </div>	
43
+				                    <div class="itp_form_in">
44
+				                        <div class="form-group border">
45
+				                            <label class="col-xs-2 itp_lb">수요예측 품목명</label>
46
+												<div class="col-xs-10 itp_ip">
47
+													<div class="col-xs-3 itp_in">
48
+														<input type="text" id="ITP_FORM_STOCKMNG06010_DETAIL_SCH_ITEM_ID" class="form-control itp_input" value="" maxlength="100" readonly>
49
+									                </div>
50
+									                <div class="col-xs-3 itp_in">
51
+														<div class="input-group">
52
+															<input type="text" id="ITP_FORM_STOCKMNG06010_DETAIL_SCH_ITEM_NM" class="form-control itp_input" value="" maxlength="100" readonly>
53
+															<span class="input-group-btn">
54
+																<button id="ITP_BTN_STOCKMNG06010_DETAIL_ITEM_DELETE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
55
+															</span>
56
+														</div>
57
+													</div>
58
+													<div class="col-xs-2 itp_in" style="padding-left: 5px;">
59
+														<button type="button" id="ITP_BTN_STOCKMNG06010_DETAIL_ITEM_SRH_" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
60
+									                </div>
61
+												</div>
62
+				                        </div>
63
+			                         </div>	
64
+				                </section>	
65
+				                <div class="itp_caption">
66
+				                	<label>※ 수요예측은 조회하는 일자의 월 포함 3개월에 대한 조회입니다.</label>
67
+				                </div>
68
+				            </form>
69
+				        </div>
70
+				    </div>
71
+				</div>
72
+								
73
+			</div>
74
+		</article>
75
+	</div>
76
+	<div id="ITP_TAP_JS"></div>	
77
+</section>

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

@@ -126,12 +126,17 @@ a, button {outline:none !important; text-decoration:none !important;}
126 126
 #ITP_MAIN_HEADER .col_3 {background:#eee; width:27%; height:80px; display:inline-block; margin:5px 23px; border-radius:8px;}
127 127
 #ITP_MAIN_HEADER .col_3 .itp_header_label {padding:12px 18px 3px 18px; font-size:17px; font-weight:700;}
128 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
+
129 134
 #ITP_SIDE_BAR {background:#eee; width:20%; height:100%; float:right; border-radius:15px;}
130 135
 #ITP_SIDE_BAR .itp_side_bar_header {padding-top:15px; text-align:center; font-size:17px;}
131 136
 #ITP_SIDE_BAR .itp_side_bar_note {padding:15px;}
132 137
 #ITP_SIDE_BAR .itp_side_bar_note label {width:100%; margin-bottom:8px;}
133 138
 #ITP_MAIN_GRAPH_AREA {width:80%; height:770px;}
134
-#ITP_MAIN_GRAPH_AREA .itp_graph_area {border:1px solid #000; width:49.8%; height:380px; display:inline-block;}
139
+#ITP_MAIN_GRAPH_AREA .itp_graph_area {width:49.8%; height:380px; display:inline-block;}
135 140
 /* ITP_HEADER */
136 141
 #ITP_HEADER .itp_head {font-family: 'GmarketSansMedium';width:100%; height:50px; position:relative; line-height:50px; z-index:100;}
137 142
 #ITP_HEADER .itp_tit {margin:0; padding:0; line-height:50px; font-size:20px;}
@@ -266,6 +271,8 @@ a, button {outline:none !important; text-decoration:none !important;}
266 271
 #ITP_CONTAINER .itp_detail .itp_det_in .itp_stat_faq span {color: #a94442}
267 272
 #ITP_CONTAINER .itp_detail .itp_form {width:809px;}
268 273
 #ITP_CONTAINER .itp_detail .itp_form_tit {font-size:14px; border-left:5px solid #337ab7; padding-left:10px; font-weight:bold;}
274
+#ITP_CONTAINER .itp_detail .itp_form .itp_caption {padding-top:10px; padding-bottom:25px;}
275
+#ITP_CONTAINER .itp_detail .itp_form .itp_caption label{width:100%;}
269 276
 #ITP_CONTAINER .itp_detail .itp_form .itp_form_sec {margin-top:50px;}
270 277
 #ITP_CONTAINER .itp_detail .itp_form .itp_form_sec.noMar {margin-top:0;}
271 278
 #ITP_CONTAINER .itp_detail .itp_form .itp_form_in {margin-top:25px; padding-left:8px;}

+ 12 - 10
src/main/webapp/js/app/main.js

@@ -49,6 +49,7 @@ function drawChartReq() {
49 49
 
50 50
   var options = {
51 51
     chart: {
52
+    	width:'100%'
52 53
     }
53 54
   };
54 55
 
@@ -60,12 +61,13 @@ function drawChartReq() {
60 61
 //구매발주 그래프
61 62
 function drawChartPodr() {
62 63
 	  var data = google.visualization.arrayToDataTable([
63
-	    ['구매요청', '대기', '반려', '승인'],
64
-	    ['2014', 1000, 400, 200]
64
+	    ['구매발주', '요청', '진행', '취소'],
65
+	    ['2014', 3.5, 1.7, 1.2]
65 66
 	  ]);
66 67
 
67 68
 	  var options = {
68 69
 	    chart: {
70
+	    	width:'100%'
69 71
 	    }
70 72
 	  };
71 73
 
@@ -77,13 +79,14 @@ function drawChartPodr() {
77 79
 //구매요청 상위 품목 그리드
78 80
 function drawChartReqUp() {
79 81
   var data = google.visualization.arrayToDataTable([
80
-    ['Year', 'Sales', 'Expenses', 'Profit'],
81
-    ['항목 1', 1000, 400, 200],
82
+    ['Year', '품목5', '품목4', '품목3','품목2','품목1'],
83
+    ['항목 1', 17, 15, 12, 10, 8],
82 84
   ]);
83 85
 
84 86
   var options = {
85 87
     chart: {
86 88
       title: '구매요청 상위 품목(일주일)',
89
+      width:'100%'
87 90
     },
88 91
     bars: 'horizontal' // Required for Material Bar Charts.
89 92
   };
@@ -98,15 +101,14 @@ function drawChartcore() {
98 101
 
99 102
     var data = google.visualization.arrayToDataTable([
100 103
       ['Task', 'Hours per Day'],
101
-      ['Work',     11],
102
-      ['Eat',      2],
103
-      ['Commute',  2],
104
-      ['Watch TV', 2],
105
-      ['Sleep',    7]
104
+      ['요청', 25],
105
+      ['확인', 65],
106
+      ['반려', 10],
106 107
     ]);
107 108
 
108 109
     var options = {
109
-      title: '정산'
110
+		title: '정산',
111
+		width:'100%'
110 112
     };
111 113
 
112 114
     var chart = new google.visualization.PieChart(document.getElementById('ITP_STTL_GRAPH'));

+ 9 - 14
src/main/webapp/js/app/rtnmng/ITP_RTNMNG01010.js

@@ -57,34 +57,34 @@ const gridColModel = {
57 57
 		{
58 58
 			index: 'ITEM_ID', name: 'itemId',
59 59
 			label: ITP_MSG_LOCALE.label.itemId,
60
-			width: '15', fixed: false, align: 'center',
60
+			width: '10', fixed: false, align: 'center',
61 61
 			sortable: false, editable: false, edittype: 'text',
62 62
 			editrules: { required: true }
63 63
 		},
64 64
 		{
65 65
 			index: 'ITEM_NM', name: 'itemNm',
66 66
 			label: ITP_MSG_LOCALE.label.itemNm,
67
-			width: '25', fixed: false, align: 'center',
67
+			width: '8', fixed: false, align: 'left',
68 68
 			sortable: true, editable: false, edittype: 'text',
69 69
 			editrules: { required: true }
70 70
 		},
71 71
 		{
72 72
 			index: 'UNIT', name: 'unit',
73 73
 			label: ITP_MSG_LOCALE.label.unit,
74
-			width: '10', fixed: false, align: 'center',
74
+			width: '8', fixed: false, align: 'center',
75 75
 			sortable: false, editable: false, edittype: 'text'
76 76
 		},
77 77
 		{
78 78
 			index: 'UNIT_AMT', name: 'unitAmt',
79 79
 			label: ITP_MSG_LOCALE.label.unitAmt,
80
-			width: '10', fixed: false, align: 'center',
80
+			width: '6', fixed: false, align: 'right',
81 81
 			sortable: false, editable: false, edittype: 'text', hidden: false, 
82 82
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
83 83
 		},
84 84
 		{
85 85
 			index: 'RTN_QTY', name: 'rtnQty',
86 86
 			label: '반품수량', //수량
87
-			width: '10', fixed: false, align: 'center',
87
+			width: '8', fixed: false, align: 'right',
88 88
 			sortable: false, editable: true, edittype: 'text',
89 89
 			editrules: { number:true }, 
90 90
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -92,14 +92,14 @@ const gridColModel = {
92 92
 		{
93 93
 			index: 'RTN_AMT', name: 'rtnAmt',
94 94
 			label: '반품예상금액',
95
-			width: '10', fixed: false, align: 'center',
95
+			width: '8', fixed: false, align: 'right',
96 96
 			sortable: false, editable: false, edittype: 'text', hidden: false, 
97 97
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
98 98
 		},		
99 99
 		{
100 100
 			index: 'RTN_DVSN', name: 'rtnDvsn',
101 101
 			label: '반품구분',
102
-			width: '10', fixed: false, align: 'center',
102
+			width: '9', fixed: false, align: 'left',
103 103
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
104 104
 			editoptions: {value: ITP_COMMON_CD_RTN_DVSN},
105 105
 			editrules: {required: true}
@@ -107,7 +107,7 @@ const gridColModel = {
107 107
 		{
108 108
 			index: 'RTN_RSN_DVSN', name: 'rtnRsnDvsn',
109 109
 			label: '사유구분',
110
-			width: '10', fixed: false, align: 'center',
110
+			width: '9', fixed: false, align: 'left',
111 111
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
112 112
 			editoptions: {value: ITP_COMMON_CD_RTN_RSN_DVSN},
113 113
 			editrules: {required: true}
@@ -115,7 +115,7 @@ const gridColModel = {
115 115
 		{
116 116
 			index: 'RTN_RSN', name: 'rtnRsn',
117 117
 			label: '반품사유', 
118
-			width: '15', fixed: false, align: 'left',
118
+			width: '12', fixed: false, align: 'left',
119 119
 			sortable: false, editable: true, edittype: 'text'
120 120
 		},
121 121
 		{
@@ -184,7 +184,6 @@ let pageObj = {
184 184
 	},
185 185
 	callback: {
186 186
 		create: function(rowDataPop) {
187
-			console.log(rowDataPop);
188 187
 			if(rowDataPop) {
189 188
 				$('#ITP_FORM_RTNMNG01010_DETAIL_RTN_WHS_NM').val(rowDataPop.whsNm);
190 189
 				$('#ITP_FORM_RTNMNG01010_DETAIL_RTN_WHS_ID').val(rowDataPop.whsId);
@@ -230,7 +229,6 @@ let pageObj = {
230 229
 		},
231 230
 		grid: function() {
232 231
 			itp_fn_jqgrid_resize(RTNMNG01010_DETAIL_GRID_ID, RTNMNG01010_DETAIL_GRID_LIST, 'lg');
233
-			//listObj.empty.init();
234 232
 			itp_fn_fire_window_resize();
235 233
 		},
236 234
 		ready: function() {
@@ -280,7 +278,6 @@ let pageObj = {
280 278
 			addRow: function() {
281 279
 				// 팝업
282 280
 				var popFn = function(rowDataPop) {
283
-					console.log(rowDataPop);
284 281
 					// 기존등록 데이터
285 282
 					var exists = '';
286 283
 					const rowData = $(RTNMNG01010_DETAIL_GRID_ID).getRowData();
@@ -323,7 +320,6 @@ let pageObj = {
323 320
 			itp_fn_grid_make_local(option);
324 321
 		},
325 322
 		clearData: function() {
326
-			// console.log(this.gridId);
327 323
 			$(RTNMNG01010_DETAIL_GRID_ID).jqGrid('clearGridData', true);
328 324
 			$(RTNMNG01010_DETAIL_GRID_LIST).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
329 325
 			$(RTNMNG01010_DETAIL_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
@@ -461,7 +457,6 @@ let createObj = {
461 457
 						param.gridInsertData = gridInsertData;
462 458
 						param.gridUpdateData = gridUpdateData;
463 459
 						param.gridDeleteData = gridDeleteData;
464
-						console.log(JSON.stringify(param));
465 460
 						
466 461
 						var searhFn = function() {
467 462
 							createObj.newinit();

+ 4 - 15
src/main/webapp/js/app/rtnmng/ITP_RTNMNG02010.js

@@ -61,7 +61,7 @@ const gridColModel = {
61 61
 		{
62 62
 			index: 'BRAND_NM', name: 'brandNm',
63 63
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
64
-			width: '10', fixed: false, align: 'center',
64
+			width: '10', fixed: false, align: 'left',
65 65
 			sortable: false, hidden: false
66 66
 		},
67 67
 		{
@@ -79,7 +79,7 @@ const gridColModel = {
79 79
 		{
80 80
 			index: 'RTN_REQ_ST_CD', name: 'rtnReqStCd',
81 81
 			label: '상태', 
82
-			width: '0', fixed: false, align: 'center',
82
+			width: '0', fixed: false, align: 'left',
83 83
 			sortable: false, hidden: true
84 84
 		},
85 85
 		{
@@ -110,7 +110,7 @@ const gridColModel = {
110 110
 		{
111 111
 			index: 'RTN_REQ_ITEM_QTY', name: 'rtnReqItemQty',
112 112
 			label: '요청품목수', 
113
-			width: '9', fixed: false, align: 'right',
113
+			width: '8', fixed: false, align: 'right',
114 114
 			sortable: false, hidden: false, 
115 115
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
116 116
 		},
@@ -123,7 +123,7 @@ const gridColModel = {
123 123
 		{
124 124
 			index: 'RTN_REQ_MGR_NM', name: 'rtnReqMgrNm',
125 125
 			label: '반품요청자',
126
-			width: '10', fixed: false, align: 'left',
126
+			width: '9', fixed: false, align: 'left',
127 127
 			sortable: false, hidden: false
128 128
 		},
129 129
 		{
@@ -347,14 +347,12 @@ let pageObj = {
347 347
 	},
348 348
 	callback: {
349 349
 		create: function(rowDataPop) {
350
-			console.log(rowDataPop);
351 350
 			if(rowDataPop) {
352 351
 				$('#ITP_FORM_RTNMNG02010_SEARCH_SWHS_NM').val(rowDataPop.whsNm);
353 352
 				$('#ITP_FORM_RTNMNG02010_SEARCH_SWHS_ID').val(rowDataPop.whsId);
354 353
 			}			
355 354
 		},
356 355
 		modify: function(rowDataPop) {
357
-			console.log(rowDataPop);
358 356
 			if(rowDataPop) {
359 357
 				$('#ITP_FORM_RTNMNG02010_DETAIL_WHS_NM').val(rowDataPop.whsNm);
360 358
 				$('#ITP_FORM_RTNMNG02010_DETAIL_WHS_ID').val(rowDataPop.whsId);
@@ -437,7 +435,6 @@ let pageObj = {
437 435
 	},
438 436
 	grid: {
439 437
 		init: function(mode, gridRows) {
440
-			console.log(mode);
441 438
 			this.gridId = (mode === 'VIEW') ? RTNMNG02010_VIEW_GRID_ID : RTNMNG02010_DETAIL_GRID_ID;
442 439
 			this.gridList = (mode === 'VIEW') ? RTNMNG02010_VIEW_GRID_LIST : RTNMNG02010_DETAIL_GRID_LIST;
443 440
 			this.gridEmpty = (mode === 'VIEW') ? RTNMNG02010_VIEW_GRID_EMPTY : RTNMNG02010_DETAIL_GRID_EMPTY;
@@ -454,7 +451,6 @@ let pageObj = {
454 451
 			addRow: function() {
455 452
 				// 팝업
456 453
 				var popFn = function(rowDataPop) {
457
-					console.log(rowDataPop);
458 454
 					// 기존등록 데이터
459 455
 					var exists = '';
460 456
 					const rowData = $(RTNMNG02010_DETAIL_GRID_ID).getRowData();
@@ -500,11 +496,9 @@ let pageObj = {
500 496
 			itp_fn_grid_make_local(option);
501 497
 		},
502 498
 		recal: function() {
503
-			// console.log("recal call");
504 499
 			if (SCREEN_MODE === 'DETAIL') {
505 500
 				var ids = $(RTNMNG02010_DETAIL_GRID_ID).getDataIDs();
506 501
 				$.each(ids, function(idx, rowId) {
507
-					// console.log("recal start");
508 502
 					var viewCd = jQuery(RTNMNG02010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'viewCd');
509 503
 					var unitAmt = jQuery(RTNMNG02010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'unitAmt');
510 504
 					var rtnQty = jQuery(RTNMNG02010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'rtnQty');
@@ -542,7 +536,6 @@ let listObj = {
542 536
 			let param = $('#ITP_FORM_RTNMNG02010_SEARCH').serializeObject();
543 537
 			param.gridSize = $.jgrid.defaults.rowNum;
544 538
 			param.gridPage = $.jgrid.defaults.page;
545
-			console.log(param);
546 539
 			$(RTNMNG02010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
547 540
 		},
548 541
 		create: function() {
@@ -602,7 +595,6 @@ let listObj = {
602 595
 					}
603 596
 				},
604 597
 				loadComplete: function(data) {
605
-					console.log(data);
606 598
 					itp_fn_grid_load_complete(data, RTNMNG02010_GRID_ID, true, 'number', 'RTNMNG02010', listObj.itp_RTNMNG02010_search, listObj.empty, true, data.gridRecords, true);
607 599
 					var ids = $(RTNMNG02010_GRID_ID).getDataIDs();
608 600
 					$.each(ids, function(idx, rowId) {
@@ -637,7 +629,6 @@ let viewObj = {
637 629
 		fn_ajax_call(API_DETAIL_INFO, param, this.callback, 'GET');
638 630
 	},
639 631
 	callback: function (result) {
640
-		console.log(result);
641 632
 		pageObj.switchScreen('VIEW');
642 633
 		$('#ITP_FORM_RTNMNG02010_VIEW #ITP_FORM_RTNMNG02010_VIEW_BRAND_ID').val(result.brandId);
643 634
 		$('#ITP_FORM_RTNMNG02010_VIEW #ITP_FORM_RTNMNG02010_VIEW_RTN_REQ_UNQ_NO').val(result.rtnReqUnqNo);
@@ -774,7 +765,6 @@ let modifyObj = {
774 765
 							param.gridInsertData = gridInsertData;
775 766
 							param.gridUpdateData = gridUpdateData;
776 767
 							param.gridDeleteData = gridDeleteData;
777
-							// console.log('>>>>>>>>>>>>>> ' + JSON.stringify(param));
778 768
 							var searhFn = function() {
779 769
 								ITP_FORM_RTNMNG02010_DETAIL_IS_WRITING = false;
780 770
 								modifyObj.button.clear();
@@ -802,7 +792,6 @@ let modifyObj = {
802 792
 		fn_ajax_call(API_DETAIL_INFO, param, this.callback, 'GET');
803 793
 	},
804 794
 	callback: function (result) {
805
-		// console.log(result);
806 795
 		pageObj.switchScreen('MODIFY');
807 796
 		
808 797
 		$('#ITP_FORM_RTNMNG02010_DETAIL #ITP_FORM_RTNMNG02010_DETAIL_VIEW_CD').val('U');

+ 12 - 13
src/main/webapp/js/app/rtnmng/ITP_RTNMNG03010.js

@@ -82,21 +82,21 @@ const gridColModel = {
82 82
 			sortable: false, hidden: true
83 83
 		},
84 84
 		{
85
-			index: 'BRAND_NM', name: 'brandNm',
85
+			index: 'BRAND_NM', name: 'bra ndNm',
86 86
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
87
-			width: '10', fixed: false, align: 'center',
87
+			width: '10', fixed: false, align: 'left',
88 88
 			sortable: false, hidden: false
89 89
 		},
90 90
 		{
91 91
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
92 92
 			label: '반품장소', 
93
-			width: '10', fixed: false, align: 'center',
93
+			width: '10', fixed: false, align: 'left',
94 94
 			sortable: false, hidden: false
95 95
 		},
96 96
 		{
97 97
 			index: 'SPPLY_NM', name: 'spplyNm',
98 98
 			label: '공급사명', 
99
-			width: '10', fixed: false, align: 'center',
99
+			width: '10', fixed: false, align: 'left',
100 100
 			sortable: false, hidden: false
101 101
 		},
102 102
 		{
@@ -121,7 +121,7 @@ const gridColModel = {
121 121
 		{
122 122
 			index: 'RTN_DVSN_NM', name: 'rtnDvsnNm',
123 123
 			label: '반품구분', 
124
-			width: '8', fixed: false, align: 'center',
124
+			width: '8', fixed: false, align: 'left',
125 125
 			sortable: false, hidden: false
126 126
 		},
127 127
 		{
@@ -134,19 +134,19 @@ const gridColModel = {
134 134
 		{
135 135
 			index: 'RTN_REQ_DT', name: 'rtnReqDt',
136 136
 			label: '반품요청일', 
137
-			width: '10', fixed: false, align: 'center',
137
+			width: '9', fixed: false, align: 'center',
138 138
 			sortable: false, hidden: false
139 139
 		},
140 140
 		{
141 141
 			index: 'COL_REQ_DT', name: 'colReqDt',
142 142
 			label: '수거요청일', 
143
-			width: '10', fixed: false, align: 'center',
143
+			width: '9', fixed: false, align: 'center',
144 144
 			sortable: false, hidden: false
145 145
 		},		
146 146
 		{
147 147
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
148 148
 			label: '반품사유', 
149
-			width: '8', fixed: false, align: 'left',
149
+			width: '7', fixed: false, align: 'left',
150 150
 			sortable: false, hidden: false
151 151
 		}
152 152
 	],
@@ -196,7 +196,7 @@ const gridColModel = {
196 196
 		{
197 197
 			index: 'UNIT', name: 'unit',
198 198
 			label: ITP_MSG_LOCALE.label.unit, //단위
199
-			width: '7', fixed: false, align: 'center',
199
+			width: '5', fixed: false, align: 'center',
200 200
 			sortable: false, editable: false, edittype: 'text',
201 201
 			hidden: false
202 202
 		},
@@ -219,7 +219,7 @@ const gridColModel = {
219 219
 		{
220 220
 			index: 'RTN_AMT', name: 'rtnAmt',
221 221
 			label: '발주금액', 
222
-			width: '8', fixed: false, align: 'right',
222
+			width: '6', fixed: false, align: 'right',
223 223
 			sortable: false, editable: false, edittype: 'text',
224 224
 			hidden: false,
225 225
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -227,7 +227,7 @@ const gridColModel = {
227 227
 		{
228 228
 			index: 'RTN_DVSN_NM', name: 'rtnDvsnNm',
229 229
 			label: '반품구분', 
230
-			width: '7', fixed: false, align: 'left',
230
+			width: '6', fixed: false, align: 'left',
231 231
 			sortable: false, editable: false, edittype: 'text',
232 232
 			hidden: false
233 233
 		},
@@ -898,6 +898,7 @@ let listObj = {
898 898
 				colModel: gridColModel.list,
899 899
 				param: param,
900 900
 				url: DOMAIN + API_DETAIL_GRID_LIST,
901
+				rownumbers: false,
901 902
 				pager: RTNMNG03010_GRID_PAGER,
902 903
 				loadComplete: function(data) {
903 904
 					itp_fn_grid_load_complete(data, RTNMNG03010_GRID_ID, true, 'number', 'RTNMNG03010', listObj.itp_RTNMNG03010_search, listObj.empty, true, data.gridRecords, true);
@@ -970,7 +971,6 @@ let modifyObj = {
970 971
 				
971 972
 					var dataCnt = 0;
972 973
 					$.each(rowData1, function(key, value) {
973
-						console.log(value.viewCd);
974 974
 						if (value.viewCd != 'D') {
975 975
 							dataCnt = dataCnt + 1;
976 976
 						} 
@@ -1034,7 +1034,6 @@ let modifyObj = {
1034 1034
 							pageObj.grid.clearData();
1035 1035
 							modifyObj.button.cancel();
1036 1036
 						}
1037
-						console.log(JSON.stringify(param));
1038 1037
 						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
1039 1038
 					}
1040 1039
 				};

+ 1 - 6
src/main/webapp/js/app/rtnmng/ITP_RTNMNG04010.js

@@ -124,7 +124,7 @@ const gridColModel = {
124 124
 		{
125 125
 			index: 'RODR_DTL_ST_NM', name: 'rodrDtlStNm',
126 126
 			label: '발주상세상태', 
127
-			width: '5', fixed: false, align: 'center',
127
+			width: '5', fixed: false, align: 'left',
128 128
 			sortable: false, hidden: false
129 129
 		},
130 130
 		{
@@ -276,7 +276,6 @@ let listObj = {
276 276
 			param.gridSize = $.jgrid.defaults.rowNum;
277 277
             param.gridPage = $.jgrid.defaults.page;
278 278
             param.sidx = '0';
279
-            console.log(JSON.stringify(param));
280 279
             $(RTNMNG04010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
281 280
         }
282 281
 	},
@@ -317,7 +316,6 @@ let listObj = {
317 316
             let param = $('#ITP_FORM_RTNMNG04010_SEARCH').serializeObject();
318 317
             param.gridSize = $.jgrid.defaults.rowNum;
319 318
             param.sidx = '0';
320
-            console.log(JSON.stringify(param));
321 319
             var option = {
322 320
             	gridId: RTNMNG04010_GRID_ID,
323 321
             	colModel: gridColModel.list,
@@ -336,7 +334,6 @@ let listObj = {
336 334
                     }
337 335
 				},
338 336
 				loadComplete: function(data) {
339
-					console.log(data);
340 337
                     itp_fn_grid_load_complete(data, RTNMNG04010_GRID_ID, true, 'number', 'RTNMNG04010', listObj.itp_RTNMNG04010_search, listObj.empty, true, data.gridRecords, true);
341 338
                     var ids = $(RTNMNG04010_GRID_ID).getDataIDs();
342 339
                     $.each(ids, function(idx, rowId) {
@@ -474,7 +471,6 @@ let modifyObj = {
474 471
 		fn_ajax_call(API_RTNMNG_RTN_INFO_RTNODR, param, this.callback, 'GET');
475 472
 	},
476 473
 	callback: function(result) {
477
-		// console.log('>>>> ' + JSON.stringify(result));
478 474
 		
479 475
 		// 그리드 전화번호 '-' 함수
480 476
 		let telNo = '';
@@ -550,7 +546,6 @@ let modifyObj = {
550 546
 					}
551 547
 				},
552 548
 				loadComplete: function(data) {
553
-					console.log(data);
554 549
 					let datas = data.rows;
555 550
 					for(let i = 0; i < datas.length; i++) {
556 551
 						let podrDtlStCd = datas[i].podrDtlStCd;

+ 9 - 28
src/main/webapp/js/app/rtnmng/ITP_RTNMNG05010.js

@@ -85,7 +85,7 @@ const gridColModel = {
85 85
 		{
86 86
 			index: 'ITEM_NM', name: 'itemNm',
87 87
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
88
-			width: '10', fixed: false, align: 'left',
88
+			width: '7', fixed: false, align: 'left',
89 89
 			sortable: false, hidden: false
90 90
 		},
91 91
 		{
@@ -99,7 +99,7 @@ const gridColModel = {
99 99
 		{
100 100
 			index: 'COL_REQ_QTY', name: 'colReqQty',
101 101
 			label: '수거요청수량', 
102
-			width: '8', fixed: false, align: 'right',
102
+			width: '9', fixed: false, align: 'right',
103 103
 			sortable: false, hidden: false,
104 104
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
105 105
 		},
@@ -113,7 +113,7 @@ const gridColModel = {
113 113
 		{
114 114
 			index: 'COL_AMT', name: 'colAmt',
115 115
 			label: '수거금액', 
116
-			width: '10', fixed: false, align: 'right',
116
+			width: '9', fixed: false, align: 'right',
117 117
 			sortable: false, hidden: false, 
118 118
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
119 119
 		},
@@ -216,14 +216,12 @@ let listObj = {
216 216
 	itp_RTNMNG05010_search: false,
217 217
 	button: {
218 218
 		search: function() {
219
-			// console.log("search event");
220 219
 			listObj.itp_RTNMNG05010_search = true;
221 220
 			let param = $('#ITP_FORM_RTNMNG05010_SEARCH').serializeObject();
222 221
 			param.gridSize = $.jgrid.defaults.rowNum;
223 222
 			param.gridPage = $.jgrid.defaults.page;
224 223
 			param.sbrandId = fn_make_user_info.get('brandId');
225 224
 			param.sstoreId = fn_make_user_info.get('storeId');
226
-			
227 225
 			// if (param.swhsId == "") {
228 226
 			if ($('#ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_NM').val() == "") {
229 227
 				itp_fn_modal_alert("수거창고를 지정해주세요!");
@@ -292,7 +290,6 @@ let listObj = {
292 290
 					param.rtnWhsId = srtnWhsId;
293 291
 					param.brandId = fn_make_user_info.get('brandId');
294 292
 					param.storeId = storeId; 
295
-					// param.dlvCnfmDocFileNo = "";
296 293
 					param.gridInsertData = gridInsertData;
297 294
 					console.log(JSON.stringify(param));
298 295
 					var searhFn = function () {
@@ -329,11 +326,11 @@ let listObj = {
329 326
 			$('#ITP_FORM_RTNMNG05010_SEARCH_SWHS_ID').val('');
330 327
 		});
331 328
 		
332
-		// 매장/창고 조회 버튼 클릭
329
+		// 수거창고 조회 버튼 클릭
333 330
 		$('#ITP_BTN_RTNMNG05010_SEARCH_POP_SRTN_WHS_NM').on('click', function() {
334 331
 			_this.popup('rwhs');
335 332
 		});
336
-		// 매장/창고 텍스트 삭제 버튼 클릭
333
+		// 수거창고 텍스트 삭제 버튼 클릭
337 334
 		$('#ITP_BTN_RTNMNG05010_SEARCH_DEL_SRTN_WHS_NM').on('click', function() {
338 335
 			$('#ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_NM').val('');
339 336
 			$('#ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_ID').val('');
@@ -358,7 +355,7 @@ let listObj = {
358 355
 			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
359 356
 		} else if(arg === 'rwhs'){
360 357
 			var popFn = this.callback.rwhs;
361
-			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:"W02"};
358
+			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
362 359
 			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
363 360
 		}
364 361
 		
@@ -386,8 +383,6 @@ let listObj = {
386 383
 			$('button').each(function() {
387 384
 				var id = $(this).attr('id');
388 385
 				$(this).on('click', function() {
389
-					// console.log("button");
390
-					// console.log(id);
391 386
 					switch (id) {
392 387
 						case 'ITP_BTN_RTNMNG05010_SRH'		: listObj.button.search(); 	break;	// 조회 버튼 클릭
393 388
 						case 'ITP_BTN_RTNMNG05010_RTN_PROC'	: listObj.button.save(); 	break;	// 입고처리 버튼
@@ -409,32 +404,19 @@ let listObj = {
409 404
 	},
410 405
 	empty: {
411 406
 		init: function() {
412
-			var _this = this;
413
-			this.push();
414
-			$(RTNMNG05010_GRID_EMPTY).on('click', function() {
415
-				_this.back();
416
-				_this.itp_RTNMNG05010_param.gridSize = $.jgrid.defaults.rowNum;
417
-				$(RTNMNG05010_GRID_ID).setGridParam({ 'postData': JSON.stringify(_this.itp_RTNMNG05010_param) }).trigger('reloadGrid');
418
-			});
407
+			
419 408
 		},
420 409
 		itp_RTNMNG05010_param: {},
421 410
 		push: function() {
422
-			let param = $('#ITP_FORM_RTNMNG05010_SEARCH').serializeObject();
423
-			listObj.itp_RTNMNG05010_param = param;
411
+			
424 412
 		},
425 413
 		back: function() {
426
-			$('#ITP_FORM_RTNMNG05010_SEARCH_FROM_DT').val(this.itp_RTNMNG05010_param.fromDt);
427
-			$('#ITP_FORM_RTNMNG05010_SEARCH_TO_DT').val(this.itp_RTNMNG05010_param.toDt);
428
-			$('#ITP_FORM_RTNMNG05010_SEARCH_DLV_STTMT_UNQ_NO').val(this.itp_RTNMNG05010_param.sDlvSttmtUnqNo);
429
-			$('#ITP_FORM_RTNMNG05010_SEARCH_SPPLY_ID').val(this.itp_RTNMNG05010_param.sSpplyId);
430
-			$('#ITP_FORM_RTNMNG05010_SEARCH_WHS_ID').val(this.itp_RTNMNG05010_param.sWhsId);
431
-			$('#ITP_FORM_RTNMNG05010_SEARCH_ITEM_NM').val(this.itp_RTNMNG05010_param.sItemNm);
414
+			
432 415
 		}
433 416
 	},
434 417
 	grid: {
435 418
 		init: function() {
436 419
 			// 데이터 없을때
437
-			listObj.empty.push();
438 420
 			itp_fn_jqgrid_resize(RTNMNG05010_GRID_ID, RTNMNG05010_GRID_LIST, 'lg');
439 421
 			itp_fn_fire_window_resize();
440 422
 			this.search();
@@ -452,7 +434,6 @@ let listObj = {
452 434
 			param.sstoreId = fn_make_user_info.get('storeId');
453 435
 			// param.swhsId = "Order";
454 436
 			var option = {
455
-				// multiselect: true,
456 437
 				autowidth: true,
457 438
 				gridId: RTNMNG05010_GRID_ID,
458 439
 				colModel: gridColModel.list,

+ 11 - 21
src/main/webapp/js/app/rtnmng/ITP_RTNMNG06010.js

@@ -26,7 +26,7 @@ const gridColModel = {
26 26
 		{
27 27
 			index: 'BRAND_NM', name: 'brandNm',
28 28
 			label: '브랜드', 
29
-			width: '10', fixed: false, align: 'center',
29
+			width: '10', fixed: false, align: 'left',
30 30
 			sortable: false, hidden: false
31 31
 		},
32 32
 		{
@@ -50,41 +50,41 @@ const gridColModel = {
50 50
 		{
51 51
 			index: 'ITEM_NM', name: 'itemNm',
52 52
 			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
53
-			width: '8', fixed: false, align: 'center',
53
+			width: '8', fixed: false, align: 'left',
54 54
 			sortable: false, hidden: false
55 55
 		},
56 56
 		{
57 57
 			index: 'RODR_QTY', name: 'rodrQty',
58 58
 			label: '반품발주수량', 
59
-			width: '5', fixed: false, align: 'center',
59
+			width: '5', fixed: false, align: 'right',
60 60
 			sortable: false, hidden: false, 
61 61
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
62 62
 		},
63 63
 		{
64 64
 			index: 'COL_REQ_QTY', name: 'colReqQty',
65 65
 			label: '수거요청수량', 
66
-			width: '5', fixed: false, align: 'center',
66
+			width: '5', fixed: false, align: 'right',
67 67
 			sortable: false, hidden: false, 
68 68
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
69 69
 		},
70 70
 		{
71 71
 			index: 'COL_QTY', name: 'colQty',
72 72
 			label: '수거수량', 
73
-			width: '5', fixed: false, align: 'center',
73
+			width: '5', fixed: false, align: 'right',
74 74
 			sortable: false, hidden: false, 
75 75
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
76 76
 		},
77 77
 		{
78 78
 			index: 'COL_AMT', name: 'colAmt',
79 79
 			label: '수거금액', 
80
-			width: '8', fixed: false, align: 'center',
80
+			width: '8', fixed: false, align: 'right',
81 81
 			sortable: false, hidden: false,
82 82
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
83 83
 		}, 
84 84
 		{
85 85
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
86 86
 			label: '수거창고', 
87
-			width: '10', fixed: false, align: 'center',
87
+			width: '10', fixed: false, align: 'left',
88 88
 			sortable: false, hidden: false
89 89
 		},
90 90
 		{
@@ -96,7 +96,7 @@ const gridColModel = {
96 96
 		{
97 97
 			index: 'PICK_MGR_NM', name: 'pickMgrNm',
98 98
 			label: '수거담당자명', 
99
-			width: '8', fixed: false, align: 'center',
99
+			width: '8', fixed: false, align: 'left',
100 100
 			sortable: false, hidden: false
101 101
 		},
102 102
 		{
@@ -211,28 +211,18 @@ let listObj = {
211 211
 	},
212 212
 	empty: {
213 213
 		init: function() {
214
-			var _this = this;
215
-            this.push();
216
-            $(RTNMNG06010_GRID_EMPTY).on('click', function() {
217
-                _this.back();
218
-                listObj.itp_RTNMNG06010_param.gridSize = $.jgrid.defaults.rowNum;
219
-                $(RTNMNG06010_GRID_ID).setGridParam({'postData': JSON.stringify(listObj.itp_RTNMNG06010_param)}).trigger('reloadGrid');
220
-            });
214
+
221 215
 		},
222 216
 		push: function() {
223
-            let param = $('#ITP_FORM_RTNMNG06010_SEARCH').serializeObject();
224
-            listObj.itp_RTNMNG06010_param = param;
217
+            
225 218
         },
226 219
         back: function() {
227
-            $('#ITP_FORM_RTNMNG06010_SERVICE_BRAND_TYPE').val(listObj.itp_RTNMNG06010_param.brandType);
228
-            $('#ITP_FORM_RTNMNG06010_SERVICE_ST_CD').val(listObj.itp_RTNMNG06010_param.stCd);
229
-            $('#ITP_FORM_RTNMNG06010_SEARCH_BRAND_NM').val(listObj.itp_RTNMNG06010_param.brandNm);
220
+           
230 221
         }
231 222
 	},
232 223
 	grid: {
233 224
 		init: function() {
234 225
 			// 데이터 없을때
235
-            listObj.empty.push();
236 226
             this.search();
237 227
 		},
238 228
 		colModel: gridColModel.list,

+ 36 - 1
src/main/webapp/main.html

@@ -145,7 +145,42 @@
145 145
 						<h2 class="hidden">메뉴안내</h2>
146 146
 						<article class="itp_detail">
147 147
 							<div id="ITP_AJAX_SUMMARY_DETAIL_CONTAINER" class="itp_det_in">
148
-								<div id="ITP_MAIN_HEADER">
148
+								<!-- 여기는 공급사 매장 로그인 시 나오는 구간 -->
149
+								<div id="ITP_MAIN_HEADER" style="display: inline-block;">
150
+									<div class="col_4">
151
+										<div class="itp_header_label ">
152
+										구매요청 
153
+										</div>
154
+										<div class="itp_header_result ">
155
+										10건
156
+										</div>
157
+									</div>
158
+									<div class="col_4">
159
+										<div class="itp_header_label ">
160
+										발주진행
161
+										</div>
162
+										<div class="itp_header_result ">
163
+										10건
164
+										</div>
165
+									</div>
166
+									<div class="col_4">
167
+										<div class="itp_header_label ">
168
+										발주완료
169
+										</div>
170
+										<div class="itp_header_result ">
171
+										10건
172
+										</div>
173
+									</div>
174
+									<div class="col_4">
175
+										<div class="itp_header_label ">
176
+										구매가능금액
177
+										</div>
178
+										<div class="itp_header_result ">
179
+										1,000,000원
180
+										</div>
181
+									</div>
182
+								</div>
183
+								<div id="ITP_MAIN_HEADER" style="display: none;">
149 184
 									<div class="col_3">
150 185
 										<div class="itp_header_label ">
151 186
 										구매요청 건수