1112 17:04

111

dist/static/css/chunk-08dff963.15bc3a64.css

@@ -1 +0,0 @@
-.left[data-v-28deca8c]{margin-right:20px}.listWrap[data-v-28deca8c]{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}

dist/static/css/chunk-0c0f60b7.47f7abb7.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-21c40686],.el-button--primary[data-v-21c40686]:active,.el-button--primary[data-v-21c40686]:focus,.el-button--primary[data-v-21c40686]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-21c40686]{margin-top:40px}.el-col[data-v-21c40686]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-21c40686]{width:200px;margin:0 20px}[data-v-21c40686] .el-tree-node__content{height:40px!important}.moreRule[data-v-21c40686]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-21c40686]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-21c40686]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-21c40686]{display:inline-block}.moreRuleIn .el-form-item[data-v-21c40686]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-21c40686] .el-form-item__content{margin-left:0!important}.max[data-v-21c40686],.min[data-v-21c40686]{display:inline-block;width:180px;text-align:center;margin-right:10px}

dist/static/css/chunk-d3512760.fe9253ef.css → dist/static/css/chunk-6c5f724a.60ef9150.css

@@ -1 +1 @@
-.m-core[data-v-3fe36664]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-3fe36664]{width:180px}.m-core h4[data-v-3fe36664]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-3fe36664],.m-core .right[data-v-3fe36664],.m-core .vipLeft[data-v-3fe36664]{width:400px}.planList[data-v-3fe36664]{padding:0 25px}.planList .planTop[data-v-3fe36664]{height:40px;line-height:40px;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:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-3fe36664]{font-size:14px}.planList .planCore .row[data-v-3fe36664]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-3fe36664]{width:87px}.okBtn[data-v-3fe36664]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-b08ac250]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-b08ac250]{width:180px}.m-core h4[data-v-b08ac250]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-b08ac250],.m-core .right[data-v-b08ac250],.m-core .vipLeft[data-v-b08ac250]{width:400px}.planList[data-v-b08ac250]{padding:0 25px}.planList .planTop[data-v-b08ac250]{height:40px;line-height:40px;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:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-b08ac250]{font-size:14px}.planList .planCore .row[data-v-b08ac250]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-b08ac250]{width:87px}.okBtn[data-v-b08ac250]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

dist/static/css/chunk-72a1f64a.85aa288b.css → dist/static/css/chunk-b50645a8.89ca7195.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-27303c4d]{font-size:14px}.btnList[data-v-27303c4d]{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-27303c4d]{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-72508880]{font-size:14px}.btnList[data-v-72508880]{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-72508880]{margin-right:15px}

src/api/buildTeam.js

@@ -660,4 +660,14 @@ export function getEmployeeOrgan (data) {
     method: 'get',
     params: data
   })
+}
+
+
+// 课酬调整
+export function getTeacherSalary (data) {
+  return request({
+    url: api + `/courseSchedule/queryTeacherSalary`,
+    method: 'get',
+    params: data
+  })
 }

src/layout/components/Sidebar/index.vue

@@ -63,3 +63,10 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+.el-menu-item {
+  &:nth-last-child(1) {
+    padding-bottom: 20px;
+  }
+}
+</style>

src/utils/searchArray.js

@@ -64,13 +64,12 @@ const musicGroupStatus = [
   { value: 'PAY', text: '缴费中' },
   { value: 'PREPARE', text: '筹备中' },
   { value: 'PROGRESS', text: '进行中' },
-  { value: 'CANCELED', text: '已停止' },
-  { value: 'AUDIT', text: '审核中' },
   { value: 'PAUSE', text: '已结束' },
   { value: 'DRAFT', text: '编辑中' },
-  { value: 'AUDIT_FAILED', text: '审核失败' }
+  { value: 'AUDIT', text: '审核中' },
+  { value: 'AUDIT_FAILED', text: '审核失败' },
+  { value: 'CANCELED', text: '取消' },
 ]
