20221107 수정

src/main/webapp/app/stinfo/STINFO01010.html

@@ -18,6 +18,7 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_STINFO01010_SEARCH" class="form-horizontal">
+									<input type="hidden" id="ITP_FORM_STINFO01010_SEARCH_BRAND_ID" name="sbrandId" />
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_STINFO01010_SERVICE_BRAND_TYPE" data-select-code="BRAND_TYPE" class="form-control itp_input" name="sbrandType">

src/main/webapp/app/stinfo/STINFO01011.html

@@ -17,6 +17,7 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_STINFO01011_SEARCH" class="form-horizontal">
+									<input type="hidden" id="ITP_FORM_STINFO01011_SEARCH_BRAND_ID" name="sbrandId" />
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_STINFO01011_SERVICE_BRAND_TYPE" data-select-code="BRAND_TYPE" class="form-control itp_input" name="sbrandType">

src/main/webapp/app/stinfo/STINFO04010.html

@@ -412,14 +412,14 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">품목분류 *</label>
-											<div class="col-xs-10 itp_ip">
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass1" style="width:2%;">s</div>
+											<div class="col-xs-12 itp_ip">
+												<div class="col-xs-1 itp_in itp_noMar fnItemClass1" style="width:auto;"></div>
 												<label class="col-xs-1 itp_in" style="width:2%;">></label>
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass2" style="width:2%;">s</div>
+												<div class="col-xs-1 itp_in itp_noMar fnItemClass2" style="width:auto;"></div>
 												<label class="col-xs-1 itp_in" style="width:2%;">></label>
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass3" style="width:2%;">s</div>
+												<div class="col-xs-1 itp_in itp_noMar fnItemClass3" style="width:auto;"></div>
 												<label class="col-xs-1 itp_in" style="width:2%;">></label>
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass4" style="width:2%;">s</div>
+												<div class="col-xs-1 itp_in itp_noMar fnItemClass4" style="width:auto;"></div>
 											</div>
 										</div>
 									</div>

src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -45,7 +45,7 @@ let API_DETAIL_INFO 		= '/api/user/info-user';
 let API_DETAIL_SAVE 		= '/api/user/save-user';
 let API_CHECK_DUPLICATE 	= '/api/user/check-duplicate';
 let API_INTI_USERPW 		= '/api/user/inti-userpw';
-let BRAND_POP_GRID_LIST 	= '/api/brand/pop-grid-list';
+let API_POP_GRID_LIST 		= '/api/brand/pop-grid-list';
 
 /*화면 Grid ColModel*/
 const gridColModel = {
@@ -206,7 +206,7 @@ let pageObj = {
 					var param = {
 						'afflShopId': _this.afflShopId
 					};
-					fn_ajax_call(BRAND_POP_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
+					fn_ajax_call(API_POP_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
 				} else {
 					var brandList = [{'brandId': _this.brandId, 'brandNm': _this.brandNm}];
 					this.setBrand(brandList);

src/main/webapp/js/app/stinfo/ITP_STINFO02010.js

@@ -168,7 +168,7 @@ let pageObj = {
 
 			// form alert message 주입
 			$('input[data-alert-required="ONLYCHK"]').each(function() {
-				if($(this).data('alert-msg') === 'address') {
+				if($(this).data('alert-msg') === 'addrses') {
 					$(this).data('alert-msg', ITP_MSG_LOCALE.message.form.emptyAddr);
 				}
 			});
@@ -503,18 +503,23 @@ let createObj = {
 		},
 		save: function() {
 			const formId = '#ITP_FORM_STINFO02010_DETAIL';
-			itp_fn_form_event.removeChar('#ITP_FORM_OPER03010_DETAIL');
 			itp_fn_form_clear_validate(null, formId);
 
 			// console.log($(formId).serializeObject());
 			if (itp_fn_form_event.isValid(formId)) {
-				let param = $(formId).serializeObject();
-				console.log(JSON.stringify(param));
-				var searhFn = function() {
-					ITP_FORM_STINFO02010_DETAIL_IS_WRITING = false;
-					listObj.grid.search();
+				var modalFn = {
+					callBack: (args) => {
+						itp_fn_form_event.removeChar('#ITP_FORM_OPER03010_DETAIL');
+						let param = $(formId).serializeObject();
+						console.log(JSON.stringify(param));
+						var searhFn = function () {
+							ITP_FORM_STINFO02010_DETAIL_IS_WRITING = false;
+							listObj.grid.search();
+						}
+						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
+					}
 				};
-				fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
+				itp_fn_modal_confirm('저장 하시겠습니까?', modalFn);
 			}
 		}
 	}

src/main/webapp/js/app/stinfo/ITP_STINFO04010.js

@@ -410,10 +410,10 @@ let viewObj = {
         pageObj.switchScreen('VIEW');
         $('#ITP_FORM_STINFO04010_VIEW #ITP_FORM_STINFO04010_VIEW_ITEM_ID').val(result.itemId);
         $('#ITP_FORM_STINFO04010_VIEW .fnStCd').text(result.itemStNm);
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass1').text(result.itemClass1);
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass2').text(result.itemClass2);
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass3').text(result.itemClass3);
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass4').text(result.itemClass4);
+        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass1').text(result.itemClass1Nm);
+        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass2').text(result.itemClass2Nm);
+        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass3').text(result.itemClass3Nm);
+        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass4').text(result.itemClass4Nm);
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClassMgntNo').text(result.itemClassMgntNo);
         $('#ITP_FORM_STINFO04010_VIEW .fnItemType').text(result.itemType);
         $('#ITP_FORM_STINFO04010_VIEW .fnItemNm').text(result.itemClassNm);

src/main/webapp/js/app/stinfo/ITP_STINFO07010.js

@@ -55,27 +55,27 @@ const gridColModel = {
 			sortable: false, hidden: false
 		},
 		{
-			index: 'ITEM_CLASS_LEVEL1', name: 'itemClass1',
+			index: 'ITEM_CLASS_LEVEL1', name: 'itemClass1Nm',
 			label: ITP_MSG_LOCALE.label.itemClassLevel1, //품목분류Level 1
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
-			index: 'ITEM_CLASS_LEVEL2', name: 'itemClass2',
+			index: 'ITEM_CLASS_LEVEL2', name: 'itemClass2Nm',
 			label: ITP_MSG_LOCALE.label.itemClassLevel2, //품목분류Level 2
-			width: '13', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
-			index: 'ITEM_CLASS_LEVEL3', name: 'itemClass3',
+			index: 'ITEM_CLASS_LEVEL3', name: 'itemClass3Nm',
 			label: ITP_MSG_LOCALE.label.itemClassLevel3, //품목분류Level 3
-			width: '13', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
-			index: 'ITEM_CLASS_LEVEL4', name: 'itemClass4',
+			index: 'ITEM_CLASS_LEVEL4', name: 'itemClass4Nm',
 			label: ITP_MSG_LOCALE.label.itemClassLevel4, //품목분류Level 4
-			width: '6', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -298,8 +298,9 @@ let listObj = {
 					if (colNm === 'itemClassNm') {
 						const selectVal = $(this).jqGrid('getCell', rowId, 'itemClassMgntNo');
 						const key = {brandId:fn_make_user_info.get('brandId'), itemClassMgntNo: selectVal, viewCd: 'R'};
-						var param = $.param(key);
-						viewObj.init(param);
+						// var param = $.param(key);
+						// viewObj.init(param);
+						listObj.popup($(gridId).jqGrid('getRowData', rowId));
 					}
 				},
 				loadComplete: function(data) {