From fdbf922684fbe75b2342b676fed8772854f5e133 Mon Sep 17 00:00:00 2001
From: kdyzm <zhengrongjun@haier.com>
Date: Wed, 2 Jun 2021 17:56:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=93=8D=E4=BD=9C=E6=9B=B4=E6=8D=A2button=20?=
 =?UTF-8?q?loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/vue/index-tree.vue.vm        | 10 ++++++----
 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index ca9974979..f1247aba3 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -247,7 +247,7 @@
 #end
       </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>
@@ -302,6 +302,8 @@ export default {
   },
   data() {
     return {
+	  //按钮loading
+	  buttonLoading: false,
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -502,7 +504,7 @@ export default {
     submitForm() {
       this.#[[$]]#refs["form"].validate(valid => {
         if (valid) {
-		  this.loading = true;
+		  this.buttonLoading = true;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
           this.form.$column.javaField = this.form.${column.javaField}.join(",");
@@ -510,14 +512,14 @@ export default {
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
-			  this.loading = false;
+			  this.buttonLoading = false;
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             add${BusinessName}(this.form).then(response => {
-			  this.loading = false;
+			  this.buttonLoading = false;
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index c0114493c..0b4e7ccfc 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -301,7 +301,7 @@
 #end
       </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>
@@ -353,6 +353,8 @@ export default {
   },
   data() {
     return {
+	  //按钮loading
+	  buttonLoading: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -556,7 +558,7 @@ export default {
     submitForm() {
       this.#[[$]]#refs["form"].validate(valid => {
         if (valid) {
-            this.loading = true;
+            this.buttonLoading = true;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
           this.form.$column.javaField = this.form.${column.javaField}.join(",");
@@ -567,14 +569,14 @@ export default {
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
-              this.loading = false;
+              this.buttonLoading = false;
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             add${BusinessName}(this.form).then(response => {
-              this.loading = false;
+              this.buttonLoading = false;
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();