From 24e40a360bd5f6a42f8b4420846498471ff350a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 14 Apr 2021 23:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2=E9=80=89?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/RoleList.vue                  | 6 +++---
 jshERP-web/src/views/system/modules/RoleFunctionModal.vue | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue
index 63e63b7b..f3a08e18 100644
--- a/jshERP-web/src/views/system/RoleList.vue
+++ b/jshERP-web/src/views/system/RoleList.vue
@@ -45,7 +45,7 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a @click="handleSetFunction(record.id)">分配功能</a>
+          <a @click="handleSetFunction(record)">分配功能</a>
           <a-divider type="vertical" />
 <!--          <a @click="handleSetPushBtn(record.id)">分配按钮</a>-->
 <!--          <a-divider type="vertical" />-->
@@ -131,8 +131,8 @@
       }
     },
     methods: {
-      handleSetFunction(id) {
-        this.$refs.roleFunctionModal.edit(id);
+      handleSetFunction(record) {
+        this.$refs.roleFunctionModal.edit(record);
         this.$refs.roleFunctionModal.title = "分配功能";
         this.$refs.roleFunctionModal.disableSubmit = false;
       },
diff --git a/jshERP-web/src/views/system/modules/RoleFunctionModal.vue b/jshERP-web/src/views/system/modules/RoleFunctionModal.vue
index 68e5270e..9be173f6 100644
--- a/jshERP-web/src/views/system/modules/RoleFunctionModal.vue
+++ b/jshERP-web/src/views/system/modules/RoleFunctionModal.vue
@@ -76,16 +76,16 @@
     created () {
     },
     methods: {
-      edit (id) {
+      edit (record) {
         this.form.resetFields();
         this.model = Object.assign({}, {});
         this.visible = true;
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model,'name', 'type', 'description'))
         });
-        this.roleId = id
+        this.roleId = record.id
         this.checkedKeys = []
-        this.loadTree(id)
+        this.loadTree(record.id)
       },
       close () {
         this.$emit('close');
@@ -99,7 +99,7 @@
             that.confirmLoading = true;
             let formData = Object.assign(this.model, values);
             formData.type = 'RoleFunctions'
-            formData.keyId = this.model.id
+            formData.keyId = this.roleId
             formData.value = this.checkedKeys
             let obj;
             checkUserBusiness({'type': 'RoleFunctions','keyId': this.roleId}).then((res)=>{