diff --git a/frontend/src/modules/attractMgt/views/ChannelDetail.vue b/frontend/src/modules/attractMgt/views/ChannelDetail.vue index 5bd0db1..f6e0dd9 100644 --- a/frontend/src/modules/attractMgt/views/ChannelDetail.vue +++ b/frontend/src/modules/attractMgt/views/ChannelDetail.vue @@ -222,10 +222,21 @@ export default { }, created() { console.log(this.$route.params.userSeq); - this.loginId = this.$route.params.loginId; + //this.$store.commit("login/isLogin", true); this.getExcelHeader(); - this.channelDetail(this.$route.params.userSeq); + if(this.$route.params.userSeq != null){ //리스트에서 상세 호출 + this.loginId = this.$route.params.loginId; + this.$store.commit('dataStore/updateUserSeq', this.$route.params.userSeq); + this.$store.commit('dataStore/updateUserId', this.$route.params.userId); + this.channelDetail(this.$route.params.userSeq); + }else{ + var userSeq = this.$store.getters["dataStore/getUserSeq"]; + var userId = this.$store.getters["dataStore/getUserId"]; + this.loginId = userId; + this.channelDetail(userSeq); + } }, + methods: { async channelDetail(userSeq) { this.row.userSeq = userSeq; diff --git a/frontend/src/modules/custMgt/views/SubsDetail.vue b/frontend/src/modules/custMgt/views/SubsDetail.vue index 6c7f7b4..7a70e34 100644 --- a/frontend/src/modules/custMgt/views/SubsDetail.vue +++ b/frontend/src/modules/custMgt/views/SubsDetail.vue @@ -181,6 +181,7 @@ import CarryOverListPop from '../components/CarryOverListPop'; import ValidationConfirmPop from '../components/ValidationConfirmPop'; import AdminNmPop from '../components/AdminNmPop'; import commonModal from "@/components/modal/commonModal"; +//import { mapGetters } from 'vuex'; export default { name: "subsDetail", @@ -236,11 +237,21 @@ export default { }, created() { console.log(this.$route.params.serviceId); - this.$store.commit("login/isLogin", true); - //console.log(this.$route.params); - this.subsDetail(this.$route.params.serviceId); - this.setMenuActive(); + this.$store.commit("login/isLogin", true); + if(this.$route.params.serviceId != null){ // 리스트에서 상세 호출시 + this.$store.commit('dataStore/updateDataStore', this.$route.params.serviceId); + this.subsDetail(this.$route.params.serviceId); + this.setMenuActive(); + }else{ // 상세 화면에서 새로고침 호출시 + var serviceId = this.$store.getters["dataStore/getDataStore"]; + console.log('serviceId : '+serviceId); + this.subsDetail(serviceId); + } + }, + + destroyed() { + this.$store.commit('dataStore/updateDataStore', ''); }, methods: { callAlert(props) { @@ -266,22 +277,7 @@ export default { this.row.page = 1; this.$router.push({name: 'subsList', params: this.row}); - }, - async doInsert(props) { - - console.log(props); - // try { - // const response = await custMgtApi.insertTestId(this.row); - // const result = response.data; - // if (result != null && result.retCode == "0000") { - // alert('저장 하였습니다.'); - // this.toComplete(); - // } - // } catch(err) { - // alert("실패 하였습니다."); - // } - // } - }, + }, async subsDetail(serviceId) { this.row.serviceId = serviceId; try { @@ -363,13 +359,8 @@ export default { this.$refs.carryOverListPop.carryOverListPopOpen(this.serviceId); }, confirmPopOpen: function () { - if (this.doValidate()) { - // this.row.title = '사용자 수정 확인'; - // this.row.msg = '변경된 내용을 저장하시겠습니까?'; - // console.log(this.row); - // this.$refs.confirmPop.confirmModalOpen(this.row); - this.$refs.validationConfirmPop.confirmUpdateSubOpen(); - // this.$refs.commmonModal.confirmModalOpen(this.row); + if (this.doValidate()) { + this.$refs.validationConfirmPop.confirmUpdateSubOpen(); } }, diff --git a/frontend/src/store.js b/frontend/src/store.js index 5c9613a..3c9ed5b 100644 --- a/frontend/src/store.js +++ b/frontend/src/store.js @@ -1,15 +1,18 @@ import Vue from 'vue' import Vuex from 'vuex' import searchcondition from './store/search-condition' +import dataStore from './store/dataStore' import login from './modules/login/store/index' import createPersistedState from 'vuex-persistedstate'; + Vue.use(Vuex) export default new Vuex.Store({ modules: { searchcondition, - login + login, + dataStore }, - plugins: [createPersistedState({ paths: ["login"] })], + plugins: [createPersistedState({ paths: ["login","dataStore"] })], }) diff --git a/frontend/src/store/dataStore.js b/frontend/src/store/dataStore.js new file mode 100644 index 0000000..f6a10a0 --- /dev/null +++ b/frontend/src/store/dataStore.js @@ -0,0 +1,34 @@ +const state = { + dataStore: '' + ,userSeq: '' + ,userId: '' +} + +const getters = { + getDataStore: state => state.dataStore, + getUserSeq: state => state.userSeq, + getUserId: state => state.userId, +} + +const mutations = { + updateDataStore: (state, data) => { + state.dataStore = data; + }, + updateUserSeq: (state, data) => { + state.userSeq = data; + }, + updateUserId: (state, data) => { + state.userId = data; + } +} + +const actions = { +} + +export default { + namespaced: true, + state, + getters, + mutations, + actions +}; \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java index 5d1a864..74afef1 100644 --- a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java @@ -223,7 +223,14 @@ public class SendNumMgtService { sendNumMgtMapper.insertNumberList(dbInsertNumber); } } - + + // 사업자 인증 여부 Y + if(allSendNumbers.size() > 0) { + UpdateApprReqDto updateApprReqDto = new UpdateApprReqDto(); + updateApprReqDto.setAdminId(adminId); + sendNumMgtMapper.updateSvcUser(updateApprReqDto); + } + // 사업자 인증이 안된 경우 파일업로드... if(!StringUtils.equals(Const.COMM_YES, insertNumberReqDto.getBizrAuthYn())){