사용자관리 수정

src/main/webapp/app/oper/OPER03010.html

@@ -56,6 +56,7 @@
 						<div class="col-xs-12">
 							<form id="ITP_FORM_OPER03010_DETAIL" class="form-horizontal">
 								<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_VIEW_CD" name="viewCd" value="C">
+								<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_ID" class="form-control itp_input" name="afflShopId">
 								<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_CMPY_LOCATION" name="cmpyLocation" value="">
 					
 								<section class="itp_form_sec">
@@ -76,17 +77,15 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">가맹점 명 *</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_NM" class="form-control itp_input" name="afflShopNm" value="" maxlength="10">
-												</div>
+												<div class="col-xs-7 itp_in fnAfflShopNm"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">가맹점 KEY *<br>사용자 계정 추가-3자리</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-4 itp_in">
 													<div class="input-group">
-														<input type="text" id="ITP_FORM_OPER03010_DETAIL_" class="form-control itp_input" name="" value="" maxlength="10" readonly>
+														<input type="text" id="ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_KEY" class="form-control itp_input" name="" value="" maxlength="10" readonly>
 														<span class="input-group-btn">
-															<button id="ITP_FORM_OPER03010_DETAIL_" class="btn btn-default btn-sm itp_btn SHOW" type="button" disabled><i class="glyphicon glyphicon-ok"></i></button>
+															<button id="ITP_BTN_OPER03010_DETAIL_AFFL_SHOP_KEY" class="btn btn-default btn-sm itp_btn SHOW" type="button" disabled><i class="glyphicon glyphicon-ok"></i></button>
 														</span>
 													</div>
 												</div>

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

