From cee7bc89610d5d81bfaa803f1d9a4975900e6fc9 Mon Sep 17 00:00:00 2001
From: won503 <won96503@gmail.com>
Date: Tue, 13 Jun 2023 10:49:38 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custMgt/components/InsertChrgModal.vue    | 79 +++++++++++++++----
 .../mapper/mysql/custMgt/custMgt-mapper.xml   |  3 +
 2 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/frontend/src/modules/custMgt/components/InsertChrgModal.vue b/frontend/src/modules/custMgt/components/InsertChrgModal.vue
index 9af7cf1..6a62fc6 100644
--- a/frontend/src/modules/custMgt/components/InsertChrgModal.vue
+++ b/frontend/src/modules/custMgt/components/InsertChrgModal.vue
@@ -17,11 +17,10 @@
                 <button type="button" class="button grey" @click="searchIdPop">조회</button>
               </div>
             </td>
-            
           </tr>
           <tr>
             <th>충전월</th>
-            <td>
+            <td v-if="joinDiv==1">
                 <div class="input_box cal" style="width:60%">
                     <div class="term">
                         <span class="custom_input icon_date">
@@ -54,8 +53,27 @@
                     </div>
                 </div>
             </td>
+            <td v-if="joinDiv==2">
+                <div class="input_box cal" style="width:60%">
+                    <div class="term">
+                        <span class="custom_input icon_date">
+                        <vuejs-datepicker
+                            :language="ko"
+                            :format="customFormatter"
+                            :disabled-dates="disabledSDate"
+                            :minimumView="sDateDiv"
+                            :maximumView="sDateDiv"
+                            v-model="startDate"
+                            @selected="selectedStartDate(0)"
+                            @closed="closeDate('start')"
+                            :picker-options="startDateOptions"
+                        ></vuejs-datepicker>
+                        </span>
+                    </div>
+                </div>
+            </td>
           </tr>
-          <tr >
+          <tr v-if="joinDiv==1">
             <th>충전금액</th>
             <td>
               <div class="input_add">
@@ -91,6 +109,28 @@
               </div>
             </td>
           </tr>
+          <tr v-if="joinDiv==2">
+            <th>충전금액</th>
+            <td>
+              <div class="input_add">
+              <input
+                type="radio"
+                name="nmineeDivCd"
+                value="01"
+                id="popup_radio5"
+                v-model="nmineeDivCd"
+              />
+              <label for="popup_radio6">이월금액 <span style="font-size: 14px;">(다음달 정액 요금에 이월되는 충전금액입니다)</span></label>
+              <input 
+                class="search-box" 
+                type="number"  
+                placeholder="이월 충전 금액 입력" 
+                v-model="chrgAmtC" 
+                v-bind:disabled ="nmineeDivCd=='02'"
+              />
+              </div>
+            </td>
+          </tr>
         </tbody>
         </table>
         <div class="popup-btn2">
@@ -146,6 +186,7 @@ export default {
       chrgSeq : '',
       userTpCd: '',
       userSeq: '',
+      joinDiv:'1',
 
       row: {},
 
@@ -154,7 +195,7 @@ export default {
    components: {
     vuejsDatepicker,
     UserListPop,
-      CommonModal,
+    CommonModal,
   },
   mounted(){
     // 달력 세팅
@@ -178,7 +219,7 @@ export default {
       for (var i = 0; i < dimmed.length; i++) {
         dimmed[i].style.display = 'none';
       }
-
+      this.$refs.userListPop.UserListPopClose();
     },
     formReset() {
       Object.assign(this.$data, this.$options.data());
@@ -193,6 +234,7 @@ export default {
       this.custSeq = data.custSeq;
       this.userTpCd = data.userTpCd;
       this.userSeq = data.userSeq;
+      this.joinDiv = data.joinDiv;
     },
 
     search: function (isKeep) {
@@ -233,20 +275,27 @@ export default {
         initStartDate.setMonth(Number(moment(initStartDate).format('MM')) -1)
         initEndDate.setMonth(Number(moment(initEndDate).format('MM')) + 100)
 
+        if (this.joinDiv==1) {
+          if (type == 'start') {
+            // this.disabledSDate = {to: initStartDate, from: new Date()};
+            if (this.startDate !== initStartDate) {
+              this.disabledEDate = {to: this.startDate, from: initEndDate};
 
-        if (type == 'start') {
-          this.disabledSDate = {to: initStartDate, from: new Date()};
-          if (this.startDate !== initStartDate) {
+            }
+          } else if (type == 'end') {
             this.disabledEDate = {to: this.startDate, from: initEndDate};
-
-          }
-        } else if (type == 'end') {
-          this.disabledEDate = {to: this.startDate, from: initEndDate};
-          if (this.endDate !== initEndDate) {
-            this.disabledSDate = {from: this.endDate};
-            this.disabledSDate = {to: initStartDate, from: this.endDate};
+            if (this.endDate !== initEndDate) {
+              this.disabledSDate = {from: this.endDate};
+              this.disabledSDate = {to: initStartDate, from: this.endDate};
+            }
           }
+        } else {
+          this.disabledSDate = {to: new Date(), from: new Date()};
+            if (this.startDate !== initStartDate) {
+              this.disabledEDate = {to: new Date(), from: new Date()};
+            }
         }
+        
       }
     },
     customFormatter: function (date) {
diff --git a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
index a389538..49af706 100644
--- a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
+++ b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
@@ -1242,9 +1242,11 @@
 			, ecm.USE_YN 
 			, eci.BIZRNO 
 			, ecm.CHRG_SEQ 
+			, esi.JOIN_DIV
 		FROM hubez_admin.EZ_CHARGE_MNG ecm 
 		INNER JOIN hubez_common.EZ_SVC_USER esu ON esu.USER_SEQ = ecm.USER_SEQ 
 		INNER JOIN hubez_common.EZ_CUST_INFO eci ON eci.CUST_SEQ = esu.CUST_SEQ 
+		INNER JOIN hubez_common.EZ_SUBS_INFO esi ON esi.USER_SEQ = ecm.USER_SEQ  
 		WHERE 1 = 1
 			AND ecm.USE_YN ='Y'		
 			AND ecm.CHRG_SEQ  = #{chrgSeq}
@@ -1274,6 +1276,7 @@
 			, esu.USER_SEQ  
 			, esu.USER_STTUS_CD 
 			, esu.USER_TP_CD 
+			, esi.JOIN_DIV
 		 FROM hubez_common.EZ_SVC_USER esu 
 		 INNER JOIN hubez_common.EZ_SUBS_INFO esi ON esi.USER_SEQ = esu.USER_SEQ 
 		 INNER JOIN hubez_common.EZ_CUST_INFO eci ON eci.CUST_SEQ = esu.CUST_SEQ