1

1

dist/static/css/chunk-1ca30b97.3194f810.css

@@ -0,0 +1 @@
+.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-69ae4217] .description-title{margin:0!important}

dist/static/css/chunk-74aa7010.e7625d6c.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-fb68d2e0.c25330a0.css
+.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-619f17a0] .el-button+.el-button{margin-left:0}.select[data-v-619f17a0]{font-size:14px}.btnList[data-v-619f17a0]{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-619f17a0]{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-44ef2152] .el-button+.el-button{margin-left:0}.select[data-v-44ef2152]{font-size:14px}.btnList[data-v-44ef2152]{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-44ef2152]{margin-right:15px}
+>>>>>>> 03/03Lebao:dist/static/css/chunk-74aa7010.e7625d6c.css

dist/static/css/chunk-fb68d2e0.c25330a0.css

@@ -1 +1,5 @@
-.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-619f17a0] .el-button+.el-button{margin-left:0}.select[data-v-619f17a0]{font-size:14px}.btnList[data-v-619f17a0]{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-619f17a0]{margin-right:15px}
+<<<<<<< HEAD:dist/static/css/chunk-fb68d2e0.c25330a0.css
+.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-619f17a0] .el-button+.el-button{margin-left:0}.select[data-v-619f17a0]{font-size:14px}.btnList[data-v-619f17a0]{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-619f17a0]{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-44ef2152] .el-button+.el-button{margin-left:0}.select[data-v-44ef2152]{font-size:14px}.btnList[data-v-44ef2152]{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-44ef2152]{margin-right:15px}
+>>>>>>> 03/03Lebao:dist/static/css/chunk-74aa7010.e7625d6c.css

src/App.vue

@@ -384,9 +384,17 @@ input[type="number"] {
 }
 .el-select__tags {
   .el-tag.el-tag--info.el-tag--small.el-tag--light {
-    max-width: 85px;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    .el-select__tags-text {
+        flex-wrap: nowrap;
+      max-width: 60px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: inline-block;
+    }
   }
 }
 </style>

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

@@ -661,6 +661,20 @@ export default {
           data.attribute1 = info.attribute1;
         }
 
+        let hasCourseFee = false
+
+        for (const item of data.musicGroupPaymentCalenderCourseSettingsList) {
+          if (item.courseCurrentPrice > 0 || item.isStudentOptional == true) {
+            hasCourseFee = true
+            break
+          }
+        }
+        // console.log(this.baseInfo?.musicGroup?.courseViewType, this.paymentType, hasCourseFee, this.type)
+        if (this.baseInfo?.musicGroup?.courseViewType == 2 && this.paymentType == 0 && hasCourseFee && this.type === 'user') {
+          this.$message.error('报名缴费云教练收费模式课程费用不得大于0且不可选')
+          return
+        }
+
         if (!this.rowDetail?.batchNo) {
 
 

src/views/teamDetail/components/modals/create-user-pay.vue

@@ -2,7 +2,7 @@
   <div>
     <el-alert title="班级信息" :closable="false" class="alert" type="info">
     </el-alert>
-    <el-form :model="form" label-width="100px">
+    <el-form :model="form" label-width="120px">
       <el-row>
         <el-col :span="12">
           <el-form-item label="声部班">
@@ -57,7 +57,24 @@
             </select-all>
           </el-form-item>
         </el-col>
+              <el-col :span="12">
+          <el-form-item label="线上基础技能班">
+            <el-select
+              v-model.trim="form.highonline"
+              filterable
+              clearable
+            >
+              <el-option
+                v-for="(item, index) in highonlineList.filter(item => item.lockFlag != 1)"
+                :key="index"
+                :value="item.id"
+                :label="item.name"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
+      <!-- highonlineList -->
     </el-form>
     <el-alert title="课程信息设置" :closable="false" class="alert" type="info">
     </el-alert>
@@ -155,7 +172,7 @@ import { courseType } from '@/constant'
 import { getTimes, objectToOptions } from "@/utils";
 import { paymentPatternType } from '@/constant'
 export default {
-  props: ["snapList", "highList", "mixList", "signList", 'createdUserId', 'organizationCourseUnitPriceSettings', 'musicGroupId', 'baseInfo'],
+  props: ["snapList", "highList", "mixList", "signList", 'highonlineList','createdUserId', 'organizationCourseUnitPriceSettings', 'musicGroupId', 'baseInfo'],
   components: {
     paymentCycle,
     otherform,
@@ -170,6 +187,7 @@ export default {
         mixClass: '',
         highClass: '',
         snapClass: '',
+        highonline:''
       },
       payment: {
         paymentPattern: null,
@@ -196,6 +214,9 @@ export default {
     'form.snapClass'() {
       this.classChange()
     },
+    'form.highonline'(){
+      this.classChange()
+    },
     'payment.paymentPattern'() {
       this.syncAllMoney()
     },
@@ -270,7 +291,7 @@ export default {
       return _
     },
     getAllIds() {
-      return [this.form.signClass, this.form.mixClass, this.form.highClass, ...this.form.snapClass].filter(item => !!item)
+      return [this.form.signClass, this.form.mixClass, this.form.highClass, this.form.highonline,...this.form.snapClass].filter(item => !!item)
     },
     async classChange() {
       try {

src/views/teamDetail/components/studentList.vue

@@ -721,6 +721,7 @@
         :mixList="mixList"
         :highList="highList"
         :snapList="snapList"
+        :highonlineList="highonlineList"
         :musicGroupId="this.teamid"
         :organizationCourseUnitPriceSettings="
           organizationCourseUnitPriceSettings
@@ -1132,30 +1133,35 @@ export default {
           this.soundList = res.data;
         }
       });
-
+    // this.getMusicClass()
       // 获取乐团基本信息
       getMusicGroup({ musicGroupId: this.teamid }).then(
         (res) => (this.baseInfo = res.data)
       );
       // 获取乐团所有合奏课
-      getMusicGroupAllClass({ musicGroupId: this.teamid }).then((res) => {
+
+    },
+    getMusicClass(){
+            getMusicGroupAllClass({ musicGroupId: this.teamid }).then((res) => {
         if (res.code == 200) {
           this.classList = res.data;
           this.signList = [];
           this.mixList = [];
           this.highList = [];
           this.snapList = [];
-          // else if (item.type == "HIGH_ONLINE") {
-          //    this.highonlineList.push(item);
-          //  }
+          this.highonlineList = [];
           this.classList.forEach((item) => {
             if (item.type == "NORMAL") {
               this.signList.push(item);
             } else if (item.type == "MIX") {
               this.mixList.push(item);
-            } else if (item.type == "HIGH" || (item.type=="HIGH_ONLINE"&&item.studentNum<6)) {
+            } else if (item.type == "HIGH") {
               this.highList.push(item);
-            } else if (item.type == "SNAP") {
+            }
+            else if (item.type == "HIGH_ONLINE"&&item.studentNum<6) {
+             this.highonlineList.push(item);
+           }
+            else if (item.type == "SNAP") {
               this.snapList.push(item);
             }  else if (item.type == "MUSIC_NETWORK") {
               this.muiscnetworkList.push(item);
@@ -1736,7 +1742,11 @@ export default {
     },
   },
   watch: {
-
+    createUserPayVisible(val){
+      if(val){
+        this.getMusicClass()
+      }
+    },
     "quitForm.isMaintenanceFee"(val) {
       if (val) {
         this.quitForm.maintenanceFee = 300;