Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/BaseService/BaseService.Application/UserManagement/RoleAppService.cs

@@ -11,7 +11,7 @@ using Volo.Abp.Identity;
 namespace BaseService.UserManagement
 {
     [Route("api/[controller]/[action]")]
-    [Authorize(IdentityPermissions.Roles.Default)]
+    //[Authorize(IdentityPermissions.Roles.Default)]
     public class RoleAppService : ApplicationService
     {
         private IdentityRoleManager _roleManager { get; }

code/src/Modules/BaseService/BaseService.Application/UserManagement/UserAppService.cs

@@ -25,7 +25,7 @@ using IdentityUser = Volo.Abp.Identity.IdentityUser;
 namespace BaseService.Systems.UserManagement
 {
     [Route("api/base/user")]
-    [Authorize(IdentityPermissions.Users.Default)]
+    //[Authorize(IdentityPermissions.Users.Default)]
     public class UserAppService : ApplicationService, IUserAppService
     {
         protected IdentityUserManager UserManager { get; }

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js

@@ -58,10 +58,10 @@ export default [
         ...createPage("bei-jian", "title=备件价格单"),
         children: [createButton("query", "title=查询&isTop=true"), createButton("import", "title=导入&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")],
       },
-      {
+      // {
-        ...createPage("cai-gou", "title=采购价格单"),
+      //   ...createPage("cai-gou", "title=采购价格单"),
-        children: [createButton("query", "title=查询&isTop=true"), createButton("import", "title=导入&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")],
+      //   children: [createButton("query", "title=查询&isTop=true"), createButton("import", "title=导入&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")],
-      },
+      // },
       {
         ...createPage("xiao-shou", "title=销售价格单"),
         children: [createButton("query", "title=查询&isTop=true"), createButton("import", "title=导入&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")],

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/index.js

@@ -86,6 +86,10 @@ const refreshRouter = async () => {
   const appStore = useAppStore();
   const permissions = appStore.user.permissions;
   const serverRoutes = Object.assign([], remoteRoutes);
+  if (appStore.user.roles.some((o) => o === "物流")) {
+    const baseDataRoutes = serverRoutes.find((o) => o.path === "base-data");
+    baseDataRoutes.children = baseDataRoutes.children.filter((o) => o.path !== "bei-jian" && o.path !== "xiao-shou");
+  }
   const setPermission = (list, parent = null) => {
     list.forEach((o) => {
       // full path