Merge branch '03/03Lebao' of http://git.dayaedu.com/molingzhide/dy-admin-manager into 03/03Lebao

src/views/teamBuild/signupList.vue

@@ -654,7 +654,32 @@
       width="640px"
       :visible.sync="quitVisible"
     >
-      <el-form :model="quitForm" ref="quitForm" :rules="quitRules">
+      <el-form :model="quitForm" ref="quitForm" label-width="150px" :rules="quitRules">
+        <el-form-item
+          label="退还云教练费用"
+          prop="isCloudTeacherAmount"
+          v-if="activeRow.cloudTeacherAmount > 0"
+        >
+          <el-radio v-model.trim="quitForm.isCloudTeacherAmount" :label="true"
+            >是</el-radio
+          >
+          <el-radio v-model.trim="quitForm.isCloudTeacherAmount" :label="false"
+            >否</el-radio
+          >
+        </el-form-item>
+        <el-form-item
+          label="退还云教练金额"
+          prop="cloudTeacherAmount"
+          v-if="quitForm.isCloudTeacherAmount"
+        >
+          <el-input
+            type="number"
+            v-model.trim="quitForm.cloudTeacherAmount"
+            style="width: 180px"
+          >
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
         <el-form-item label="退还课程费用" prop="isRefundCourseFee">
           <el-radio v-model.trim="quitForm.isRefundCourseFee" :label="true"
             >是</el-radio
@@ -717,9 +742,11 @@
           <el-popover placement="right" width="500" trigger="click">
             <div class="popoverWrap">
               <p>乐团退团退费规则：</p>
+              <p>退还乐器练习云教练费用：报名缴费时缴费的乐器练习云教练费用</p>
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
+              <p>退还乐保费用：报名缴费时缴费的乐保费用</p>
             </div>
             <el-button
               type="text"
@@ -839,6 +866,8 @@ export default {
         isRefundInstrumentFee: null,
         isRefundTeachingAssistantsFee: null,
         isMaintenanceFee: null,
+        cloudTeacherAmount: null,
+        isCloudTeacherAmount: null,
         maintenanceFee: 0,
         reason: "",
       },
