Merge branch 'develop' of http://git.mhez-qa.uplus.co.kr/hubez/hubez-admin into develop

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

@@ -22,10 +22,10 @@
       </div>
     </div>
 
-    <div class="dimmed confirm" @click="confirmModalCancel();"></div>
-    <div class="popup-wrap confirm">
+    <div class="dimmed confirm1" @click="confirmModalCancel();"></div>
+    <div class="popup-wrap confirm1">
       <!-- 수정 확인 -->
-      <div class="popup confirm">
+      <div class="popup confirm1">
         <div class="pop-head">
           <h3 class="pop-tit">{{ title }}</h3>
         </div>
@@ -138,7 +138,7 @@ export default {
     },
     // 모달 오픈
     confirmModalOpen(props) {
-      var dimmed = document.getElementsByClassName('confirm');
+      var dimmed = document.getElementsByClassName('confirm1');
       for (var i = 0; i < dimmed.length; i++) {
         dimmed[i].style.display = 'block';
       }
@@ -148,6 +148,7 @@ export default {
       this.msg2 = props.msg2;
       this.msg3 = props.msg3;
       this.msg4 = props.msg4;
+
     },
     confirmModalOpen2(props) {
       var dimmed = document.getElementsByClassName('confirm2');
@@ -175,12 +176,13 @@ export default {
     },
     // 모달 끄기(ok)
     confirmModalClose() {
-      var dimmed = document.getElementsByClassName('confirm');
+      var dimmed = document.getElementsByClassName('confirm1');
       for (var i = 0; i < dimmed.length; i++) {
         dimmed[i].style.display = 'none';
       }
 
       this.row.result = true;
+      this.row.title = this.title;
       // 부모 함수 호출.
       this.$parent.confirmCalbackFnc(this.row);
     },
@@ -208,14 +210,15 @@ export default {
     },
     // 모달 끄기(취소)
     confirmModalCancel() {
-      var dimmed = document.getElementsByClassName('confirm');
+      console.log("확인4")
+      var dimmed = document.getElementsByClassName('confirm1');
       for (var i = 0; i < dimmed.length; i++) {
         dimmed[i].style.display = 'none';
       }
 
       this.row.result = false;
       // 부모 함수 호출.
-      this.$parent.confirmCalbackFnc(this.row);
+      // this.$parent.confirmCalbackFnc(this.row);
     },
     // 모달 끄기(취소)
     confirmModalCancel2() {

frontend/src/modules/custMgt/views/SubsDetail.vue

@@ -82,7 +82,7 @@
               <td colspan="5">
                 <div class="input-double">
                   <input type="text" disabled v-model="stat" />
-                  <button v-if="(this.subsSttusCd=='01')||(this.subsSttusCd=='00')" type="button" class="button grey btn-a" @click="cancleSubsStatus">청약취소</button>
+                  <button v-if="(this.subsSttusCd=='01')||(this.subsSttusCd=='00')" type="button" class="button grey btn-a" @click="cancleSubsConfirm">청약취소</button>
                 </div>
               </td>
             </tr>
@@ -387,10 +387,13 @@ export default {
         this.$refs.validationConfirmPop.confirmUpdateSubOpen();
       }
     },
-    /* confirmCalbackFnc: function (props) {
+    confirmCalbackFnc: function (props) {
       if (props.result) {
+        if(props.title == '청약상태취소'){
+          this.cancleSubsStatus();
+        }
       }
-    }, */
+    },
     searchIDPopOpen: function () {
       var params = {
         serviceId: this.serviceId,
@@ -423,6 +426,13 @@ export default {
       });
     },
 
+    cancleSubsConfirm(){
+      this.row.title = '청약상태취소';
+      this.row.msg1 = '상태값을 취소로 바꾸시겠습니까?';
+      this.$refs.commmonModal.confirmModalOpen(this.row);
+      // this.cancleSubsStatus();
+    },
+
     async cancleSubsStatus(){
       let param = {
         userId : this.serviceId,