👌 调整loading、done顺序以符合最新api，非强迫症可以无视

src/views/authority/apiscope.vue

@@ -401,30 +401,30 @@
     },
     methods: {
       // 菜单管理模块
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {
@@ -526,38 +526,38 @@
       handleDrawerClose(hide) {
         hide();
       },
-      rowSaveScope(row, loading, done) {
+      rowSaveScope(row, done, loading) {
         row = {
           ...row,
           menuId: this.scopeMenuId,
-        }
+        };
         addApiScope(row).then(() => {
-          loading();
           this.onLoadScope(this.pageScope);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdateScope(row, index, loading, done) {
+      rowUpdateScope(row, index, done, loading) {
         row = {
           ...row,
           menuId: this.scopeMenuId,
-        }
+        };
         updateApiScope(row).then(() => {
-          loading();
           this.onLoadScope(this.pageScope);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDelScope(row) {

src/views/authority/datascope.vue

@@ -478,30 +478,30 @@
         });
       },
       // 菜单管理模块
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {
@@ -604,38 +604,38 @@
       handleDrawerClose(hide) {
         hide();
       },
-      rowSaveScope(row, loading, done) {
+      rowSaveScope(row, done, loading) {
         row = {
           ...row,
           menuId: this.scopeMenuId,
-        }
+        };
         addDataScope(row).then(() => {
-          loading();
           this.onLoadScope(this.pageScope);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdateScope(row, index, loading, done) {
+      rowUpdateScope(row, index, done, loading) {
         row = {
           ...row,
           menuId: this.scopeMenuId,
-        }
+        };
         updateDataScope(row).then(() => {
-          loading();
           this.onLoadScope(this.pageScope);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDelScope(row) {

src/views/authority/role.vue

@@ -248,30 +248,30 @@
           this.onLoad(this.page);
         });
       },
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
           this.onLoad(this.page);
-          loading();
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {

src/views/desk/notice.vue

@@ -168,30 +168,30 @@
       }
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {
@@ -271,13 +271,13 @@
         const {releaseTimeRange} = params;
         let values = {
           ...params,
-        }
+        };
         if (releaseTimeRange) {
           values = {
             ...params,
             releaseTime_datege: releaseTimeRange[0],
             releaseTime_datelt: releaseTimeRange[1],
-          }
+          };
           values.releaseTimeRange = null;
           this.query.releaseTimeRange = null;
         }

src/views/resource/oss.vue

@@ -271,30 +271,30 @@
       }
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {

src/views/resource/sms.vue

@@ -287,30 +287,30 @@
       }
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {
@@ -362,8 +362,8 @@
           window.console.log(res);
           this.box = false;
         }, error => {
-          done();
           window.console.log(error);
+          loading();
         });
       },
       handleDelete() {

src/views/system/client.vue

@@ -193,30 +193,30 @@
       }
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {

src/views/system/dept.vue

@@ -221,38 +221,38 @@
         });
         this.$refs.crud.rowAdd();
       },
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then((res) => {
           // 获取新增数据的相关字段
           const data = res.data.data;
           row.id = data.id;
           row.deptCategoryName = data.deptCategoryName;
           row.tenantId = data.tenantId;
-          // 数据回调进行刷新
-          loading(row);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
+          // 数据回调进行刷新
+          done(row);
         }, error => {
-          done();
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          // 数据回调进行刷新
-          loading(row);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
+          // 数据回调进行刷新
+          done(row);
         }, error => {
-          done();
           window.console.log(error);
+          loading();
         });
       },
-      rowDel(row, index, loading) {
+      rowDel(row, index, done) {
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -262,12 +262,12 @@
             return remove(row.id);
           })
           .then(() => {
-            // 数据回调进行刷新
-            loading(row);
             this.$message({
               type: "success",
               message: "操作成功!"
             });
+            // 数据回调进行刷新
+            done(row);
           });
       },
       handleDelete() {

src/views/system/dict.vue

@@ -163,41 +163,35 @@
       });
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         const form = {
           ...row,
           dictKey: -1,
         };
-        add(form).then(
+        add(form).then(() => {
-          () => {
-            loading();
           this.onLoadParent(this.pageParent);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
-        );
-      },
-      rowUpdate(row, index, loading, done) {
-        update(row).then(
-          () => {
           loading();
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
           this.onLoadParent(this.pageParent);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
+          loading();
-        );
+        });
       },
       rowDel(row) {
         this.$confirm("确定将选择数据删除?", {
@@ -287,37 +281,31 @@
       refreshChange() {
         this.onLoadParent(this.pageParent, this.query);
       },
-      rowSaveChild(row, loading, done) {
+      rowSaveChild(row, done, loading) {
-        add(row).then(
+        add(row).then(() => {
-          () => {
-            loading();
           this.onLoadChild(this.pageChild);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
-        );
-      },
-      rowUpdateChild(row, index, loading, done) {
-        update(row).then(
-          () => {
           loading();
+        });
+      },
+      rowUpdateChild(row, index, done, loading) {
+        update(row).then(() => {
           this.onLoadChild(this.pageChild);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
+          loading();
-        );
+        });
       },
       rowDelChild(row) {
         this.$confirm("确定将选择数据删除?", {

src/views/system/dictbiz.vue

@@ -163,41 +163,35 @@
       });
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         const form = {
           ...row,
           dictKey: -1,
         };
-        add(form).then(
+        add(form).then(() => {
-          () => {
-            loading();
           this.onLoadParent(this.pageParent);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
-        );
-      },
-      rowUpdate(row, index, loading, done) {
-        update(row).then(
-          () => {
           loading();
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
           this.onLoadParent(this.pageParent);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
+          loading();
-        );
+        });
       },
       rowDel(row) {
         this.$confirm("确定将选择数据删除?", {
@@ -287,37 +281,31 @@
       refreshChange() {
         this.onLoadParent(this.pageParent, this.query);
       },
-      rowSaveChild(row, loading, done) {
+      rowSaveChild(row, done, loading) {
-        add(row).then(
+        add(row).then(() => {
-          () => {
-            loading();
           this.onLoadChild(this.pageChild);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
-        );
-      },
-      rowUpdateChild(row, index, loading, done) {
-        update(row).then(
-          () => {
           loading();
+        });
+      },
+      rowUpdateChild(row, index, done, loading) {
+        update(row).then(() => {
           this.onLoadChild(this.pageChild);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
+          loading();
-        );
+        });
       },
       rowDelChild(row) {
         this.$confirm("确定将选择数据删除?", {

src/views/system/menu.vue

@@ -254,36 +254,36 @@
         });
         this.$refs.crud.rowAdd();
       },
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then((res) => {
           // 获取新增数据的相关字段
           const data = res.data.data;
           row.id = data.id;
-          // 数据回调进行刷新
-          loading(row);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
+          // 数据回调进行刷新
+          done(row);
         }, error => {
-          done();
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          // 数据回调进行刷新
-          loading(row);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
+          // 数据回调进行刷新
+          done(row);
         }, error => {
-          done();
           window.console.log(error);
+          loading();
         });
       },
-      rowDel(row, index, loading) {
+      rowDel(row, index, done) {
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -293,12 +293,12 @@
             return remove(row.id);
           })
           .then(() => {
-            // 数据回调进行刷新
-            loading(row);
             this.$message({
               type: "success",
               message: "操作成功!"
             });
+            // 数据回调进行刷新
+            done(row);
           });
       },
       handleDelete() {

src/views/system/param.vue

@@ -116,30 +116,30 @@
       }
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {

src/views/system/post.vue

@@ -164,30 +164,30 @@
       }
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
-          console.log(error);
+        }, error => {
+          window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {

src/views/system/tenant.vue

@@ -208,30 +208,30 @@
       }
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {
@@ -332,8 +332,8 @@
           done();
           this.box = false;
         }, error => {
-          done();
           window.console.log(error);
+          loading();
         });
       },
       currentChange(currentPage) {

src/views/system/topmenu.vue

@@ -179,30 +179,30 @@
           this.onLoad(this.page);
         });
       },
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {

src/views/system/user.vue

@@ -548,36 +548,36 @@
           this.onLoad(this.page);
         });
       },
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         row.deptId = row.deptId.join(",");
         row.roleId = row.roleId.join(",");
         row.postId = row.postId.join(",");
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         row.deptId = row.deptId.join(",");
         row.roleId = row.roleId.join(",");
         row.postId = row.postId.join(",");
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {
@@ -677,9 +677,9 @@
       },
       uploadAfter(res, done, loading, column) {
         window.console.log(column);
-        done();
         this.excelBox = false;
         this.refreshChange();
+        done();
       },
       handleExport() {
         this.$confirm("是否导出用户数据?", "提示", {

src/views/tool/code.vue

@@ -233,30 +233,30 @@
       }
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {

src/views/tool/datasource.vue

@@ -155,30 +155,30 @@
       }
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
           done();
+        }, error => {
           window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {

src/views/util/demo/dict-classic.vue

@@ -223,37 +223,31 @@
         });
         this.$refs.crud.rowAdd();
       },
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
-        add(row).then(
+        add(row).then(() => {
-          () => {
-            loading();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
-        );
-      },
-      rowUpdate(row, index, loading, done) {
-        update(row).then(
-          () => {
           loading();
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
+          loading();
-        );
+        });
       },
       rowDel(row) {
         this.$confirm("确定将选择数据删除?", {

src/views/util/demo/dict-horizontal.vue

@@ -230,37 +230,31 @@
       }
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
-        add(row).then(
+        add(row).then(() => {
-          () => {
-            loading();
           this.onLoadParent(this.pageParent);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
-        );
-      },
-      rowUpdate(row, index, loading, done) {
-        update(row).then(
-          () => {
           loading();
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
           this.onLoadParent(this.pageParent);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
+          loading();
-        );
+        });
       },
       rowDel(row) {
         this.$confirm("确定将选择数据删除?", {
@@ -339,37 +333,31 @@
       refreshChange() {
         this.onLoadParent(this.page, this.query);
       },
-      rowSaveChild(row, loading, done) {
+      rowSaveChild(row, done, loading) {
-        add(row).then(
+        add(row).then(() => {
-          () => {
-            loading();
           this.onLoadChild(this.pageChild);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
-        );
-      },
-      rowUpdateChild(row, index, loading, done) {
-        update(row).then(
-          () => {
           loading();
+        });
+      },
+      rowUpdateChild(row, index, done, loading) {
+        update(row).then(() => {
           this.onLoadChild(this.pageChild);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
+          loading();
-        );
+        });
       },
       rowDelChild(row) {
         this.$confirm("确定将选择数据删除?", {

src/views/util/demo/dict-vertical.vue

@@ -235,37 +235,31 @@
       }
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
-        add(row).then(
+        add(row).then(() => {
-          () => {
-            loading();
           this.onLoadParent(this.pageParent);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
-        );
-      },
-      rowUpdate(row, index, loading, done) {
-        update(row).then(
-          () => {
           loading();
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
           this.onLoadParent(this.pageParent);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
+          loading();
-        );
+        });
       },
       rowDel(row) {
         this.$confirm("确定将选择数据删除?", {
@@ -344,37 +338,31 @@
       refreshChange() {
         this.onLoadParent(this.page, this.query);
       },
-      rowSaveChild(row, loading, done) {
+      rowSaveChild(row, done, loading) {
-        add(row).then(
+        add(row).then(() => {
-          () => {
-            loading();
           this.onLoadChild(this.pageChild);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
-        );
-      },
-      rowUpdateChild(row, index, loading, done) {
-        update(row).then(
-          () => {
           loading();
+        });
+      },
+      rowUpdateChild(row, index, done, loading) {
+        update(row).then(() => {
           this.onLoadChild(this.pageChild);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          },
-          error => {
           done();
+        }, error => {
           window.console.log(error);
-          }
+          loading();
-        );
+        });
       },
       rowDelChild(row) {
         this.$confirm("确定将选择数据删除?", {