提交测试

1

src/views/studentManager/memberList.vue

@@ -224,6 +224,7 @@ export default {
         isMaintenanceFee: null,
         cloudTeacherAmount: null,
         isCloudTeacherAmount: null,
+        isRefundMemberFee:null,
         maintenanceFee: 0,
         reason: "",
       },
@@ -287,6 +288,7 @@ export default {
             isRefundCourseFee: false,
             isRefundInstrumentFee: false,
             isRefundTeachingAssistantsFee: false,
+            isRefundMemberFee:false
           }).then((res) => {
             this.quitForm = {
               // 退团信息确认
@@ -296,6 +298,7 @@ export default {
               isMaintenanceFee: null,
               cloudTeacherAmount: null,
               isCloudTeacherAmount: null,
+              isRefundMemberFee:null,
               maintenanceFee: 0,
               reason: "",
             };
@@ -327,9 +330,10 @@ export default {
                 isRefundTeachingAssistantsFee:
                   this.quitForm.isRefundTeachingAssistantsFee,
                 maintenanceFee: this.quitForm.maintenanceFee,
+                isRefundMemberFee:this.quitForm.isRefundMemberFee
               };
               // 退还乐器练习云教练费用
-              if (this.quitForm.isCloudTeacherAmount) {
+              if (this.quitForm.isRefundMemberFee) {
                 params.cloudTeacherAmount = this.quitForm.cloudTeacherAmount;
               } else {
                 params.cloudTeacherAmount = 0;
@@ -344,6 +348,7 @@ export default {
                   isMaintenanceFee: null,
                   cloudTeacherAmount: null,
                   isCloudTeacherAmount: null,
+                  isRefundMemberFee:null,
                   maintenanceFee: 0,
                   reason: "",
                 };

src/views/teamBuild/signupList.vue

@@ -936,6 +936,7 @@ export default {
         isMaintenanceFee: null,
         cloudTeacherAmount: null,
         isCloudTeacherAmount: null,
+        isRefundMemberFee:null,
         maintenanceFee: 0,
         reason: "",
       },
@@ -1564,6 +1565,7 @@ export default {
             isRefundCourseFee: false,
             isRefundInstrumentFee: false,
             isRefundTeachingAssistantsFee: false,
+            isRefundMemberFee:false,
           }).then((res) => {
             this.quitForm = {
               // 退团信息确认
@@ -1604,9 +1606,10 @@ export default {
                 isRefundTeachingAssistantsFee:
                   this.quitForm.isRefundTeachingAssistantsFee,
                 maintenanceFee: this.quitForm.maintenanceFee,
+                isRefundMemberFee:this.quitForm.isRefundMemberFee,
               };
               // 退还乐器练习云教练费用
-              if (this.quitForm.isCloudTeacherAmount) {
+              if (this.quitForm.isRefundMemberFee) {
                 params.cloudTeacherAmount = this.quitForm.cloudTeacherAmount;
               } else {
                 params.cloudTeacherAmount = 0;
@@ -1846,6 +1849,7 @@ export default {
           isCloudTeacherAmount: null,
           maintenanceFee: 0,
           reason: "",
+          isRefundMemberFee:null
         };
         this.$refs["quitForm"].$refs["quitForm"].resetFields();
       }

src/views/teamDetail/components/modals/quite-team.vue

@@ -6,23 +6,32 @@
       label-width="150px"
       :rules="quitRules"
     >
-    <!-- v-if="activeRow.cloudTeacherAmount > 0" -->
       <el-form-item
-        label="退还云教练费用"
-        prop="isCloudTeacherAmount"
-
+        label="退还会员费用"
+        prop="isRefundMemberFee"
+        v-if="quitForm.status == 'APPROVED'"
       >
-        <el-radio v-model.trim="quitForm.isCloudTeacherAmount" label="true"
+        <el-radio v-model.trim="quitForm.isRefundMemberFee" :label="true"
+          >是</el-radio
+        >
+        <el-radio v-model.trim="quitForm.isRefundMemberFee" :label="false"
+          >否</el-radio
+        >
+      </el-form-item>
+      <!-- v-if="activeRow.cloudTeacherAmount > 0" -->
+
+      <el-form-item label="退还云教练费用" prop="isRefundMemberFee">
+        <el-radio v-model.trim="quitForm.isRefundMemberFee" label="true"
           >是</el-radio
         >
-        <el-radio v-model.trim="quitForm.isCloudTeacherAmount" label="false"
+        <el-radio v-model.trim="quitForm.isRefundMemberFee" label="false"
           >否</el-radio
         >
       </el-form-item>
       <el-form-item
         label="退还云教练金额"
         prop="cloudTeacherAmount"
-        v-if="quitForm.isCloudTeacherAmount"
+        v-if="quitForm.isRefundMemberFee&&quitForm.isRefundMemberFee!='false'"
       >
         <el-input
           type="number"
@@ -93,7 +102,7 @@
 </template>
 <script>
 export default {
-  props: ["quitForm","activeRow"],
+  props: ["quitForm", "activeRow"],
   data() {
     return {
       quitRules: {
@@ -113,6 +122,9 @@ export default {
         isMaintenanceFee: [{ required: true, message: "选择是否退还乐保费用" }],
         maintenanceFee: [{ required: true, message: "请输入退还乐保金额" }],
         reason: [{ required: true, message: "请填写退团退费原因" }],
+        isRefundMemberFee: [
+          { required: true, message: "请选择是否退还会员费用" },
+        ],
       },
     };
   },

src/views/teamDetail/components/studentList.vue

@@ -1254,9 +1254,10 @@ export default {
                 isRefundTeachingAssistantsFee:
                   this.quitForm.isRefundTeachingAssistantsFee,
                 maintenanceFee: this.quitForm.maintenanceFee,
+                isRefundMemberFee:this.quitForm.isRefundMemberFee
               };
               // 退还乐器练习云教练费用
-              if (this.quitForm.isCloudTeacherAmount) {
+              if (this.quitForm.isRefundMemberFee) {
                 params.cloudTeacherAmount = this.quitForm.cloudTeacherAmount;
               } else {
                 params.cloudTeacherAmount = 0;
@@ -1271,6 +1272,7 @@ export default {
                   isMaintenanceFee: null,
                   cloudTeacherAmount: null,
                   isCloudTeacherAmount: null,
+                  isRefundMemberFee:null,
                   maintenanceFee: 0,
                   reason: "",
                 };
@@ -1691,6 +1693,7 @@ export default {
           isMaintenanceFee: null,
           cloudTeacherAmount: null,
           isCloudTeacherAmount: null,
+          isRefundMemberFee:null,
           maintenanceFee: 0,
           reason: "",
         };

src/views/withdrawal-application/modals/quit.vue

@@ -12,22 +12,23 @@
         >
         <el-radio v-model.trim="quitForm.status" label="DENIED">拒绝</el-radio>
       </el-form-item>
+
       <el-form-item
         label="退还云教练费用"
-        prop="isCloudTeacherAmount"
+        prop="isRefundMemberFee"
         v-if=" quitForm.status == 'APPROVED'"
       >
-        <el-radio v-model.trim="quitForm.isCloudTeacherAmount" :label="true"
+        <el-radio v-model.trim="quitForm.isRefundMemberFee" label="true"
           >是</el-radio
         >
-        <el-radio v-model.trim="quitForm.isCloudTeacherAmount" :label="false"
+        <el-radio v-model.trim="quitForm.isRefundMemberFee" label="false"
           >否</el-radio
         >
       </el-form-item>
       <el-form-item
         label="退还云教练金额"
         prop="cloudTeacherAmount"
-        v-if="quitForm.isCloudTeacherAmount && quitForm.status == 'APPROVED'"
+        v-if="quitForm.isRefundMemberFee&&quitForm.isRefundMemberFee!='false' && quitForm.status == 'APPROVED'"
       >
         <el-input
           type="number"
@@ -132,6 +133,7 @@ export default {
         maintenanceFee: 0,
         cloudTeacherAmount: null,
         isCloudTeacherAmount: null,
+        isRefundMemberFee:null,
         reason: null,
       },
     };
@@ -162,6 +164,7 @@ export default {
         ],
         isMaintenanceFee: [{ required: true, message: "选择是否退还乐保费用" }],
         maintenanceFee: [{ required: true, message: "请输入退还乐保金额" }],
+        isRefundMemberFee:[{required: true, message: "请选择是否退还会员费用"}],
         reason: [{ required: true, message: "请填写退团原因" }],
       };
     },