提交重新打包

1

dist/static/css/chunk-4537ddda.111e815d.css

@@ -0,0 +1 @@
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-5231da42] .el-button+.el-button{margin-left:0}.select[data-v-5231da42]{font-size:14px}.btnList[data-v-5231da42]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-5231da42]{margin-right:15px}

dist/static/css/chunk-a8c754c0.ca1a71eb.css

@@ -1 +1 @@
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-60877430] .el-button+.el-button{margin-left:0}.select[data-v-60877430]{font-size:14px}.btnList[data-v-60877430]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-60877430]{margin-right:15px}
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-5231da42] .el-button+.el-button{margin-left:0}.select[data-v-5231da42]{font-size:14px}.btnList[data-v-5231da42]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-5231da42]{margin-right:15px}

src/views/businessManager/shopManager/shopOperation.vue

@@ -182,9 +182,8 @@
                      multiple
                      :disabled="pageDisabled || (form.musicGroupShow != 0 && form.musicGroupShow != 1)"
                      clearable>
-            <el-option label="课程收费" value="0"></el-option>
-            <el-option label="系统收费" value="1"></el-option>
-            <el-option label="云教练收费" value="2"></el-option>
+          <el-option label="课程收费" value="0"></el-option>
+            <el-option label="会员收费" value="1"></el-option>
           </select-all>
         </el-form-item>
         <el-form-item label="是否库存预警" prop="stockWarning">

src/views/categroyManager/productSystem/memberSet.vue

@@ -72,7 +72,10 @@
                 >详情</el-button
               >
             </auth>
-            <auth   :auths="['memberRankSetting/get','memberRankSetting/update']" mulit>
+            <auth
+              :auths="['memberRankSetting/get', 'memberRankSetting/update']"
+              mulit
+            >
               <el-button type="text" @click="resetMember(scope.row, 'update')"
                 >修改</el-button
               >
@@ -218,7 +221,9 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button  v-if="!addDisabled"  @click="branchStatus = false">取 消</el-button>
+        <el-button v-if="!addDisabled" @click="branchStatus = false"
+          >取 消</el-button
+        >
         <el-button @click="onSubmit" type="primary">确 定</el-button>
       </span>
     </el-dialog>
@@ -288,18 +293,23 @@ export default {
       pageType: "",
       allChildIds: [],
       checkList: [],
-      searchName:'搜索\xa0\xa0\xa0\xa0\xa0\xa0\xa0'
+      searchName: "搜索\xa0\xa0\xa0\xa0\xa0\xa0\xa0",
     };
   },
   async mounted() {
-    try {
-      const res = await getMemberPrivilegesItem();
-      this.silderList = res.data;
-      this.treeData = this.setTableData(res.data);
-    } catch (e) {}
-
     this.getList();
   },
