Merge branch '01/19NavMenu' into online

src/views/teamDetail/components/resetClass.vue

@@ -94,7 +94,7 @@
             </template>
           </el-table-column>
           <el-table-column align="center" width="240px" label="操作">
-            <template slot-scope="scope">
+            <template slot-scope="scope" v-if="scope.row.lockFlag != 1">
               <div>
                 <!-- v-if="scope.row.type !='MIX'" -->
                 <el-button
@@ -113,10 +113,9 @@
                 <el-button
                   type="text"
                   v-if="
-                    scope.row.lockFlag != 1 &&
-                    (permission('classGroup/classGroupUpdate') ||
+                    permission('classGroup/classGroupUpdate') ||
                     permission('classGroup/revisionClassGroup') ||
-                    permission('classGroup/revisionAddClassGroup'))
+                    permission('classGroup/revisionAddClassGroup')
                   "
                   @click="classAdjustment(scope.row)"
                   >排课</el-button