whakdo963 před 2 roky
rodič
revize
9cbcbdb913

+ 3 - 1
src/main/webapp/app/pomng/POMNG04010.html

@@ -19,7 +19,9 @@
19 19
                                 <input type="hidden" id="ITP_FORM_POMNG04010_SEARCH_BRAND_ID" name="sbrandId" value="">
20 20
 									<div class="form-group">
21 21
 										<div class="col-xs-2 itp_ip itp_noMar">
22
-                                            <label>발주일자 *</label>
22
+                                            <select id="ITP_FORM_POMNG04010_SERVICE_PODR_DT" class="form-control itp_input" name="servicePodrDt">
23
+												<option value="A">발주일자*</option>											
24
+											</select>
23 25
 										</div>										
24 26
 										<div class="col-xs-3 itp_ip itp_noMar">
25 27
 											<div class="input-daterange input-group date">

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

@@ -17,7 +17,9 @@
17 17
 								<input type="hidden" id="ITP_FORM_POMNG07010_SEARCH_STORE_ID" name="sstoreId" value="">
18 18
 									<div class="form-group">
19 19
 										<div class="col-xs-2 itp_ip itp_noMar">
20
-											<label>일고일 *</label>
20
+											<select id="ITP_FORM_POMNG07010_SERVICE_DT" class="form-control itp_input" name="serviceDt">
21
+												<option value="A">일고일*</option>											
22
+											</select>
21 23
 										</div>											
22 24
 										<div class="col-xs-3 itp_ip itp_noMar">
23 25
 											<div class="input-daterange input-group date">
@@ -54,7 +56,7 @@
54 56
 											</div>
55 57
 										</div>
56 58
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:10%;">
57
-											<button type="button" id="ITP_BTN_POMNG07010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
59
+											<button type="button" id="ITP_BTN_POMNG07010_SEARCH_WHS_ID" class="btn btn-success	 btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
58 60
 										</div>
59 61
 										<div class="col-xs-4 itp_ip itp_noMar">
60 62
 											<input type="text" id="ITP_FORM_POMNG07010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />

+ 0 - 0
src/main/webapp/app/popup/biz/BIZPOP_DLV_LMT_PAY.html


+ 40 - 0
src/main/webapp/app/popup/biz/BIZPOP_DLV_PCH_OK.html

@@ -0,0 +1,40 @@
1
+<div id="ITP_BIZPOP_DLV_PCH_OK" class="modal itp_modal">
2
+	<div class="modal-dialog" style="width:350px;">
3
+		<div class="modal-content">
4
+			<form id="ITP_FORM_BIZPOP_DLV_PCH_OK">
5
+				<input type="hidden" id="ITP_FORM_BIZPOP_DLV_PCH_OK_BRAND_ID" name="sbrandId" value="">
6
+				<div class="modal-body">
7
+					<div class="itp_form fix">
8
+						<div class="col-xs-12 itp_form_inline">
9
+							<div class="form-horizontal fix">
10
+								<div style="margin:25px 0;">
11
+									<div class="itp_div_label">
12
+										<label>납품요청일</label>
13
+										<span>:</span>
14
+										<div class="fn col_a">2022.09.30</div>
15
+									</div>
16
+									<div class="itp_div_label">
17
+										<label>품목수</label>
18
+										<span>:</span>
19
+										<div class="fn col_a">2개</div>
20
+									</div>
21
+									<div class="itp_div_label">
22
+										<label>구매금액</label>
23
+										<span>:</span>
24
+										<div class="fn col_a">424,000원</div>
25
+									</div>
26
+								</div>
27
+								<label style="text-align:center; width:100%;">구매요청 하시겠습니까?</label>
28
+							</div>
29
+						</div>
30
+					</div>
31
+				</div>
32
+				<div class="modal-bottom">
33
+					<button type="button" class="col_3" data-dismiss="modal" aria-hidden="true">취소</button>
34
+					<button type="button" class="col_7 btn-primary" data-dismiss="modal" aria-hidden="true">확인</button>
35
+				</div>
36
+			</form>
37
+		</div>
38
+	</div>
39
+	<div id="ITP_POPUP_JS"></div>
40
+</div>

+ 41 - 0
src/main/webapp/app/popup/biz/BIZPOP_DLV_PPAY.html

