提交测试

1

src/views/accompanyManager/accompanyList.vue

@@ -322,7 +322,7 @@
         />
       </div>
     </div>
-    <!-- <el-dialog title="关闭课程组" width="400px" :visible.sync="closeVisible">
+    <el-dialog title="关闭课程组" width="400px" :visible.sync="closeVisible">
       <el-form
         :model="closeForm"
         ref="closeForm"
@@ -341,12 +341,13 @@
             v-model.trim="closeForm.money"
           ></el-input>
         </el-form-item>
+        <p style="color:red"  v-if="closeForm.isBack">退费金额暂不进入账户余额</p>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="closeVisible = false">取 消</el-button>
         <el-button type="primary" @click="submieCloseCrouse">确 定</el-button>
       </div>
-    </el-dialog> -->
+    </el-dialog>
     <el-dialog title="备注" width="400px" :visible.sync="memoVisible">
       <el-input
         type="textarea"
@@ -613,43 +614,44 @@ export default {
     },
     closeCrouse(row) {
       this.activeRow = row;
-      this.$confirm("请确认是否关闭课程组，关闭后不予退费", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then((res) => {
-          cancelGroup({
-            groupId: row.id,
-            groupType: "PRACTICE",
-            refundAmount: 0,
-          }).then((res) => {
-            if (res.code == 200) {
-              this.$message.success("关闭成功");
-              this.getList();
-              // this.closeVisible = false;
-            }
-            if (res.code == 206) {
-              this.$confirm(res.msg, "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-              }).then(() => {
-                cancelGroup({
-                  groupId: row.id,
-                  groupType: "PRACTICE",
-                  refundAmount: 0,
-                  confirmReturnActivityGive: true,
-                }).then((res) => {
-                  if (res.code == 200) {
-                    this.$message.success("关闭成功");
-                    this.getList();
-                  }
-                });
-              });
-            }
-          });
-        })
-        .catch(() => {});
+      this.closeVisible = true;
+      // this.$confirm("请确认是否关闭课程组，关闭后不予退费", "提示", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   type: "warning",
+      // })
+      //   .then((res) => {
+      //     cancelGroup({
+      //       groupId: row.id,
+      //       groupType: "PRACTICE",
+      //       refundAmount: 0,
+      //     }).then((res) => {
+      //       if (res.code == 200) {
+      //         this.$message.success("关闭成功");
+      //         this.getList();
+      //         // this.closeVisible = false;
+      //       }
+      //       if (res.code == 206) {
+      //         this.$confirm(res.msg, "提示", {
+      //           confirmButtonText: "确定",
+      //           cancelButtonText: "取消",
+      //         }).then(() => {
+      //           cancelGroup({
+      //             groupId: row.id,
+      //             groupType: "PRACTICE",
+      //             refundAmount: 0,
+      //             confirmReturnActivityGive: true,
+      //           }).then((res) => {
+      //             if (res.code == 200) {
+      //               this.$message.success("关闭成功");
+      //               this.getList();
+      //             }
+      //           });
+      //         });
+      //       }
+      //     });
+      //   })
+      //   .catch(() => {});
 
       // this.closeVisible = true;
     },

src/views/categroyManager/modals/baseInfo.vue

@@ -177,7 +177,7 @@
           </el-select>
           <el-tooltip placement="top" popper-class="mTooltip">
             <div slot="content">
-              课程余额：学员缴费金额进入课程余额，排课时扣减课程余额；若课程余额不足则不可排课<br/>
+              课程余额：学员缴费金额进入课程余额，排课时扣减课程余额，若课程余额不足则不可排课<br/>
               资格限制：学员缴费金额不进入课程余额，学员购买后增加可排课次数，排课后扣减可排课次数
               会员活动默认为资格限制，不可修改
             </div>

src/views/studentManager/memberList.vue

@@ -49,10 +49,11 @@
           <el-select
             class="multiple"
             v-model.trim="searchForm.hasMember"
