From b57f2a267747845f2846002e7042c38727f12c45 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 16 十月 2024 10:43:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/class-management/Class.vue | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/views/class-management/Class.vue b/src/views/class-management/Class.vue
index d1508bc..7cf959e 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>
@@ -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)" 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>
@@ -127,7 +127,8 @@
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>
@@ -331,10 +332,20 @@
this.form = row
this.open = true
},
- handleClose (done) {
+ handleClose () {
this.open = false
this.resetForm()
- done()
+ },
+ handleNotifyClose () {
+ this.notifyOpen = false
+ this.resetNotifyForm()
+ },
+ resetNotifyForm () {
+ this.notifyForm = {
+ className: '',
+ notifyContent: '',
+ classesId: null
+ }
},
handlerAdd () {
this.open = true
--
Gitblit v1.8.0