From 0360eff3b6eceb570e7891832c3cded5a085c027 Mon Sep 17 00:00:00 2001
From: USER <USER@DESKTOP-3V0A84G>
Date: Mon, 5 Sep 2022 15:58:44 +0900
Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95=EA=B1=B4=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attractMgt/views/ChannelDetail.vue        | 34 ++++++------
 .../src/modules/calculate/views/CalcList.vue  |  2 +-
 .../custMgt/views/MemberAdminDetail.vue       | 16 +++---
 .../modules/custMgt/views/MemberDetail.vue    | 16 +++---
 .../src/modules/custMgt/views/SubsDetail.vue  | 23 +++++---
 .../sendNumMgt/components/NumberRegPop.vue    |  2 +-
 frontend/src/router.js                        | 52 ++++++++++++++++---
 frontend/src/store/dataStore.js               |  1 +
 8 files changed, 102 insertions(+), 44 deletions(-)

diff --git a/frontend/src/modules/attractMgt/views/ChannelDetail.vue b/frontend/src/modules/attractMgt/views/ChannelDetail.vue
index 10077b1..8b3273f 100644
--- a/frontend/src/modules/attractMgt/views/ChannelDetail.vue
+++ b/frontend/src/modules/attractMgt/views/ChannelDetail.vue
@@ -210,29 +210,30 @@ export default {
       custTyNm: '',
     }
   },