+            clearable
             placeholder="会员是否过期"
           >
             <el-option label="已过期" value="0"></el-option>
-            <el-option label="即将过期" value="1"></el-option>
+            <el-option label="未过期" value="1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="visitTime">
@@ -128,7 +129,7 @@
           <el-table-column align="center" prop="studentId" label="会员是否过期">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.memberDay > 0 ? "即将过期" : "已过期" }}
+                {{ scope.row.memberDay > 0 ? "未过期" : "已过期" }}
               </div>
             </template>
           </el-table-column>
@@ -192,6 +193,7 @@
     <!-- 退团弹窗 -->
     <el-dialog title="退团信息确认" width="660px" :visible.sync="quitVisible">
       <quiteTeam :quitForm="quitForm" :activeRow="activeRow" ref="quitForm" />
+       <p style="color:red;paddingLeft:150px">退费金额暂不进入账户余额</p>
       <span slot="footer" class="dialog-footer question">
         <div>
           <el-popover placement="right" width="500" trigger="click">
@@ -202,7 +204,7 @@
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
               <p>退还乐保费用：报名缴费时缴费的乐保费用</p>
-              <p>退费金额暂不进入账户余额</p>
+
             </div>
             <el-button
               type="text"
@@ -270,6 +272,8 @@ export default {
       },
       quitForm: {
         // 退团信息确认
+        studentName:null,
+        musicGroupName:null,
         isRefundCourseFee: null,
         isRefundInstrumentFee: null,
         isRefundTeachingAssistantsFee: null,
@@ -328,6 +332,8 @@ export default {
       this.activeRow = row;
       this.quitVisible = true;
       this.quitForm.cloudTeacherAmount = row.cloudTeacherAmount;
+       this.quitForm.studentName = row.username
+       this.quitForm.musicGroupName = row.musicGroupName
     },
     quieTeams(row) {
       this.$prompt("请输入退团原因", "提示", {

src/views/teamBuild/signupList.vue

@@ -993,6 +993,7 @@
       :visible.sync="quitVisible"
     >
       <quiteTeam :quitForm="quitForm" :activeRow="activeRow" ref="quitForm" />
+       <p style="color:red;paddingLeft:150px">退费金额暂不进入账户余额</p>
       <span slot="footer" class="dialog-footer question">
         <div>
           <el-popover placement="right" width="500" trigger="click">
@@ -1003,7 +1004,6 @@
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
               <p>退还乐保费用：报名缴费时缴费的乐保费用</p>
-              <p>退费金额暂不进入账户余额</p>
             </div>
             <el-button
               type="text"

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

@@ -9,34 +9,43 @@
     >
       <el-row>
         <el-col :span="10">
-          <el-form-item label="学员姓名" >
-            <span>{{quitForm.studentName}}</span>
+          <el-form-item label="学员姓名">
+            <span>{{ quitForm.studentName }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="乐团名称">
-                 <overflow-text
-                :text="quitForm.musicGroupName"
-                width="150px"
-              ></overflow-text>
+            <overflow-text
+              :text="quitForm.musicGroupName"
+              width="150px"
+            ></overflow-text>
             <!-- <span>{{}}</span>   -->
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-row>
-        <el-form-item label="是否回访" prop="isVisit"   >
-          <el-radio v-model.trim="quitForm.isVisit" :label="true"
-          :disabled='isDisabled'
+        <el-form-item label="是否回访" prop="isVisit">
+          <el-radio
+            v-model.trim="quitForm.isVisit"
+            :label="true"
+            :disabled="isDisabled"
             >是</el-radio
           >
-          <el-radio  :disabled='isDisabled' v-model.trim="quitForm.isVisit" :label="false"
+          <el-radio
+            :disabled="isDisabled"
+            v-model.trim="quitForm.isVisit"
+            :label="false"
             >否</el-radio
           >
         </el-form-item>
-        <el-form-item label="回访时间" v-if="quitForm.isVisit" :rules="[{required: true, message: '请选择回访回访时间'}]">
+        <el-form-item
+          label="回访时间"
+          v-if="quitForm.isVisit"
+          :rules="[{ required: true, message: '请选择回访回访时间' }]"
+        >
           <el-date-picker
-           :disabled='isDisabled'
+            :disabled="isDisabled"
             v-model.trim="quitForm.visitTime"
             align="right"
             type="date"
@@ -95,23 +104,31 @@
         <!-- v-if="activeRow.cloudTeacherAmount > 0" -->
 
         <el-row>
-          <el-form-item label="退还课程费用" prop="isReturnCourseFee"   :rules="[{required: true, message: '请选择是否退还课程费用'}]">
-            <el-radio  :disabled='isDisabled' v-model.trim="quitForm.isReturnCourseFee" :label="true"
+          <el-form-item
+            label="退还课程费用"
+            prop="isReturnCourseFee"
+            :rules="[{ required: true, message: '请选择是否退还课程费用' }]"
+          >
+            <el-radio
+              :disabled="isDisabled"
+              v-model.trim="quitForm.isReturnCourseFee"
+              :label="true"
               >是</el-radio
             >
-            <el-radio  :disabled='isDisabled' v-model.trim="quitForm.isReturnCourseFee" :label="false"
+            <el-radio
+              :disabled="isDisabled"
+              v-model.trim="quitForm.isReturnCourseFee"
+              :label="false"
               >否</el-radio
             >
           </el-form-item>
           <el-form-item
             label="退还课程金额"
             prop="courseFee"
-            v-if="
-            quitForm.isReturnCourseFee
-            "
+            v-if="quitForm.isReturnCourseFee"
           >
             <el-input
-            disabled
+              disabled
               type="number"
               v-model.trim="quitForm.courseFee"
               style="width: 180px"
@@ -121,15 +138,19 @@
           </el-form-item>
         </el-row>
         <el-row>
-          <el-form-item label="退还乐器费用" prop="isReturnMusicalFee"  :rules="[{required: true, message: '请选择是否退还乐器费用'}]">
+          <el-form-item
+            label="退还乐器费用"
+            prop="isReturnMusicalFee"
+            :rules="[{ required: true, message: '请选择是否退还乐器费用' }]"
+          >
             <el-radio
-             :disabled='isDisabled'
+              :disabled="isDisabled"
               v-model.trim="quitForm.isReturnMusicalFee"
               :label="true"
               >是</el-radio
             >
             <el-radio
-             :disabled='isDisabled'
+              :disabled="isDisabled"
               v-model.trim="quitForm.isReturnMusicalFee"
               :label="false"
               >否</el-radio
@@ -138,9 +159,7 @@
           <el-form-item
             label="退还乐器金额"
             prop="musicalFee"
-            v-if="
-              quitForm.isReturnMusicalFee
-            "
+            v-if="quitForm.isReturnMusicalFee"
           >
             <el-input
               type="number"
@@ -154,18 +173,18 @@
         </el-row>
         <el-row>
           <el-form-item
-          :rules="[{required: true, message: '请选择是否退还教辅费用'}]"
+            :rules="[{ required: true, message: '请选择是否退还教辅费用' }]"
             label="退还教辅费用"
             prop="isReturnAccessoriesFee"
           >
             <el-radio
-             :disabled='isDisabled'
+              :disabled="isDisabled"
               v-model.trim="quitForm.isReturnAccessoriesFee"
               :label="true"
               >是</el-radio
             >
             <el-radio
-             :disabled='isDisabled'
+              :disabled="isDisabled"
               v-model.trim="quitForm.isReturnAccessoriesFee"
               :label="false"
               >否</el-radio
@@ -177,7 +196,7 @@
             v-if="quitForm.isReturnAccessoriesFee"
           >
             <el-input
-               disabled
+              disabled
               type="number"
               v-model.trim="quitForm.accessoriesFee"
               style="width: 180px"
@@ -189,23 +208,25 @@
         <el-row>
           <el-form-item
             label="退还乐保费用"
-            :rules="[{required: true, message: '请选择是否退还乐保费用'}]"
+            :rules="[{ required: true, message: '请选择是否退还乐保费用' }]"
             prop="isReturnMaintenanceFee"
           >
             <el-radio
-             :disabled='isDisabled'
-             v-model.trim="quitForm.isReturnMaintenanceFee" :label="true"
+              :disabled="isDisabled"
+              v-model.trim="quitForm.isReturnMaintenanceFee"
+              :label="true"
               >是</el-radio
             >
             <el-radio
-             :disabled='isDisabled'
-             v-model.trim="quitForm.isReturnMaintenanceFee" :label="false"
+              :disabled="isDisabled"
+              v-model.trim="quitForm.isReturnMaintenanceFee"
+              :label="false"
               >否</el-radio
             >
           </el-form-item>
           <el-form-item
             label="退还乐保金额"
-            :rules="[{required: true, message: '请输入乐保金额'}]"
+            :rules="[{ required: true, message: '请输入乐保金额' }]"
             prop="maintenanceFee"
             v-if="quitForm.isReturnMaintenanceFee"
           >
@@ -224,7 +245,7 @@
           <el-input
             type="textarea"
             :rows="3"
-             :disabled='isDisabled'
+            :disabled="isDisabled"
             v-model.trim="quitForm.userComment"
             style="width: 455px !important"
           ></el-input>
@@ -232,7 +253,7 @@
       </el-row>
       <el-form-item label="审批理由" prop="reason">
         <el-input
-         :disabled='isDisabled'
+          :disabled="isDisabled"
           type="textarea"
           :rows="3"
           v-model.trim="quitForm.reason"
@@ -244,9 +265,8 @@
 </template>
 <script>
 export default {
-  props: ["quitForm",'isDisabled'],
+  props: ["quitForm", "isDisabled"],
   mounted() {
-    console.log("quitForm", this.quitForm);
   },
   data() {
     return {

src/views/teamDetail/components/studentList.vue

@@ -769,6 +769,7 @@
     <!-- 退团弹窗 -->
     <el-dialog title="退团信息确认" width="700px" :visible.sync="quitVisible">
       <quiteTeam :quitForm="quitForm" ref="quitForm" />
+       <p style="color:red;paddingLeft:150px">退费金额暂不进入账户余额</p>
       <span slot="footer" class="dialog-footer question">
         <div>
           <el-popover placement="right" width="500" trigger="click">
@@ -779,7 +780,6 @@
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
               <p>退还乐保费用：报名缴费时缴费的乐保费用</p>
-              <p>退费金额暂不进入账户余额</p>
             </div>
             <el-button
               type="text"

src/views/withdrawal-application/index.vue

@@ -225,6 +225,7 @@
         :isDisabled="isDisabled"
         ref="musicForm"
       />
+       <p style="color:red;paddingLeft:150px">退费金额暂不进入账户余额</p>
       <span slot="footer" class="dialog-footer question">
         <div>
           <el-popover placement="right" width="500" trigger="click">
@@ -235,7 +236,6 @@
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
               <p>退还乐保费用：报名缴费时缴费的乐保费用</p>
-              <p>退费金额暂不进入账户余额</p>
             </div>
             <el-button
               type="text"

src/views/workBenchManager/journal/model/musicGroup.vue

@@ -160,6 +160,7 @@
         (!isManage && musicForm.currentApproveRole == '3')
       "
     />
+     <p style="color:red;paddingLeft:150px">退费金额暂不进入账户余额</p>
     <span
       slot="footer"
       class="dialog-footer question"
@@ -174,7 +175,6 @@
             <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
             <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
             <p>退还乐保费用：报名缴费时缴费的乐保费用</p>
-             <p>退费金额暂不进入账户余额</p>
           </div>
           <el-button
             type="text"