Merge branch 'master' of http://39.97.59.228:8013/hrx/mky-vent-base

src/views/vent/dataCenter/user/index.vue

@@ -36,7 +36,7 @@
     <PasswordModal @register="registerPasswordModal" @success="reload" />
     <!--用户代理-->
     <UserAgentModal @register="registerAgentModal" @success="reload" />
-    <!--回收站-->
+    <!--授权弹窗-->
     <UserPermModal @register="registerPermModal" @success="reload" />
   </div>
 </template>
@@ -210,7 +210,7 @@ function getTableAction(record): ActionItem[] {
     },
     {
       label: '授权',
-      onClick: handlePermissionModel.bind(null, record.id),
+      onClick: handlePermissionModel.bind(null, record.username),
       // ifShow: () => hasPermission('system:user:edit'),
     },
   ];

src/views/vent/dataCenter/user/user.data.ts

@@ -152,6 +152,44 @@ export const formSchema: FormSchema[] = [
     field: 'thirdType',
     component: 'Input',
     defaultValue: '_thirdPartyUser',
+    show: false,
+  },
+  {
+    label: '角色',
+    field: 'selectedroles',
+    component: 'ApiSelect',
+    componentProps: {
+      mode: 'multiple',
+      api: getAllRolesList,
+      labelField: 'roleName',
+      valueField: 'id',
+    },
+  },
+  {
+    label: '所属部门',
+    field: 'selecteddeparts',
+    component: 'JSelectDept',
+    required: true,
+    componentProps: ({ formActionType, formModel }) => {
+      return {
+        sync: false,
+        checkStrictly: true,
+        defaultExpandLevel: 2,
+
+        onSelect: (options, values) => {
+          const { updateSchema } = formActionType;
+          //所属部门修改后更新负责部门下拉框数据
+          updateSchema([
+            {
+              field: 'departIds',
+              componentProps: { options },
+            },
+          ]);
+          //所属部门修改后更新负责部门数据
+          formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
+        },
+      };
+    },
   },
 ];