@@ -260,9 +260,9 @@ let pageObj = {
 		comCode: function () {
 			// 공통코드 표시
 			fn_make_select(CODE_LIST, 'ST_CD', 'ITP_FORM_OPER03010_SEARCH_ST_CD', true, '상태(전체)');
-			fn_make_select(CODE_LIST, 'ST_CD', 'ITP_FORM_OPER03010_DETAIL_STAT_CD', true, '선택');
+			fn_make_select(CODE_LIST, 'ST_CD', 'ITP_FORM_OPER03010_DETAIL_ST_CD', true, '선택');
 			fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_OPER03010_DETAIL_TYPE_CD', true, '선택');
-			fn_make_select(CODE_LIST, 'FRCOMP_AUTH_CD', 'ITP_FORM_OPER03010_DETAIL_AUTH_TYPE', true, '선택');
+			fn_make_select(CODE_LIST, 'AUTH_TYPE', 'ITP_FORM_OPER03010_DETAIL_AUTH_TYPE', true, '선택');
 		},
 		ready: function () {
 			listObj.init();
@@ -475,20 +475,24 @@ let viewObj = {
 		pageObj.switchScreen('VIEW');
 		$('#ITP_FORM_OPER03010_VIEW #ITP_FORM_OPER03010_VIEW_AFFL_SHOP_ID').val(result.afflShopId);
 
-		$('#ITP_FORM_OPER03010_VIEW .fnCmpyNm').text(result.afflShopNm);
-		$('#ITP_FORM_OPER03010_VIEW .fnCmpyStatCd').text(result.cmpyStatNm);
-		$('#ITP_FORM_OPER03010_VIEW .fnCmpyCd').text(result.afflShopId);
+		$('#ITP_FORM_OPER03010_VIEW .fnAfflShopId').text(result.afflShopId);
+		$('#ITP_FORM_OPER03010_VIEW .fnAfflShopNm').text(result.afflShopNm);
+		$('#ITP_FORM_OPER03010_VIEW .fnStCd').text(result.stNm);
 		$('#ITP_FORM_OPER03010_VIEW .fnCmpyTypeCd').text(result.corpType);
-		$('#ITP_FORM_OPER03010_VIEW .fnCmpyRegNum').text(result.corpRegNo);
-		$('#ITP_FORM_OPER03010_VIEW .fnFrcompAuthCd').text(result.frcompAuthNm);
-		$('#ITP_FORM_OPER03010_VIEW .fnCoptNum').text(result.coptNum);
-		$('#ITP_FORM_OPER03010_VIEW .fnBizCate').text(result.bizCate);
-		$('#ITP_FORM_OPER03010_VIEW .fnBizType').text(result.bizType);
-		$('#ITP_FORM_OPER03010_VIEW .fnBossNm').text(result.ownerNm);
-		$('#ITP_FORM_OPER03010_VIEW .fnMainTel').text(result.ownerTelNo);
-		$('#ITP_FORM_OPER03010_VIEW .fnMainFax').text(result.mainFax);
-		$('#ITP_FORM_OPER03010_VIEW .fnMainEmail').text(result.mainEmail);
-		$('#ITP_FORM_OPER03010_VIEW .fnCmpyAddress').text('('+ result.cmpyZipno + ') ' + result.addr1 + ' ' + result.addr2);
+		$('#ITP_FORM_OPER03010_VIEW .fnBsnsRegNo').text(result.corpRegNo);
+		$('#ITP_FORM_OPER03010_VIEW .fnCorpRegNo').text(result.corpRegNo);
+		$('#ITP_FORM_OPER03010_VIEW .fnTelNo').text(result.ownerTelNo);
+		$('#ITP_FORM_OPER03010_VIEW .fnFaxNo').text(result.rprstFaxNo);
+		$('#ITP_FORM_OPER03010_VIEW .fnEmalAddr').text(result.rprstEmai);
+		$('#ITP_FORM_OPER03010_VIEW .fnBsnsCndt').text(result.bsnsCndt);
+		$('#ITP_FORM_OPER03010_VIEW .fnOwnerNm').text(result.ownerNm);
+		$('#ITP_FORM_OPER03010_VIEW .fnCtgrBsns').text(result.ctgrBsns);
+		$('#ITP_FORM_OPER03010_VIEW .fnOwnerTelNo').text(result.ownerTelNo);
+		$('#ITP_FORM_OPER03010_VIEW .fnContSttDt').text(result.joinSttDt);
+		$('#ITP_FORM_OPER03010_VIEW .fnContEndDt').text(result.joinEndDt);
+		$('#ITP_FORM_OPER03010_VIEW .fnZipNo').text(result.zipNo);
+		$('#ITP_FORM_OPER03010_VIEW .fnLoadAddr').text(result.addr1);
+		$('#ITP_FORM_OPER03010_VIEW .fnDtlAddr').text(result.addr2);
 
 		$('#ITP_FORM_OPER03010_VIEW .fnAddDt').text(result.regDt);
 		$('#ITP_FORM_OPER03010_VIEW .fnChgDt').text(result.chgDt);
@@ -549,23 +553,25 @@ let modifyObj = {
 		pageObj.switchScreen('MODIFY');
 		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_VIEW_CD').val('U');
 
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_NM').val(result.afflShopNm);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_STAT_CD').val(result.afflAbbr);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_FRCOMP_AUTH_CD').val(result.frcompAuthCd);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_CD').val(result.afflShopId);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_TYPE_CD').val(result.corpType);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_REG_NUM').val(result.cmpyRegNum);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_COPT_NUM').val(result.coptNum);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_BIZ_CATE').val(result.bizCate);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_BIZ_TYPE').val(result.bizType);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_BOSS_NM').val(result.ownerNm);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_MAIN_TEL').val(result.ownerTelNo);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_MAIN_FAX').val(result.mainFax);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_MAIN_EMAIL').val(result.mainEmail);
-
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_ZIPNO').val(result.cmpyZipno);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_ADRES').val(result.addr1);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_ADRES_DTL').val(result.addr2);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_ID').val(result.afflShopId);
+		$('#ITP_FORM_OPER03010_DETAIL .fnAfflShopId').text(result.afflShopId);
+		$('#ITP_FORM_OPER03010_DETAIL .fnAfflShopNm').text(result.afflShopNm);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_ST_CD').val(result.stNm);
+		// $('#ITP_FORM_OPER03010_DETAIL #fnCmpyTypeCd').text(result.corpType);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_BSNS_REG_NO').val(result.corpRegNo);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CORP_REG_NO').val(result.corpRegNo);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_STINFO01010_DETAIL_TEL_NO').val(result.ownerTelNo);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_STINFO01010_DETAIL_FAX_NO').val(result.rprstFaxNo);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_EMAL_ADDR').val(result.rprstEmai);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_BSNS_CNDT').val(result.bsnsCndt);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_OWNER_NM').val(result.ownerNm);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CTGR_BSNS').val(result.ctgrBsns);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_OWNER_TEL_NO').val(result.ownerTelNo);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_SEARCH_CONT_STT_DT').val(result.joinSttDt);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_SEARCH_CONT_END_DT').val(result.joinEndDt);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_ZIPNO').val(result.zipNo);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_LOAD_ADDR').val(result.addr1);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_DTL_ADDR').val(result.addr2);
 
 		$('#ITP_FORM_OPER03010_DETAIL .fnAddDt').text(result.regDt);
 		$('#ITP_FORM_OPER03010_DETAIL .fnChgDt').text(result.chgDt);
