10/29 13:47

dist/static/css/chunk-572d4582.57747218.css → dist/static/css/chunk-6e5b2754.7415b14d.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-0d594fdf]{font-size:14px}.btnList[data-v-0d594fdf]{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-0d594fdf]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-c3be00bc]{font-size:14px}.btnList[data-v-c3be00bc]{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-c3be00bc]{margin-right:15px}

dist/static/js/chunk-252f70e1.ed90faf5.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-252f70e1"],{"144d":function(t,s,a){},"26fc":function(t,s,a){t.exports=a.p+"static/img/404_cloud.0f4bc32b.png"},"8cdb":function(t,s,a){"use strict";a.r(s);var e=function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"wscn-http404-container"},[a("div",{staticClass:"wscn-http404"},[t._m(0),t._v(" "),a("div",{staticClass:"bullshit"},[a("div",{staticClass:"bullshit__oops"},[t._v("OOPS!")]),t._v(" "),t._m(1),t._v(" "),a("div",{staticClass:"bullshit__headline"},[t._v(t._s(t.message))]),t._v(" "),a("div",{staticClass:"bullshit__info"},[t._v("Please check that the URL you entered is correct, or click the button below to return to the homepage.")]),t._v(" "),a("a",{staticClass:"bullshit__return-home",attrs:{href:""}},[t._v("Back to home")])])])])},c=[function(){var t=this,s=t.$createElement,e=t._self._c||s;return e("div",{staticClass:"pic-404"},[e("img",{staticClass:"pic-404__parent",attrs:{src:a("a36b"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child left",attrs:{src:a("26fc"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child mid",attrs:{src:a("26fc"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child right",attrs:{src:a("26fc"),alt:"404"}})])},function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"bullshit__info"},[t._v("All rights reserved\n        "),a("a",{staticStyle:{color:"#20a0ff"},attrs:{href:"https://wallstreetcn.com",target:"_blank"}},[t._v("wallstreetcn")])])}],i={name:"Page404",computed:{message:function(){return"The webmaster said that you can not enter this page..."}}},l=i,n=(a("a633"),a("2877")),r=Object(n["a"])(l,e,c,!1,null,"18d31acf",null);s["default"]=r.exports},a36b:function(t,s,a){t.exports=a.p+"static/img/404.a57b6f31.png"},a633:function(t,s,a){"use strict";var e=a("144d"),c=a.n(e);c.a}}]);

dist/static/js/chunk-2d0b8f21.5d21d36f.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0b8f21"],{"319f":function(n,e,t){"use strict";t.r(e);var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  结算周期设置\n")])},c=[],l=t("2877"),r={},s=Object(l["a"])(r,u,c,!1,null,null,null);e["default"]=s.exports}}]);

dist/static/js/chunk-2d0c42e2.1153b764.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c42e2"],{"3a75":function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div",[t("router-view")],1)},c=[],r=t("2877"),l={},a=Object(r["a"])(l,u,c,!1,null,null,null);n["default"]=a.exports}}]);

dist/static/js/chunk-2d0c49aa.488e1cc4.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c49aa"],{"3c15":function(n,e,c){"use strict";c.r(e);var t=function(){var n=this,e=n.$createElement,c=n._self._c||e;return c("div",[n._v("\n  异常签到\n")])},u=[],a=c("2877"),l={},r=Object(a["a"])(l,t,u,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-2d0cc2c5.1b0c6cfa.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0cc2c5"],{"4d98":function(e,n,c){"use strict";c.r(n);var t=function(){var e=this,n=e.$createElement,c=e._self._c||n;return c("div",[c("router-view")],1)},u=[],r=c("2877"),l={},i=Object(r["a"])(l,t,u,!1,null,null,null);n["default"]=i.exports}}]);

dist/static/js/chunk-2d0e22e3.d5c26cf2.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e22e3"],{"7e32":function(n,e,t){"use strict";t.r(e);var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  支付通道设置\n")])},c=[],l=t("2877"),r={},s=Object(l["a"])(r,u,c,!1,null,null,null);e["default"]=s.exports}}]);

dist/static/js/chunk-2d0f0a2c.0adc746e.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f0a2c"],{"9ce1":function(e,n,t){"use strict";t.r(n);var c=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div",{staticClass:"m-container"},[t("router-view")],1)},a=[],r={},s=r,u=t("2877"),i=Object(u["a"])(s,c,a,!1,null,null,null);n["default"]=i.exports}}]);

