From f06461d18cff4bfdc6753a336905ed8791cc6378 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 16 十月 2024 09:32:08 +0800
Subject: [PATCH] 代码合并
---
src/views/class-management/Class.vue | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/views/class-management/Class.vue b/src/views/class-management/Class.vue
index 4f2f3f9..d1508bc 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="寮�鐝椂闂�"
@@ -120,7 +120,7 @@
</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
@@ -146,7 +146,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 +214,7 @@
status: '',
subject: null,
pageSize: 10,
- pageNum: 1
+ currentPage: 1
},
form: {
id: null,
@@ -330,9 +331,10 @@
this.form = row
this.open = true
},
- handleClose () {
+ handleClose (done) {
this.open = false
this.resetForm()
+ done()
},
handlerAdd () {
this.open = true
--
Gitblit v1.8.0