소스검증을 위한 수정 변경

frontend/src/modules/custMgt/components/MemberModifyPop.vue

@@ -199,7 +199,7 @@ export default {
             }
         },
         //사용자ID 수정 처리
-        async memberUpdate(){
+    async memberUpdate(){
             this.row.userId = this.userId;
             this.row.userPw = this.userPwd1;
             this.row.userNm = this.userNm;            
@@ -210,29 +210,31 @@ export default {
 				const response = await custMgtApi.updateUser(this.row);
 				const result = response.data;
 				console.log(result);
+        this.row = {}
 				if (result != null && result.retCode == "0000") {
-          			this.row.title = '청약고객관리';
-          			this.row.msg1 = '수정 완료하였습니다.';
-          			this.$refs.commmonModal.alertModalOpen(this.row);
-          			this.toComplete();
+          this.row.title = '청약고객관리';
+          this.row.msg1 = '수정 완료하였습니다.';
+          this.$refs.commmonModal.alertModalOpen(this.row);
+          // this.memberUpdateModalClose();
+          this.toComplete();
 
 				} else {
-          			this.row.title = '청약고객관리';
-          			this.row.msg1 = '실패 하였습니다.';
-          			this.$refs.commmonModal.alertModalOpen(this.row);
-        		}
+          this.row.title = '청약고객관리';
+          this.row.msg1 = '실패 하였습니다.';
+          this.$refs.commmonModal.alertModalOpen(this.row);
+        }
 			} catch(err) {
-        			this.row.title = '청약고객관리';
-        			this.row.msg1 = '실패 하였습니다.';
-        			this.$refs.commmonModal.alertModalOpen(this.row);
+          this.row.title = '청약고객관리';
+          this.row.msg1 = '실패 하였습니다.';
+          this.$refs.commmonModal.alertModalOpen(this.row);
 			} 
         },
         //사용자ID 수정 모달 Close
         memberUpdateModalClose(){
             var dimmed = document.getElementsByClassName('memberUpdate');
-			for(var i = 0; i < dimmed.length; i++){
-				dimmed[i].style.display = 'none';
-			}
+            for(var i = 0; i < dimmed.length; i++){
+              dimmed[i].style.display = 'none';
+            }
         },
         toComplete(){
             this.row.serviceId = this.adminId;

frontend/src/modules/custMgt/components/MemoTotalPop.vue

@@ -28,10 +28,10 @@
           <button class="btn-default" @click="memoTotalModalClose();">닫기</button>
         </div>
 
-        <common-modal ref="commmonModal"></common-modal>
 			</div>
 
-        </div>        
+        <common-modal ref="commmonMemoModal"></common-modal>
+        </div>
     </div>
 </template>
 
@@ -39,7 +39,7 @@
 import customGrid from "@/components/CustomGrid";
 import api from '@/service/api';
 import custMgtApi from "../service/custMgtApi.js";
-import commonModal from "@/components/modal/commonModal";
+import commonModal from "../components/commonModal";
 
 class CustomATagRenderer {
     constructor(props) {
@@ -81,6 +81,8 @@ export default {
         // 테이블 리스트 데이터
         perPageCnt: 10,
         userId: '',
+        seqNo:'',
+
         grid: {
 				url: '/api/v1/bo/custMgt/allMemoList',
 				pagePerRows: 10,
@@ -94,13 +96,13 @@ export default {
 					{ name: 'register', header: '작성자', align: 'center'},
 					{ name: 'regDt', header: '작성일', align: 'center'},
 					{ name: 'delete', header: '삭제', align: 'center', renderer: {
-                        type: CustomATagRenderer
-                            ,options: {
-                                callback: this.deleteMemo,
-                            }
-                        }
-                    },
-                    { name: 'seqNo', header: '내용일련번호', align: 'center', hidden: true},
+              type: CustomATagRenderer
+                  ,options: {
+                      callback: this.deleteMemo,
+                  }
+              }
+          },
+          { name: 'seqNo', header: '내용일련번호', align: 'center', hidden: true},
 				],
 				noDataStr: '검색 결과가 없습니다.',
 				params: {
@@ -145,7 +147,7 @@ export default {
             const getP_memo = this.$refs.table.getPagination();
             this.$store.commit('searchcondition/updateSearchCondition', {
                 page: getP_memo._currentPage,        
-		        perPage: this.perPageCnt,        
+		            perPage: this.perPageCnt,
                 params: {
                     userId : this.userId,
                 }
@@ -163,8 +165,8 @@ export default {
 
             // 메모 모달팝업 오픈
             var dimmed = document.getElementsByClassName('memoTotal');
-			for(var i = 0; i < dimmed.length; i++){
-			    dimmed[i].style.display = 'block';
+			      for(var i = 0; i < dimmed.length; i++){
+			        dimmed[i].style.display = 'block';
             }  
             
             // 리스트 그리드 오픈
@@ -185,63 +187,71 @@ export default {
 			
 		},
         //메모전체 모달 Close
-        memoTotalModalClose(){
-            var dimmed = document.getElementsByClassName('memoTotal');
+    memoTotalModalClose(){
+      var dimmed = document.getElementsByClassName('memoTotal');
 			for(var i = 0; i < dimmed.length; i++){
 				dimmed[i].style.display = 'none';
 			}
+      this.$parent.memberDetail(this.userId);
             //this.formReset();
-        },
-        toComplete(){
-            this.row.serviceId = this.adminId;
-            this.memoTotalModalClose();
-            this.$parent.memberDetail(this.adminId);			
-        },
-        deleteMemo: function(props) {
-            console.log(props);
-            var param = {};
-            param.seqNo = props.seqNo;
-            param.userId = this.userId;
-            this.deleteMemoConfirm(param);                 
-        },
-        async deleteMemoConfirm(target){            
+    },
+    toComplete(){
+        this.row.serviceId = this.adminId;
+        this.memoTotalModalClose();
+        this.$parent.memberDetail(this.adminId);
+    },
+    deleteMemo: function(props) {
+      console.log(props);
+      this.seqNo=props.seqNo;
+      this.memorow = {}
+      this.memorow.title = '메모';
+      this.memorow.msg1 = '삭제 하시겠습니까?';
+      this.$refs.commmonMemoModal.confirmModalOpenMemo(this.memorow);
+    },
+    async deleteMemoConfirm(target){
+      try {
+          const response = await custMgtApi.deleteMemo(target);
+          const result = response.data;
+          console.log(result);
+          if (result != null && result.retCode == "0000") {
+                    // alert('삭제 성공');
+            // 그리드 reload
+                    // 리스트 그리드 오픈
+            let page = 1;
+            // 페이지 정보 및 검색 조건
+            const getCondition = this.$store.getters['searchcondition/getSearchCondition'];
+            console.log('getCondition : '+getCondition);
 
-            if(window.confirm('삭제 하시겠습니까?')){
-                try {
-			        const response = await custMgtApi.deleteMemo(target);
-			        const result = response.data;
-			        console.log(result);
-			        if (result != null && result.retCode == "0000") {
-                        // alert('삭제 성공');
-				        // 그리드 reload
-                        // 리스트 그리드 오픈
-                let page = 1;
-                // 페이지 정보 및 검색 조건
-                const getCondition = this.$store.getters['searchcondition/getSearchCondition'];
-                console.log('getCondition : '+getCondition);
-
-              // store에 저장된 페이지 정보 및 검색 조건을 불러오기
-                let isKeep = false;
-                if (getCondition) {
-                    this.grid.pagePerRows = getCondition.perPage;
-                    this.grid.params = getCondition.params;
-                    page = getCondition.page;
-                    isKeep = true;
-                }
-                this.search(isKeep);
-			        } else {
-                this.memorow.title = '청약고객관리';
-                this.memorow.msg1 = '실패 하였습니다.';
-                this.$refs.commmonModal.alertModalOpen(this.memorow);
-              }
-		        } catch (error) {
-			        console.log(error);
-              this.memorow.title = '청약고객관리';
-              this.memorow.msg1 = '실패 하였습니다.';
-              this.$refs.commmonModal.alertModalOpen(this.memorow);
-		        }
+          // store에 저장된 페이지 정보 및 검색 조건을 불러오기
+            let isKeep = false;
+            if (getCondition) {
+                this.grid.pagePerRows = getCondition.perPage;
+                this.grid.params = getCondition.params;
+                page = getCondition.page;
+                isKeep = true;
             }
+            this.search(isKeep);
+          } else {
+            this.memorow.title = '메모 삭제';
+            this.memorow.msg1 = '실패 하였습니다.';
+            this.$refs.commmonMemoModal.alertModalOpen(this.memorow);
+          }
+        } catch (error) {
+          console.log(error);
+          this.memorow.title = '메모 삭제';
+          this.memorow.msg1 = '실패 하였습니다.';
+          this.$refs.commmonMemoModal.alertModalOpen(this.memorow);
         }
+    },
+    confirmCalbackFnc(props){
+      console.log(props)
+      if(props.result){
+        this.memorow = {}
+        this.memorow.seqNo = this.seqNo;
+        this.memorow.userId = this.userId;
+        this.deleteMemoConfirm(this.memorow);
+      }        
+    },
         
 	}
 }

frontend/src/modules/custMgt/components/TestIdRegPop.vue

@@ -3,58 +3,56 @@
 	<div>
 		<div class="dimmed" @click="ModalClose();"></div>
 		<div class="popup-wrap">
-			<!-- 테스트 ID 생성 -->
-			<div class="popup modal29 popup_form">
-				<div class="pop-head">
-					<h3 class="pop-tit">테스트 ID 생성</h3>
-				</div>
-				<form autocomplete="off">
-					<table>
-						<tbody>
-							<tr>
-								<th>ID</th>
-								<td><input type="text" placeholder="아이디 입력" v-model.trim="userId" ref="_userId" /></td>
-							</tr>
-							<tr>
-								<th>비밀번호</th>
-								<td><input type="password" @keypress="onlyPassword" @input="onlyPassword" required minlength="8" maxlength="16" ref="_pwd1" v-model.trim="userPwd1"></td>
-							</tr>
-							<tr>
-								<th>비밀번호 확인</th>
-								<td><input type="password" @keypress="onlyPassword" @input="onlyPassword" required minlength="8" maxlength="16" ref="_pwd2" v-model.trim="userPwd2"></td>
-							</tr>
-							<tr>
-								<th>이름</th>
-								<td><input type="text" @keypress="onlyName" @input="onlyName" v-model.trim="userNm" ref="_userNm" required maxlength="40"></td>
-							</tr>
-							<tr>
-								<th>휴대폰번호</th>
-								<td><input type="number" placeholder="- 자 제외 숫자만 입력" v-model.trim="mdn" v-on:keyup="onlyNum" @input="onlyNum" minlength="10" maxlength="11" ref="_phone"></td>
-							</tr>
-							<tr>
-								<th>이메일</th>
-								<td><input type="email" v-model.trim="email" @keypress="onlyEmail" @input="onlyEmail" maxlength="20" ref="_email"></td>
-							</tr>
-							<tr>
-								<th class="center">상태</th>
-								<td>
-									<input type="radio" name="state" value="01" id="popup_radio1" v-model="userStat">
-									<label for="popup_radio1">사용</label>
-									<input type="radio" name="state" value="02" id="popup_radio2" v-model="userStat">
-									<label for="popup_radio2">정지</label>
-								</td>
-							</tr>
-						</tbody>
-					</table>
-				</form>
-				<div class="pop-btn2">
-					<button class="btn-default" @click="ModalClose();">취소</button>
-					<button class="btn-pcolor" @click="doInsert">저장</button>
-				</div>
-
+	      <!-- 테스트 ID 생성 -->
+      <div class="popup modal29 popup_form">
+        <div class="pop-head">
+          <h3 class="pop-tit">테스트 ID 생성</h3>
+        </div>
+        <form autocomplete="off">
+          <table>
+            <tbody>
+                <tr>
+                  <th>ID</th>
+                  <td><input type="text" placeholder="아이디 입력" v-model.trim="userId" ref="_userId" /></td>
+                </tr>
+                <tr>
+                  <th>비밀번호</th>
+                  <td><input type="password" @keypress="onlyPassword" @input="onlyPassword" required minlength="8" maxlength="16" ref="_pwd1" v-model.trim="userPwd1"></td>
+                </tr>
+                <tr>
+                  <th>비밀번호 확인</th>
+                  <td><input type="password" @keypress="onlyPassword" @input="onlyPassword" required minlength="8" maxlength="16" ref="_pwd2" v-model.trim="userPwd2"></td>
+                </tr>
+                <tr>
+                  <th>이름</th>
+                  <td><input type="text" @keypress="onlyName" @input="onlyName" v-model.trim="userNm" ref="_userNm" required maxlength="40"></td>
+                </tr>
+                <tr>
+                  <th>휴대폰번호</th>
+                  <td><input type="number" placeholder="- 자 제외 숫자만 입력" v-model.trim="mdn" v-on:keyup="onlyNum" @input="onlyNum" minlength="10" maxlength="11" ref="_phone"></td>
+                </tr>
+                <tr>
+                  <th>이메일</th>
+                  <td><input type="email" v-model.trim="email" @keypress="onlyEmail" @input="onlyEmail" maxlength="20" ref="_email"></td>
+                </tr>
+                <tr>
+                  <th class="center">상태</th>
+                  <td>
+                    <input type="radio" name="state" value="01" id="popup_radio1" v-model="userStat">
+                    <label for="popup_radio1">사용</label>
+                    <input type="radio" name="state" value="02" id="popup_radio2" v-model="userStat">
+                    <label for="popup_radio2">정지</label>
+                  </td>
+                </tr>
+            </tbody>
+          </table>
+        </form>
+        <div class="popup-btn2">
+          <button class="btn-pcolor" @click="doInsert">저장</button>
+          <button class="btn-default" @click="ModalClose();">취소</button>
+        </div>
+      </div>
         <common-modal ref="commmonModal"></common-modal>
-
-			</div>
 		</div>
 	</div>
 </template>
@@ -64,7 +62,7 @@ import api from '@/service/api';
 import custMgtApi from "../service/custMgtApi.js";
 import { utils_mixin, chkPattern2 } from '../service/mixins';
 import lodash from "lodash";
-import commonModal from "@/components/modal/commonModal";
+import commonModal from "../components/commonModal";
 import ValidationConfirmPop from "@/modules/custMgt/components/ValidationConfirmPop";
 
 export default {
@@ -99,7 +97,7 @@ export default {
   },
 	created(){            
 		this.formReset();
-    }, 
+  },
 	methods :{
 		doPwdValidate(){
 			if(this.isNull(this.userPwd1)){
@@ -200,9 +198,9 @@ export default {
 				return false;
 			}
 			this.row.userId=this.userId;
-			this.row.name=this.userNm;
+			this.row.userNm=this.userNm;
 			this.row.mdn=hp;
-			this.row.email=email;
+			this.row.userEmail=email;
 			this.row.userStat=this.userStat;
 			return true;
 		},
@@ -214,6 +212,7 @@ export default {
 			wrap[0].style.display = 'block';
 			var obj = document.getElementsByClassName('modal29');
 			obj[0].style.display = 'block';
+      this.formReset();
 		},
 		// 모달 끄기
 		ModalClose(){
@@ -228,18 +227,20 @@ export default {
 		},
 		// 저장 후 부모창 호출.
 		toComplete(){
-			this.getParent('custList').$refs.table.reloadData();
+      this.getParent('memberList').$refs.table.reloadData();
 			this.ModalClose();
-        },
+    },
 		async doInsert(){
-      if(this.doValidate() && window.confirm('등록 하시겠습니까?')){
+      if(this.doValidate()){
+        console.log(this.row)
+
         try {
 					const response = await custMgtApi.insertTestId(this.row);
 					const result = response.data;
 					if (result != null && result.retCode == "0000") {
-            this.row.title = '청약고객관리';
-            this.row.msg1 = '저장 하였습니다.';
-            this.$refs.commmonModal.alertModalOpen(this.row);
+            // this.row.title = '청약고객관리';
+            // this.row.msg1 = '저장 하였습니다.';
+            // this.$refs.commmonModal.alertModalOpen(this.row);
 						this.toComplete();
 					}
         } catch(err) {
@@ -249,15 +250,11 @@ export default {
         }
       }
     },
-		formReset(){
-			//this.$refs.adminRegForm.reset();
-		},
+    formReset(){
+      // this.$refs.adminRegForm.reset();
+      Object.assign(this.$data, this.$options.data());
+    },
+
 	}
 }
-</script>
-
-<style>
-	.popup-btn-wrap {width: 500px; margin: auto; padding: 100px 0;}
-	.popup-btn-wrap button {width: 100%; margin-bottom: 10px; height: 50px; border-radius: 5px; box-shadow: none; border: 1px solid #000; }
-	.popup-btn-wrap button:hover {background: #000; color: #fff;}
-</style>
+</script>

frontend/src/modules/custMgt/components/ValidationConfirmPop.vue

@@ -18,24 +18,24 @@
 			</div>
         </div>
 
-            <!-- 사용자 등록 - 최초 등록 -->
+        <!-- 사용자 등록 - 최초 등록 -->
         <div class="dimmed confirm-insert" @click="confirmInsertClose();"></div>
         <div class="popup-wrap confirm-insert">
-            <div class="popup confirm-insert">
-				<div class="pop-head">
-					<h3 class="pop-tit">사용자 등록</h3>
-				</div>
-				<div class="pop-cont">
-					<p>해당 사용자를 등록하고 인증 메일을</p>
-					<p>발송하시겠습니까?</p>
-					<p>사용을 위해서는 등록된 이메일 인증 후</p>
-					<p>서비스 이용이 가능합니다.</p>
-				</div>
-				<div class="pop-btn2">
-					<button class="btn-pcolor" @click="confirmInsert();">확인</button>
-					<button class="btn-default" @click="confirmInsertClose();">취소</button>
-				</div>
-			</div>	
+          <div class="popup confirm-insert">
+            <div class="pop-head">
+              <h3 class="pop-tit">사용자 등록</h3>
+            </div>
+            <div class="pop-cont">
+              <p>해당 사용자를 등록하고 인증 메일을</p>
+              <p>발송하시겠습니까?</p>
+              <p>사용을 위해서는 등록된 이메일 인증 후</p>
+              <p>서비스 이용이 가능합니다.</p>
+            </div>
+            <div class="popup-btn2">
+              <button class="btn-pcolor" @click="confirmInsert();">확인</button>
+              <button class="btn-default" @click="confirmInsertClose();">취소</button>
+            </div>
+          </div>
 		</div>
 
 			<!-- 사용자 등록 - 이메일 형식 체크 -->
@@ -124,18 +124,18 @@
 			<!-- 사용자 수정 확인 -->
         <div class="dimmed confirm-update" @click="confirmUpdateClose();"></div>
         <div class="popup-wrap confirm-update">
-			<div class="popup confirm-update">
-				<div class="pop-head">
-					<h3 class="pop-tit">사용자 수정 확인</h3>
-				</div>
-				<div class="pop-cont">
-					<p>변경된 내용을 저장하시겠습니까?</p>
-				</div>
-				<div class="pop-btn2">
-					<button class="btn-pcolor" @click="confirmUpdate();">확인</button>
-					<button class="btn-default" @click="confirmUpdateClose();">취소</button>
-				</div>
-			</div>	
+          <div class="popup confirm-update">
+            <div class="pop-head">
+              <h3 class="pop-tit">사용자 수정 확인</h3>
+            </div>
+            <div class="pop-cont">
+              <p>변경된 내용을 저장하시겠습니까?</p>
+            </div>
+            <div class="popup-btn2">
+              <button class="btn-pcolor" @click="confirmUpdate();">확인</button>
+              <button class="btn-default" @click="confirmUpdateClose();">취소</button>
+            </div>
+          </div>
 		</div>
 
         <!-- 사용자 수정(청약고객:sub) 확인 -->

frontend/src/modules/custMgt/components/commonModal.vue

@@ -60,6 +60,27 @@
 				</div>
 			</div>
     </div>
+
+    <div class="dimmed confirmMemo" @click="confirmModalCancelMemo();"></div>
+		<div class="popup-wrap confirmMemo">
+			<!-- 수정 확인 -->
+			<div class="popup confirmMemo">
+				<div class="pop-head">
+					<h3 class="popup-tit">{{title}}</h3>
+				</div>
+				<div class="pop-cont">
+          <p>{{ msg1 }}</p>
+          <p v-if="msg2 !== ''">{{ msg2 }}</p>
+          <p v-if="msg3 !== ''">{{ msg3 }}</p>
+          <p v-if="msg4 !== ''">{{ msg4 }}</p>
+				</div>
+				<div class="popup-btn2">
+					<button class="btn-pcolor" @click="confirmModalCloseMemo();">확인</button>
+					<button class="btn-default" @click="confirmModalCancelMemo();">취소</button>
+				</div>
+			</div>
+    </div>
+    
   </div>
 </template>
 
@@ -80,14 +101,13 @@ export default {
     },
 	methods :{
     alertModalOpen(props){
-      console.log('>>>>>>>>>> alertModalOpen');
       console.log(props.msg1);
       this.title = props.title;
       this.msg1 = props.msg1;
       this.msg2 = props.msg2;
       this.msg3 = props.msg3;
       this.msg4 = props.msg4;
-
+      console.log(props)
       var dimmed = document.getElementsByClassName('alertModal');
       for(var i = 0; i < dimmed.length; i++){
         dimmed[i].style.display = 'block';
@@ -110,6 +130,7 @@ export default {
     },
         // 모달 오픈
 		confirmModalOpen(props){
+      console.log(props)
 			var dimmed = document.getElementsByClassName('confirm');
 			for(var i = 0; i < dimmed.length; i++){
 				dimmed[i].style.display = 'block';
@@ -127,6 +148,18 @@ export default {
 				dimmed[i].style.display = 'block';
 			}
 
+      this.title = props.title;
+      this.msg1 = props.msg1;
+      this.msg2 = props.msg2;
+      this.msg3 = props.msg3;
+      this.msg4 = props.msg4;
+		},
+    confirmModalOpenMemo(props){
+			var dimmed = document.getElementsByClassName('confirmMemo');
+			for(var i = 0; i < dimmed.length; i++){
+				dimmed[i].style.display = 'block';
+			}
+
       this.title = props.title;
       this.msg1 = props.msg1;
       this.msg2 = props.msg2;
@@ -151,6 +184,17 @@ export default {
 				dimmed[i].style.display = 'none';
 			}
 
+      this.row.result = true;
+      // 부모 함수 호출.
+      this.$parent.confirmCalbackFnc(this.row);
+		},
+    	// 모달 끄기(ok)
+		confirmModalCloseMemo(){
+			var dimmed = document.getElementsByClassName('confirmMemo');
+			for(var i = 0; i < dimmed.length; i++){
+				dimmed[i].style.display = 'none';
+			}
+
       this.row.result = true;
       // 부모 함수 호출.
       this.$parent.confirmCalbackFnc(this.row);
@@ -177,6 +221,18 @@ export default {
       // 부모 함수 호출.
       this.$parent.confirmCalbackFnc(this.row);
 		},		
+        // 모달 끄기(취소)
+		confirmModalCancelMemo(){
+			var dimmed = document.getElementsByClassName('confirmMemo');
+			for(var i = 0; i < dimmed.length; i++){
+				dimmed[i].style.display = 'none';
+			}
+
+      this.row.result = false;
+      // 부모 함수 호출.
+      this.$parent.memberDeleteConfirmCalbackFnc(this.row);
+		},		
+    	
 	}
 }
 </script>