Merge branch '0609getMusicFee' into test

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

@@ -8,7 +8,7 @@
         1、会员团每学期赠送3960（88课时x45分钟）分钟免费课程时长，该时长可排声部课、集训声部课、合奏课、集训合奏课、综合课，课程时长以上类型课程共享；
       </p>
       <p>
-       2、在本学期内声部课、集训声部课总共最多能排课1980（44课时x45分钟分钟）；合奏课、集训合奏课最多能排课1980（44课时x45分钟分钟）分钟；综合课最多能排课3960（88课时x45分钟分钟）分钟；
+       2、在本学期内声部课、集训声部课总共最多能排课1980（44课时x45分钟）；合奏课、集训合奏课最多能排课1980（44课时x45分钟分钟）分钟；综合课最多能排课3960（88课时x45分钟分钟）分钟；
       </p>
       <p>
       3、赠送课程仅可在该学期内完成排课，且不可将本学期课程调整至学期时间范围之外；

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

@@ -134,6 +134,7 @@ export default {
   },
   async mounted() {
     // 获取所有得会员信息
+    console.log('organId',this.organId)
     try {
       const res = await getAllmemberRank();
       this.memberRankList = res.data;

src/views/resetTeaming/modals/studentPayDetail.vue

@@ -27,10 +27,10 @@
           }}
         </div>
       </el-form-item>
-      <el-form-item label="总现价" v-if="allCurrentPrice">
+      <el-form-item label="课程总现价" v-if="allCurrentPrice">
         <div>{{ allCurrentPrice | moneyFormat }}元</div>
       </el-form-item>
-      <el-form-item label="总原价" v-if="allOriginalPrice">
+      <el-form-item label="课程总原价" v-if="allOriginalPrice">
         <div>{{ allOriginalPrice | moneyFormat }}元</div>
       </el-form-item>
       <el-form-item label="课程详情" v-if="msgList.length > 0">

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

@@ -93,7 +93,8 @@
         v-if="courseViewType == 1&&paymentType !== undefined"
         :form="memberForm"
         :isUserType="isUserType"
-        :organId="baseInfo.organId"
+        :organId="baseInfo.musicGroup.organId"
+       :addStudent="addStudent"
         :showTime="false"
       />
       <el-alert title="缴费设置" :closable="false" class="alert" type="info">
@@ -297,6 +298,9 @@ export default {
     };
   },
   computed: {
+    addStudent(){
+      return this.paymentType == 'ADD_STUDENT'|| this.paymentType ==3
+    },
     musicGroup() {
       return this.baseInfo?.musicGroup;
     },
@@ -409,8 +413,6 @@ export default {
   mounted() {
     this.formatCourse();
     this.init();
-
-
   },
   activated() {
     this.formatCourse();
@@ -446,7 +448,6 @@ export default {
       }
       this.getCharges();
       if (this.rowDetail) {
-        console.log("this.rowDetail", this.rowDetail);
         for (const key in paymentTypeFormat) {
           if (paymentTypeFormat.hasOwnProperty(key)) {
             const item = paymentTypeFormat[key];

src/views/teamDetail/teamCourseList.vue

@@ -347,6 +347,15 @@
               </div>
             </template>
           </el-table-column>
+               <el-table-column
+            align="center"
+            prop="isCallNames"
+            label="云教练课程"
+          >
+            <template slot-scope="scope">{{
+              scope.row.memberFlag ? "是" : "否"
+            }}</template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="isCallNames"
@@ -780,6 +789,18 @@
             <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
+              <el-form-item label="云教练课程" prop="memberFlag">
+          <el-select
+            style="width: 180px"
+            v-model.trim="searchForm.memberFlag"
+            clearable
+            filterable
+            placeholder="云教练课程"
+          >
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="创建日期" prop="creatTimer">
           <el-date-picker
             v-model.trim="searchForm.creatTimer"
@@ -862,6 +883,7 @@ const initSearch = {
   schoolId: null, // 教学点编号
   creatTimer: [],
   courseIdSearch: null,
+  memberFlag:null
 };
 export default {
   name:'teamCourseList',
@@ -930,6 +952,7 @@ export default {
         this.searchForm.mergeCourseType||
         this.searchForm.teachType||
         this.searchForm.isCallNames||
+        this.searchForm.memberFlag||
         this.searchForm.creatTimer?.length>0
       );
     },