From 430addf5203b744cdd3c0b5755fe6165d0f535d4 Mon Sep 17 00:00:00 2001
From: kdyzm <zhengrongjun@haier.com>
Date: Wed, 2 Jun 2021 16:40:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E4=B8=BA=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0loading=EF=BC=9B=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=87=BD=E6=95=B0=E5=8F=98=E6=9B=B4=E4=B8=BA?=
 =?UTF-8?q?=E7=AE=AD=E5=A4=B4=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 b384ba5e..c0114493 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -534,9 +534,11 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.loading = true;
       this.reset();
       const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
       get${BusinessName}(${pkColumn.javaField}).then(response => {
+        this.loading = false;
         this.form = response.data;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
@@ -554,6 +556,7 @@ export default {
     submitForm() {
       this.#[[$]]#refs["form"].validate(valid => {
         if (valid) {
+            this.loading = true;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
           this.form.$column.javaField = this.form.${column.javaField}.join(",");
@@ -564,12 +567,14 @@ export default {
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
+              this.loading = false;
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             add${BusinessName}(this.form).then(response => {
+              this.loading = false;
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -585,9 +590,11 @@ export default {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(function() {
+        }).then(()=> {
+          this.loading = true;
           return del${BusinessName}(${pkColumn.javaField}s);
         }).then(() => {
+          this.loading = false;
           this.getList();
           this.msgSuccess("删除成功");
         })

From 9590de2c1971b596c047deddd926c2b80ade2c67 Mon Sep 17 00:00:00 2001
From: kdyzm <zhengrongjun@haier.com>
Date: Wed, 2 Jun 2021 17:08:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=91=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0loading=E3=80=81=E4=BF=AE=E6=94=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE=E7=9A=84=E5=9B=9E=E8=B0=83=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E4=B8=BA=E7=AE=AD=E5=A4=B4=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/vue/index-tree.vue.vm          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 969dba85..ca997497 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
@@ -480,12 +480,14 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+	  this.loading = true;
       this.reset();
       this.getTreeselect();
       if (row != null) {
         this.form.${treeParentCode} = row.${treeCode};
       }
       get${BusinessName}(row.${pkColumn.javaField}).then(response => {
+	    this.loading = false;
         this.form = response.data;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
@@ -500,6 +502,7 @@ export default {
     submitForm() {
       this.#[[$]]#refs["form"].validate(valid => {
         if (valid) {
+		  this.loading = true;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
           this.form.$column.javaField = this.form.${column.javaField}.join(",");
@@ -507,12 +510,14 @@ export default {
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
+			  this.loading = false;
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             add${BusinessName}(this.form).then(response => {
+			  this.loading = false;
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -527,9 +532,11 @@ export default {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(function() {
+        }).then(() => {
+		  this.loading = true;
           return del${BusinessName}(row.${pkColumn.javaField});
         }).then(() => {
+		  this.loading = false;
           this.getList();
           this.msgSuccess("删除成功");
         })