dist/static/js/chunk-2d208c0d.65b1cb94.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d208c0d"],{a5ad:function(n,e,t){"use strict";t.r(e);var c=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  请假管理\n")])},u=[],a=t("2877"),l={},r=Object(a["a"])(l,c,u,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-2d209131.c202be3e.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d209131"],{a804:function(n,e,t){"use strict";t.r(e);var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  系统模板设置\n")])},c=[],l=t("2877"),a={},r=Object(l["a"])(a,u,c,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-2d2221d6.62261324.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d2221d6"],{ccdd:function(n,e,c){"use strict";c.r(e);var t=function(){var n=this,e=n.$createElement,c=n._self._c||e;return c("div",[n._v("\n  节假日设置\n")])},u=[],l=c("2877"),d={},r=Object(l["a"])(d,t,u,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-2d226388.13b34a31.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d226388"],{e876:function(n,e,t){"use strict";t.r(e);var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  课程活动设置\n")])},c=[],l=t("2877"),r={},s=Object(l["a"])(r,u,c,!1,null,null,null);e["default"]=s.exports}}]);

dist/static/js/chunk-2d229d67.3cd82251.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d229d67"],{dec3:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div",[t("router-view")],1)},c=[],r={},l=r,i=t("2877"),o=Object(i["a"])(l,u,c,!1,null,null,null);n["default"]=o.exports}}]);

src/views/teamBuild/components/teamBaseInfo.vue