@@ -0,0 +1,41 @@
1
+<div id="ITP_BIZPOP_DLV_PPAY" class="modal itp_modal">
2
+	<div class="modal-dialog" style="width:350px;">
3
+		<div class="modal-content">
4
+			<form id="ITP_FORM_BIZPOP_DLV_PPAY">
5
+				<input type="hidden" id="ITP_FORM_BIZPOP_DLV_PPAY_BRAND_ID" name="sbrandId" value="">
6
+				<div class="modal-body">
7
+					<div class="itp_form fix">
8
+						<div class="col-xs-12 itp_form_inline">
9
+							<div class="form-horizontal fix">
10
+								<div style="margin:25px 0;">
11
+									<div class="itp_div_label">
12
+										<label>납품요청일</label>
13
+										<span>:</span>
14
+										<div class="fn col_a">2022.09.30</div>
15
+									</div>
16
+									<div class="itp_div_label">
17
+										<label>품목수</label>
18
+										<span>:</span>
19
+										<div class="fn col_a">2개</div>
20
+									</div>
21
+									<div class="itp_div_label">
22
+										<label>구매금액</label>
23
+										<span>:</span>
24
+										<div class="fn col_a">424,000원</div>
25
+									</div>
26
+								</div>
27
+								<label style="text-align:left; width:100%;">선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다.</label>
28
+								<label style="text-align:center; width:100%; margin-top:10px;">결재를 하시겠습니까?</label>
29
+							</div>
30
+						</div>
31
+					</div>
32
+				</div>
33
+				<div class="modal-bottom">
34
+					<button type="button" class="col_3" data-dismiss="modal" aria-hidden="true">취소</button>
35
+					<button type="button" class="col_7 btn-primary" data-dismiss="modal" aria-hidden="true">확인</button>
36
+				</div>
37
+			</form>
38
+		</div>
39
+	</div>
40
+	<div id="ITP_POPUP_JS"></div>
41
+</div>

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

@@ -610,7 +610,11 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
610 610
 #ITP_ASIDE .itp_modal .itp_form .itp_ipGrp_right .itp_input {border-top-left-radius:0; border-bottom-left-radius:0;}
611 611
 #ITP_ASIDE .itp_modal .itp_form .itp_err_msg {display: inline-block; font-size: 12px; color: #a94442; margin-left: 1px;}  /* 송호성 추가(2021.07.11) */
612 612
 #ITP_ASIDE .itp_modal .itp_form_inline {margin-bottom:10px; padding:0;}
613
-#ITP_ASIDE .itp_modal .itp_form_inline .form-horizontal {margin-bottom:10px;}
613
+#ITP_ASIDE .itp_modal .itp_form_inline .form-horizontal {margin-bottom:10px; font-size:18px;}
614
+#ITP_ASIDE .itp_modal .itp_form_inline .form-horizontal .itp_div_label {display:inline-flex; margin-left:20px;}
615
+#ITP_ASIDE .itp_modal .itp_form_inline .form-horizontal .itp_div_label label {min-width:90px;}
616
+#ITP_ASIDE .itp_modal .itp_form_inline .form-horizontal .itp_div_label span{margin:0 15px;}
617
+#ITP_ASIDE .itp_modal .itp_form_inline .form-horizontal .itp_div_label div{width:130px; text-align:right;}
614 618
 #ITP_ASIDE .itp_modal .itp_form_inline .itp_ip {margin-right:20px;}
615 619
 #ITP_ASIDE .itp_modal .itp_form_inline .itp_ip.itp_long {width:98%; margin-right:0;}
616 620
 #ITP_ASIDE .itp_modal .itp_form_inline .itp_ipGrp_left {margin-right:0;}
@@ -694,7 +698,9 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
694 698
 #ITP_ASIDE .itp_modal .itp_preview_bottom {margin-top: 5px; margin-bottom: 5px; text-align: right;}
695 699
 #ITP_ASIDE .itp_modal .itp_mainform {width: 100%; margin: 10px 0 0 0; padding: 0; border: solid 0.5px #bfbfbf; height: 400px; overflow-y: scroll;}
696 700
 #ITP_ASIDE .itp_modal .itp_lctnview {width: 100%; margin: 10px 0 0 0; padding: 0; border: solid 0.5px #bfbfbf; height: 100%; }
697
-
701
+#ITP_ASIDE .itp_modal .modal-bottom {border-top:1px solid #aaa; height:50px; display:flex;}
702
+#ITP_ASIDE .itp_modal .modal-bottom .col_3 {width:40%; hegith:50px;}
703
+#ITP_ASIDE .itp_modal .modal-bottom .col_7 {width:60%; height:50px;}
698 704
 #ITP_NOT_FOUND {width:100%; height:100%;}