@@ -904,9 +933,9 @@ export default {
         ],
       },
       quitRules: {
-        isRefundCourseFee: [
-          { required: true, message: "请选择是否退还课程费用" },
-        ],
+        isCloudTeacherAmount: [{ required: true, message: "请输入云教练费用" }],
+        cloudTeacherAmount: [{ required: true, message: "请输入云教练金额", trigger: 'blur' }],
+        isRefundCourseFee: [{ required: true, message: "请选择是否退还课程费用" }],
         isRefundInstrumentFee: [
           { required: true, message: "选择是否退还乐器费用" },
         ],
@@ -1428,6 +1457,7 @@ export default {
     quitTeam(row) {
       this.activeRow = row;
       this.quitVisible = true;
+      this.quitForm.cloudTeacherAmount = row.cloudTeacherAmount
     },
     quieTeams(row) {
       this.$prompt("请输入退团原因", "提示", {
@@ -1453,6 +1483,8 @@ export default {
               isRefundInstrumentFee: null,
               isRefundTeachingAssistantsFee: null,
               isMaintenanceFee: null,
+              cloudTeacherAmount: null,
+              isCloudTeacherAmount: null,
               maintenanceFee: 0,
               reason: "",
             };
@@ -1475,8 +1507,7 @@ export default {
           })
             .then(() => {
               let row = this.activeRow;
-              // 发请求 退团
-              StudentQuit({
+              let params = {
                 musicGroupId: this.id,
                 userId: row.studentId,
                 reason: this.quitForm.reason,
@@ -1485,13 +1516,23 @@ export default {
                 isRefundTeachingAssistantsFee: this.quitForm
                   .isRefundTeachingAssistantsFee,
                 maintenanceFee: this.quitForm.maintenanceFee,
-              }).then((res) => {
+              }
+              // 退还乐器练习云教练费用
+              if(this.quitForm.isCloudTeacherAmount) {
+                params.cloudTeacherAmount = this.quitForm.cloudTeacherAmount
+              } else {
+                params.cloudTeacherAmount = 0
+              }
+              // 发请求 退团
+              StudentQuit(params).then((res) => {
                 this.quitForm = {
                   // 退团信息确认
                   isRefundCourseFee: null,
                   isRefundInstrumentFee: null,
                   isRefundTeachingAssistantsFee: null,
                   isMaintenanceFee: null,
+                  cloudTeacherAmount: null,
+                  isCloudTeacherAmount: null,
                   maintenanceFee: 0,
                   reason: "",
                 };
@@ -1641,6 +1682,10 @@ export default {
           isRefundCourseFee: null,
           isRefundInstrumentFee: null,
           isRefundTeachingAssistantsFee: null,
+          isMaintenanceFee: null,
+          cloudTeacherAmount: null,
+          isCloudTeacherAmount: null,
+          maintenanceFee: 0,
           reason: "",
         };
         this.$refs["quitForm"].resetFields();

src/views/teamDetail/components/studentList.vue

@@ -538,7 +538,32 @@
     </el-dialog>
     <!-- 退团弹窗 -->
     <el-dialog title="退团信息确认" width="640px" :visible.sync="quitVisible">
-      <el-form :model="quitForm" ref="quitForm" :rules="quitRules">
+      <el-form :model="quitForm" ref="quitForm" label-width="150px" :rules="quitRules">
+        <el-form-item
+          label="退还云教练费用"
+          prop="isCloudTeacherAmount"
+          v-if="activeRow.cloudTeacherAmount > 0"
+        >
+          <el-radio v-model.trim="quitForm.isCloudTeacherAmount" :label="true"
+            >是</el-radio
+          >
+          <el-radio v-model.trim="quitForm.isCloudTeacherAmount" :label="false"
+            >否</el-radio
+          >
+        </el-form-item>
+        <el-form-item
+          label="退还云教练金额"
+          prop="cloudTeacherAmount"
+          v-if="quitForm.isCloudTeacherAmount"
+        >
+          <el-input
+            type="number"
+            v-model.trim="quitForm.cloudTeacherAmount"
+            style="width: 180px"
+          >
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
         <el-form-item label="退还课程费用" prop="isRefundCourseFee">
           <el-radio v-model.trim="quitForm.isRefundCourseFee" :label="true"
             >是</el-radio
@@ -601,9 +626,11 @@
           <el-popover placement="right" width="500" trigger="click">
             <div class="popoverWrap">
               <p>乐团退团退费规则：</p>
+              <p>退还乐器练习云教练费用：报名缴费时缴费的乐器练习云教练费用</p>
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
+              <p>退还乐保费用：报名缴费时缴费的乐保费用</p>
             </div>
             <el-button
               type="text"
@@ -855,6 +882,8 @@ export default {
       organizationCourseUnitPriceSettings: [],
       quitForm: {
         // 退团信息确认
+        isCloudTeacherAmount: null,
+        cloudTeacherAmount: null,
         isRefundCourseFee: null,
         isRefundInstrumentFee: null,
         isRefundTeachingAssistantsFee: null,
@@ -921,6 +950,8 @@ export default {
       remark: "", // 退团原因
       classList: [],
       quitRules: {
+        isCloudTeacherAmount: [{ required: true, message: "请输入云教练费用" }],
+        cloudTeacherAmount: [{ required: true, message: "请输入云教练金额", trigger: 'blur' }],
         isRefundCourseFee: [
           { required: true, message: "请选择是否退还课程费用" },
         ],
@@ -1293,23 +1324,31 @@ export default {
           })
             .then(() => {
               let row = this.activeRow;
-              // 发请求 退团
-              StudentQuit({
+              let params = {
                 musicGroupId: this.teamid,
                 userId: row.userId,
                 reason: this.quitForm.reason,
                 isRefundCourseFee: this.quitForm.isRefundCourseFee,
                 isRefundInstrumentFee: this.quitForm.isRefundInstrumentFee,
-                isRefundTeachingAssistantsFee: this.quitForm
-                  .isRefundTeachingAssistantsFee,
+                isRefundTeachingAssistantsFee: this.quitForm.isRefundTeachingAssistantsFee,
                 maintenanceFee: this.quitForm.maintenanceFee,
-              }).then((res) => {
+              }
+              // 退还乐器练习云教练费用
+              if(this.quitForm.isCloudTeacherAmount) {
+                params.cloudTeacherAmount = this.quitForm.cloudTeacherAmount
+              } else {
+                params.cloudTeacherAmount = 0
+              }
+              // 发请求 退团
+              StudentQuit(params).then((res) => {
                 this.quitForm = {
                   // 退团信息确认
                   isRefundCourseFee: null,
                   isRefundInstrumentFee: null,
                   isRefundTeachingAssistantsFee: null,
                   isMaintenanceFee: null,
+                  cloudTeacherAmount: null,
+                  isCloudTeacherAmount: null,
                   maintenanceFee: 0,
                   reason: "",
                 };
@@ -1502,6 +1541,7 @@ export default {
     quieTeamMask(row) {
       this.activeRow = row;
       this.quitVisible = true;
+      this.quitForm.cloudTeacherAmount = row.cloudTeacherAmount
     },
     quieTeam(row) {
       this.$prompt("请输入退团原因", "提示", {
@@ -1523,12 +1563,14 @@ export default {
           }).then((res) => {
             this.quitForm = {
               // 退团信息确认
-              isRefundCourseFee: null,
-              isRefundInstrumentFee: null,
-              isRefundTeachingAssistantsFee: null,
-              isMaintenanceFee: null,
-              maintenanceFee: 0,
-              reason: "",
+                isRefundCourseFee: null,
+                isRefundInstrumentFee: null,
+                isRefundTeachingAssistantsFee: null,
+                isMaintenanceFee: null,
+                cloudTeacherAmount: null,
+                isCloudTeacherAmount: null,
+                maintenanceFee: 0,
+                reason: "",
             };
             if (res.code == 200) {
               this.$message.success("退团成功");

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

@@ -4,7 +4,7 @@
       :model="quitForm"
       ref="quitForm"
       :rules="quitRules"
-      label-width="110px"
+      label-width="130px"
     >
       <el-form-item label="审核状态" prop="status">
         <el-radio v-model.trim="quitForm.status" label="APPROVED"
@@ -13,6 +13,31 @@
         <el-radio v-model.trim="quitForm.status" label="DENIED">拒绝</el-radio>
       </el-form-item>
       <el-form-item
+        label="退还云教练费用"
+        prop="isCloudTeacherAmount"
+        v-if="detail.cloudTeacherAmount > 0 && quitForm.status == 'APPROVED'"
+      >
+        <el-radio v-model.trim="quitForm.isCloudTeacherAmount" :label="true"
+          >是</el-radio
+        >
+        <el-radio v-model.trim="quitForm.isCloudTeacherAmount" :label="false"
+          >否</el-radio
+        >
+      </el-form-item>
+      <el-form-item
+        label="退还云教练金额"
+        prop="cloudTeacherAmount"
+        v-if="quitForm.isCloudTeacherAmount && quitForm.status == 'APPROVED'"
+      >
+        <el-input
+          type="number"
+          v-model.trim="quitForm.cloudTeacherAmount"
+          style="width: 180px"
+        >
+          <template slot="append">元</template>
+        </el-input>
+      </el-form-item>
+      <el-form-item
         label="退还课程费用"
         prop="isRefundCourseFee"
         v-if="quitForm.status == 'APPROVED'"
@@ -105,12 +130,14 @@ export default {
         isRefundTeachingAssistantsFee: null,
         isMaintenanceFee: null,
         maintenanceFee: 0,
+        cloudTeacherAmount: null,
+        isCloudTeacherAmount: null,
         reason: null,
       },
     };
   },
   mounted() {
-    console.log(this.detail);
+    this.quitForm.cloudTeacherAmount = this.detail.cloudTeacherAmount
   },
   watch:{
         "quitForm.isMaintenanceFee"(val) {
@@ -125,6 +152,8 @@ export default {
     quitRules() {
       const required = this.quitForm.status === "APPROVED";
       return {
+        isCloudTeacherAmount: [{ required: true, message: "请输入云教练费用" }],
+        cloudTeacherAmount: [{ required: true, message: "请输入云教练金额", trigger: 'blur' }],
         status: [{ required: true, message: "请选择审核状态" }],
         isRefundCourseFee: [{ required, message: "请选择是否退还课程费用" }],
         isRefundInstrumentFee: [{ required, message: "选择是否退还乐器费用" }],