From f147a4c73b21f5f45efed8a25bf6ad34f792188b Mon Sep 17 00:00:00 2001
From: smallwei <1634566606@qq.com>
Date: Fri, 1 Mar 2019 14:24:18 +0800
Subject: [PATCH] fix #issues9

---
 src/views/system/role.vue | 370 +++++++++++++++++++-------------------
 1 file changed, 189 insertions(+), 181 deletions(-)

diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index 68092a6..02b6e21 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -41,7 +41,6 @@
                show-checkbox
                node-key="id"
                ref="tree"
-               :default-expanded-keys="defaultObj"
                :default-checked-keys="defaultObj"
                :props="props">
       </el-tree>
@@ -56,220 +55,229 @@
 </template>
 
 <script>
-  import {
-    getList,
-    remove,
-    update,
-    add,
-    grant,
-    grantTree,
-    getRole,
-    getRoleTree
-  } from "@/api/system/role";
-  import {mapGetters} from "vuex";
+import {
+  getList,
+  remove,
+  update,
+  add,
+  grant,
+  grantTree,
+  getRole,
+  getRoleTree
+} from "@/api/system/role";
+import { mapGetters } from "vuex";
 
-  export default {
-    data() {
-      return {
-        form: {},
-        box: false,
-        props: {
-          label: "title",
-          valie: "key"
-        },
-        list: [],
-        defaultObj: [],
-        selectionList: [],
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        option: {
-          tip: false,
-          tree: true,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: true,
-          column: [
-            {
-              label: "角色名称",
-              prop: "roleName",
-              search: true,
-              rules: [{
+export default {
+  data() {
+    return {
+      form: {},
+      box: false,
+      props: {
+        label: "title",
+        valie: "key"
+      },
+      list: [],
+      defaultObj: [],
+      selectionList: [],
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      option: {
+        tip: false,
+        tree: true,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: true,
+        column: [
+          {
+            label: "角色名称",
+            prop: "roleName",
+            search: true,
+            rules: [
+              {
                 required: true,
                 message: "请输入角色名称",
                 trigger: "blur"
-              }]
-            },
-            {
-              label: "角色别名",
-              prop: "roleAlias",
-              search: true,
-              rules: [{
+              }
+            ]
+          },
+          {
+            label: "角色别名",
+            prop: "roleAlias",
+            search: true,
+            rules: [
+              {
                 required: true,
                 message: "请输入角色别名",
                 trigger: "blur"
-              }]
+              }
+            ]
+          },
+          {
+            label: "上级角色",
+            prop: "parentId",
+            dicData: [],
+            type: "tree",
+            hide: true,
+            props: {
+              label: "title"
             },
-            {
-              label: "上级角色",
-              prop: "parentId",
-              dicData: [],
-              type: "tree",
-              hide: true,
-              props: {
-                label: "title"
-              },
-              rules: [{
+            rules: [
+              {
                 required: false,
                 message: "请选择上级角色",
                 trigger: "blur"
-              }]
-            },
-            {
-              label: "角色排序",
-              prop: "sort",
-              type: "number",
-              rules: [{
+              }
+            ]
+          },
+          {
+            label: "角色排序",
+            prop: "sort",
+            type: "number",
+            rules: [
+              {
                 required: true,
                 message: "请输入角色排序",
                 trigger: "blur"
-              }]
-            }
-          ]
-        },
-        data: []
+              }
+            ]
+          }
+        ]
+      },
+      data: []
+    };
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        addBtn: this.permission.role_add,
+        viewBtn: this.permission.role_view,
+        delBtn: this.permission.role_delete,
+        editBtn: this.permission.role_edit
       };
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.permission.role_add,
-          viewBtn: this.permission.role_view,
-          delBtn: this.permission.role_delete,
-          editBtn: this.permission.role_edit
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    submit() {
+      const menuLIst = this.$refs.tree.getCheckedKeys().join(",");
+      grant(this.ids[0], menuLIst).then(() => {
+        this.box = false;
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        return ids.join(",");
-      }
+        this.onLoad(this.page);
+      });
     },
-    methods: {
-      submit() {
-        const menuLIst = this.$refs.tree.getCheckedKeys().join(",");
-        grant(this.ids[0], menuLIst).then(() => {
-          this.box = false;
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          this.onLoad(this.page);
+    rowSave(row, loading) {
+      add(row).then(() => {
+        loading();
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      rowSave(row, loading) {
-        add(row).then(() => {
-          loading();
+      });
+    },
+    rowUpdate(row, index, loading) {
+      update(row).then(() => {
+        this.onLoad(this.page);
+        loading();
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+      });
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
         });
-      },
-      rowUpdate(row, index, loading) {
-        update(row).then(() => {
+    },
+
+    searchReset() {
+      this.onLoad(this.page);
+    },
+    searchChange(params) {
+      this.onLoad(this.page, params);
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    handleRole() {
+      if (this.selectionList.length !== 1) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.defaultObj = [];
+      grantTree()
+        .then(res => {
+          this.list = res.data.data;
+          return getRole(this.ids[0]);
+        })
+        .then(res => {
+          this.defaultObj = res.data.data;
+          this.box = true;
+        });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
           this.onLoad(this.page);
-          loading();
           this.$message({
             type: "success",
             message: "操作成功!"
           });
+          this.$refs.crud.toggleSelection();
         });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-
-      searchReset() {
-        this.onLoad(this.page);
-      },
-      searchChange(params) {
-        this.onLoad(this.page, params);
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      handleRole() {
-        if (this.selectionList.length !== 1) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        grantTree()
-          .then(res => {
-            this.list = res.data.data;
-            return getRole(this.ids[0]);
-          })
-          .then(res => {
-            this.defaultObj = res.data.data;
-            this.box = true;
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      onLoad(page, params = {}) {
-        getList(page.currentPage, page.pageSize, params).then(res => {
+    },
+    onLoad(page, params = {}) {
+      getList(page.currentPage, page.pageSize, params).then(res => {
+        const data = res.data.data;
+        this.data = data;
+        getRoleTree().then(res => {
           const data = res.data.data;
-          this.data = data;
-          getRoleTree().then(res => {
-            const data = res.data.data;
-            const index = this.$refs.crud.findColumnIndex("parentId");
-            this.option.column[index].dicData = data;
-          });
+          const index = this.$refs.crud.findColumnIndex("parentId");
+          this.option.column[index].dicData = data;
         });
-      }
+      });
     }
-  };
+  }
+};
 </script>
 
 <style>