699 705
 #ITP_NOT_FOUND .itp_head {margin-bottom:8px; letter-spacing:-1px;}
700 706
 #ITP_NOT_FOUND .itp_bar {margin:0; padding:0; float:left; margin:0 15px 0 15px; font-size:22px;}

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

@@ -1040,4 +1040,4 @@ td.menu_text {
1040 1040
 .ui-jqgrid .jqgrid-rownum {background-color: transparent !important;}
1041 1041
 .table>tbody>tr.active .jqgrid-rownum {background:#e8e8e8 !important; z-index:1}
1042 1042
 .table>tbody>tr.success .jqgrid-rownum {background:#E3FEE4 !important;}
1043
-.input-color {background:#000;}
1043
+.input_color {background:#F0E9BE; color:000;}

+ 0 - 1
src/main/webapp/js/app/pomng/ITP_POMNG01010.js

@@ -137,7 +137,6 @@ let pageObj = {
137 137
 		
138 138
 		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'),whsDvsn: whsDvsn};
139 139
 		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
140
-		
141 140
 	},
142 141
 	callback: {
143 142
 		create: function(rowDataPop) {

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

@@ -94,7 +94,7 @@ const gridColModel = {
94 94
 			width: '10', fixed: false, align: 'right',
95 95
 			sortable: true, editable: true, edittype: 'text',
96 96
 			editrules: { required: false, number: true },
97
-			classes: '.input_color',
97
+			classes: 'input_color',
98 98
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
99 99
 		},
100 100
 		{

+ 0 - 0
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DLV_LMT_PAY.js


+ 146 - 0
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DLV_PCH_OK.js

@@ -0,0 +1,146 @@
1
+require(['config'], function() {
2
+	require([
3
+		'jquery'
4
+	], function($) {
5
+
6
+	});
7
+});
8
+
9
+let API_POP_GRID_LIST = '/api/whs/mng/pop-whs-search';
10
+
11
+function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
12
+	console.log(args);
13
+	let itp_BIZPOP_WHS_LOCATION_param = {};
14
+	let itp_BIZPOP_WHS_LOCATION_search = false;
15
+
16
+	const THIS_FORM_ID = '#ITP_FORM_BIZPOP_WHS_LOCATION';
17
+	const THIS_GIRD_ID = '#ITP_BIZPOP_WHS_LOCATION_jqGrid';
18
+	const THIS_GIRD_PAGER = '#ITP_BIZPOP_WHS_LOCATION_jqGridPager';
19
+
20
+	$('#ITP_FORM_BIZPOP_WHS_LOCATION_BRAND_ID').val(fn_make_user_info.get('brandId'));
21
+	$('#ITP_FORM_BIZPOP_WHS_LOCATION_STORE_ID').val(fn_make_user_info.get('storeId'));
22
+	$('#ITP_FORM_BIZPOP_WHS_LOCATION_WHS_DVSN').val(args.whsDvsn);
23
+
24
+	
25
+	$('#ITP_BIZPOP_WHS_LOCATION').one('shown.bs.modal', function(e) {
26
+		itp_fn_jqgrid_resize(THIS_GIRD_ID, '#ITP_BIZPOP_WHS_LOCATION_jqGrid_list', '');
27
+		itp_fn_fire_window_resize();
28
+	}).one('hidden.bs.modal', function(e) {
29
+		$('#ITP_BIZPOP_WHS_LOCATION').remove();
30
+	}).modal('show');
31
+
32
+	$('#ITP_BIZPOP_WHS_LOCATION_BTN_SEARCH').on('click', function() {
33
+		itp_BIZPOP_WHS_LOCATION_search = true;
34
+		let param = $(THIS_FORM_ID).serializeObject();
35
+		param.gridSize = 10;
36
+		param.gridPage = $.jgrid.defaults.page;
37
+		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
38
+	});
39
+	
40
+	$('#ITP_BIZPOP_WHS_LOCATION_BTN_SELECT').on('click', function() {		
41
+		
42
+		const rowKey = $(THIS_GIRD_ID).getGridParam('selrow');
43
+	    if (!rowKey) {
44
+	    	return;
45
+	    }
46
+	
47
+		const selRow = $(THIS_GIRD_ID).getRowData(rowKey);
48
+		parentPopFn(selRow);
49
+		
50
+	
51
+		$('#ITP_BIZPOP_WHS_LOCATION').modal('hide'); // 팝업닫기
52
+	});
53
+
54
+	$('#ITP_BIZPOP_WHS_LOCATION_jqGridEmpty').on('click', function() {
55
+		itp_fn_BIZPOP_WHS_LOCATION_empty.back();
56
+		itp_BIZPOP_WHS_LOCATION_param.gridSize = 10;
57
+		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(itp_BIZPOP_WHS_LOCATION_param)}).trigger('reloadGrid');
58
+	});
59
+
60
+	var itp_fn_BIZPOP_WHS_LOCATION_empty = {
61
+		push: function() {
62
+			let param = $(THIS_FORM_ID).serializeObject();
63
+			itp_BIZPOP_WHS_LOCATION_param = param;
64
+		},
65
+		back: function() {
66
+			$(THIS_FORM_ID + '_BRAND_ID').val(itp_BIZPOP_WHS_LOCATION_param.sbrandId);
67
+			$(THIS_FORM_ID + '_STROE_ID').val(itp_BIZPOP_WHS_LOCATION_param.sstoreId);
68
+		}
69
+	};
70
+
71
+	itp_fn_BIZPOP_WHS_LOCATION_empty.push();
72
+	let param = $('#ITP_FORM_BIZPOP_WHS_LOCATION').serializeObject();
73
+	param.gridSize = 10;
74
+	console.log(JSON.stringify(param));
75
+
76
+	$(THIS_GIRD_ID).jqGrid({
77
+		colModel: [
78
+			{
79
+				index: 'BRAND_ID', name: 'brandId',
80
+				label: '브랜드아이디', //
81
+				width: '10', fixed: false, align: 'center',
82
+				sortable: false, hidden: true
83
+			},
84
+			{
85
+				index: 'BRAND_NM', name: 'brandNm',
86
+				label: '브랜드명', //
87
+				width: '12', fixed: false, align: 'left',
88
+				sortable: false, hidden: false
89
+			},
90
+			{
91
+				index: 'WHS_ID', name: 'whsId',
92
+				label: '창고아이디', //
93
+				width: '6', fixed: false, align: 'center',
94
+				sortable: false, hidden: true
95
+			},
96
+			{
97
+				index: 'WHS_NM', name: 'whsNm',
98
+				label: '창고명', //
99
+				width: '6', fixed: false, align: 'right',
100
+				sortable: false, hidden: false
101
+			},
102
+			{
103
+				index: 'LOCATION', name: 'location',
104
+				label: 'LOCATION', //
105
+				width: '6', fixed: false, align: 'center',
106
+				sortable: false, hidden: true
107
+			},
108
+			{
109
+				index: 'LOCATION_NM', name: 'locationNm',
110
+				label: 'LOCATION명', //
111
+				width: '6', fixed: false, align: 'center',
112
+				sortable: false, hidden: false
113
+			},
114
+			{
115
+				index: 'STCK_DVSN', name: 'stckDvsn',
116
+				label: '창고구분', //
117
+				width: '10', fixed: false, align: 'center',
118
+				sortable: false, hidden: true
119
+			},
120
+			{
121
+				index: 'STCK_DVSN_NM', name: 'stckDvsnNm',
122
+				label: '창고구분명', //
123
+				width: '10', fixed: false, align: 'center',
124
+				sortable: false, hidden: false
125
+			}
126
+		],
127
+		loadBeforeSend: function(jqXHR) {
128
+		    jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
129
+		},
130
+		postData: JSON.stringify(param),
131
+		url: DOMAIN + API_POP_GRID_LIST,
132
+		pager: THIS_GIRD_PAGER,
133
+		multiselect: false,
134
+		rownumbers: false,
135
+		loadComplete: function(data) {
136
+			console.log(data);
137
+			itp_fn_grid_load_complete(data, THIS_GIRD_ID, true, undefined, 'BIZPOP_WHS_LOCATION', itp_BIZPOP_WHS_LOCATION_search, itp_fn_BIZPOP_WHS_LOCATION_empty, true, data.gridRecords, false);
138
+	    },
139
+	    loadError: function(jqXHR, textStatus, errorThrown) {
140
+	    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
141
+	    },
142
+	    onPaging: function(action) {
143
+	    	itp_fn_grid_paging(THIS_GIRD_ID, action, param);
144
+	    }
145
+	}).navGrid(THIS_GIRD_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
146
+};

+ 0 - 0
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DLV_PPAY.js