From e9ac312fdfdf723dfc5b97dbf56df9c339f635f9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 26 七月 2024 18:04:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/class-management/Class.vue | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/src/views/class-management/Class.vue b/src/views/class-management/Class.vue
index 91a17f6..a259483 100644
--- a/src/views/class-management/Class.vue
+++ b/src/views/class-management/Class.vue
@@ -52,24 +52,24 @@
<el-tag v-if="scope.row.status === '瑙ｆ暎'" type="danger">{{ scope.row.status }}</el-tag>
</template>
</el-table-column>
- <el-table-column
- width="100px"
- align="center"
- label="鍗曚綅"
- prop="unit"
- ></el-table-column>
+<!-- <el-table-column-->
+<!-- width="100px"-->
+<!-- align="center"-->
+<!-- label="鍗曚綅"-->
+<!-- prop="unit"-->
+<!-- ></el-table-column>-->
<el-table-column
align="center"
width="100px"
label="鏁欏笀"
prop="createUserName"
></el-table-column>
- <el-table-column
- align="center"
- width="120px"
- label="鑱旂郴鐢佃瘽"
- prop="teacherPhone"
- ></el-table-column>
+<!-- <el-table-column-->
+<!-- align="center"-->
+<!-- width="120px"-->
+<!-- label="鑱旂郴鐢佃瘽"-->
+<!-- prop="teacherPhone"-->
+<!-- ></el-table-column>-->
<el-table-column
width="140px"
label="寮�鐝椂闂�"
@@ -98,9 +98,24 @@
<el-button v-if="scope.row.status !== '瑙ｆ暎'" @click="studentManager(scope.row.id)" size="small"
type="success">鎴愬憳绠＄悊
</el-button>
- <el-button v-if="scope.row.status !== '瑙ｆ暎'" @click="dissolution(scope.row.id)" type="danger"
- size="small">瑙ｆ暎
- </el-button>
+ <el-popconfirm
+ class="confirm"
+ title="纭畾瑕佽В鏁ｈ鐝骇锛�"
+ @confirm="dissolution(scope.row.id)"
+ >
+ <el-button slot="reference" v-if="scope.row.status !== '瑙ｆ暎'" type="danger"
+ size="small">瑙ｆ暎
+ </el-button>
+ </el-popconfirm>
+ <el-popconfirm
+ class="confirm"
+ title="纭畾瑕佹仮澶嶈鐝骇鍚楋紵"
+ @confirm="recover(scope.row.id)"
+ >
+ <el-button slot="reference" v-if="scope.row.status === '瑙ｆ暎'" type="success"
+ size="small">鎭㈠姝ｅ父
+ </el-button>
+ </el-popconfirm>
</template>
</el-table-column>
</el-table>
@@ -174,7 +189,7 @@
</template>
<script>
-import { addClasses, editClasses, getClassess, dissolution } from '@/api/classes'
+import { addClasses, editClasses, getClassess, dissolution, recover } from '@/api/classes'
import { addClassesNotify } from '@/api/classesNotify'
import Pagination from '@/components/Pagination'
@@ -305,6 +320,12 @@
this.page()
})
},
+ recover(id) {
+ recover(id).then(res => {
+ this.$message.success(res.data.message)
+ this.page()
+ })
+ },
handlerEdit (row) {
this.form = row
this.open = true
@@ -333,6 +354,9 @@
</script>
<style scoped lang="scss">
+.confirm {
+ margin-left: 5px;
+}
.flex {
display: flex;
}
--
Gitblit v1.8.0