Browse Source

팝업수정

whakdo963 2 years ago
parent
commit
d6833be48e

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

@@ -1,40 +0,0 @@
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>

+ 10 - 9
src/main/webapp/css/style.css

@@ -577,7 +577,14 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
577 577
     -o-transform:translate(0, calc(50vh - 50%));
578 578
     transform:translate(0, 50vh) translate(0, -50%);
579 579
 }
580
-
580
+#ITP_FOOTER .itp_modal .itp_form_inline .form-horizontal {margin-bottom:10px; font-size:18px;}
581
+#ITP_FOOTER .itp_modal .itp_form_inline .form-horizontal .itp_div_label {display:inline-flex; margin-left:-5px;}
582
+#ITP_FOOTER .itp_modal .itp_form_inline .form-horizontal .itp_div_label label {min-width:90px;}
583
+#ITP_FOOTER .itp_modal .itp_form_inline .form-horizontal .itp_div_label span{margin:0 15px;}
584
+#ITP_FOOTER .itp_modal .itp_form_inline .form-horizontal .itp_div_label div{width:130px; text-align:right;}
585
+#ITP_FOOTER .itp_modal .modal-bottom {border-top:1px solid #aaa; height:50px; display:flex;}
586
+#ITP_FOOTER .itp_modal .modal-bottom .col_3 {width:40%; hegith:50px;}
587
+#ITP_FOOTER .itp_modal .modal-bottom .col_7 {width:60%; height:50px;}
581 588
 /* ITP_ASIDE */
582 589
 #ITP_ASIDE .itp_modal .modal-header {padding:12px 15px 12px 15px; background:#337ab7; cursor:move;}
583 590
 #ITP_ASIDE .itp_modal .modal-header .close {color:#fff; opacity:1;}
@@ -610,11 +617,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
610 617
 #ITP_ASIDE .itp_modal .itp_form .itp_ipGrp_right .itp_input {border-top-left-radius:0; border-bottom-left-radius:0;}
611 618
 #ITP_ASIDE .itp_modal .itp_form .itp_err_msg {display: inline-block; font-size: 12px; color: #a94442; margin-left: 1px;}  /* 송호성 추가(2021.07.11) */
612 619
 #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; 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;}
620
+
618 621
 #ITP_ASIDE .itp_modal .itp_form_inline .itp_ip {margin-right:20px;}
619 622
 #ITP_ASIDE .itp_modal .itp_form_inline .itp_ip.itp_long {width:98%; margin-right:0;}
620 623
 #ITP_ASIDE .itp_modal .itp_form_inline .itp_ipGrp_left {margin-right:0;}
@@ -698,9 +701,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
698 701
 #ITP_ASIDE .itp_modal .itp_preview_bottom {margin-top: 5px; margin-bottom: 5px; text-align: right;}
699 702
 #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;}
700 703
 #ITP_ASIDE .itp_modal .itp_lctnview {width: 100%; margin: 10px 0 0 0; padding: 0; border: solid 0.5px #bfbfbf; height: 100%; }
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;}
704
+
704 705
 #ITP_NOT_FOUND {width:100%; height:100%;}
705 706
 #ITP_NOT_FOUND .itp_head {margin-bottom:8px; letter-spacing:-1px;}
706 707
 #ITP_NOT_FOUND .itp_bar {margin:0; padding:0; float:left; margin:0 15px 0 15px; font-size:22px;}

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

@@ -1,146 +0,0 @@
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
-};

+ 27 - 8
src/main/webapp/main.html

@@ -292,16 +292,35 @@
292 292
 			<div id="ITP_MODAL_ALERT" class="modal itp_modal">
293 293
 				<div class="modal-dialog modal-sm">
294 294
 					<div class="modal-content">
295
-						<div class="modal-header">
296
-							<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
297
-							<h5 class="modal-title">알림</h5>
298
-						</div>
299 295
 						<div class="modal-body">
300
-							<div class="text-center itp_alert_txt"></div>
296
+							<div class="itp_form fix">
297
+								<div class="col-xs-12 itp_form_inline">
298
+									<div class="form-horizontal fix">
299
+										<div style="margin:25px 0;">
300
+											<div class="itp_div_label">
301
+												<label>납품요청일</label>
302
+												<span>:</span>
303
+												<div class="fn col_a">2022.09.30</div>
304
+											</div>
305
+											<div class="itp_div_label">
306
+												<label>품목수</label>
307
+												<span>:</span>
308
+												<div class="fn col_a">2개</div>
309
+											</div>
310
+											<div class="itp_div_label">
311
+												<label>구매금액</label>
312
+												<span>:</span>
313
+												<div class="fn col_a">424,000원</div>
314
+											</div>
315
+										</div>
316
+										<label style="text-align:center; width:100%;">구매요청 하시겠습니까?</label>
317
+									</div>
318
+								</div>
319
+							</div>
301 320
 						</div>
302
-						<div class="modal-footer">
303
-							<button type="button" class="btn btn-default" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
304
-							<button type="button" class="btn btn-primary" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
321
+						<div class="modal-bottom">
322
+							<button type="button" class="col_3 btn btn-default" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
323
+							<button type="button" class="col_7 btn btn-primary" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
305 324
 						</div>
306 325
 					</div>
307 326
 				</div>