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

11

Browse Source
This commit is contained in:
佘春生
2024-06-11 17:27:06 +08:00
parent 9dd993f28e
commit a3ca2594e3
30 changed files with 695 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs
+15 -3
View File
@@ -277,7 +277,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnAdd))
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationMenuId, Const.BtnAdd))
{
this.SetTextTemp();
string window = String.Format("PMIDelegationEdit.aspx?PMIDelegationId={0}", string.Empty, "新增 - ") ;
@@ -327,7 +327,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
/// <param name="e"></param>
protected void btnDelete_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnDelete))
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationMenuId, Const.BtnDelete))
{
var trustManage =Funs.DB.PMI_Delegation.FirstOrDefault (t=>t.Id==this.PMIDelegationId);
if (trustManage != null)
@@ -384,6 +384,18 @@ namespace FineUIPro.Web.WeldingProcess.PMI
#endregion
#endregion
#region 获取按钮权限
/// <summary>
/// 获取按钮权限
/// </summary>
/// <param name="button"></param>
/// <returns></returns>
private bool GetButtonPower(string button)
{
return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DailyReportCompleteMenuId, button);
}
#endregion
}
}
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
+1 -1
View File
@@ -191,7 +191,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationId, Const.BtnSave))
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDelegationMenuId, Const.BtnSave))
{
try
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs
+2 -2
View File
@@ -50,7 +50,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
}
if (this.drpIsALl.SelectedValue=="报警")
{
query = query.Where(t=>(t.RateBys<=2 && t.PMIBySNum<=2) || (t.RateByf<=2 && t.PMIByFNum<=2));
query = query.Where(t=>(t.RateBys<=2 || t.PMIBySNum<=2) || (t.RateByf<=2 || t.PMIByFNum<=2));
}
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text))
{
@@ -98,7 +98,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
itemLable.Text = rates.ToString() + "%";
int PMIByFNum = Convert.ToInt32(labPMIByFNum.Text);
labRateByf.Text = ratef.ToString() + "%";
if ((rates <= 2 && PMIBySNum <= 2) || (ratef <= 2 && PMIByFNum <= 2))
if ((rates <= 2 || PMIBySNum <= 2) || (ratef <= 2 || PMIByFNum <= 2))
{
e.RowCssClass = "color1";
}
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
+5 -5
View File
@@ -330,11 +330,11 @@ namespace FineUIPro.Web.WeldingProcess.PMI
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
//if (!CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.BItemEndCheckMenuId, Const.BtnSave))
//{
// ShowNotify("您没有这个权限，请与管理员联系！");
// return;
//}
if (!CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.PMIDetectionEntryMenuId, Const.BtnSave))
{
ShowNotify("您没有这个权限，请与管理员联系！");
return;
}
if (Grid1.GetModifiedData().Count > 0)
{