@@ -357,6 +357,7 @@
 import { getSection, getType, getCooperation, getTeacher, getAddress, getPayMaster, getPayStatus, getTeamBaseInfo, resetTeamBaseInfo } from '@/api/buildTeam'
 import { scrollTo } from '@/utils/scroll-to'
 export default {
+  props: ['getTeamList'],
   data () {
     return {
       topFrom: {
@@ -431,14 +432,17 @@ export default {
     }
   },
   created () {
-    //, { id: 191015094822001, name: '测试2团' }
+    // 分为3种  1.resetTeam 乐团修改
+    //         2. newTeam  新建乐团
+    //          3.teamList 跨团修改
+    this.teamStatus = this.$route.query.type;
+    console.log();
     // 传过来的乐团信息
-    this.activeTeam = [{ id: 191014135135001, name: '测试1团' }, { id: 191015094822001, name: '测试2团' }]
-    // 分为3种 1.
-    if (this.activeTeam && this.activeTeam.length == 1) {
+    this.activeTeam = this.getTeamList;
+
+    if (this.teamStatus == 'resetTeam') {
       // 单团修改
-      this.teamStatus = 'resetOne'
-      this.teamid = this.activeTeam[0].id;
+      this.teamid = this.$route.query.id;
       getTeamBaseInfo({ musicGroupId: this.teamid }).then(res => {
         if (res.code == 200) {
           // 头部
@@ -482,15 +486,6 @@ export default {
       })
     }
 
-    if (!this.activeTeam || this.activeTeam.length == 0) {
-      // 新建团
-      this.teamStatus = 'newTeam'
-    }
-    if (this.activeTeam && this.activeTeam.length > 1) {
-      // 多团合并
-      this.teamStatus = 'newTeam'
-    }
-
   },
   mounted () {
     // 1.获取各个选项卡的数据内容
@@ -535,11 +530,6 @@ export default {
     //     })
     //   }
     // })
-    getPayStatus({ 'rows': 1000 }).then(res => {
-      if (res.code == 200) {
-
-      }
-    })
   },
   methods: {
     gotoNext (num) {

src/views/teamBuild/components/teamResetSound.vue

@@ -212,6 +212,11 @@ export default {
       }
     })
 
+    this.payfor = this.$store.getters.payList;
+    this.topfor = this.$store.getters.topinfo;
+    this.checkfor = this.$store.getters.checkinfo;
+    let type = this.topfor.type;
+
   },
   methods: {
     // 删除声部
@@ -418,8 +423,75 @@ export default {
       return result;
     },
     submitInfo () {
-      let obj = {}
+      let obj = {};
       this.payfor.student.chiose == 'loop' ? obj.months = this.payfor.chioseMonth : obj.months = [];
+      obj.musicGroup = {
+        settlementType: this.topfor.salary,
+        applyExpireDate: this.topfor.time + ' 00:00:01',
+        chargeTypeId: this.topfor.type,
+        cooperationOrganId: this.topfor.school,
+        teamTeacherId: this.topfor.boss,
+        educationalTeacherId: this.topfor.teacher,
+        enrollClasses: this.topfor.startClass.join(','),
+        name: this.topfor.name,
+        organId: this.topfor.section,
+        // paymentMonths:obj.months  有待确认
+        schoolId: this.topfor.address,
+        courseForm: JSON.stringify(this.checkfor)
+      }
+      obj.musicGroupPaymentEntities = []
+      // 添加学校主体付费方式
+      // console.log(this.payfor.company.ischeck)
+      if (this.payfor.school.ischeck) {
+
+        obj.musicGroupPaymentEntities.push({
+          'amount': this.payfor.school.price,
+          'memo': this.payfor.school.value,
+          'paymentMethod': this.payfor.school.chiose,
+          'name': '学校'
+        })
+      }
+      // 添加公司主体付费方式
+      if (this.payfor.company.ischeck) {
+        obj.musicGroupPaymentEntities.push({
+          'amount': this.payfor.company.price,
+          'memo': this.payfor.company.value,
+          'paymentMethod': this.payfor.company.chiose,
+          'name': '公司'
+        })
+      }
+      // 添加商品以及教辅
+      // 添加声部
+      obj.musicGroupSubjectPlans = [];
+      for (let i in this.activeSoundList) {
+        let item = {};
+        // expectedStudentNum
+        item.subName = this.activeSoundList[i].sound;
+        item.subjectId = this.activeSoundList[i].id;
+        item.fee = this.activeSoundList[i].yuji;
+        obj.musicGroupSubjectPlans.push(item);
+      }
+      // 添加学员
+      obj.subjectRegisters = [];
+      for (let i in this.activeSoundList) {
+        let item = {};
+        // expectedStudentNum
+        item.subjectId = this.activeSoundList[i].id;
+        item.registerIdList = []
+        for (let j in this.activeSoundList[i].studentList) {
+          item.registerIdList.push(this.activeSoundList[i].studentList[j].id)
+        }
+        obj.subjectRegisters.push(item);
+      }
+
+      // 发请求修改
+      createTeam(obj).then(res => {
+        if (res.code == 200) {
+          // 成功 跳转到筹备中
+          let id = res.data;
+          this.$router.push({ path: '/business/teamSeting', query: { id } })
+        }
+      })
     },
     goback () {
       this.$emit('chiosetab', 0);

src/views/teamBuild/index.vue

@@ -78,12 +78,23 @@ export default {
         active: require('@/assets/images/base/step-arrow.png')
       },
       pageName: '建团申请',
-      getTeamList: []
+      getTeamList: [],
+      teamStatus: ''
     }
   },
   created () {
     // 判断 是新建乐团还是修改乐团 
-    this.getTeamList = [{ id: 191014141237001, name: 'asjfasdkf' }, { id: 191015094822001, name: '带数据的测试团' }]
+    this.teamStatus = this.$route.query.type;
+    if (this.$route.query.teamList) {
+      this.getTeamList = this.$route.query.teamList
+    }
+
+    if (this.teamStatus == 'newTeam') {
+      // 新建团
+      this.pageName = '建团申请'
+    } else {
+      this.pageName = '乐团修改'
+    }
   },
   methods: {
     chiosetab (val) {

src/views/teamDetail/components/classList.vue

@@ -14,7 +14,8 @@
     </el-form> -->
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList'>
+      <el-table :data='tableList'
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align='center'
                          prop="classGroupName"
                          label="班级名称">

src/views/teamDetail/components/courseList.vue

@@ -55,7 +55,8 @@
     </el-form>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList'>
+      <el-table :data='tableList'
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align='center'
                          prop="classDate"
                          label="时间">

src/views/teamDetail/components/salaryList.vue

@@ -20,7 +20,8 @@
     <!-- 查询列表 -->
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList'>
+      <el-table :data='tableList'
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align='center'
                          prop="classDate"
                          label="时间">
@@ -59,15 +60,24 @@
                width="800px"
                :visible.sync="dialogTableVisible">
       <el-table :data="activeTeacherList">
-        <el-table-column label="老师姓名"></el-table-column>
-        <el-table-column label="老师角色"></el-table-column>
-        <el-table-column label="课程课酬"></el-table-column>
-        <el-table-column label="课时补贴"></el-table-column>
+        <el-table-column label="老师姓名"
+                         prop="userName"></el-table-column>
+        <el-table-column label="老师角色">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.teacherRole |workType }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="课程课酬"
+                         prop="expectSalary"></el-table-column>
+        <el-table-column label="课时补贴"
+                         prop="subsidy"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <div>
               <el-button type='text'
-                         @click="resetTeacher">操作</el-button>
+                         @click="resetTeacher(scope.row)">操作</el-button>
             </div>
           </template>
         </el-table-column>
@@ -97,7 +107,7 @@
              class="dialog-footer">
           <el-button @click="innerVisible = false">取 消</el-button>
           <el-button type="primary"
-                     @click="innerVisible = false">确 定</el-button>
+                     @click="resetSalary">确 定</el-button>
         </div>
       </el-dialog>
     </el-dialog>
@@ -106,6 +116,7 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { getCourseList } from '@/api/buildTeam'
+import { updateTeacherCoursesSalary } from '@/api/teacherManager'
 export default {
   name: 'salaryList',
   props: {
@@ -182,9 +193,28 @@ export default {
     },
     setCourseInfo (row) {
       this.dialogTableVisible = true;
+      this.activeTeacherList = row.teachingTeachers;
     },
     resetTeacher (row) {
       this.innerVisible = true;
+      this.activeTeacher = row;
+    },
+    resetSalary () {
+      // console.log(this.activeTeacher);
+      updateTeacherCoursesSalary({
+        courseScheduleId: this.activeTeacher.courseScheduleId,
+        salary: this.teacherMask.salary,
+        teacherId: this.activeTeacher.userId,
+        subsidy: this.teacherMask.subsidy,
+        scope: this.teacherMask.radio
+
+      }).then(res => {
+        if (res.code == 200) {
+          this.$message.success('修改成功')
+          this.dialogTableVisible = false;
+          this.innerVisible = false;
+        }
+      })
     }
   }
 }

src/views/teamDetail/components/studentList.vue

@@ -75,7 +75,8 @@
 
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList'>
+      <el-table :data='tableList'
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column label="学员姓名"
                          width="120px;"
                          prop="realName">

src/views/teamDetail/components/teacherList.vue

@@ -38,7 +38,8 @@
 
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList'>
+      <el-table :data='tableList'
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align='center'
                          prop="teacherId"
                          label="老师编号">

src/views/teamDetail/index.vue

@@ -7,7 +7,8 @@
       <div class="term active">第二学期</div> -->
     </h2>
     <div class="m-core">
-      <div class='newBand abs'>乐团调整</div>
+      <div class='newBand abs'
+           @click='resetTeam'>乐团修改</div>
       <p class='msg'>
         <img src="@/assets/images/base/clock.png"
              alt=""> 报名中
@@ -90,6 +91,10 @@ export default {
       // console.log(name);
       this.name = name;
       localStorage.setItem('teamName', name);
+    },
+    resetTeam () {
+      // id  type 
+      this.$router.push({ path: '/business/teamBuild', query: { type: 'resetTeam', id: this.teamid } })
     }
   },
   components: {

src/views/teamDetail/teamList.vue

@@ -5,9 +5,8 @@
       <div class="btnList">
         <div class='newBand'
              @click="createNewTeam">新建乐团</div>
-        <div class='newBand'>声部调整</div>
-        <div class='newBand'>乐团合并</div>
-        <div class='newBand'>乐团加课</div>
+        <div class='newBand'
+             @click="resetTeam">乐团调整</div>
       </div>
 
       <el-form :inline="true"
@@ -71,7 +70,14 @@
       </div> -->
       <div class="tableWrap">
         <el-table style="width: 100%"
+                  @selection-change="handleSelectionChange"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                   :data='tableData'>
+          <el-table-column type="selection"
+                           :selectable="checkSelectable"
+                           width="50">
+          </el-table-column>
+
           <el-table-column prop="id"
                            align='center'
                            label="乐团编号">
@@ -209,7 +215,8 @@ export default {
         page: 1, // 当前页
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
-      }
+      },
+      passed: [], // 传递的参数
     }
   },
   components: {
@@ -231,7 +238,15 @@ export default {
       })
     },
     createNewTeam () {
-      this.$router.push({ path: '/business/teamBuild' })
+      this.$router.push({ path: '/business/teamBuild', query: { type: 'newTeam' } })
+    },
+    resetTeam () {
+      // 这里还有勾选的乐团信息
+      if (this.passed && this.passed.length <= 0) {
+        this.$message.error('请至少选择一个乐团进行调整')
+        return
+      }
+      this.$router.push({ path: '/business/teamBuild', query: { type: 'teamList', teamList: this.passed } })
     },
     setSearchList (obj) {
       // 
@@ -328,6 +343,18 @@ export default {
           break
         }
       }
+    },
+    checkSelectable (row) {
+      return row.status == 'PROGRESS'
+    },
+    handleSelectionChange (arr) {
+      this.passed = [];
+      for (let i in arr) {
+        let obj = {};
+        obj.id = arr[i].id;
+        obj.name = arr[i].name;
+        this.passed.push(obj)
+      }
     }
   },
   watch: {