From c12dc71ecea33d5c23e2ceb32bfc3db68e4198e3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 23 六月 2021 09:44:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
ruoyi-ui/src/views/demo/demo/index.vue | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/views/demo/demo/index.vue b/ruoyi-ui/src/views/demo/demo/index.vue
index b831ad9..279c469 100644
--- a/ruoyi-ui/src/views/demo/demo/index.vue
+++ b/ruoyi-ui/src/views/demo/demo/index.vue
@@ -150,9 +150,17 @@
<el-form-item label="鍊�" prop="value">
<el-input v-model="form.value" placeholder="璇疯緭鍏ュ��" />
</el-form-item>
+ <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
+ <el-date-picker clearable size="small"
+ v-model="form.createTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鍒涘缓鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -168,6 +176,8 @@
},
data() {
return {
+ //鎸夐挳loading
+ buttonLoading: false,
// 閬僵灞�
loading: true,
// 瀵煎嚭閬僵灞�
@@ -277,9 +287,11 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
+ this.loading = true;
this.reset();
const id = row.id || this.ids
getDemo(id).then(response => {
+ this.loading = false;
this.form = response.data;
this.open = true;
this.title = "淇敼娴嬭瘯鍗曡〃";
@@ -289,14 +301,17 @@
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
+ this.buttonLoading = true;
if (this.form.id != null) {
updateDemo(this.form).then(response => {
+ this.buttonLoading = false;
this.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
addDemo(this.form).then(response => {
+ this.buttonLoading = false;
this.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
@@ -312,9 +327,11 @@
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.loading = true;
return delDemo(ids);
}).then(() => {
+ this.loading = false;
this.getList();
this.msgSuccess("鍒犻櫎鎴愬姛");
})
--
Gitblit v1.9.3