-  props: {
-    userSeq: {
-      type: String,
-      default: "",
-    },
-  },
+  // props: {
+  //   userSeq: {
+  //     type: String,
+  //     default: "",
+  //   },
+  // },
   components: {
     channelMgtApi,
     AdminNmPop,
   },
   created() {
     this.getExcelHeader();
-    if(this.$route.params.userSeq != null){ //리스트에서 상세 호출
-      this.loginId = this.$route.params.loginId;
+    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.$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);  
-    }    
+    }
+    // else{
+    //   var userSeq = this.$store.getters["dataStore/getUserSeq"];
+    //   var userId = this.$store.getters["dataStore/getUserId"];
+    //   this.loginId = userId;
+    //   this.channelDetail(userSeq);  
+    // }    
   },
   destroyed() {
     this.$store.commit('dataStore/updateUserSeq', '');
@@ -356,6 +357,9 @@ export default {
       }
     }, // end of getExcelDataDown
     goChannelList() {
+      // this.row.userSeq = this.$route.params.userSeq;
+      
+      // alert(this.row.userSeq);
       this.$router.push({name: 'channelList'});
     },
     searchIDPopOpen: function () {
diff --git a/frontend/src/modules/calculate/views/CalcList.vue b/frontend/src/modules/calculate/views/CalcList.vue
index 0d57455..48918d0 100644
--- a/frontend/src/modules/calculate/views/CalcList.vue
+++ b/frontend/src/modules/calculate/views/CalcList.vue
@@ -25,7 +25,7 @@
                       :picker-options="startDateOptions"
                   ></vuejs-datepicker>
                 </span>
-              <span class="hypen">~</span>
+              ~
               <span class="custom_input icon_date">
                   <vuejs-datepicker
                       :language="ko"
diff --git a/frontend/src/modules/custMgt/views/MemberAdminDetail.vue b/frontend/src/modules/custMgt/views/MemberAdminDetail.vue
index 975b35b..e4fc293 100644
--- a/frontend/src/modules/custMgt/views/MemberAdminDetail.vue
+++ b/frontend/src/modules/custMgt/views/MemberAdminDetail.vue
@@ -255,14 +255,15 @@ export default {
   },
   created() {
     if (this.$route.params.serviceId != null) {
-      this.$store.commit('dataStore/updateUserId', this.$route.params.serviceId);
+      this.$store.commit('dataStore/updateDataStore', this.$route.params.serviceId);
       this.userId = this.$route.params.serviceId;
       this.memberDetail(this.$route.params.serviceId);
-    } else {
-      var userId2 = this.$store.getters['dataStore/getUserId'];
-      this.userId = userId2;
-      this.memberDetail(this.userId);
-    }
+    } 
+    // else {
+    //   var userId2 = this.$store.getters['dataStore/getUserId'];
+    //   this.userId = userId2;
+    //   this.memberDetail(this.userId);
+    // }
   },
   destroyed() {
     this.$store.commit('searchcondition/updateSearchCondition', {
@@ -274,7 +275,7 @@ export default {
         searchText1: '',
       },
     });
-    this.$store.commit('dataStore/updateUserId', '');
+    this.$store.commit('dataStore/updateDataStore', '');
   },
   mounted() {},
   computed: {
@@ -375,6 +376,7 @@ export default {
     },
     // 저장 후 부모창 호출.
     toComplete() {
+      this.row.serviceId = this.userId;
       this.$router.push({ name: 'memberList', params: this.row });
     },
 
diff --git a/frontend/src/modules/custMgt/views/MemberDetail.vue b/frontend/src/modules/custMgt/views/MemberDetail.vue
index 292432c..5a66f6a 100644
--- a/frontend/src/modules/custMgt/views/MemberDetail.vue
+++ b/frontend/src/modules/custMgt/views/MemberDetail.vue
@@ -127,17 +127,18 @@ export default {
   },
   created() {
     if (this.$route.params.serviceId != null) {
-      this.$store.commit('dataStore/updateUserId', this.$route.params.serviceId);
+      this.$store.commit('dataStore/updateDataStore', this.$route.params.serviceId);
       this.userId = this.$route.params.serviceId;
       this.memberDetail(this.$route.params.serviceId);
-    } else {
-      var userId2 = this.$store.getters['dataStore/getUserId'];
-      this.userId = userId2;
-      this.memberDetail(this.userId);
-    }
+    } 
+    // else {
+    //   var userId2 = this.$store.getters['dataStore/getUserId'];
+    //   this.userId = userId2;
+    //   this.memberDetail(this.userId);
+    // }
   },
   destroyed() {
-    this.$store.commit('dataStore/updateUserId', '');
+    this.$store.commit('dataStore/updateDataStore', '');
   },
   mounted() {},
   methods: {
@@ -202,6 +203,7 @@ export default {
     },
     // 저장 후 부모창 호출.
     toComplete() {
+      this.row.serviceId = this.userId;
       this.$router.push({ name: 'memberList', params: this.row });
     },
     doValidate() {
diff --git a/frontend/src/modules/custMgt/views/SubsDetail.vue b/frontend/src/modules/custMgt/views/SubsDetail.vue
index 662428c..4716b1b 100644
--- a/frontend/src/modules/custMgt/views/SubsDetail.vue
+++ b/frontend/src/modules/custMgt/views/SubsDetail.vue
@@ -239,14 +239,22 @@ export default {
     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"];
-      this.subsDetail(serviceId);
-    }    
+      //this.setMenuActive();
+    }
+    // else{ // 상세 화면에서 새로고침 호출시
+    //   var serviceId = this.$store.getters["dataStore/getDataStore"];
+    //   //this.row.serviceId = serviceId;
+    //   //return $router.push({ path: '/custMgt/subsDetail', params:  this.row});
+    //   //if(serviceId == ''){
+    //     //window.top.location.href = '/custMgt/subsList';
+    //     //this.
+    //     //$router.push({ path: '/custMgt/subsList', params:  })
+    //   //}
+    //   this.subsDetail(serviceId);
+    // }    
   },
   
