提交测试

1

src/views/teamDetail/components/resetClass.vue

@@ -120,9 +120,18 @@
                   @click="classAdjustment(scope.row)"
                   >排课</el-button
                 >
+                   <el-button
+                    type="text"
+                    v-if="
+                      scope.row.studentNum == '0' ||
+                      scope.row.totalClassTimes == '0'
+                    "
+                      @click="removeClass(scope)"
+                    >删除</el-button
+                  >
                 <!--<el-button type="text"
                 @click="recourse(scope.row)">重新排课</el-button>-->
-                <el-popover
+                <!-- <el-popover
                   placement="top"
                   width="200"
                   :ref="`popover-${scope.$index}`"
@@ -144,17 +153,8 @@
                       >确定</el-button
                     >
                   </div>
-                  <!-- v-if="scope.row.type !='MIX'" -->
-                  <el-button
-                    type="text"
-                    v-if="
-                      scope.row.studentNum == '0' ||
-                      scope.row.totalClassTimes == '0'
-                    "
-                    slot="reference"
-                    >删除</el-button
-                  >
-                </el-popover>
+
+                </el-popover> -->
               </div>
             </template>
           </el-table-column>
@@ -1032,22 +1032,26 @@ export default {
     },
     // 删除班级
     removeClass(scope) {
-      removeSingleClass({ classGroupId: scope.row.id })
+         this.$confirm("是否确定删除该班级?", "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "warning"
+    })
+      .then(() => {
+        removeSingleClass({ classGroupId: scope.row.id })
         .then((res) => {
           if (res.code == 200) {
-            scope._self.$refs[`popover-${scope.$index}`].doClose();
             this.$message.success("删除成功");
-
             // 重新请求列表
             this.getList(this.activeMixClass);
-          } else {
-            this.$message.error(res.msg);
-            scope._self.$refs[`popover-${scope.$index}`].doClose();
           }
         })
         .catch((res) => {
-          scope._self.$refs[`popover-${scope.$index}`].doClose();
+
         });
+      })
+      .catch(() => { });
+
     },
     // 修改班级
     resetClass(row) {

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')
                 "

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