Browse Source

🚑 组织机构添加角色分页查询问题,以及未添加权限。

pull/71/head
王军 4 years ago
parent
commit
2632da0621
  1. 5
      vben28/src/views/admin/organizationUnits/AddRoleToOrganizationUnit.vue
  2. 3
      vben28/src/views/admin/organizationUnits/AddUserToOrganizationUnit.vue
  3. 11
      vben28/src/views/admin/organizationUnits/OrganizationUnit.vue

5
vben28/src/views/admin/organizationUnits/AddRoleToOrganizationUnit.vue

@ -35,8 +35,7 @@ export default defineComponent({
setup(_, { emit }) {
const { t } = useI18n();
const getTableAsync = async () => {
let request= new GetUnAddRoleInput();
const getTableAsync = async (request:GetUnAddRoleInput) => {
request.organizationUnitId=organizationUnitId;
return await getUnAddRolesAsync(request)
};
@ -59,7 +58,7 @@ export default defineComponent({
let organizationUnitId = "";
const [registerModal, { closeModal, changeOkLoading }] = useModalInner(async (data) => {
organizationUnitId = data.organizationUnitId;
await reload();
await reload({ searchInfo: { organizationUnitId: organizationUnitId } });
});
//
let selectRoles:string[]=[];

3
vben28/src/views/admin/organizationUnits/AddUserToOrganizationUnit.vue

@ -35,8 +35,7 @@ export default defineComponent({
setup(_, { emit }) {
const { t } = useI18n();
const getTableAsync = async () => {
let request= new GetUnAddUserInput();
const getTableAsync = async (request:GetUnAddUserInput) => {
request.organizationUnitId=organizationUnitId;
request.filter=getForm().getFieldsValue().filter;
return await GetUnAddUserAsync(request)

11
vben28/src/views/admin/organizationUnits/OrganizationUnit.vue

@ -120,7 +120,7 @@ import CreateOrganizationUnit from "./CreateOrganizationUnit.vue";
import EditOrganizationUnit from "./EditOrganizationUnit.vue";
import AddRoleToOrganizationUnit from "./AddRoleToOrganizationUnit.vue";
import AddUserToOrganizationUnit from "./AddUserToOrganizationUnit.vue";
import { usePermission } from '/@/hooks/web/usePermission';
import { useModal } from "/@/components/Modal";
import { useMessage } from "/@/hooks/web/useMessage";
import { useI18n } from "/@/hooks/web/useI18n";
@ -149,7 +149,7 @@ export default defineComponent({
const [registerEditOrganizationUnit, { openModal: EditOrganizationUnitModal }] = useModal();
const [registerAddRoleToOrganizationUnit, { openModal: AddRoleToOrganizationUnitModal }] = useModal();
const [registerAddUserToOrganizationUnit, { openModal: AddUserToOrganizationUnitModal }] = useModal();
const { hasPermission } = usePermission();
let organizationUnitId: string = "";
const openAddUserToOrganizationUnitModal= ()=>{
if(organizationUnitId)
@ -180,10 +180,13 @@ export default defineComponent({
}
function getRightMenuList(node: any): ContextMenuItem[] {
let create = hasPermission('AbpIdentity.OrganizationUnitManagement.Create');
let update = hasPermission('AbpIdentity.OrganizationUnitManagement.Update');
let deleted = hasPermission('AbpIdentity.OrganizationUnitManagement.Delete');
return [
{
label: t("common.createText"),
hidden: !create,
handler: () => {
let record = {
parentId: node.eventKey,
@ -196,6 +199,7 @@ export default defineComponent({
},
{
label: t("common.editText"),
hidden: !update,
handler: () => {
let record = {
id: node.eventKey,
@ -207,6 +211,7 @@ export default defineComponent({
},
{
label: t("common.delText"),
hidden: !deleted,
handler: () => {
createConfirm({
iconType: "warning",

Loading…
Cancel
Save