shecs
/
Basf_FCL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250605

This commit is contained in:
毕文静 2025-06-05 10:36:47 +08:00
parent 647d00f201
commit fbcfd95f73
5 changed files with 68 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
FCL/BLL/Common/CommonService.cs
View File

@ -125,11 +125,11 @@ namespace BLL
return isPower; return isPower;
} }
#endregion #endregion
#region 根据登陆id和系统id得到菜单列表 #region 根据登陆id和系统id得到菜单列表
/// <summary> /// <summary>
/// 本项目用这个方法来获取权限（不按项目角色和项目用户来获取权限） /// 本项目用这个方法来获取权限（不按项目角色和项目用户来获取权限）
@ -145,8 +145,11 @@ namespace BLL
{ {
if (user.UserId == Const.GlyId) //// 如果是管理员或者本部人员返回所有菜单 if (user.UserId == Const.GlyId) //// 如果是管理员或者本部人员返回所有菜单
{ {
var sysMenu = from x in Funs.DB.Sys_Menu orderby x.SortIndex select x; var sysMenu = from x in Funs.DB.Sys_Menu orderby x.SortIndex select x;
reMenuList = sysMenu.ToList(); if (sysMenu.Count() > 0)
{
reMenuList = sysMenu.ToList();
}
} }
else else
{ {
@ -155,7 +158,10 @@ namespace BLL
where y.RoleId == user.RoleId where y.RoleId == user.RoleId
orderby x.SortIndex orderby x.SortIndex
select x; select x;
reMenuList = sysMenuRole.ToList(); if (sysMenuRole.Count() > 0)
{
reMenuList = sysMenuRole.ToList();
}
// 对主协调员权限特殊处理 // 对主协调员权限特殊处理
List<string> mc = (from x in Funs.DB.FC_SESRelatedData select x.Main_Coordinator).ToList(); List<string> mc = (from x in Funs.DB.FC_SESRelatedData select x.Main_Coordinator).ToList();
@ -163,11 +169,15 @@ namespace BLL
{ {
Model.Sys_Menu addSupMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == "21FCD41E-2E96-4DE0-8F5F-BDD0C967134F" select x).First(); Model.Sys_Menu addSupMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == "21FCD41E-2E96-4DE0-8F5F-BDD0C967134F" select x).First();
Model.Sys_Menu addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.ContractorQualificationMenuId select x).First(); Model.Sys_Menu addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.ContractorQualificationMenuId select x).First();
reMenuList.Add(addMenu); if (addMenu != null)
{
reMenuList.Add(addMenu);
}
} }
} }
} }
reMenuList = reMenuList.Distinct().OrderBy(x => x.SortIndex).ToList(); reMenuList = reMenuList.Distinct().OrderBy(x => x.SortIndex).ToList();
return reMenuList; return reMenuList;
} }
#endregion #endregion

2
FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx
View File

@ -70,7 +70,7 @@
<Items> <Items>
<f:TextBox ID="txtUserRepresentative" runat="server" Label="User Representative" LabelAlign="Right" LabelWidth="160px" Readonly="true"> <f:TextBox ID="txtUserRepresentative" runat="server" Label="User Representative" LabelAlign="Right" LabelWidth="160px" Readonly="true">
</f:TextBox> </f:TextBox>
<f:DropDownList ID="drpBYC_RU" runat="server" Label="BYC Resp. Dept." EnableGroup="true" EnableEdit="true" LabelAlign="Right" LabelWidth="160px" Required="true" ShowRedStar="true"></f:DropDownList> <f:DropDownList ID="drpBYC_RU" runat="server" Label="BYC Resp. Dept." EnableGroup="true" EnableEdit="true" LabelAlign="Right" LabelWidth="160px" Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpBYC_RU_SelectedIndexChanged"></f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>

41
FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.cs
View File