-  destroyed() {
+  destroyed() {    
     this.$store.commit('dataStore/updateDataStore', '');
   },
   methods: {
@@ -265,7 +273,8 @@ export default {
       this.row.startDt = '';
       this.row.endDt = '';
       this.row.page = 1;
-
+      this.row.serviceId = this.$route.params.serviceId;
+      console.log(this.row);
       this.$router.push({name: 'subsList', params: this.row});
     },    
     async subsDetail(serviceId) {
diff --git a/frontend/src/modules/sendNumMgt/components/NumberRegPop.vue b/frontend/src/modules/sendNumMgt/components/NumberRegPop.vue
index b6c8918..57cda88 100644
--- a/frontend/src/modules/sendNumMgt/components/NumberRegPop.vue
+++ b/frontend/src/modules/sendNumMgt/components/NumberRegPop.vue
@@ -51,7 +51,7 @@
                 <input type="text" placeholder="발신번호명" v-model="numberInput.sendNm" maxlength="20">
                 <input type="text" placeholder="발신번호(숫자만입력)" v-model="numberInput.sendNum" @keypress="onlyNum"
                        @input="onlyNum" maxlength="11">
-                <button class="button white" @click="delNumberInput">삭제</button>
+                <button class="button white min" @click="delNumberInput"></button>
               </div>
             </div>
           </td>
diff --git a/frontend/src/router.js b/frontend/src/router.js
index ba931a4..33a4997 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -97,22 +97,61 @@ router.beforeEach((to, from, next) => {
            
         }        
       }
+      
+      
       if((nextUrl == '/custMgt/memberList') || (nextUrl == '/custMgt/memberDetail')
         || (nextUrl == '/custMgt/subsDetail') || (nextUrl == '/custMgt/memberAdminDetail')){
           
-          for(var i=0; i<menuUrls.length; i++){
-            if(menuUrls[i] == '/custMgt/subsList'){
-              moveFlag = true;
+        for(var i=0; i<menuUrls.length; i++){
+          if(menuUrls[i] == '/custMgt/subsList'){
+            moveFlag = true;
+          }
+        }    
+        
+        // 청약 관리 상세
+        if(nextUrl == '/custMgt/subsDetail'){          
+          var serviceId = store.getters["dataStore/getDataStore"];
+          console.log('serviceId : '+serviceId);
+          if(to.params.serviceId == undefined){
+            
+            if(serviceId == ''){
+              return next('/custMgt/subsList');
+            }else{
+              to.params.serviceId = serviceId;
             }
-          }                
-        }        
+          }
+        }
+        
+        // 회원관리 사용자/어드민 상세
+        if((nextUrl == '/custMgt/memberDetail') || (nextUrl == '/custMgt/memberAdminDetail')){          
+          var serviceId = store.getters["dataStore/getDataStore"];
+          if(to.params.serviceId == undefined){
+            
+            if(serviceId == ''){
+              return next('/custMgt/memberList');
+            }else{
+              to.params.serviceId = serviceId;
+            }
+          }
+        }
+      }
+        
+        
       // url Check 유치채널
       if((nextUrl == '/attractMgt/channelDetail')){
         for(var i=0; i<menuUrls.length; i++){
           if(menuUrls[i] == '/attractMgt/channelList'){
             moveFlag = true;
           }
-        }
+        }        
+        var userSeq = store.getters["dataStore/getUserSeq"];
+        if(to.params.userSeq == undefined){
+          if(userSeq == ''){
+            return next('/attractMgt/channelList');
+          }else{
+            to.params.userSeq = userSeq;
+          }
+        }         
       }       
       // url Check 날짜별 통계      
       if((nextUrl == '/stats/dayList')){
@@ -171,6 +210,7 @@ router.beforeEach((to, from, next) => {
         }              
         return next(rootUrl);
       }
+      
     }
     
   }
diff --git a/frontend/src/store/dataStore.js b/frontend/src/store/dataStore.js
index 80b2413..5bc4d26 100644
--- a/frontend/src/store/dataStore.js
+++ b/frontend/src/store/dataStore.js
@@ -16,6 +16,7 @@ const mutations = {
   },
   updateUserSeq: (state, data) => {
     state.userSeq = data;
+    console.log('mutate: '+state.userSeq);
   },
   updateUserId: (state, data) => {
     state.userId = data;