-
 export {
   courseType,
   attendance,

src/views/buildVip/index.vue

@@ -235,6 +235,20 @@
       <el-form :model="maskForm"
                label-position="right"
                label-width="150px">
+        <el-form-item label="线上课开课时间">
+          <el-date-picker v-model="maskForm.courseStartOnline"
+                          type="date"
+                          :picker-options="courseOption"
+                          placeholder="请选择开课时间" />
+        </el-form-item>
+        <el-form-item label="线下课开课时间">
+          <el-date-picker v-model="maskForm.courseStartOffline"
+                          type="date"
+                          :picker-options="courseOption"
+                          placeholder="请选择开课时间" />
+        </el-form-item>
+        <div class="line"
+             style="height:1px; background:#ccc; margin:0 25px;"></div>
         <el-form-item label="课程类型"
                       prop="type">
           <el-radio v-if="hasOnline"
@@ -248,18 +262,6 @@
             线下课
           </el-radio>
         </el-form-item>
-        <el-form-item label="线上课开课时间">
-          <el-date-picker v-model="maskForm.courseStartOnline"
-                          type="date"
-                          :picker-options="courseOption"
-                          placeholder="请选择开课时间" />
-        </el-form-item>
-        <el-form-item label="线下课开课时间">
-          <el-date-picker v-model="maskForm.courseStartOffline"
-                          type="date"
-                          :picker-options="courseOption"
-                          placeholder="请选择开课时间" />
-        </el-form-item>
         <el-form-item label="循环周次"
                       prop="week">
           <el-select v-model="maskForm.week"

src/views/resetTeaming/index.vue

@@ -55,6 +55,9 @@ export default {
     this.teamid = this.$route.query.id;
     console.log(this.teamid)
   },
+  beforeDestroy () {
+    sessionStorage.setItem('resetCode', 1)
+  },
   mounted () {
 
   }, methods: {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -44,9 +44,7 @@
         <el-form-item label="教学地点"
                       prop="address"
                       :rules="[{ required: true, message: '教学地点不能为空'},]">
-          <el-select v-model="topFrom.address"
-                     :disabled="!topFrom.school"
-                     clearable>
+          <el-select v-model="topFrom.address">
             <el-option v-for="(item,index) in addList"
                        :key='index'
                        :label="item.name"
@@ -543,7 +541,12 @@ export default {
         this.teacherList = res.data;
       }
     })
-
+    // 5.获取教学地点选项卡
+    getAddress({ 'rows': 1000, }).then(res => {
+      if (res.code == 200) {
+        this.addList = res.data.rows;
+      }
+    })
     // 6.默认支付主体
     // getPayMaster({ 'rows': 1000 }).then(res => {
     //   console.log(res);
@@ -560,12 +563,8 @@ export default {
   },
   methods: {
     chioseSchool (val) {
-      // 5.获取教学地点选项卡
-      getAddress({ 'rows': 1000, cooperationOrganId: val }).then(res => {
-        if (res.code == 200) {
-          this.addList = res.data.rows;
-        }
-      })
+
+
     },
     gotoNext (num) {
       // 1.效验数据    判断是否数据正常=> 正常放入store存储  

src/views/teamBuild/components/teamResetSound.vue

@@ -3,6 +3,7 @@
     <div class="listWrap">
       <el-table :data='activeSoundList'
                 ref="multipleTable"
+                @selection-change="handleSelectionChange"
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                 highlight-current-row>
         <el-table-column type="selection"
@@ -28,7 +29,7 @@
             <div>
               <el-button type="text"
                          @click="resetStudent(scope.row)">添加</el-button>
-              <el-button type="text">删除</el-button>
+              <!-- <el-button type="text">删除</el-button> -->
             </div>
           </template>
         </el-table-column>
@@ -221,9 +222,11 @@ export default {
   methods: {
     // 删除声部
     removeListItem () {
+      console.log(this.multipleSelection)
       for (let i = 0; i < this.activeSoundList.length; i++) {
         for (let j = 0; j < this.multipleSelection.length; j++) {
           if (this.activeSoundList[i].id == this.multipleSelection[j].id) {
+            console.log('删除');
             this.activeSoundList.splice(i, 1);
             // 遍历循环所有的group 删除所选id
             for (let key in this.soundLists) {
@@ -262,6 +265,7 @@ export default {
       }
     },
     handleSelectionChange (e) {
+      console.log(e);
       // 点击改变勾选
       this.multipleSelection = e;
     },