@ -8,6 +8,7 @@ using System.Web.UI.WebControls;
using FineUIPro.Web.common; using FineUIPro.Web.common;
using BLL.Common; using BLL.Common;
using BLL; using BLL;
using Org.BouncyCastle.Asn1.Sec;
namespace FineUIPro.Web.SES namespace FineUIPro.Web.SES
{ {
@ -36,7 +37,7 @@ namespace FineUIPro.Web.SES
{ {
this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string view = Request.Params["view"]; string view = Request.Params["view"];
var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId); var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId);
if (role != null && role.RoleName == "Contract Administrator") if (role != null && role.RoleName == "Contract Administrator")
{ {
@ -85,7 +86,7 @@ namespace FineUIPro.Web.SES
BLL.SESRelatedDataService.InitFONoDropDownList(this.drpFO_No, drpContractor.SelectedValue, true);//合同号 BLL.SESRelatedDataService.InitFONoDropDownList(this.drpFO_No, drpContractor.SelectedValue, true);//合同号
this.drpFO_No.SelectedValue = punishment.FO_NO; this.drpFO_No.SelectedValue = punishment.FO_NO;
} }
this.txtDiscispline.Text = punishment.Discipline; this.txtDiscispline.Text = punishment.Discipline;
this.txtLocation.Text = punishment.Location; this.txtLocation.Text = punishment.Location;
this.txtDescription.Text = punishment.Description; this.txtDescription.Text = punishment.Description;
@ -98,7 +99,7 @@ namespace FineUIPro.Web.SES
{ {
drpViolationDegree.SelectedValue = pun.ViolationDegree; drpViolationDegree.SelectedValue = pun.ViolationDegree;
} }
txtContractAdmin.Text = punishment.Contract_Admin; txtContractAdmin.Text = punishment.Contract_Admin;
txtMainCoordinator.Text = punishment.Main_Coordinator; txtMainCoordinator.Text = punishment.Main_Coordinator;
txtMCDept.Text = punishment.MCDept; txtMCDept.Text = punishment.MCDept;
@ -112,11 +113,16 @@ namespace FineUIPro.Web.SES
drpSelectYesNo.SelectedValue = ""; drpSelectYesNo.SelectedValue = "";
} }
txtDef.Text= punishment.Def; txtDef.Text = punishment.Def;
if (!string.IsNullOrEmpty(punishment.BYC_RU)) if (!string.IsNullOrEmpty(punishment.BYC_RU))
{ {
this.drpBYC_RU.SelectedValue = punishment.BYC_RU; this.drpBYC_RU.SelectedValue = punishment.BYC_RU;
//BYC Resp. Dept.选择NA时，End User（BYC Resp. Dept.部门）填写部分灰化
if (this.drpBYC_RU.SelectedText == "NA")
{
GPDep.Enabled = false;
}
} }
if (!string.IsNullOrEmpty(punishment.Violation_Inspector)) if (!string.IsNullOrEmpty(punishment.Violation_Inspector))
{ {
@ -126,7 +132,7 @@ namespace FineUIPro.Web.SES
txtInspectionDep.Text = depName; txtInspectionDep.Text = depName;
} }
if (this.CurrUser.DepartId == punishment.BYC_RU || this.CurrUser.Account==Const.Gly) if (this.CurrUser.DepartId == punishment.BYC_RU || this.CurrUser.Account == Const.Gly)
{ {
btnSave.Hidden = false; btnSave.Hidden = false;
txtViolationRelatedSes.Enabled = true; txtViolationRelatedSes.Enabled = true;
@ -155,7 +161,7 @@ namespace FineUIPro.Web.SES
} }
else else
{ {
} }
if (view == "1") if (view == "1")
@ -266,7 +272,7 @@ namespace FineUIPro.Web.SES
{ {
Save(); Save();
} }
} }
private void Save() private void Save()
@ -328,7 +334,7 @@ namespace FineUIPro.Web.SES
var vses = (from x in Funs.DB.EMC_Punishment var vses = (from x in Funs.DB.EMC_Punishment
where (x.RelatedSesMailIsSend == null || x.RelatedSesMailIsSend == false) where (x.RelatedSesMailIsSend == null || x.RelatedSesMailIsSend == false)
&& x.BYC_RU != null && x.BYC_RU.ToUpper() != "NA" && x.Flag == "1" && x.BYC_RU != null && x.BYC_RU.ToUpper() != "NA" && x.Flag == "1"
&& x.PunishmentId== punishment.PunishmentId && x.PunishmentId == punishment.PunishmentId
select x).ToList(); select x).ToList();
if (vses.Count() > 0) if (vses.Count() > 0)
{ {
@ -517,8 +523,25 @@ namespace FineUIPro.Web.SES
SetReadonly(false); SetReadonly(false);
} }
} }
} }
#endregion #endregion
/// <summary>
/// BYC Resp. Dept.选择NA时，End User（BYC Resp. Dept.部门）填写部分灰化
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpBYC_RU_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.drpBYC_RU.SelectedText == "NA")
{
this.GPDep.Enabled = false;
}
else
{
this.GPDep.Enabled = true;
}
}
} }
} }

2
FCL/FineUIPro.Web/Web.config
View File

@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/> <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections> </configSections>
<connectionStrings> <connectionStrings>
<add name="FCLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=FCLDB;uid=sa;pwd=1111;" providerName="System.Data.SqlClient"/> <add name="FCLDBConnectionString" connectionString="Data Source=.\sql2022;Initial Catalog=FCLDB;uid=sa;pwd=1111;" providerName="System.Data.SqlClient"/>
</connectionStrings> </connectionStrings>
<FineUIPro DebugMode="false" CustomTheme="Metro_Dark_Blue" EnableAnimation="true" JSLibrary="All"/> <FineUIPro DebugMode="false" CustomTheme="Metro_Dark_Blue" EnableAnimation="true" JSLibrary="All"/>
<appSettings> <appSettings>

33
FCL/FineUIPro.Web/index.aspx.cs
View File

@ -125,24 +125,27 @@ namespace FineUIPro.Web
leftPanel.Items.Add(accordionMenu); leftPanel.Items.Add(accordionMenu);
var dt = GetNewMenu("0"); var dt = GetNewMenu("0");
foreach (var dr in dt) if (dt.Count() > 0)
{ {
AccordionPane accordionPane = new AccordionPane(); foreach (var dr in dt)
accordionPane.Title = dr.MenuName; {
//accordionPane.Layout = Layout.Fit; AccordionPane accordionPane = new AccordionPane();
accordionPane.ShowBorder = false; accordionPane.Title = dr.MenuName;
accordionPane.BodyPadding = "2px 0 0 0"; //accordionPane.Layout = Layout.Fit;
accordionMenu.Items.Add(accordionPane); accordionPane.ShowBorder = false;
accordionPane.BodyPadding = "2px 0 0 0";
accordionMenu.Items.Add(accordionPane);
Tree innerTree = new Tree(); Tree innerTree = new Tree();
innerTree.ShowBorder = false; innerTree.ShowBorder = false;
innerTree.ShowHeader = false; innerTree.ShowHeader = false;
innerTree.EnableIcons = true; innerTree.EnableIcons = true;
innerTree.AutoScroll = true; innerTree.AutoScroll = true;
innerTree.EnableSingleClickExpand = true; innerTree.EnableSingleClickExpand = true;
accordionPane.Items.Add(innerTree); accordionPane.Items.Add(innerTree);
BoundTree(innerTree.Nodes, dr.MenuId); BoundTree(innerTree.Nodes, dr.MenuId);
}
} }
return accordionMenu; return accordionMenu;
} }