From 05ea3ffeb18b80ddadfb411dd725d05cff1dd2e1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 05 六月 2024 17:03:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/Manage/ClassManagement/Class.vue |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/views/Manage/ClassManagement/Class.vue b/src/views/Manage/ClassManagement/Class.vue
index 6bfa2e3..bca2c77 100644
--- a/src/views/Manage/ClassManagement/Class.vue
+++ b/src/views/Manage/ClassManagement/Class.vue
@@ -40,10 +40,10 @@
                   width="180px"
                 ></el-table-column>
                 <el-table-column
-                  label="骞寸骇"
+                  label="鐘舵��"
                   align="center"
                   width="80px"
-                  prop="grade"
+                  prop="status"
                 ></el-table-column>
                 <el-table-column
                   width="100px"
@@ -84,8 +84,8 @@
                     <el-button size="small" @click="handlerEdit(scope.row)" type="primary">淇敼</el-button>
                     <el-button size="small" type="warning">鐝骇楠岃瘉</el-button>
                     <el-button size="small" type="info">閫氱煡</el-button>
-                    <el-button @click="routersTo()" size="small" type="success">鎴愬憳绠$悊</el-button>
-                    <el-button @click="remove(scope.row.id)" type="danger" size="small">鍒犻櫎</el-button>
+                    <el-button @click="studentManager(scope.row.id)" size="small" type="success">鎴愬憳绠$悊</el-button>
+                    <el-button v-if="scope.row.status !== '瑙f暎'" @click="dissolution(scope.row.id)" type="danger" size="small">瑙f暎</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -151,7 +151,7 @@
 </template>
 
 <script>
-import { addClasses, editClasses, getClassess, deleteClassesById } from "@/api/classes";
+import { addClasses, editClasses, getClassess, dissolution } from "@/api/classes";
 import Pagination from "@/components/Pagination"
 export default {
   components: {Pagination},
@@ -231,9 +231,9 @@
         }
       });
     },
-    remove(id) {
-      deleteClassesById(id).then(res => {
-        this.$message.success("鍒犻櫎鎴愬姛")
+    dissolution(id) {
+      dissolution(id).then(res => {
+        this.$message.success(res.data.message)
         this.page()
       })
     },
@@ -250,10 +250,8 @@
       this.title = "鏂板鐝骇"
     },
     // 璺宠浆(鏌ョ湅鐝骇浜哄憳鎯呭喌)
-    routersTo() {
-      this.$router.push({
-        name: "ClassStaff",
-      });
+    studentManager(classesId) {
+      this.$router.push({ path: "class-management/Class-staff", query: { classesId: classesId } });
     },
     // 杩斿洖涓婁竴涓〉闈�
     goBack() {

--
Gitblit v1.8.0