From 27bb405d884f5c6652e780ea48e79a80c73972aa Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 15 May 2019 16:40:09 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=20crud=E7=BB=84=E4=BB=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=8A=A5=E9=94=99=E5=90=8E=E6=81=A2=E5=A4=8D=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/desk/notice.vue   | 10 ++++++++--
 src/views/system/client.vue | 10 ++++++++--
 src/views/system/dept.vue   | 27 ++++++++++++++++++++-------
 src/views/system/dict.vue   | 14 ++++++++++----
 src/views/system/menu.vue   | 10 ++++++++--
 src/views/system/param.vue  | 10 ++++++++--
 src/views/system/role.vue   | 10 ++++++++--
 src/views/system/tenant.vue | 10 ++++++++--
 src/views/system/user.vue   | 20 +++++++++-----------
 src/views/tool/code.vue     | 10 ++++++++--
 10 files changed, 95 insertions(+), 36 deletions(-)

diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index 2e406bb..9eda9dc 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -140,7 +140,7 @@
       }
     },
     methods: {
-      rowSave(row, loading) {
+      rowSave(row, loading, done) {
         add(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -148,9 +148,12 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
-      rowUpdate(row, index, loading) {
+      rowUpdate(row, index, loading, done) {
         update(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -158,6 +161,9 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
       rowDel(row) {
diff --git a/src/views/system/client.vue b/src/views/system/client.vue
index 8320bb6..2d9a101 100644
--- a/src/views/system/client.vue
+++ b/src/views/system/client.vue
@@ -181,7 +181,7 @@
       }
     },
     methods: {
-      rowSave(row, loading) {
+      rowSave(row, loading, done) {
         add(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -189,9 +189,12 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
-      rowUpdate(row, index, loading) {
+      rowUpdate(row, index, loading, done) {
         update(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -199,6 +202,9 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
       rowDel(row) {
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 0fd90f8..50ce5dc 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -67,17 +67,24 @@
               }]
             },
             {
-              label: "租户编号",
+              label: "所属租户",
               prop: "tenantCode",
-              search: website.tenantMode,
-              hide: !website.tenantMode,
+              type: "tree",
+              dicUrl: "/api/blade-system/tenant/select",
               addDisplay: false,
               editDisplay: false,
               viewDisplay: website.tenantMode,
+              span: 24,
+              props: {
+                label: "tenantName",
+                value: "tenantCode"
+              },
+              hide: !website.tenantMode,
+              search: website.tenantMode,
               rules: [{
                 required: true,
-                message: "请输入租户编号",
-                trigger: "blur"
+                message: "请输入所属租户",
+                trigger: "click"
               }]
             },
             {
@@ -151,7 +158,7 @@
       }
     },
     methods: {
-      rowSave(row, loading) {
+      rowSave(row, loading, done) {
         add(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -159,9 +166,12 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
-      rowUpdate(row, index, loading) {
+      rowUpdate(row, index, loading, done) {
         update(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -169,6 +179,9 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
       rowDel(row) {
diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue
index 8e88503..6c6429b 100644
--- a/src/views/system/dict.vue
+++ b/src/views/system/dict.vue
@@ -59,7 +59,7 @@
               label: "字典编号",
               prop: "code",
               search: true,
-              span:24,
+              span: 24,
               rules: [{
                 required: true,
                 message: "请输入字典编号",
@@ -115,7 +115,7 @@
               label: "字典备注",
               prop: "remark",
               search: true,
-              span:24,
+              span: 24,
               hide: true,
             },
           ]
@@ -142,7 +142,7 @@
       }
     },
     methods: {
-      rowSave(row, loading) {
+      rowSave(row, loading, done) {
         add(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -150,9 +150,12 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
-      rowUpdate(row, index, loading) {
+      rowUpdate(row, index, loading, done) {
         update(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -160,6 +163,9 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
       rowDel(row) {
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index bab3413..01712ff 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -244,7 +244,7 @@
       }
     },
     methods: {
-      rowSave(row, loading) {
+      rowSave(row, loading, done) {
         add(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -252,9 +252,12 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
-      rowUpdate(row, index, loading) {
+      rowUpdate(row, index, loading, done) {
         update(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -262,6 +265,9 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
       rowDel(row) {
diff --git a/src/views/system/param.vue b/src/views/system/param.vue
index e4fcccd..3f31ddc 100644
--- a/src/views/system/param.vue
+++ b/src/views/system/param.vue
@@ -100,7 +100,7 @@
       }
     },
     methods: {
-      rowSave(row, loading) {
+      rowSave(row, loading, done) {
         add(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -108,9 +108,12 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
-      rowUpdate(row, index, loading) {
+      rowUpdate(row, index, loading, done) {
         update(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -118,6 +121,9 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
       rowDel(row) {
diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index fbc2876..071b93e 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -201,7 +201,7 @@ export default {
         this.onLoad(this.page);
       });
     },
-    rowSave(row, loading) {
+    rowSave(row, loading, done) {
       add(row).then(() => {
         loading();
         this.onLoad(this.page);
@@ -209,9 +209,12 @@ export default {
           type: "success",
           message: "操作成功!"
         });
+      }, error => {
+        done();
+        console.log(error);
       });
     },
-    rowUpdate(row, index, loading) {
+    rowUpdate(row, index, loading, done) {
       update(row).then(() => {
         this.onLoad(this.page);
         loading();
@@ -219,6 +222,9 @@ export default {
           type: "success",
           message: "操作成功!"
         });
+      }, error => {
+        done();
+        console.log(error);
       });
     },
     rowDel(row) {
diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue
index 09b3bfb..edbc72b 100644
--- a/src/views/system/tenant.vue
+++ b/src/views/system/tenant.vue
@@ -120,7 +120,7 @@
       }
     },
     methods: {
-      rowSave(row, loading) {
+      rowSave(row, loading, done) {
         add(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -128,9 +128,12 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
-      rowUpdate(row, index, loading) {
+      rowUpdate(row, index, loading, done) {
         update(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -138,6 +141,9 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
       rowDel(row) {
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 73241de..e16b838 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -275,7 +275,7 @@
       },
     },
     methods: {
-      rowSave(row, loading) {
+      rowSave(row, loading, done) {
         row.deptId = row.deptId.join(",");
         row.roleId = row.roleId.join(",");
         add(row).then(() => {
@@ -285,9 +285,12 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
-      rowUpdate(row, index, loading) {
+      rowUpdate(row, index, loading, done) {
         row.deptId = row.deptId.join(",");
         row.roleId = row.roleId.join(",");
         update(row).then(() => {
@@ -297,6 +300,9 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
       rowDel(row) {
@@ -371,15 +377,7 @@
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
           getUser(this.form.id).then(res => {
-            this.form = res.data;
-            this.form.deptId = this.form.deptId.split(",");
-            this.form.deptId.forEach((ele, index) => {
-              this.form.deptId[index] = Number(ele);
-            });
-            this.form.roleId = this.form.roleId.split(",");
-            this.form.roleId.forEach((ele, index) => {
-              this.form.roleId[index] = Number(ele);
-            });
+            this.form = res.data.data;
           });
         }
         done();
diff --git a/src/views/tool/code.vue b/src/views/tool/code.vue
index e2a7a20..8b129f6 100644
--- a/src/views/tool/code.vue
+++ b/src/views/tool/code.vue
@@ -158,7 +158,7 @@
       }
     },
     methods: {
-      rowSave(row, loading) {
+      rowSave(row, loading, done) {
         add(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -166,9 +166,12 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
-      rowUpdate(row, index, loading) {
+      rowUpdate(row, index, loading, done) {
         update(row).then(() => {
           loading();
           this.onLoad(this.page);
@@ -176,6 +179,9 @@
             type: "success",
             message: "操作成功!"
           });
+        }, error => {
+          done();
+          console.log(error);
         });
       },
       rowDel(row) {