@@ -573,13 +579,13 @@ let modifyObj = {
 		kakaoMap.init('ITP_FORM_OPER03010_DETAIL_MAP', $('#ITP_FORM_OPER03010_DETAIL_CMPY_ADRES').val());
 
 		// 영업담당자 리스트 조회
-		modifyObj.grid.load();
+		modifyObj.grid.load(result.saleList);
 	},
 	grid: {
 		init: function() {
 		},
 		colModel: gridColModel.detail,
-		load: function() {
+		load: function(gridData) {
 			let param = $('#ITP_FORM_OPER03010_DETAIL').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
 			param.pagingYn = false; // 페이지안함
@@ -587,40 +593,10 @@ let modifyObj = {
 			var option = {
 				gridId: OPER03010_DETAIL_GRID_ID,
 				colModel: gridColModel.detail,
-				param: JSON.stringify(param),
-				url: DOMAIN + AFFL_DETAIL_GRID_LIST,
+				data: gridData,
 				pager: OPER03010_DETAIL_GRID_PAGER,
-				loadComplete: function(data) {
-					itp_fn_grid_load_complete(data, OPER03010_DETAIL_GRID_ID, true, undefined, 'OPER03010_DETAIL');
-				},
-				onPaging: function(action) {
-					var pagingFn = {
-						callBack: function(args) {
-							$(args).trigger('reloadGrid');
-						}
-					};
-					if (itp_fn_check_grid_is_writing(OPER03010_DETAIL_GRID_ID)) {
-						itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, pagingFn, OPER03010_DETAIL_GRID_ID);
-						return 'stop';
-					} else {
-						itp_fn_grid_paging(OPER03010_DETAIL_GRID_ID, action, param);
-					}
-				},
-				onSortCol: function(index, columnIndex, sortOrder) {
-					var sortingFn = {
-						callBack: function(args) {
-							$(args).trigger('reloadGrid');
-						}
-					};
-					if (itp_fn_check_grid_is_writing(OPER03010_DETAIL_GRID_ID)) {
-						itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, sortingFn, OPER03010_DETAIL_GRID_ID);
-						return 'stop';
-					} else {
-						itp_fn_grid_sorting(OPER03010_DETAIL_GRID_ID, index, sortOrder);
-					}
-				}
 			};
-			itp_fn_grid_make_remote(option);
+			itp_fn_grid_make_local(option);
 		},
 		clearData : function() {
 			$(OPER03010_DETAIL_GRID_ID).jqGrid('clearGridData', true);
@@ -704,21 +680,20 @@ let createObj = {
 				var exists = '';
 				const rowData = $(OPER03010_DETAIL_GRID_ID).getRowData();
 				$.each(rowData, function(key, value) {
-					exists = exists + value.salesUserId + ';';
+					exists = exists + value.saleMgrId + ';';
 				});
 
 				$.each(rowDataPop, function(key, value) {
-					if(exists.indexOf(value.salesUserId) < 0) {
+					if(exists.indexOf(value.saleMgrId) < 0) {
 						// 행추가
 						$(OPER03010_DETAIL_GRID_ID).jqGrid('addRow', {position: 'last'});
 						var rids = $(OPER03010_DETAIL_GRID_ID).jqGrid('getDataIDs');
 						var last_row_id = rids[rids.length - 1];
 						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'viewCd', 'C');
-						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'salesUserId', value.salesUserId);
-						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'salesUserNm', value.salesUserNm);
-						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'useStatCd', value.useStatCd);
-						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'useStatNm', value.useStatNm);
-						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'cmpyCd', '');
+						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'saleMgrId', value.saleMgrId);
+						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'saleMgrNm', value.saleMgrNm);
+						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'stCd', value.stCd);
+						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'stNm', value.stNm);
 					}
 				});
 				$(OPER03010_DETAIL_GRID_EMPTY).hide();

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_NK_SALES_USER_SCH.js

@@ -6,7 +6,8 @@ require(['config'], function() {
 	});
 });
 
-let SAUSER_POP_SALEUSER_GRID_LIST = '/api/sauser/pop-saleuser-grid-list';
+let SAUSER_POP_SALEUSER_GRID_LIST = '/api/srep/pop-grid-list';
+// let SAUSER_POP_SALEUSER_GRID_LIST = '/api/sauser/pop-saleuser-grid-list';
 
 function itp_fn_BIZPOP_NK_SALES_USER_SCH(parentPopFn, schParam, returnType) {
 	
@@ -78,22 +79,28 @@ function itp_fn_BIZPOP_NK_SALES_USER_SCH(parentPopFn, schParam, returnType) {
 	$(THIS_GIRD_ID).jqGrid({
 		colModel: [
 			{
-				index: 'SALES_USER_ID', name: 'salesUserId',
+				index: 'SALE_MGR__ID', name: 'saleMgrId',
 				label: '영업담당자ID', 
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'SALES_USER_NM', name: 'salesUserNm',
+				index: 'SALE_MGR_NM', name: 'saleMgrNm',
 				label: '영업담당자명', // 
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'USE_STAT_NM', name: 'useStatNm',
+				index: 'ST_CD', name: 'stCd',
 				label: '상태', //
 				width: '12', fixed: false, align: 'center',
 				sortable: false, hidden: false
+			},
+			{
+				index: 'ST_NM', name: 'stNm',
+				label: '상태', //
+				width: '12', fixed: false, align: 'center',
+				sortable: false, hidden: true
 			}
 		],
 		loadBeforeSend: function(jqXHR) {