20250605
This commit is contained in:
parent
647d00f201
commit
fbcfd95f73
|
|
@ -146,8 +146,11 @@ namespace BLL
|
|||
if (user.UserId == Const.GlyId) //// 如果是管理员或者本部人员返回所有菜单
|
||||
{
|
||||
var sysMenu = from x in Funs.DB.Sys_Menu orderby x.SortIndex select x;
|
||||
if (sysMenu.Count() > 0)
|
||||
{
|
||||
reMenuList = sysMenu.ToList();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var sysMenuRole = from x in Funs.DB.Sys_Menu
|
||||
|
|
@ -155,7 +158,10 @@ namespace BLL
|
|||
where y.RoleId == user.RoleId
|
||||
orderby x.SortIndex
|
||||
select x;
|
||||
if (sysMenuRole.Count() > 0)
|
||||
{
|
||||
reMenuList = sysMenuRole.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 addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.ContractorQualificationMenuId select x).First();
|
||||
if (addMenu != null)
|
||||
{
|
||||
reMenuList.Add(addMenu);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
reMenuList = reMenuList.Distinct().OrderBy(x => x.SortIndex).ToList();
|
||||
|
||||
return reMenuList;
|
||||
}
|
||||
#endregion
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@
|
|||
<Items>
|
||||
<f:TextBox ID="txtUserRepresentative" runat="server" Label="User Representative" LabelAlign="Right" LabelWidth="160px" Readonly="true">
|
||||
</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>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ using System.Web.UI.WebControls;
|
|||
using FineUIPro.Web.common;
|
||||
using BLL.Common;
|
||||
using BLL;
|
||||
using Org.BouncyCastle.Asn1.Sec;
|
||||
|
||||
namespace FineUIPro.Web.SES
|
||||
{
|
||||
|
|
@ -112,11 +113,16 @@ namespace FineUIPro.Web.SES
|
|||
drpSelectYesNo.SelectedValue = "";
|
||||
}
|
||||
|
||||
txtDef.Text= punishment.Def;
|
||||
txtDef.Text = punishment.Def;
|
||||
|
||||
if (!string.IsNullOrEmpty(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))
|
||||
{
|
||||
|
|
@ -126,7 +132,7 @@ namespace FineUIPro.Web.SES
|
|||
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;
|
||||
txtViolationRelatedSes.Enabled = true;
|
||||
|
|
@ -328,7 +334,7 @@ namespace FineUIPro.Web.SES
|
|||
var vses = (from x in Funs.DB.EMC_Punishment
|
||||
where (x.RelatedSesMailIsSend == null || x.RelatedSesMailIsSend == false)
|
||||
&& x.BYC_RU != null && x.BYC_RU.ToUpper() != "NA" && x.Flag == "1"
|
||||
&& x.PunishmentId== punishment.PunishmentId
|
||||
&& x.PunishmentId == punishment.PunishmentId
|
||||
select x).ToList();
|
||||
if (vses.Count() > 0)
|
||||
{
|
||||
|
|
@ -520,5 +526,22 @@ namespace FineUIPro.Web.SES
|
|||
|
||||
}
|
||||
#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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
|
||||
</configSections>
|
||||
<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>
|
||||
<FineUIPro DebugMode="false" CustomTheme="Metro_Dark_Blue" EnableAnimation="true" JSLibrary="All"/>
|
||||
<appSettings>
|
||||
|
|
|
|||
|
|
@ -125,6 +125,8 @@ namespace FineUIPro.Web
|
|||
leftPanel.Items.Add(accordionMenu);
|
||||
|
||||
var dt = GetNewMenu("0");
|
||||
if (dt.Count() > 0)
|
||||
{
|
||||
foreach (var dr in dt)
|
||||
{
|
||||
AccordionPane accordionPane = new AccordionPane();
|
||||
|
|
@ -144,6 +146,7 @@ namespace FineUIPro.Web
|
|||
|
||||
BoundTree(innerTree.Nodes, dr.MenuId);
|
||||
}
|
||||
}
|
||||
return accordionMenu;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue