From 5678ed6352ff0fcba2cc6c078cb3c744899c1b5f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 06 六月 2024 15:52:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/Manage/TestPaper/subject.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/views/Manage/TestPaper/subject.vue b/src/views/Manage/TestPaper/subject.vue
index a313b0a..a1091f0 100644
--- a/src/views/Manage/TestPaper/subject.vue
+++ b/src/views/Manage/TestPaper/subject.vue
@@ -57,13 +57,13 @@
</div>
</div>
- <el-dialog :visible.sync="form.visible" style="width: 100%;height: 100%">
+ <el-dialog :visible.sync="visible" width="400px">
<el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
<el-form-item label="鍚嶇О锛�" prop="name" required>
- <el-input v-model="form.name" />
+ <el-input v-model="form.name" maxlength="10" show-word-limit />
</el-form-item>
<el-form-item label="鎺掑簭锛�" prop="itemOrder" required>
- <el-input v-model="form.itemOrder" type="number" />
+ <el-input-number v-model="form.itemOrder" type="number" :min="1" :max="100" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm">鎻愪氦</el-button>
@@ -97,9 +97,9 @@
form: {
id: '',
name: '',
- itemOrder: '',
- visible: false
+ itemOrder: ''
},
+ visible: false,
rules: {
name: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' }
@@ -116,7 +116,7 @@
methods: {
// 鑾峰彇鎺掑簭
getItemOrder() {
- subjectApi.getItemOrder.then(re => {
+ subjectApi.getItemOrder().then(re => {
this.form.itemOrder = re.data
})
},
@@ -139,14 +139,15 @@
if (row) {
subjectApi.select(row.id).then(re => {
if (re.code === 1) {
- this.form.visible = true;
this.form = re.data;
+ this.visible = true;
} else {
this.$message.error(re.message)
}
})
} else {
- this.form.visible = true;
+ this.getItemOrder();
+ this.visible = true;
}
},
status(row) {
@@ -183,9 +184,12 @@
if (re.code === 1) {
_this.$message.success(re.message)
_this.search()
+ _this.formLoading = false
+ _this.visible = false
} else {
_this.$message.error(re.message)
- this.formLoading = false
+ _this.formLoading = false
+ _this.visible = false
}
})
}
--
Gitblit v1.8.0