11wqe1 4 часов назад
Родитель
Сommit
896665bd43
1 измененных файлов с 30 добавлено и 23 удалено
  1. 30 23
      src/components/pages/studentManageNew/component/table.vue

+ 30 - 23
src/components/pages/studentManageNew/component/table.vue

@@ -196,7 +196,7 @@
       >
         <el-table-column
           type="selection"
-          v-if="boxType == 0 || (boxType == 1 && interestType == 1)"
+          v-if="boxType == 0 || (boxType == 1 && interestType == 1) || boxType == 2"
           width="55px"
         >
         </el-table-column>
@@ -322,26 +322,11 @@
           </template>
         </el-table-column>
       </el-table>
-      <div
-        class="page_box"
-        v-if="boxType == 2 || (boxType == 1 && interestType == 0)"
-      >
-        <el-pagination
-          background
-          @size-change="handleSizeChange"
-          @current-change="handlePageChange"
-          :current-page.sync="page"
-          :page-sizes="[10, 15, 20, 25]"
-          :page-size="pageSize"
-          layout="sizes, prev, pager, next"
-          :total="total"
-        >
-        </el-pagination>
-      </div>
+
       <div
         class="page_box"
         v-if="
-          (boxType == 0 || (boxType == 1 && interestType == 1)) &&
+          (boxType == 0 || (boxType == 1 && interestType == 1) || boxType == 2) &&
             selectedData.length
         "
       >
@@ -357,7 +342,7 @@
               @click="cancelAllSelection"
               v-if="
                 selectedData.length != 0 &&
-                  selectedData.length == tableData.length
+                (selectedData.length == tableData.length || selectedData.length == allTableData.length)
               "
             >
               {{ lang.ssCancelSelAll }}
@@ -370,7 +355,7 @@
           <div
             @click="deleteSelectionStudent"
             class="action_btn"
-            v-if="boxType == 0"
+            v-if="boxType == 0 || boxType == 2"
             style="background: #ff4d4f; color: #fff"
           >
             {{ lang.Delete }}
@@ -386,6 +371,22 @@
           </div>
         </div>
       </div>
+      <div
+        class="page_box"
+        v-if="boxType == 2 || (boxType == 1 && interestType == 0)"
+      >
+        <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handlePageChange"
+          :current-page.sync="page"
+          :page-sizes="[10, 15, 20, 25]"
+          :page-size="pageSize"
+          layout="sizes, prev, pager, next"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
     </div>
 
     <!-- 添加兴趣班弹框 -->
@@ -899,9 +900,15 @@ export default {
     },
     // 全选
     allSel() {
-      this.tableData.forEach(row => {
-        this.$refs.tableData.toggleRowSelection(row, true);
-      });
+      if(this.boxType == 2) {
+        this.allTableData.forEach(row => {
+          this.$refs.tableData.toggleRowSelection(row, true);
+        });
+      } else {
+        this.tableData.forEach(row => {
+          this.$refs.tableData.toggleRowSelection(row, true);
+        });
+      }
     },
     // 导出学生
     exportStudent() {