From 94c4eeda4803e9addc2e8f480c6699b00b6d7cf3 Mon Sep 17 00:00:00 2001
From: USER <USER@DESKTOP-3V0A84G>
Date: Wed, 14 Sep 2022 18:34:34 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EB=AA=A8=20=ED=98=B8=EC=B6=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custMgt/components/MemoTotalPop.vue       | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/frontend/src/modules/custMgt/components/MemoTotalPop.vue b/frontend/src/modules/custMgt/components/MemoTotalPop.vue
index 444bfed..7442d5d 100644
--- a/frontend/src/modules/custMgt/components/MemoTotalPop.vue
+++ b/frontend/src/modules/custMgt/components/MemoTotalPop.vue
@@ -124,19 +124,19 @@ export default {
   mounted() {
     // 달력 세팅
 
-    let page = 1;
-    // 페이지 정보 및 검색 조건
-    const getCondition = this.$store.getters['searchcondition/getSearchCondition'];
+    // let page = 1;
+    // // 페이지 정보 및 검색 조건
+    // const getCondition = this.$store.getters['searchcondition/getSearchCondition'];
 
-    // store에 저장된 페이지 정보 및 검색 조건을 불러오기
-    let isKeep = false;
-    if (getCondition) {
-      this.grid.pagePerRows = getCondition.perPage;
-      this.grid.params = getCondition.params;
-      page = getCondition.page;
-      isKeep = true;
-    }
-    this.search(isKeep);
+    // // store에 저장된 페이지 정보 및 검색 조건을 불러오기
+    // let isKeep = false;
+    // if (getCondition) {
+    //   this.grid.pagePerRows = getCondition.perPage;
+    //   this.grid.params = getCondition.params;
+    //   page = getCondition.page;
+    //   isKeep = true;
+    // }
+    // this.search(isKeep);
   },
   methods :{
         search: function(isKeep) {
@@ -155,11 +155,6 @@ export default {
         },
         //메모전체 모달 Open
         async memoTotalModalOpen(props){			
-            this.grid.params.userId = props.adminId;
-            this.userId = props.adminId;
-            // this.grid.params.userId = props.serviceId;
-            // this.userId = props.serviceId;
-
             // 메모 모달팝업 오픈
             var dimmed = document.getElementsByClassName('memoTotal');
 			      for(var i = 0; i < dimmed.length; i++){
@@ -176,8 +171,12 @@ export default {
             this.grid.pagePerRows = getCondition.perPage;
             this.grid.params = getCondition.params;
             page = getCondition.page;
-            isKeep = true;
+            isKeep = true;            
           }
+          
+          this.grid.params.userId = props.userId;
+          this.userId = props.userId;
+
           this.search(isKeep);
 			
 		},