Merge branch 'LAO_MO' into online

src/views/vipClass/vipDetail/components/fnanceInfo.vue

@@ -45,9 +45,11 @@
       <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                 :data='tableList'>
         <el-table-column label="上课时间"
+                         align="center"
                          prop="classDate">
         </el-table-column>
         <el-table-column label="课时类型"
+                         align="center"
                          prop="teachMode">
           <template slot-scope="scope">
             <div>
@@ -56,12 +58,15 @@
           </template>
         </el-table-column>
         <el-table-column label="实收总额"
+                         align="center"
                          prop="deductionFee">
         </el-table-column>
         <el-table-column label="老师课酬"
+                         align="center"
                          prop="actualSalary">
         </el-table-column>
         <el-table-column label="结算状态"
+                         align="center"
                          prop="isSalary">
           <template slot-scope="scope">
             <div>

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -120,6 +120,7 @@
           <template slot-scope="scope">
             <div>
               <el-button type="text"
+                         v-if="scope.row.attendanceNum"
                          v-permission="'vipGroupManage/findVipGroupAttendanceStudents'"
                          @click="lookStudents(scope.row)">查看学员</el-button>
               <!-- <el-button type="text" v-permission="'vipGroupManage/classStartDateAdjust'"

src/views/vipClass/vipList.vue

@@ -192,6 +192,7 @@
                              slot="reference">停止</el-button>
                 </el-popover>
                 <el-button type="text"
+                           v-if="scope.row.status > 1"
                            v-permission="'/vipReset'"
                            @click="resetVip(scope.row.id)">修改</el-button>
               </div>
@@ -288,7 +289,7 @@ export default {
       let params = this.searchForm
       params.page = this.rules.page
       params.rows = this.rules.limit
-      params.organId = this.searchForm.orgin
+      params.organId = this.searchForm.orgin || null
       params.status = this.searchForm.status || null
       getVipList(params).then(res => {
         if (res.code == 200) {