修改课酬

src/api/vipSeting.js

@@ -9,6 +9,16 @@ export function vipGroupCategory (data) {
     params: data
   })
 }
+
+// 获取vip 老师默认分类列表
+export function findTeacherDefaultSalary (data) {
+  return request({
+    url: api + '/vipGroupCategory/findTeacherDefaultSalary',
+    method: 'post',
+    data: qs.stringify(data)
+  })
+}
+
 // 获取 vip循环列表
 export function getDefaultClassesCycle (data) {
   return request({

src/views/categroyManager/insideSetting/staffManager.vue

@@ -40,9 +40,18 @@
           </el-table-column>
           <el-table-column align='center'
                            label="所属部门">
-            <template slot-scope="scope">
-              {{ scope.row.organNameList | joinArray(',') }}
-            </template>
+            
+            <span style="display: inline-block;width: 100%;overflow: hidden;white-space: nowrap; text-overflow: ellipsis;" slot-scope="scope">
+              <el-popover
+                placement="top-start"
+                width="200"
+                trigger="hover"
+                :content="scope.row.organNameList | joinArray(',')">
+                <!-- <el-button slot="reference">hover 激活</el-button> -->
+                <span slot="reference">{{ scope.row.organNameList | joinArray(',') }}</span>
+              </el-popover>
+              
+            </span>
           </el-table-column>
           <el-table-column align='center'
                            label="状态" :formatter="formatLockFlag">
@@ -98,10 +107,11 @@
           <!-- collapse-tags -->
         </el-form-item>
         <el-form-item label="所属部门" prop="organIdLists" :label-width="formLabelWidth">
-          <el-select v-model="form.organIdLists" multiple>
+          <el-select style="width: calc(100% - 75px) !important;" v-model="form.organIdLists" multiple>
             <el-option v-for="item in branchList" :key="item.value" 
               :label="item.label" :value="item.value"></el-option>
           </el-select>
+          <el-button @click="onBranchCheckAll">全选</el-button>
         </el-form-item>
         <el-form-item label="工作类型" prop="jobNature" :label-width="formLabelWidth">
           <el-select v-model="form.jobNature">
@@ -193,6 +203,12 @@ export default {
     
   },
   methods: {
+    onBranchCheckAll() {
+      this.form.organIdLists = []
+      this.branchList.forEach(item => {
+        this.form.organIdLists.push(item.value)
+      })
+    },
     onRoleSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {

src/views/categroyManager/vipNewActive.vue

@@ -26,6 +26,7 @@
                        :label="item.name"
                        :value="item.id"></el-option>
           </el-select>
+          <el-button @click="onCheckAllBranch">适用所有分部</el-button>
         </el-form-item>
         <el-form-item label="活动描述"
                       prop="desc">
@@ -312,6 +313,13 @@ export default {
       // 线上线下课 勾选就传不勾选就不传
       // addVipActive().then(res => { })
     },
+    onCheckAllBranch() {
+      // 选择所有分部
+      this.vipform.organ = []
+      this.organList.forEach(item => {
+        this.vipform.organ.push(item.id)
+      })
+    },
     onCancel () {
       this.$router.push("/vipClassSet/vipActiveList")
     },

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -50,7 +50,7 @@
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column label="上课时间">
           <template slot-scope="scope">
-            {{ scope.row.classDate }}
+            {{ scope.row.classDate + ' ' + scope.row.classTime }}
           </template>
         </el-table-column>
         <el-table-column label="班级名称"

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

@@ -111,7 +111,7 @@
 <script>
 import { vipGroupSalaryList, vipGroupSalarySet, teacherSalaryList, teacherSalaryBatchUpset } from '@/api/teacherManager'
 import { sysConfigList } from '@/api/generalSettings'
-import { vipGroupCategory } from '@/api/vipSeting'
+import { findTeacherDefaultSalary } from '@/api/vipSeting'
 export default {
   props: ['teacherId'],
   data () {
@@ -180,7 +180,7 @@ export default {
   methods: {
     __init () {
       // 获取课程形态 设置vip课酬
-      vipGroupCategory().then(res => {
+      findTeacherDefaultSalary({ userId: this.teacherId }).then(res => {
         if (res.code == 200 && res.data.length > 0) {
           let vipData = []
           res.data.forEach(item => {

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

@@ -405,9 +405,9 @@ export default {
               if (res.code == 200) {
                 // 权限判断，是否有课酬设置
                 if (permission('/teacherAdd/salarySeting')) {
-                  this.$router.push('/business/teacherList')
-                } else {
                   this.$emit('onTeacher', res.data)
+                } else {
+                  this.$router.push('/business/teacherList')
                 }
 
               }