+  watch: {
+    async branchStatus(val) {
+      if (val) {
+        try {
+          const res = await getMemberPrivilegesItem();
+          this.silderList = res.data;
+          this.treeData = this.setTableData(res.data);
+        } catch (e) {}
+      }
+    },
+  },
   methods: {
     onFormClose(ruleForm) {
       (this.form = {
@@ -328,10 +338,9 @@ export default {
       } catch {}
     },
     async addLeave() {
-
       this.checkList = [];
       this.title = "新增会员等级";
-       this.addDisabled = false;
+      this.addDisabled = false;
       this.pageType = "create";
       this.treeData = this.setTableData(this.silderList, this.addDisabled);
       this.branchStatus = true;

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -380,7 +380,8 @@
           :rules="[
             { required: true, message: '请输入预计缴费金额', trigger: 'blur' },
             {
-              pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+              pattern:
+                /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
               message: '请输入正确的金额',
               trigger: 'blur',
             },
@@ -396,13 +397,14 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="studentVisible" title="学生列表"
-               width="600">
-      <el-table :data="studentList"
-                class="studenTable"
-                ref="singleTable"
-                highlight-current-row
-                @current-change="handleCurrentChange">
+    <el-dialog :visible.sync="studentVisible" title="学生列表" width="600">
+      <el-table
+        :data="studentList"
+        class="studenTable"
+        ref="singleTable"
+        highlight-current-row
+        @current-change="handleCurrentChange"
+      >
         <!-- <el-table-column type="selection"
                          width="55">
         </el-table-column> -->
@@ -452,7 +454,7 @@ import {
   queryCanAddStudent,
   addMusicGroupPaymentCalenderStudent,
   delMusicGroupPaymentCalenderStudent,
-  sendWaitRenewMessage
+  sendWaitRenewMessage,
 } from "@/api/buildTeam";
 
 export default {
@@ -512,6 +514,10 @@ export default {
         paymentValidStartDate: "",
         paymentValidEndDate: "",
         calenderSettingsName: "",
+        memberPaymentAmount: "",
+        memberRankSettingName: "",
+        originalMemberPaymentAmount: "",
+        memberValidDate: "",
       },
     };
   },
@@ -564,6 +570,10 @@ export default {
             paymentValidStartDate: res.data.calender.paymentValidStartDate,
             paymentValidEndDate: res.data.calender.paymentValidEndDate,
             calenderSettingsName: res.data.calenderSettingsName,
+            memberPaymentAmount: res.data.calender.memberPaymentAmount,
+            memberRankSettingName:res.data.calender.memberRankSettingName,
+            originalMemberPaymentAmount: res.data.calender.originalMemberPaymentAmount,
+            memberValidDate:res.data.calender.memberValidDate,
           };
           this.msgList = res.data.musicGroupPaymentCalenderCourseSettings;
         }
@@ -622,8 +632,8 @@ export default {
           path: "/business/resetTeaming",
           query: { ...this.$route.query },
         });
-      }else if(query.type == 'PRE_BUILD_FEE' || query.type == 'feeAudit'){
-             this.$store.dispatch("delVisitedViews", this.$route);
+      } else if (query.type == "PRE_BUILD_FEE" || query.type == "feeAudit") {
+        this.$store.dispatch("delVisitedViews", this.$route);
         this.$router.push({
           path: "/business/resetTeaming",
           query: { ...this.$route.query },
@@ -789,45 +799,45 @@ export default {
       this.$refs.singleTable.setCurrentRow(row);
       this.studentVisible = false;
     },
-    payRemind(){
-       if(this.activeChiose.length<=0){
-         this.$message.error('请至少选择一名学员')
-         return
-       }
-       let submitArr = [];
-       let msgArr = '';
-       let str = ''
-       this.activeChiose.forEach(item=>{
-         if(item.open){
-           submitArr.push(item.userId)
-         }else{
-           msgArr+=item?.sysUser?.username+','
-         }
-       })
-       console.log(submitArr,msgArr)
-
-       if(msgArr){
-         str=`${msgArr}未开启缴费无法提醒`
-       }else{
-         str='是否发送提醒'
-       }
-      this.$confirm(str, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(async() => {
-          try{
-            const res = await sendWaitRenewMessage({studentIds:submitArr.join(','),calenderId:this.$route.query.paymentId})
-            this.$message.success('提醒成功')
-            this.getList()
-          }catch(e){
-
-          }
-        }).catch(() => {
-
-        });
+    payRemind() {
+      if (this.activeChiose.length <= 0) {
+        this.$message.error("请至少选择一名学员");
+        return;
+      }
+      let submitArr = [];
+      let msgArr = "";
+      let str = "";
+      this.activeChiose.forEach((item) => {
+        if (item.open) {
+          submitArr.push(item.userId);
+        } else {
+          msgArr += item?.sysUser?.username + ",";
+        }
+      });
+      console.log(submitArr, msgArr);
 
-    }
+      if (msgArr) {
+        str = `${msgArr}未开启缴费无法提醒`;
+      } else {
+        str = "是否发送提醒";
+      }
+      this.$confirm(str, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          try {
+            const res = await sendWaitRenewMessage({
+              studentIds: submitArr.join(","),
+              calenderId: this.$route.query.paymentId,
+            });
+            this.$message.success("提醒成功");
+            this.getList();
+          } catch (e) {}
+        })
+        .catch(() => {});
+    },
   },
   watch: {
     payVisible(val) {

src/views/resetTeaming/modals/member-pay-form.vue

@@ -5,17 +5,17 @@
     <div class="tilteWrap">
       <h4>会员团排课规则：</h4>
       <p>
-        1、会员团每学期赠送3960(88x45)分钟免费课程时长，该时长可排声部课、集训声部课、合奏课、集训合奏课、综合课，课程时长以上类型课程共享；
+        1、会员团每学期赠送3960（88课时x45分钟）分钟免费课程时长，该时长可排声部课、集训声部课、合奏课、集训合奏课、综合课，课程时长以上类型课程共享；
       </p>
       <p>
-        2、在本学期内声部课、集训声部课总共最多能排课1980(44x45)分钟；合奏课、集训合奏课最多能排课1980(44x45)分钟；综合课最多能排课3960(88x45)分钟；
+       2、在本学期内声部课、集训声部课总共最多能排课1980（44课时x45分钟分钟）；合奏课、集训合奏课最多能排课1980（44课时x45分钟分钟）分钟；综合课最多能排课3960（88课时x45分钟分钟）分钟；
       </p>
       <p>
-        3、赠送课程仅可在该学期内完成排课，且不可将本学期课程调整至学期时间范围之外；
+      3、赠送课程仅可在该学期内完成排课，且不可将本学期课程调整至学期时间范围之外；
       </p>
       <p>4、学期时间段：9月1日至2月28/29日，3月1日至8月31日；</p>
       <p>
-        5、排课时系统根据【开课日期】计算本学期最大可排课时长，计算方式为开课日期到本学期结束日期周次1980(44x45)分钟，若超过1980(44x45)分钟，按1980(44x45)分钟计算。即：若学期中途开始排课，则可能排课时长并不能达到1980分钟。
+       5、排课时系统根据【开课日期】计算本学期最大可排课时长，计算方式为开课日期到本学期结束日期周次*4*45分钟，若超过3960（88课时x45分钟）分钟，按3960（88课时x45分钟）分钟计算。即：若学期中途开始排课，则可能排课时长并不能达到3960（88课时x45分钟）分钟。
       </p>
     </div>
     <el-alert title="会员设置" :closable="false" class="alert" type="info">
@@ -25,6 +25,7 @@
       :form="memberForm"
       :isUserType="isUserType"
       :organId="baseInfo.musicGroup.organId"
+      :showTime="true"
     />
     <el-alert title="其它" :closable="false" class="alert" type="info">
     </el-alert>

src/views/resetTeaming/modals/member-setting.vue

@@ -19,7 +19,7 @@
     </el-form-item>
     <el-form-item
       label="会员等级"
-      prop="paymentDate"
+      prop="memberRankSettingId"
       v-if="isUserType&&radio"
       :rules="[{ required: true, message: '请选择会员等级', trigger: 'blur' }]"
     >

src/views/resetTeaming/modals/payment-cycle.vue

@@ -54,10 +54,11 @@
         end-placeholder="结束日期">
       </el-date-picker>
     </el-form-item>
+
     <el-form-item
       label="缴费有效期"
       prop="paymentValid"
-      v-if="courseViewType!=1"
+      v-if="courseViewType!=1 || (courseViewType==1&&paymentType=== undefined)"
       :rules="[{required: true, message: '请选择缴费有效期', trigger: 'blur'}]"
     >
       <el-date-picker
@@ -76,7 +77,7 @@
 import { paymentPatternType } from '@/constant'
 import { objectToOptions } from '@/utils'
 export default {
-  props: ['form', 'className', 'isUserType', 'isDisabled', 'isCommon', 'hidePaymentPattern','hideMoney','courseViewType'],
+  props: ['form', 'className', 'isUserType', 'isDisabled', 'isCommon', 'hidePaymentPattern','hideMoney','courseViewType','paymentType'],
   data() {
     return {
       paymentPatternTypeOptions: objectToOptions(paymentPatternType),
@@ -88,6 +89,9 @@ export default {
       },
     }
   },
+  mounted(){
+    // console.log(this.paymentType)
+  },
   methods: {
     paymentAmountChange() {
       this.$set(this.form, 'changeed', true)

src/views/resetTeaming/modals/studentPayDetail.vue

@@ -1,49 +1,74 @@
 <template>
   <div>
-    <el-form ref="titleForm"
-             :model="titleForm"
-             label-width="80px">
+    <el-form ref="titleForm" :model="titleForm" label-width="120px" >
       <el-form-item label="缴费类型">
-        <div class="inputStyle">{{ titleForm.paymentType| auditPaymentType}}</div>
+        <div class="inputStyle">
+          {{ titleForm.paymentType | auditPaymentType }}
+        </div>
       </el-form-item>
-      <el-form-item label="收费标准">
-        <div class="inputStyle">{{ titleForm.musicGroupOrganizationCourseSettingId }}</div>
+      <el-form-item
+        label="收费标准"
+        v-if="titleForm.musicGroupOrganizationCourseSettingId"
+      >
+        <div class="inputStyle">
+          {{ titleForm.musicGroupOrganizationCourseSettingId }}
+        </div>
       </el-form-item>
       <el-form-item label="缴费方式">
         <div class="inputStyle">{{ titleForm.paymentPattern }}</div>
       </el-form-item>
-      <el-form-item label="缴费周期">
+      <el-form-item
+        label="缴费周期"
+        v-if="titleForm.paymentValidStartDate && titleForm.paymentValidEndDate"
+      >
         <div class="inputStyle">
-          {{ titleForm.paymentValidStartDate|formatTimer }}~{{
-            titleForm.paymentValidEndDate|formatTimer
+          {{ titleForm.paymentValidStartDate | formatTimer }}~{{
+            titleForm.paymentValidEndDate | formatTimer
           }}
         </div>
       </el-form-item>
-      <el-form-item label="总现价">
-        <div>{{allCurrentPrice |moneyFormat}}元</div>
+      <el-form-item label="总现价" v-if="allCurrentPrice">
+        <div>{{ allCurrentPrice | moneyFormat }}元</div>
       </el-form-item>
-      <el-form-item label="总原价">
-        <div>{{ allOriginalPrice | moneyFormat}}元</div>
+      <el-form-item label="总原价" v-if="allOriginalPrice">
+        <div>{{ allOriginalPrice | moneyFormat }}元</div>
       </el-form-item>
-      <el-form-item label="课程详情">
+      <el-form-item label="课程详情" v-if="msgList.length > 0">
         <div class="inputStyle">
-          <div v-for="(item,index) in msgList"
-               class="infoMsg">
-            <p class="name">{{item.courseType | coursesType}}:</p>
-            <p class="courseTime">课程时长:{{item.courseTotalMinuties}}分钟</p>
-            <p>原价:{{item.courseOriginalPrice | moneyFormat}}元</p>
-            <p>现价{{item.courseCurrentPrice | moneyFormat}}元</p>
+          <div v-for="(item, index) in msgList" :key="index" class="infoMsg">
+            <p class="name">{{ item.courseType | coursesType }}:</p>
+            <p class="courseTime">
+              课程时长:{{ item.courseTotalMinuties }}分钟
+            </p>
+            <p>原价:{{ item.courseOriginalPrice | moneyFormat }}元</p>
+            <p>现价{{ item.courseCurrentPrice | moneyFormat }}元</p>
           </div>
         </div>
       </el-form-item>
+      <!--      memberPaymentAmount: "",
+        memberRankSettingName: "",
+        originalMemberPaymentAmount: "",
+        memberValidDate: "", -->
+      <el-form-item label="会员名称" v-if="titleForm.memberRankSettingName">
+        <div>{{ titleForm.memberRankSettingName }}</div>
+      </el-form-item>
+      <el-form-item label="会员有效期" v-if="titleForm.memberValidDate">
+        <div>{{titleForm.memberValidDate}}个月</div>
+      </el-form-item>
+      <el-form-item label="会员原价" v-if="titleForm.originalMemberPaymentAmount">
+        <div>{{ titleForm.originalMemberPaymentAmount | moneyFormat}}元</div>
+      </el-form-item>
+      <el-form-item label="会员现价" v-if="titleForm.memberPaymentAmount">
+        <div>{{ titleForm.memberPaymentAmount | moneyFormat}}元</div>
+      </el-form-item>
     </el-form>
   </div>
 </template>
 <script>
-import { courseType } from '@/utils/searchArray'
+import { courseType } from "@/utils/searchArray";
 export default {
-  props: ['msgList', 'titleForm'],
-  data () {
+  props: ["msgList", "titleForm"],
+  data() {
     return {
       // titleForm: {
       //   paymentType: "",
@@ -53,30 +78,30 @@ export default {
       //   paymentValidEndDate: "",
       //   calenderSettingsName: "",
       // },
-
-    }
+    };
+  },
+  mounted() {
+    console.log(this.titleForm)
   },
-  mounted () { },
   methods: {},
   computed: {
-    allCurrentPrice () {
+    allCurrentPrice() {
       // courseType
       let num = 0;
-      this.msgList.forEach(item => {
-        num += item.courseCurrentPrice
-      })
-      return num
+      this.msgList.forEach((item) => {
+        num += item.courseCurrentPrice;
+      });
+      return num;
     },
-    allOriginalPrice () {
+    allOriginalPrice() {
       let num = 0;
-      this.msgList.forEach(item => {
-        num += item.courseOriginalPrice
-      })
-      return num
-
-    }
-  }
-}
+      this.msgList.forEach((item) => {
+        num += item.courseOriginalPrice;
+      });
+      return num;
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 .infoMsg {
@@ -94,4 +119,4 @@ export default {
     width: 150px;
   }
 }
-</style>
+</style>

src/views/resetTeaming/modals/user-baseinfo.vue

@@ -9,17 +9,17 @@
       label="缴费类型"
       prop="leixing"
       :rules="[{required: true, message: '请选择缴费类型', trigger: 'change'}]"
-      v-if="typeof paymentType === 'undefined'"
+      v-if="typeof paymentType === 'undefined'&&courseViewType != 1"
     >
       <el-radio-group style="width: 100%" v-model="form.leixing">
-        <el-radio label="1" v-if="courseViewType != 1">乐团续费</el-radio>
+        <el-radio label="1">乐团续费</el-radio>
         <el-radio label="2">临时加课</el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item
       label="收费标准"
       prop="musicGroupOrganizationCourseSettingId"
-      v-if="isCommon && form.musicGroupOrganizationCourseSettingId != 0 && !this.rowDetail"
+      v-if="isCommon && form.musicGroupOrganizationCourseSettingId != 0 && !this.rowDetail&&courseViewType != 1"
       :rules="[{required: true, message: '请选择收费标准', trigger: 'change'}]"
     >
       <el-select style="width: 100%!important;" v-model="form.musicGroupOrganizationCourseSettingId" placeholder="请选择收费标准">
@@ -34,7 +34,7 @@
     <el-alert
       :closable="false"
       style="margin-left: 160px;width: auto;"
-      v-if="paymentType != 0 && isCommon && !rowDetail"
+      v-if="paymentType != 0 && isCommon && !rowDetail&&courseViewType != 1"
       type="warning">
       <template #title>
         <p>该乐团为{{chargeTypeName}}模式，若需创建其他模式的收费标准，请先修改乐团基本信息中的乐团模式

src/views/resetTeaming/modals/user-pay-form.vue

@@ -4,7 +4,7 @@
       title="课程信息设置"
       :closable="false"
       class="alert"
-      v-if="paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST'"
+      v-if="paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST'&&courseViewType!=1"
       type="info"
     >
     </el-alert>
@@ -86,11 +86,11 @@
         class="alert"
         style="margin-top: 20px"
         type="info"
-        v-if="courseViewType == 1"
+        v-if="courseViewType == 1&&paymentType !== undefined"
       >
       </el-alert>
       <memberSetting
-        v-if="courseViewType == 1"
+        v-if="courseViewType == 1&&paymentType !== undefined"
         :form="memberForm"
         :isUserType="isUserType"
         :organId="baseInfo.organId"
@@ -123,7 +123,7 @@
             style="width: 100% !important"
             v-model="payment.paymentPattern"
             placeholder="请选择缴费方式"
-            :disabled="courseViewType == 1"
+            :disabled="courseViewType == 1&&paymentType !== undefined"
           >
             <el-option
               v-for="item in paymentPatternTypeOptions"
@@ -157,6 +157,7 @@
             <paymentCycle
               ref="cycles"
               :form="item"
+              :paymentType="paymentType"
               :hidePaymentPattern="true"
               :isCommon="isCommon"
               :isUserType="isUserType"
@@ -407,15 +408,21 @@ export default {
   mounted() {
     this.formatCourse();
     this.init();
+
   },
   activated() {
     this.formatCourse();
     this.init();
   },
+
   methods: {
     async init() {
       let organId = this.baseInfo?.musicGroup?.organId;
       this.courseViewType = this.baseInfo?.musicGroup?.courseViewType;
+      if(this.courseViewType == 1){
+        this.form.leixing = 1;
+        this.addExtraClass()
+      }
       // 如果为学员缴费且是乐团缴费则显示云教练的价格
       if (
         !this.paymentType &&
@@ -528,6 +535,7 @@ export default {
           this.syncAllMoney();
         } catch (error) {}
       }
+
     },
     formatCourse() {
       const organId = this.musicGroup?.organId;

src/views/teamDetail/components/memberClassList.vue

@@ -339,7 +339,7 @@ export default {
           this.teacherList = res.data;
         }
       });
-     await this.getList();
+      await this.getList();
     },
     changeMixClass(val) {
       // 根据合奏班id获取合奏班下的所有声部班
@@ -465,8 +465,7 @@ export default {
                 this.musicGroupSchoolTermCourseDetailId,
             });
             this.$message.success("取消成功");
-             this.getList();
-
+            this.getList();
           } catch (e) {}
           // musicGroupSchoolTermCourseDetailId
         })
@@ -519,25 +518,27 @@ export default {
   },
   async beforeRouteLeave(to, from, next) {
     let flag = false;
+    // if (this.activeSingleList.length > 0) {
+    // }
     this.activeSingleList.forEach((item) => {
       if (item.preTotalClassTimes != 0) {
         flag = true;
       }
-      if (flag) {
-        this.$confirm("预排课程尚未提交，是否确认跳转其他页面？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(async () => {
-            next();
-            // musicGroupSchoolTermCourseDetailId
-          })
-          .catch(() => {});
-      } else {
-        next();
-      }
     });
+    if (flag) {
+      this.$confirm("预排课程尚未提交，是否确认跳转其他页面？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          next();
+          // musicGroupSchoolTermCourseDetailId
+        })
+        .catch(() => {});
+    } else {
+      next();
+    }
   },
 };
 </script>

src/views/teamDetail/components/resetClass.vue

@@ -685,6 +685,7 @@ import {
   createClass,
   pushMessage,
   coursePostpone,
+  musicGroupSchoolTermCourseDetail,
 } from "@/api/buildTeam";
 import {
   getClassAllStudent,
@@ -877,7 +878,7 @@ export default {
       options: this.processDate(),
       team_status: "",
       activeList: [],
-      courseViewType:''
+      courseViewType: "",
     };
   },
   created() {
@@ -897,14 +898,14 @@ export default {
       if (this.musicGroupInfo) {
         this.organId = this.musicGroupInfos.organId;
         this.chargeTypeId = this.musicGroupInfos.chargeTypeId;
-        this.courseViewType = this.musicGroupInfos.courseViewType
+        this.courseViewType = this.musicGroupInfos.courseViewType;
       } else {
         getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
           if (res.code == 200) {
             this.musicGroupInfos = res.data.musicGroup;
             this.organId = this.musicGroupInfos.organId;
             this.chargeTypeId = this.musicGroupInfos.chargeTypeId;
-                this.courseViewType = this.musicGroupInfos.courseViewType
+            this.courseViewType = this.musicGroupInfos.courseViewType;
           }
         });
       }
@@ -1076,7 +1077,7 @@ export default {
     },
     changeMixClass(val) {
       // 根据合奏班id获取合奏班下的所有声部班
-      console.log(val)
+      console.log(val);
       this.getList(val);
       this.activeMixClass = val;
     },
@@ -1718,13 +1719,20 @@ export default {
       this.activeClass = row.id;
       this.postponeVisible = true;
     },
-    gotoMemberCourse(){
+    async gotoMemberCourse() {
       // 这里跳转到课表
-      this.$router.push({
-        path:'/business/memberClassList',
-        query:{...this.$route.query}
-      })
-    }
+      try {
+        const res = await musicGroupSchoolTermCourseDetail({
+          musicGroupId: this.teamid,
+        });
+        this.$router.push({
+          path: "/business/memberClassList",
+          query: { ...this.$route.query },
+        });
+      } catch (e) {
+        console.log(e);
+      }
+    },
   },
 
   watch: {

src/views/teamDetail/teamList.vue

@@ -276,7 +276,7 @@
                       scope.row.status == 'AUDIT' ||
                       scope.row.status == 'FEE_AUDIT' ||
                       scope.row.status == 'APPLY' ||
-                      scope.row.status == 'PAY') &&
+                      scope.row.status == 'PAY'|| scope.row.status == 'PRE_APPLY'||scope.row.status =='PRE_BUILD_FEE') &&
                     permission('musicGroup/cancelMusicGroup')
                   "
                   @click="stopTeam(scope.row)"

vue.config.js

@@ -19,8 +19,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.148:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 开发环境
-let target = 'https://test.dayaedu.com' //测试环境
+let target = 'http://dev.dayaedu.com' // 开发环境
+// let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {