Skip to content

D
DataCenter_Core2.1_20190520
Commit f2da5f5b by guanzhenshan
Options

添加权限管理模块

parent 9c965ab7
Showing with 725 additions and 10 deletions
Bailun.DC.DailySemiPurchaseSellStock/Program.cs
......@@ -22,7 +22,7 @@ namespace Bailun.DC.DailySemiPurchaseSellStock
//{
// var _services = new Services();
// var start = DateTime.Parse("2019-11-25");
// var start = DateTime.Parse("2019-11-27");
// _services.Init(start);
// //while (start.AddDays(1) < DateTime.Now)
// //{
......
Bailun.DC.Models/Common/mOAUser.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.Models.Common
{
public class mOAUser
{
public int userId { get; set; }
public string userName { get; set; }
}
}
Bailun.DC.Models/Menu/dc_menu_permission.cs
......@@ -33,6 +33,17 @@ namespace Bailun.DC.Models.Menu
/// 是否删除，1：已删除，0：未删除
/// </summary>
public int delstatus { get; set; }
/// <summary>
/// 角色id
/// </summary>
public int role_id { get; set; }
public DateTime lastupdatetime { get; set; }
public int lastupdateuserid { get; set; }
public string lastupdateusername { get; set; }
}
}
Bailun.DC.Models/Menu/dc_user_role.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.Models.Menu
{
/// <summary>
/// 用户角色表
/// </summary>
public class dc_user_role
{
public int id { get; set; }
/// <summary>
/// 角色名称
/// </summary>
public string name { get; set; }
/// <summary>
/// 备注说明
/// </summary>
public string note { get; set; }
/// <summary>
/// 是否已删除 1：已删除 0：未删除
/// </summary>
public int delstatus { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime createtime { get; set; }
/// <summary>
/// 创建人id
/// </summary>
public int createuserid { get; set; }
/// <summary>
/// 创建人名称
/// </summary>
public string createusername { get; set; }
/// <summary>
/// 最后更新时间
/// </summary>
public DateTime lastupdatetime { get; set; }
/// <summary>
/// 最后更新人id
/// </summary>
public int lastupdateuserid { get; set; }
/// <summary>
/// 最后更新人名称
/// </summary>
public string lastupdateusername { get; set; }
}
}
Bailun.DC.Models/Menu/dc_user_role_relation.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.Models.Menu
{
/// <summary>
/// 角色和用户关系表
/// </summary>
public class dc_user_role_relation
{
/// <summary>
///
/// </summary>
public int id { get; set; }
/// <summary>
/// 角色id
/// </summary>
public int role_id { get; set; }
/// <summary>
/// 用户id
/// </summary>
public int userid { get; set; }
/// <summary>
/// 用户名称
/// </summary>
public string username { get; set; }
/// <summary>
/// 是否已删除 1：已删除 0：未删除
/// </summary>
public int delstatus { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime createtime { get; set; }
/// <summary>
/// 创建人id
/// </summary>
public int createuserid { get; set; }
/// <summary>
/// 创建人名称
/// </summary>
public string createusername { get; set; }
/// <summary>
/// 最后更新时间
/// </summary>
public DateTime lastupdatetime { get; set; }
/// <summary>
/// 最后更新人id
/// </summary>
public int lastupdateuserid { get; set; }
/// <summary>
/// 最后更新人名称
/// </summary>
public string lastupdateusername { get; set; }
}
}
Bailun.DC.Services/CommonServices.cs
......@@ -5,6 +5,7 @@ using System.Net;
using System.Text;
using Bailun.DC.Common;
using Bailun.DC.Models;
using Bailun.DC.Models.Common;
using Dapper;
using MySql.Data.MySqlClient;
......@@ -372,6 +373,47 @@ namespace Bailun.DC.Services
}
/// <summary>
/// 获取所有oa用户
/// </summary>
/// <returns></returns>
public static List<mOAUser> GetListOAUser()
{
var list = new List<mOAUser>();
//先判断有没有缓存
//var cache = GetCache("OAUSER");
//if (cache != null)
//{
// list = (List<mOAUser>)cache;
// return list;
//}
try
{
var url = "http://www.bailuntec.com/api/User/GetUser";
var result = Common.HttpHelper.NetHelper.Request(url);
result = result.Substring(1);
result = (result.Substring(0, result.Length - 2) + "]").Replace(@"\", @"");
list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<mOAUser>>(result);
//if (list.Count > 0)
//{
// AddCache("OAUSER", list); //添加到缓存
//}
}
catch (Exception ex)
{
}
return list;
}
}
#region 汇率实体 ExchangeRate
......
Bailun.DC.SkuDailyPurchaseAndSales/Program.cs
......@@ -20,7 +20,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
//static void Main(string[] args)
//{
// var start = DateTime.Parse("2019-09-01");
// var start = DateTime.Parse("2019-11-18");
// while (start.AddDays(1) < DateTime.Now)
// {
// Console.WriteLine(start.ToString("yyyy-MM-dd"));
......
Bailun.DC.Web/Areas/Users/Views/Home/RoleDetail.cshtml 0 → 100644

@{
ViewData["Title"] = "角色详情";
Layout = "~/Pages/Shared/_MainLayout2.cshtml";
ViewBag.Nav = new string[] { "系统设置", "角色管理", "角色详情" };
ViewBag.showClose = false;
}
<div style="background:#fff;padding:8px;margin:-15px;">
<h3>基本信息</h3>
<div class="fixed-table-container bootstrap-table">
<table class="table table-hover">
<tr>
<td>角色名称<span style="color:red;">*</span>:</td>
<td><input id="name" name="name" class="form-control" value="@ViewBag.m.name" /></td>
</tr>
<tr>
<td>备注:</td>
<td><input id="note" name="note" class="form-control" value="@ViewBag.m.note" /></td>
</tr>
</table>
</div>
<input id="id" name="id" type="hidden" value="@ViewBag.m.id" />
</div>
@section buttons{
<button type="button" class="btn btn-success btn-operation" onclick="Save();">提交</button>
}
@section scripts{
<script type="text/javascript">
function Save() {
var n = $('#name').val();
var note = $('#note').val();
if (n == '') {
layer.msg('角色名称不能为空！');
return false;
}
$.submit({
url: '@Url.Content("~/Users/Home/SaveUserRole")',
type:'POST',
paramData: 'id=@(ViewBag.m.id)' + '&name=' + n + '&note=' + note,
success: function (result) {
if (result.success) {
layer.msg('提交成功！');
window.location = window.location;
//layer_close();
}
else {
layer.msg(result.msg);
}
}
})
}
</script>
}
\ No newline at end of file
Bailun.DC.Web/Areas/Users/Views/Home/UserRoles.cshtml 0 → 100644

@{
ViewData["Title"] = "用户角色";
Layout = "~/Pages/Shared/_MainLayout.cshtml";
ViewBag.Nav = new string[] { "系统设置", "用户角色管理" };
}
<div class="row">
<div class="col-sm-12">
<div class="ibox-content m-b-sm border-bottom">
<form id="toolbar">
<div class="form-inline" style="line-height:40px;">
<div class="form-group">
<label>角色名称：</label>
<input id="name" name="name" class="form-control" placeholder="角色名称" />
</div>
<div class="form-group">
<label>&nbsp;</label>
<button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
<button type="button" class="btn btn-success" onclick="add();">新增</button>
</div>
</div>
</form>
</div>
<div class="ibox-content m-b-sm border-bottom">
<table id="roletable" style="table-layout:fixed;"></table>
</div>
</div>
</div>
@section css{
<link href="~/css/bootstrap-table-fixed-columns.css" rel="stylesheet" />
<style>
.mules {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
}
@section scripts{
<script src="~/js/bootstrap-table-fixed-columns.js" type="text/javascript"></script>
<script type="text/javascript">
var tb;
$(document).ready(function () {
var height = document.body.clientHeight;
$("#roletable").attr("data-height", (height - 170));
list();
})
function list() {
var columns = [
{ field: 'name', title: '角色名称', width: '130' },
{ field: 'note', title: '备注', width: '180' },
{ field: 'lastupdateusername', title: '更新人', width: '100', sortable: true, iscount: true },
{ field: 'lastupdatetime', title: '更新时间', width: '130', sortable: true, iscount: true },
{
field: 'option', title: '操作', width: '110', formatter: function (idx, data) {
return '<a class="btn btn-success btn-xs" onclick="ShowDetail(' + data.id + ')">编辑</a>' + (data.id != 1 ? '<a class="btn btn-danger btn-xs" style="margin-left:3px" onclick="DelDetail(' + data.id +')">编辑</a>':"");
}
}
];
var url = '@Url.Content("~/Users/Home/ListUserRoles")' + '?' + $("#toolbar").serialize();
if (tb == undefined) {
tb = OnlyTable("roletable", columns, url, "");
}
else {
tb.bootstrapTable('refresh', { url: url });
}
}
function add() {
layer_show('新增角色', '@Url.Content("~/Users/Home/RoleDetail")', '90%', '90%');
}
function ShowDetail(id) {
layer_show('编辑角色', '@Url.Content("~/Users/Home/RoleDetail?id=")'+id, '90%', '90%');
}
function DelDetail(id) {
if (confirm("删除后不可恢复，是否要删除该角色")) {
$.submit({
url: '@Url.Content("~/Users/Home/DelUserRole")',
type:'POST',
paramData: 'id='+id,
func: function (result) {
if (result.success) {
layer.msg('删除成功！');
list();
}
else {
layer.msg(result.msg);
}
}
})
}
}
</script>
}
Bailun.DC.Web/Bailun.DC.Web.csproj
......@@ -34,6 +34,8 @@
<Folder Include="Areas\Logistics\Models\" />
<Folder Include="Areas\Reports\Data\" />
<Folder Include="Areas\Reports\Models\" />
<Folder Include="Areas\Users\Data\" />
<Folder Include="Areas\Users\Models\" />
</ItemGroup>
<ItemGroup>
......
Bailun.DC.Web/Controllers/HomeController.cs
......@@ -22,6 +22,7 @@ namespace Bailun.DC.Web.Controllers
var companyid = -1;
var departmentname = "";
var username = "";
var userid = 0;
var isAllCompany = 0;
//var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
......@@ -32,6 +33,7 @@ namespace Bailun.DC.Web.Controllers
if (json["statusCode"].ToStr() == "200" && json["result"]["success"].ToString().ToLower() == "true")
{
username = json["result"]["Account"].ToString();
userid = json["result"]["UserId"].ToInt32();
isAllCompany = json["result"]["AllCompany"].ToStr().ToLower() == "false" ? 0 : 1;
int.TryParse(json["result"]["Company"]["Id"].ToString(), out companyid);
if (json["result"]["Department"].ToString() != "null")
......@@ -54,7 +56,8 @@ namespace Bailun.DC.Web.Controllers
});
var listMenu = new Services.MenuServices().ListMenu(username);
//var listMenu = new Services.MenuServices().ListMenu(username);
var listMenu = new Services.MenuServices().ListMenu(userid);
ViewBag.menus = listMenu;
return View();
......
Bailun.DC.Web/Pages/Shared/_MainLayout2.cshtml
......@@ -19,7 +19,7 @@
<link href="/css/hplus/css/bootstrap.min14ed.css?v=3.3.6" rel="stylesheet">
<link href="/css/hplus/css/font-awesome.min93e3.css?v=4.4.0" rel="stylesheet">
<link href="/css/hplus/css/plugins/bootstrap-table/bootstrap-table.min.css" rel="stylesheet" />
@*<link href="~/js/boostrap-table/bootstrap-table.min.css" rel="stylesheet" />*@
<link href="/css/hplus/css/animate.min.css" rel="stylesheet">
<link href="/css/Layer-2.1/skin/layer.css" rel="stylesheet" />
<!--showloading-->
......@@ -29,8 +29,9 @@
<link href="/css/hplus/css/Popup.css" rel="stylesheet" />
<!--下拉搜索控件样式-->
<link href="/css/bootstrap-select-1.12.4/css/bootstrap-select.css" rel="stylesheet" />
<!--公用的css-->
<link href="/css/css/common.css?=20180312" rel="stylesheet" />
<link href="/css/main.css?=201904090954" rel="stylesheet" />
@RenderSection("css", false)
<style>
......@@ -83,9 +84,10 @@
<script src="/css/hplus/js/jquery.min.js?v=2.1.4"></script>
<script src="/css/hplus/js/bootstrap.min.js?v=3.3.6"></script>
<script src="/css/hplus/js/bootbox.js"></script>
@*<script src="/Content/hplus/js/content.min.js"></script>*@<!--右上侧显示首页图标-->
<script src="/css/hplus/js/content.min.js"></script><!--右上侧显示首页图标-->
<script src="/css/hplus/js/plugins/sweetalert/sweetalert.min.js"></script>
@*<script src="~/js/boostrap-table/bootstrap-table.min.js"></script>*@
<script src="/css/hplus/js/plugins/bootstrap-table/bootstrap-table.min.js"></script>
<script src="/css/hplus/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js"></script>
<script src="/css/hplus/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
......@@ -94,19 +96,19 @@
<script src="/css/hplus/js/plugins/validate/jquery.validate.unobtrusive.min.js"></script>
<!--弹出框layer 控件-->
<script src="/css/Layer-2.1/layer.js"></script>
<script src="/js/Layer-2.1/layer.js"></script>
<script src="/css/laytpl-v1.1/laytpl/laytpl.js"></script>
<!--日期控件laydate-->
<script src="~/css/hplus/js/plugins/layer/laydate v5.0.9/laydate.js" type="text/javascript"></script>
<script src="/css/hplus/js/plugins/layer/laydate v5.0.9/laydate.js" type="text/javascript"></script>
<!--表格数据导出控件-->
<script src="/css/hplus/js/export/tableExport.js"></script>
<script src="/css/hplus/js/export/bootstrap-table-export.js"></script>
<!--下拉选择搜索控件-->
<script src="/css/bootstrap-select-1.12.4/js/bootstrap-select.js"></script>
<script src="~/js/jquery.cookie.js" type="text/javascript"></script>
<!--常用js方法-->
<script src="/css/js/common.js?i=20190618002"></script>
<script src="/js/common.js?i=20190618004"></script>
@RenderSection("scripts", required: false)
<script type="text/javascript">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment