Browse Source

Merge branch '01/21VipReset'

lex-xin 4 years ago
parent
commit
e10ecf6021
2 changed files with 12 additions and 8 deletions
  1. 4 3
      src/views/teamDetail/teamClassList.vue
  2. 8 5
      src/views/teamDetail/teamCourseList.vue

+ 4 - 3
src/views/teamDetail/teamClassList.vue

@@ -39,7 +39,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-select
             v-model.trim="searchForm.groupType"
             @change="()=>{searchForm.type=''}"
@@ -53,7 +53,7 @@
               :label="item.label"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <!-- musicClassTypeList -->
         <el-form-item prop="type">
           <el-select v-model.trim="searchForm.type" filterable  clearable :disabled='searchForm.groupType!="MUSIC"'>
@@ -147,13 +147,14 @@
             </template>
           </el-table-column>
           <el-table-column align="center" label="操作">
+            <!--    scope.row.groupType== 'MUSIC'&& -->
             <template slot-scope="scope">
               <el-button
                 type="text"
                 @click="addCompound(scope.row)"
                 v-if="
                   scope.row.type != 'MUSIC_NETWORK' &&
-                  scope.row.groupType== 'MUSIC'&&
+
                   !isAddCom(scope.row) &&
                   permission('classGroup/spanGroupMergeClassSplitClassAffirm')
                 "

+ 8 - 5
src/views/teamDetail/teamCourseList.vue

@@ -197,14 +197,17 @@
               type="primary"
               >导出课表</el-button
             >
+                <el-button
+              v-permission=" 'courseSchedule/batchDelete?page=teamCourseList'"
+             @click="removeCourse"
+             :disabled='!deleteList.length>0'
+              type="primary"
+              >批量删除</el-button
+            >
+
           </el-col>
         </el-row>
       </save-form>
-      <div class="btnWraps">
-        <div class="newBand"  v-permission="
-                    'courseSchedule/batchDelete?page=teamCourseList'
-                  " @click="removeCourse" >批量删除</div>
-      </div>
       <!-- 列表 -->
       <div class="tableWrap" style="margin-top: 20px">
         <el-table