From f2a9cb154099a59a97de312ea2bb45d37639868b Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期四, 17 十月 2024 19:46:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/class-management/Class.vue | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/src/views/class-management/Class.vue b/src/views/class-management/Class.vue
index 4f2f3f9..5dffd29 100644
--- a/src/views/class-management/Class.vue
+++ b/src/views/class-management/Class.vue
@@ -13,7 +13,7 @@
<div>
<el-form :inline="true" :model="searchForm" class="demo-form-inline">
<el-form-item label="鐝骇鍚嶇О">
- <el-input v-model="searchForm.className" size="small" clearable @clear="page"
+ <el-input v-model="searchForm.className" size="small" clearable @clear="page" @input="page"
placeholder="鐝骇鍚嶇О"></el-input>
</el-form-item>
<el-form-item label="鐝骇鐘舵��">
@@ -23,7 +23,7 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="page">鏌ヨ</el-button>
+ <el-button type="primary" size="small" @click="page">鏌ヨ</el-button>
</el-form-item>
</el-form>
</div>
@@ -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="寮�鐝椂闂�"
@@ -88,14 +88,14 @@
fixed="right"
>
<template slot-scope="scope">
- <el-button v-if="scope.row.status !== '瑙ｆ暎'" size="small" @click="handlerEdit(scope.row)"
+ <el-button v-show="scope.row.status !== '瑙ｆ暎'" size="small" @click="handlerEdit(scope.row)"
type="primary">淇敼
</el-button>
- <el-button v-if="scope.row.status !== '瑙ｆ暎'" size="small" type="warning">鐝骇楠岃瘉</el-button>
- <el-button v-if="scope.row.status !== '瑙ｆ暎'" size="small" @click="handlerOpenNotify(scope.row)"
+ <el-button v-show="scope.row.status !== '瑙ｆ暎'" size="small" type="warning">鐝骇楠岃瘉</el-button>
+ <el-button v-show="scope.row.status !== '瑙ｆ暎'" size="small" @click="handlerOpenNotify(scope.row)"
type="info">閫氱煡
</el-button>
- <el-button v-if="scope.row.status !== '瑙ｆ暎'" @click="studentManager(scope.row.id)" size="small"
+ <el-button v-show="scope.row.status !== '瑙ｆ暎'" @click="studentManager(scope.row.id,scope.row.className)" size="small"
type="success">鎴愬憳绠＄悊
</el-button>
<el-popconfirm
@@ -103,7 +103,7 @@
title="纭畾瑕佽В鏁ｈ鐝骇锛�"
@confirm="dissolution(scope.row.id)"
>
- <el-button slot="reference" v-if="scope.row.status !== '瑙ｆ暎'" type="danger"
+ <el-button slot="reference" v-show="scope.row.status !== '瑙ｆ暎'" type="danger"
size="small">瑙ｆ暎
</el-button>
</el-popconfirm>
@@ -112,7 +112,7 @@
title="纭畾瑕佹仮澶嶈鐝骇鍚楋紵"
@confirm="recover(scope.row.id)"
>
- <el-button slot="reference" v-if="scope.row.status === '瑙ｆ暎'" type="success"
+ <el-button slot="reference" v-show="scope.row.status === '瑙ｆ暎'" type="success"
size="small">鎭㈠姝ｅ父
</el-button>
</el-popconfirm>
@@ -120,14 +120,15 @@
</el-table-column>
</el-table>
- <pagination v-show="total>0" :total="total" :page.sync="searchForm.pageIndex"
+ <pagination v-show="total>0" :total="total" :page.sync="searchForm.currentPage"
:limit.sync="searchForm.pageSize"
@pagination="page"/>
<el-dialog
title="鐝骇閫氱煡"
:visible.sync="notifyOpen"
width="600px"
- :before-close="handleClose">
+ :before-close="handleNotifyClose"
+ :close-on-click-modal="false">
<el-form :model="notifyForm" :rules="notifyRules" ref="notifyForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="閫氱煡鐝骇锛�" prop="className">
<span>{{ notifyForm.className }}</span>
@@ -146,7 +147,8 @@
:title="title"
:visible.sync="open"
width="700px"
- :before-close="handleClose">
+ :before-close="handleClose"
+ :close-on-click-modal="false">
<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm">
<el-form-item label="鐝骇鍚嶇О" prop="className">
<el-input v-model="form.className" size="small"></el-input>
@@ -213,7 +215,7 @@
status: '',
subject: null,
pageSize: 10,
- pageNum: 1
+ currentPage: 1
},
form: {
id: null,
@@ -320,7 +322,7 @@
this.page()
})
},
- recover(id) {
+ recover (id) {
recover(id).then(res => {
this.$message.success(res.data.message)
this.page()
@@ -334,13 +336,24 @@
this.open = false
this.resetForm()
},
+ handleNotifyClose () {
+ this.notifyOpen = false
+ this.resetNotifyForm()
+ },
+ resetNotifyForm () {
+ this.notifyForm = {
+ className: '',
+ notifyContent: '',
+ classesId: null
+ }
+ },
handlerAdd () {
this.open = true
this.title = '鏂板鐝骇'
},
// 璺宠浆(鏌ョ湅鐝骇浜哄憳鎯呭喌)
- studentManager (classesId) {
- this.$router.push({ path: '/classes/class-management/Class-staff', query: { classesId: classesId } })
+ studentManager (classesId,className) {
+ this.$router.push({ path: '/classes/class-management/Class-staff', query: { classesId: classesId, className: className } })
},
// 杩斿洖涓婁竴涓〉闈�
goBack () {
--
Gitblit v1.8.0