lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
杨红卫
2024-02-27 13:31:53 +08:00
parent c6559b1f30 a9d2260381
commit 832da93400
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/SGGL_SeDin/v17/.wsuo
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+7 -8
View File
@@ -308,19 +308,18 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
//private static bool canSave; //是否可以保存 //private static bool canSave; //是否可以保存
public string ConvertPipeArea(object PipeArea) public string ConvertPipeArea(object PipeArea)
{ {
string StateName = string.Empty; string stateName = string.Empty;
if (!string.IsNullOrEmpty(PipeArea.ToString())) if (PipeArea != null && !string.IsNullOrEmpty(PipeArea.ToString()))
{ {
if (PipeArea != null) string txt = PipelineService.GetPipeArea().FirstOrDefault(x => x.Value == PipeArea.ToString())?.Text;
{
string txt = PipelineService.GetPipeArea().FirstOrDefault(x => x.Value == PipeArea.ToString()).Text;
return txt; return txt;
}
return "";
} }
return StateName;
return stateName;
} }
#region 焊接日报 提交事件 #region 焊接日报 提交事件
// 检查用户权限 // 检查用户权限
SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBook.aspx.cs
+15 -3
View File
@@ -40,20 +40,26 @@ namespace FineUIPro.Web.PHTGL.Filing
var model = new Model.PHTGL_ContractStandingBook(); var model = new Model.PHTGL_ContractStandingBook();
var RoleIds = this.CurrUser.RoleIds; var RoleIds = this.CurrUser.RoleIds;
if (RoleIds.Contains(Const.SedinHTGLManager))
if (this.CurrUser.PersonId == Const.hfnbdId || this.CurrUser.PersonId == Const.sysglyId)
{
}
else if (RoleIds.Contains(Const.SedinHTGLManager) && !string.IsNullOrEmpty(RoleIds))
{ {
//model.UnitId=this.CurrUser.UnitId; //model.UnitId=this.CurrUser.UnitId;
} }
else if (RoleIds.Contains(Const.OtherHTGLManager)) else if (RoleIds.Contains(Const.OtherHTGLManager) && !string.IsNullOrEmpty(RoleIds))
{ {
model.UnitId = this.CurrUser.UnitId; model.UnitId = this.CurrUser.UnitId;
} }
else if (RoleIds.Contains(Const.SedinHTGLDepartManager)) else if (RoleIds.Contains(Const.SedinHTGLDepartManager) && !string.IsNullOrEmpty(RoleIds))
{ {
model.UnitId = this.CurrUser.UnitId; model.UnitId = this.CurrUser.UnitId;
model.DepartId= this.CurrUser.DepartId; model.DepartId= this.CurrUser.DepartId;
} }
else else
{ {
model.UnitId = "normal"; model.UnitId = "normal";
@@ -177,6 +183,12 @@ namespace FineUIPro.Web.PHTGL.Filing
//txtSubConstruction.Text = string.Empty; //txtSubConstruction.Text = string.Empty;
} }
/// <summary>
/// 状态
/// </summary>
/// <param name="State"></param>
/// <returns></returns>
public string ConvertState(object State) public string ConvertState(object State)
{ {
string StateName = string.Empty; string StateName = string.Empty;