Merge branch 'Nov16thResetMusic' into online

src/views/resetTeaming/modals/extra-class.vue

@@ -87,7 +87,7 @@
               :controls="false"
               :precision="0"
               @change="$listeners.priceChange(scope.row, scope.$index)"
-              :min="1"
+              :min="0"
               :disabled="isDisabled"
               placeholder="课程时长"
             />
@@ -210,7 +210,7 @@ export default {
     validatorCourseTotalMinuties(index) {
       return (rule, value, callback) => {
         const { courseType } = this.list.form[index]
-        if (courseType && value && this.classTimeList[courseType] &&  value < this.classTimeList[courseType]) {
+        if (courseType && value > 1 && this.classTimeList[courseType] &&  value < this.classTimeList[courseType]) {
           callback(new Error(`单节课不得少于${this.classTimeList[courseType]}分钟`))
           return
         }

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

@@ -41,7 +41,7 @@
                 @moneyChange="syncAllMoney"
                 :courseUnitPriceSettingsByType="organizationCourseUnitPriceSettingsByType"
                 :isUserType="isUserType"
-                :isDisabled="form.leixing === '1' || paymentType == '0'" />
+                :isDisabled="form.leixing === '1' || form.leixing === '2' || paymentType == '0'" />
     <template>
       <el-alert title="缴费设置"
                 :closable="false"
@@ -83,7 +83,7 @@
               :hidePaymentPattern="true"
               :isCommon="isCommon"
               :isUserType="isUserType"
-              :isDisabled="form.leixing === '1' || paymentType == '0'"
+              :isDisabled="form.leixing === '1' || form.leixing === '2' || paymentType == '0'"
             />
           </el-collapse-item>
         </el-collapse>
@@ -101,7 +101,7 @@
         :form.sync="cycle"
         :isCommon="isCommon"
         :isUserType="isUserType"
-        :isDisabled="form.leixing === '1' || paymentType == '0'"
+        :isDisabled="form.leixing === '1' || form.leixing === '2' || paymentType == '0'"
         v-else
       />
     </template>

src/views/teamDetail/componentCourse/addCompound.vue

@@ -118,10 +118,7 @@ export default {
       let idList = []
       this.dataList.forEach(com => {
         arr.push(com.type)
-        if(com.id != this.radio){
             idList.push(com.id)
-        }
-      
       })
       arr = [... new Set(arr)]
       if (arr.length != 1) {

src/views/teamDetail/componentCourse/compoundClass.vue

@@ -213,6 +213,16 @@ export default {
   },
   methods: {
     submitResetClass () {
+        console.log(this.idList)
+        let arr = this.idList.split(',')
+        for(let i in arr){
+          if(arr[i] == this.id){
+            arr.splice(i,1)
+          }
+        }
+        let ids = arr.splite(',')
+        console.log(ids)
+        return 
       let maskForm = this.maskForm;
       if (!maskForm.startTime || !maskForm.endTime) {
         this.$message.error("请填写开始时间或结束时间");
@@ -228,6 +238,7 @@ export default {
           if (teachingTeacherIdList.length <= 0) {
             let teachingTeacherIdList = null;
           }
+        
           let obj = {
             actualTeacherId: maskForm.teacher,
             startClassTimeStr: maskForm.startTime,

src/views/teamDetail/components/modals/class-pay-list.vue

@@ -81,6 +81,7 @@ export default {
       this.teamid = this.$route.query.id
       this.activeType = this.form.classList[0].type
       this.courseTypeList = getCourseType(this.activeType)
+
       this.studentSubmitedData = {
         name:'',
         seleched:this.studentList.map(stu=> {return stu.userId})

src/views/teamDetail/components/modals/classList-item.vue

@@ -130,7 +130,7 @@ export default {
         if (res.code == 200) {
           this.studentList = res.data.map((item) => {
             return {
-              userId: item.id,
+              userId: item.userId,
               nickName: item.name,
               gender: item.gender,
               phone: item.parentsPhone,

src/views/teamDetail/components/modals/classroom-setting.vue

@@ -235,7 +235,6 @@ export default {
       try {
         let res;
         if (this.classType == 5) {
-          console.log(this.musicGroupPaymentCalenderDtos);
           res = await findClassCourseMinute(this.classIdList);
         } else {
           res = await getMusicCourseSettingsWithStudents({

src/views/teamDetail/components/resetClass.vue

@@ -188,7 +188,7 @@
         :isOnlyChangeUser="isOnlyChangeUser"
         :activeType="activeType"
         @changeActiveChioseSound="changeActiveChioseSound"
-        @searchStudent="searchStudent"
+        @searchStudent="searchStudent(activeClass)"
         @submited="studentSubmited"
         @close="studentVisible = false"
       />
@@ -798,7 +798,7 @@ export default {
       this.activeChioseSound = null;
       this.getNoClassStudent(type);
     },
-    searchStudent() {
+    searchStudent(classGroupId) {
       console.log(this.activeChioseSound);
       // 搜索学生
       // 根据声部id  乐团id搜索学生
@@ -812,7 +812,7 @@ export default {
           }
         });
       } else {
-        this.getNoClassStudent(this.activeType, this.activeChioseSound);
+        this.getNoClassStudent(this.activeType, this.activeChioseSound,classGroupId);
       }
     },
     // 选择学生的方法修改
@@ -897,7 +897,7 @@ export default {
           });
         }
       });
-      this.getNoClassStudent(row.type);
+      this.getNoClassStudent(row.type,null,row.id);
     },
     // 班级调整
     classAdjustment(row) {
@@ -922,11 +922,12 @@ export default {
       }
       this.infoVisible = true;
     },
-    async getNoClassStudent(type, actualSubjectId) {
+    async getNoClassStudent(type, actualSubjectId,classGroupId) {
       const params = {
         musicGroupId: this.teamid,
         type,
         actualSubjectId,
+        classGroupId
       };
       await getMusicGroupStuNoClassType(params).then((res) => {
         if (res.code == 200) {
@@ -959,7 +960,7 @@ export default {
               this.activeListStudent = res.data;
             }
           });
-          this.getNoClassStudent(this.activeType);
+          this.getNoClassStudent(this.activeType,null,this.activeClass);
           // getNoClassStudentAll({ musicGroupId: this.teamid }).then(res => {
           //   if (res.code == 200) {
           //     this.$message.success('删除成功');

vue.config.js

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