1110 11:57

1111

dist/static/css/chunk-5ff585ee.c04923ce.css

@@ -0,0 +1 @@
+.setBtn[data-v-3d94d6e3]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-af3f5606]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-af3f5606]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

dist/static/css/chunk-7ca96add.3df78747.css

@@ -1 +0,0 @@
-.imc[data-v-a43a7db6]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-a43a7db6]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

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

@@ -229,9 +229,9 @@
          style="margin-top:20px;">
       <div class="nextBtn"
            @click="goback">返回</div>
-      <div class="okBtn"
+      <!-- <div class="okBtn"
            style="margin-right:30px;"
-           @click="gotoNext">确定</div>
+           @click="gotoNext">确定</div> -->
     </div>
   </div>
 </template>
@@ -352,15 +352,22 @@ export default {
   methods: {
     // 确定排课
     submitInfo () {
+      this.$confirm('课表无误，确定排课', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        workOut({ musicGroupID: this.teamid, courseSchedules: this.classCardList }).then(res => {
+          if (res.code == 200) {
+            this.$message.success('恭喜您排课成功')
+            this.classCardList = [];
+          }
+        }).catch(res => {
+          // this.tableList = [];
+        })
+      }).catch(() => {
 
-      workOut({ musicGroupID: this.teamid, courseSchedules: this.classCardList }).then(res => {
-        if (res.code == 200) {
-          this.$message.success('恭喜您排课成功')
-          this.classCardList = [];
-        }
-      }).catch(res => {
-        // this.tableList = [];
-      })
+      });
     },
     // 一键排课
     classCard () {

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

@@ -283,6 +283,7 @@ export default {
       addHighClass(this.tableList).then(res => {
         if (res.code == 200) {
           this.$message.success('恭喜您创建成功')
+          this.$emit('goNav', 4)
         }
       })
     }

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

@@ -53,6 +53,10 @@
       <el-table-column>
       </el-table-column>
     </el-table>
+    <div class="btnWrap">
+      <div class="setBtn"
+           @click="gotoNext">下一步</div>
+    </div>
   </div>
 </template>
 <script>
@@ -66,8 +70,9 @@ export default {
       tableList: []
     }
   }, mounted () {
+
+    sessionStorage.setItem('setStep', 2)
     sessionStorage.setItem('resetCode', 4)
-    console.log(this.$route.query.id)
     this.teamid = this.$route.query.id;
     getAllClass({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200 && res.data.length > 0) {
@@ -84,9 +89,26 @@ export default {
   }, methods: {
     gotoPlan () {
       this.$router.push({ path: '/business/coursePlan', query: { id: this.teamid } })
+    },
+    gotoNext () {
+      // 获取课程类型 3.0跳小班课  2.0跳课酬
+      let type = sessionStorage.getItem('chargeTypeId');
+      type == 3 ? this.$emit('gotoNav', 3) : this.$emit('gotoNav', 4)
+
     }
   },
 }
 </script>
 <style lang="scss" scoped>
+.setBtn {
+  width: 120px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  border-radius: 4px;
+  color: #fff;
+  background-color: #444;
+  cursor: pointer;
+  margin: 20px 0;
+}
 </style>

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

@@ -182,11 +182,13 @@ export default {
       if (!this.isok) {
         this.$message.error('有老师未设置默认课酬,请设置后再试')
       }
+      console.log(this.searchForm.salary)
       if (this.searchForm.salary == 'TEACHER_DEFAULT' || this.searchForm.salary == 'CLASSROOM_SALARY') {
         // 组件默认课酬
         for (let i in this.defaultTableList) {
           for (let j in this.defaultTableList[i].classGroupTeacherMapperList) {
             let obj = {}
+            obj.musicGroupId = this.teamid;
             obj.classGroupId = this.defaultTableList[i].id;
             obj.userId = this.defaultTableList[i].classGroupTeacherMapperList[j].userId;
             obj.teacherRole = this.defaultTableList[i].classGroupTeacherMapperList[j].teacherRole;
@@ -197,17 +199,22 @@ export default {
 
       } else if (this.searchForm.salary == 'GRADIENT_SALARY') {
         // 组件梯度课酬
-        for (let i in this.defaultTableList) {
-          for (let j in this.defaultTableList[i].classGroupTeacherMapperList) {
+        for (let i in this.gradientTableList) {
+          for (let j in this.gradientTableList[i].classGroupTeacherMapperList) {
             let obj = {}
-            obj.classGroupId = this.defaultTableList[i].id;
-            obj.userId = this.defaultTableList[i].classGroupTeacherMapperList[j].userId;
-            obj.teacherRole = this.defaultTableList[i].classGroupTeacherMapperList[j].teacherRole;
-            obj.teacherDefaultMusicGroupSalaryList = this.defaultTableList[i].classGroupTeacherMapperList[j].teacherDefaultMusicGroupSalaryList;
+            obj.musicGroupId = this.teamid;
+            obj.classGroupId = this.gradientTableList[i].id;
+            obj.userId = this.gradientTableList[i].classGroupTeacherMapperList[j].userId;
+            obj.teacherRole = this.gradientTableList[i].classGroupTeacherMapperList[j].teacherRole;
+            obj.teacherDefaultMusicGroupSalaryList = this.gradientTableList[i].classGroupTeacherMapperList[j].teacherDefaultMusicGroupSalaryList;
             this.subList.push(obj);
           }
         }
       }
+      // let some = {
+
+      //   teacherDefaultMusicGroupSalaryList: this.subList
+      // }
       setClassGroupTeacherSalary(this.subList).then(res => {
         if (res.code == 200) {
           this.subList = [];

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

@@ -84,9 +84,9 @@
               <el-input v-model="hightNum"></el-input>
             </el-form-item>
           </el-form>
-          <div class="setBtn"
-               @click="getNoclassSign">添加</div>
           <div class="okBtn"
+               @click="getNoclassSign">添加</div>
+          <div class="setBtn"
                @click="setBossTeacher">下一步</div>
         </div>
       </div>
@@ -265,6 +265,7 @@ export default {
     }
   },
   mounted () {
+    sessionStorage.setItem('setStep', 0)
     getTeamRecruit({ musicGroupId: this.teamid }).then(res => {
       // 获取乐团声部集合
       if (res.code == 200) {

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

@@ -90,7 +90,7 @@
       </el-table>
     </div>
     <div class="footer">
-      <div class="reset">返回修改</div>
+      <!-- <div class="reset">返回修改</div> -->
       <div class="next"
            @click="gotoNext">下一步</div>
     </div>
@@ -115,6 +115,7 @@ export default {
     }
   },
   mounted () {
+    sessionStorage.setItem('setStep', 1)
     // 该乐团里所有的单技班与合奏班
     this.getEveryClass();
     // 获取所有的老师列表
@@ -267,7 +268,7 @@ export default {
     flex-direction: row;
     justify-content: flex-end;
     > div {
-      width: 150px;
+      width: 120px;
       height: 40px;
       line-height: 40px;
       text-align: center;

src/views/teamBuild/teamSeting/index.vue

@@ -76,10 +76,11 @@
       </div>
       <div v-if='activeIndex==2'>
         <!-- <coursePlan :teamid='id' /> -->
-        <lookCourse />
+        <lookCourse @gotoNav='gotoNav' />
       </div>
-      <div v-if='activeIndex==3 && chargeTypeId!=3'>
-        <improvement :teamid='id' />
+      <div v-if='activeIndex==3 && chargeTypeId==3'>
+        <improvement :teamid='id'
+                     @gotoNav='gotoNav' />
       </div>
       <div v-if='activeIndex==4'>
         <salarySet :teamid='id' />
@@ -106,7 +107,7 @@ export default {
   },
   data () {
     return {
-      activeIndex: '0',
+      activeIndex: 0,
       stepImgs: {
         nol: require('@/assets/images/base/step-arrow-active.png'),
         active: require('@/assets/images/base/step-arrow.png')
@@ -117,9 +118,12 @@ export default {
   },
   created () {
     this.id = this.$route.query.id;
+
+    this.activeIndex = sessionStorage.getItem('setStep') || 0
     getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
       if (res.code == 200) {
         this.chargeTypeId = res.data.musicGroup.chargeTypeId;
+        sessionStorage.setItem('chargeTypeId', this.chargeTypeId);
       }
     })
   },