From bb77cd2304490cdb97a7bf7241d50b989277eade Mon Sep 17 00:00:00 2001
From: Czw996 <459749926@qq.com>
Date: Fri, 6 May 2022 17:16:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/role/FormModal.vue | 102 +++++++++++++++-----------
 1 file changed, 58 insertions(+), 44 deletions(-)

diff --git a/frontend/src/views/role/FormModal.vue b/frontend/src/views/role/FormModal.vue
index e0b9fa0..cff7836 100644
--- a/frontend/src/views/role/FormModal.vue
+++ b/frontend/src/views/role/FormModal.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <a-modal v-model="visible" :confirmLoading="loading" :maskClosable="false" @cancel="cancel" @ok="confirm">
-      <div slot="title">{{ form.id ? "编辑角色" : "新增角色" }}</div>
+    <a-modal v-model="visible" :width="560" :confirmLoading="loading" :maskClosable="false" @cancel="cancel" @ok="confirm">
+      <div slot="title">{{form.id ? '编辑角色' : '新增角色' }}</div>
       <div>
         <a-form-model ref="form" :model="form" :rules="rules" :label-col="{ span: 4 }" :wrapper-col="{ span: 16 }">
           <a-form-model-item prop="name" label="名称">
@@ -11,6 +11,19 @@
             <a-input v-model="form.remark" allowClear />
           </a-form-model-item>
 
+          <!-- <a-checkbox-group v-model="form.permissions">
+            <a-descriptions size="small" title="权限" bordered>
+              <a-descriptions-item v-for="permissionTypeItem in $parent.permissionItems" :key="permissionTypeItem.id" :label="permissionTypeItem.name" :span="3">
+                <a-row>
+                  <a-col v-for="item in permissionTypeItem.permission_items" :key="item.id" :span="24">
+                    <a-checkbox :value="item.id">{{ item.name }}</a-checkbox>
+                  </a-col>
+                </a-row>
+              </a-descriptions-item>
+            </a-descriptions>
+          </a-checkbox-group> -->
+
+
           <a-checkbox-group v-model="form.permissions">
             <a-descriptions size="small" title="权限" bordered>
               <a-descriptions-item
@@ -31,6 +44,12 @@
               </a-descriptions-item>
             </a-descriptions>
           </a-checkbox-group>
+
+          <!-- <a-form-model-item prop="permissions" label="角色权限">
+            <a-tree-select v-model="form.permissions" placeholder="请选择权限" :tree-data="permissionsTree" tree-checkable
+              treeDefaultExpandAll style="width: 100%">
+            </a-tree-select>
+          </a-form-model-item> -->
         </a-form-model>
       </div>
     </a-modal>
@@ -38,46 +57,49 @@
 </template>
 
 <script>
-import { roleCreate, roleUpdate } from "@/api/system";
-import rules from "./rules.js";
+  import { roleCreate, roleUpdate } from '@/api/account'
+  import { permissionsTree } from '@/permissions.js'
+  import rules from './rules.js'
 
-export default {
-  name: "FormModal",
-  props: ["visible", "form", "roleName"],
-  model: { prop: "visible", event: "cancel" },
-  data() {
-    return {
-      rules,
-      loading: false,
-    };
-  },
-  methods: {
-    confirm() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.loading = true;
-          let func = this.form.id ? roleUpdate : roleCreate;
+  export default {
+    name: 'FormModal',
+    props: ['visible', 'form', 'roleName'],
+    model: { prop: 'visible', event: 'cancel' },
+    data() {
+      return {
+        rules,
+        loading: false,
+        permissionsTree,
+      };
+    },
+    methods: {
+      confirm() {
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            this.loading = true;
 
-          let permissions = [];
+            let permissions = [];
           for (let value of this.form.permissions) {
             if (typeof value == "number") {
               permissions.push(value);
             }
-          }
-
-          func({ ...this.form, permissions })
-            .then((data) => {
-              this.$message.success(this.form.id ? "修改成功" : "新增成功");
-              this.$emit(this.form.id ? "update" : "create", data);
+      
+            let func = this.form.id ? roleUpdate : roleCreate;
+            func({...this.form, permissions}).then(data => {
+              this.$message.success(this.form.id ? '修改成功' : '新增成功');
+              this.$emit(this.form.id ? 'update' : 'create', data);
               this.cancel();
-            })
-            .finally(() => {
+            }).finally(() => {
               this.loading = false;
             });
-        }
-      });
-    },
-    checkAll(event) {
+          }
+        });
+      },
+      cancel() {
+        this.$emit('cancel', false);
+        this.$refs.form.resetFields();
+      },
+      checkAll(event) {
       for (let item of this.$parent.permissionItems) {
         if (item.name == event.target.value) {
           for (let permissionItem of item.permission_items) {
@@ -93,17 +115,9 @@ export default {
         }
       }
     },
-    onCheck(event) {
-      if (event.target.checked) {
-        this.form.permissions.push(event.target.value);
-      }
     },
-    cancel() {
-      this.$emit("cancel", false);
-      this.$refs.form.resetFields();
-    },
-  },
-};
+  }
 </script>
 
-<style scoped></style>
+<style scoped>
+</style>
\ No newline at end of file