老师课酬

src/utils/vueFilter.js

@@ -223,6 +223,9 @@ Vue.filter('paymentStatus', value => {
 // 乐团状态
 Vue.filter('teamStatus', value => {
   let template = {
+    DRAFT: '草稿',
+    AUDIT: '审核中',
+    AUDIT_FAILED: '审核失败',
     APPLY: "报名中",
     PAY: "缴费中",
     PREPARE: "筹备中",

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -10,41 +10,56 @@
               {{ scope.row.courseScheduleType | coursesType }}
             </template>
           </el-table-column>
-          <el-table-column label="主教30min课酬">
+          <el-table-column label="默认课酬-主教">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.mainTeacher30MinSalary" placeholder="请输入课酬"></el-input>
+              <el-input v-show="scope.row.courseScheduleType != 'HIGH'" v-model="scope.row.mainTeacher30MinSalary" placeholder="请输入课酬">
+                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">每45分钟</template>
+                <template slot="append" v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">每40分钟</template>
+                <template slot="append" v-else>每30分钟</template>
+              </el-input>
             </template>
           </el-table-column>
-          <el-table-column label="助教30min课酬">
+          <el-table-column label="默认课酬-助教">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.assistantTeacher30MinSalary" placeholder="请输入课酬"></el-input>
+              <el-input v-show="scope.row.courseScheduleType != 'HIGH'" v-model="scope.row.assistantTeacher30MinSalary" placeholder="请输入课酬">
+                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">每45分钟</template>
+                <template slot="append" v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">每40分钟</template>
+                <template slot="append" v-else>每30分钟</template>
+              </el-input>
             </template>
           </el-table-column>
-          <el-table-column label="主教3.0梯度课酬">
+          <el-table-column label="3.0课酬-主教">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.mainTeacher90MinSalary" placeholder="请输入课酬"></el-input>
+              <el-input v-show="scope.row.courseScheduleType != 'CLASSROOM'" v-model="scope.row.mainTeacher90MinSalary" placeholder="请输入课酬">
+                <template slot="append">每{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template>
+              </el-input>
             </template>
           </el-table-column>
-          <el-table-column label="助教3.0梯度课酬">
+          <el-table-column label="3.0课酬-助教">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.assistantTeacher90MinSalary" placeholder="请输入课酬"></el-input>
+              <el-input v-show="scope.row.courseScheduleType != 'CLASSROOM'" v-model="scope.row.assistantTeacher90MinSalary" placeholder="请输入课酬">
+                <template slot="append">每{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template>
+              </el-input>
             </template>
           </el-table-column>
         </el-table>
 
-        <h3>单次课次参考时长：30min</h3>
-        <el-table :data='vipTable' style="width: 70%"
+        <el-table :data='vipTable' style="width: 70%; margin-top: 15px;"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column label="VIP课课酬参考值" prop="vipGroupCategoryName">
           </el-table-column>
           <el-table-column label="线上课">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.onlineClassesSalary" placeholder="请输入内容"></el-input>
+              <el-input v-model="scope.row.onlineClassesSalary" placeholder="请输入内容">
+                <template slot="append">每30分钟</template>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column label="线下课">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.offlineClassesSalary" placeholder="请输入内容"></el-input>
+              <el-input v-model="scope.row.offlineClassesSalary" placeholder="请输入内容">
+                <template slot="append">每30分钟</template>
+              </el-input>
             </template>
           </el-table-column>
         </el-table>
@@ -68,17 +83,17 @@ export default {
       teamTable: [{
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
-        courseScheduleType: "SINGLE",
+        courseScheduleType: "CLASSROOM",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
-        userId: this.$route.query.teacherId,
-      },{
+        userId: this.$route.query.teacherId
+      }, {
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
-        courseScheduleType: "HIGH",
+        courseScheduleType: "SINGLE",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
-        userId: this.$route.query.teacherId
+        userId: this.$route.query.teacherId,
       },{
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
@@ -110,7 +125,7 @@ export default {
       },{
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
-        courseScheduleType: "CLASSROOM",
+        courseScheduleType: "HIGH",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
         userId: this.$route.query.teacherId
@@ -291,7 +306,7 @@ export default {
   }
 }
 
-.el-table__body {
+/deep/.el-table__body {
   tr {
     td:nth-child(3) {
       border-right: 1px solid #EBEEF5;

src/views/teamDetail/teamList.vue

@@ -26,9 +26,7 @@
         <el-form-item prop='status'>
           <el-select class='multiple'
                      v-model="topForm.status"
-                     placeholder="请选择乐团状态"
-                     multiple
-                     collapse-tags>
+                     placeholder="请选择乐团状态">
             <el-option v-for="(item,index) in nowStatus"
                        :key="index"
                        :label="item.text"
@@ -77,7 +75,7 @@
                            label="乐团状态">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.status|teamStatus }}
+                {{ scope.row.status | teamStatus }}
               </div>
             </template>
           </el-table-column>