1105 20:00

111

src/views/teamBuild/components/teamBaseInfo.vue

@@ -141,7 +141,7 @@
           <el-checkbox v-model="topFrom.isClass">课堂课乐团</el-checkbox>
         </el-form-item>
         <el-form-item label="教学主任"
-                      v-if="teamStatus!='newTeam'"
+                      v-if="teamStatus=='resetTeam' || teamStatus=='teamList'"
                       prop='head'>
           <el-select v-model="topFrom.head"
                      clearable>
@@ -487,15 +487,16 @@ export default {
           for (let i in res.data.musicGroupPaymentEntities) {
             if (res.data.musicGroupPaymentEntities[i].name == '学校') {
               this.payList.school.ischeck = true;
-              /**
-               *   value: '',
-                price: '',
-               chiose: ''
-               */
               this.payList.school.value = res.data.musicGroupPaymentEntities[i].memo;
               this.payList.school.price = res.data.musicGroupPaymentEntities[i].amount;
               this.payList.school.chiose = res.data.musicGroupPaymentEntities[i].paymentMethod;
             }
+            if (res.data.musicGroupPaymentEntities[i].name == '公司') {
+              this.payList.company.ischeck = true;
+              this.payList.company.value = res.data.musicGroupPaymentEntities[i].memo;
+              this.payList.company.price = res.data.musicGroupPaymentEntities[i].amount;
+              this.payList.company.chiose = res.data.musicGroupPaymentEntities[i].paymentMethod;
+            }
             if (res.data.months.length > 0) {
               this.payList.student.ischeck = true;
               this.payList.student.chiose = 'loop'

src/views/teamBuild/components/teamSoundMoney.vue

@@ -395,6 +395,8 @@ export default {
       this.$emit('chiosetab', 0);
     },
     submitInfo (type) {
+      // console.log(this.activeSoundList)
+      // return;
       let status;
       if (type == 1) {
         // 保存
@@ -428,6 +430,12 @@ export default {
         }
         obj.musicGroupPaymentEntities = []
         // 添加学校主体付费方式
+        if (this.payfor.student.ischeck) {
+          obj.musicGroupPaymentEntities.push({
+            'paymentMethod': this.payfor.student.chiose,
+            'name': '学生'
+          })
+        }
         if (this.payfor.school.ischeck) {
           obj.musicGroupPaymentEntities.push({
             'amount': this.payfor.school.price,
@@ -465,7 +473,7 @@ export default {
             let some = {
               subjectId: active.id,
               type: 'ACCESSORIES',
-              goodsIdList: mark.goods,
+              goodsIdList: mark.goods.join(','),
               name: mark.name,
               price: mark.price
             }
@@ -483,6 +491,7 @@ export default {
           }
           obj.musicGroupSubjectPlans.push(item);
         })
+        console.log(obj);
         createTeam(obj).then(res => {
           if (res.code == 200) {
             // 成功 跳转到乐团报名详情
@@ -669,25 +678,26 @@ export default {
                   if (this.activeSoundList[i].id == res.data.musicGroupSubjectGoodsGroups[j].subjectId) {
                     // 
                     if (res.data.musicGroupSubjectGoodsGroups[j].type == 'INSTRUMENT') {
-                      let arr = [...res.data.musicGroupSubjectGoodsGroups[j].goodsIdList];
-                      this.activeSoundList[i].zhonglei = arr.map(item => {
-                        return parseInt(item)
-                      })
-                      this.activeSoundList[i].goodsList = res.data.musicGroupSubjectGoodsGroups[j].goodsList;
+                      this.activeSoundList[i].zhonglei = this.activeSoundList[i].zhonglei.concat(res.data.musicGroupSubjectGoodsGroups[j].goodsIdList)
+
+                      this.activeSoundList[i].goodsList = this.activeSoundList[i].goodsList.concat(res.data.musicGroupSubjectGoodsGroups[j].goodsList);
                       // goodsList
+                      // console.log(this.activeSoundList[i].goodsList)
 
                     }
+                    // 拿辅件
                     if (res.data.musicGroupSubjectGoodsGroups[j].type == 'ACCESSORIES') {
                       if (res.data.musicGroupSubjectGoodsGroups[j].goodsList.length >= 0) {
                         this.activeSoundList[i].markList = [];
-                        this.activeSoundList[i].markList.push(res.data.musicGroupSubjectGoodsGroups[j])
-                        this.activeSoundList[i].markList.map(item => {
-                          item.goods = item.goodsList.map(some => {
-                            return some.id;
-                          })
-                        })
+                        let obj = {};
+                        obj.goods = res.data.musicGroupSubjectGoodsGroups[j].goodsIdList.split(',');
+                        obj.name = res.data.musicGroupSubjectGoodsGroups[j].name
+                        obj.price = res.data.musicGroupSubjectGoodsGroups[j].price;
+                        this.activeSoundList[i].markList.push(obj);
+                        // this.activeSoundList[i].markList.goodsList.goods = JSON.parse(res.data.musicGroupSubjectGoodsGroups[j].goodsIdList)
+                        this.activeSoundList[i].markChioseList = this.activeSoundList[i].markChioseList.concat(res.data.musicGroupSubjectGoodsGroups[j].goodsList);
+                        // console.log(this.activeSoundList[i].markChioseList);
 
-                        this.activeSoundList[i].markChioseList = res.data.musicGroupSubjectGoodsGroups[j].goodsList
                       }
 
                     }

src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -19,6 +19,7 @@
                       prop="time">
           <!-- value-format="yyyy-MM-dd" -->
           <el-date-picker v-model="leftFrom.time"
+                          style="width:180px;"
                           align="right"
                           type="date"
                           placeholder="选择日期">

src/views/teamDetail/components/resetClass.vue

@@ -296,7 +296,7 @@
                v-for="(item,index) in weekList"
                :key="index">
             <span>循环周期: </span>
-            <el-select v-model="item.week">
+            <el-select v-model="item.dayOfWeek">
               <el-option v-for="(item,index) in weekDateList"
                          :key='index'
                          :label="item.label"
@@ -304,7 +304,7 @@
             </el-select>
             <span>开始时间</span>
             <el-time-select placeholder=""
-                            v-model="item.startTime"
+                            v-model="item.startClassTime"
                             :picker-options="{
                                start: '08:30',
                                step: '00:15',
@@ -313,7 +313,7 @@
             </el-time-select>
             <span>结束时间</span>
             <el-time-select placeholder=""
-                            v-model="item.endTime"
+                            v-model="item.endClassTime"
                             :picker-options="{
                               start: '08:30',
                               step: '00:15',
@@ -657,9 +657,9 @@ export default {
     addWeek () {
       // 添加循环周期
       this.weekList.push({
-        week: '',
-        startTime: '',
-        endTime: '',
+        dayOfWeek: '',
+        startClassTime: '',
+        endClassTime: '',
         id: new Date()
       })
     },
@@ -677,7 +677,7 @@ export default {
       this.$refs['teacherForm'].validate(item => {
         if (item) {
           let week = this.weekList;
-          if (!week[0] || !week[0].startTime || !week[0].endTime || !week[0].week) {
+          if (!week[0] || !week[0].startClassTime || !week[0].endClassTime || !week[0].dayOfWeek) {
             this.$message.error('至少排一节课');
             return
           }
@@ -719,7 +719,7 @@ export default {
             courseType,
             students,
             holiday,
-            courseList
+            courseTimeDtoList: courseList
           }
           if (type == 1) {
             revisionClassGroup(obj).then(res => {

vue.config.js

@@ -16,10 +16,10 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
 // http://47.99.212.176:8000
 // 
-let target = 'http://192.168.3.27:8000' // 箭河
+// let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇` `
 // let target = 'http://192.168.3.8:8000' //勇哥
-// let target = 'http://47.99.212.176:8000' // 测试服
+let target = 'http://47.99.212.176:8000' // 测试服
 // let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {