diff --git a/DataBase/版本日志/SGGLDB_WH_2024-7-1-01phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-7-1-01phf.sql
new file mode 100644
index 00000000..b64483ee
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-7-1-01phf.sql
@@ -0,0 +1,98 @@
+ALTER VIEW [dbo].[View_SitePerson_Person]
+AS
+SELECT Person.PersonId,
+ Person.CardNo,
+ Person.PersonName,
+ Person.Sex,
+ (Case Person.Sex WHEN '1' THEN '' WHEN '2' THEN 'Ů' ELSE '' END) AS SexName,
+ Person.IdentityCard,
+ Person.Address,
+ Person.ProjectId,
+ Person.UnitId,
+ Person.Birthday,
+ Person.TeamGroupId,
+ Person.WorkAreaId,
+ Person.WorkPostId,
+ Person.InTime,
+ Person.OutTime,
+ Person.OutResult,
+ Person.Telephone,
+ Person.PositionId,
+ Person.PostTitleId,
+ Person.PhotoUrl,
+ Person.IsUsed,
+ (CASE Person.IsUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsUsedName,
+ Person.IsCardUsed,
+ (CASE Person.IsCardUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsCardUsedName,
+ Person.PersonIndex,
+ Project.ProjectCode,
+ Project.ProjectName,
+ Unit.UnitCode,
+ Unit.UnitName,
+ TeamGroup.TeamGroupName,
+ --WorkArea.UnitWorkCode AS WorkAreaCode,
+ WorkAreaCode= STUFF((SELECT ',' + UnitWorkCode FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''),
+ --WorkArea.UnitWorkName AS WorkAreaName
+ WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''),
+ Post.WorkPostName,
+ Position.PositionName,
+ Title.PostTitleName,
+ Depart.DepartName,
+ Post.PostType,
+ Post.IsHsse,
+ (SELECT COUNT(*) FROM EduTrain_TrainRecordDetail T WHERE T.PersonId=Person.PersonId) AS TrainCount,
+ Person.AuditorId,
+ sysUser.UserName AS AuditorName,
+ Person.AuditorDate,
+ Person.IDCardUrl,
+ Person.IsForeign,
+ case when Person.IsForeign=1 then '' else '' end as IsForeignStr,
+ Person.IdcardType,
+ BasicData1.dictName as IdcardTypeName,
+ Person.IdcardStartDate,
+ Person.IdcardEndDate,
+ Person.IdcardForever,
+ case when Person.IdcardForever='Y' then '' else '' end as IdcardForeverStr,
+ Person.PoliticsStatus,
+ BasicData2.dictName as PoliticsStatusName,
+ Person.IdcardAddress,
+ Person.Nation,
+ BasicData3.dictName as NationName,
+ Person.EduLevel,
+ BasicData4.dictName as EduLevelName,
+ Person.MaritalStatus,
+ BasicData5.dictName as MaritalStatusName,
+ Person.CountryCode,
+ Country.cname as CountryName,
+ Person.ProvinceCode,
+ City.cname as ProvinceName,
+ Person.MainCNProfessionalId,
+ CNProfessional.ProfessionalName as MainCNProfessionalName,
+ Person.ViceCNProfessionalId,
+ '' as ViceCNProfessionalName,
+ Person.IsOutside,
+ case when Person.IsOutside=1 then '' else '' end as IsOutsideStr,
+ Person.HeadImage,
+ RealNameAddTime,
+ Person.IsBlacklist
+FROM SitePerson_Person AS Person
+LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId
+LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId
+LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=Person.TeamGroupId
+--LEFT JOIN WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Person.WorkAreaId
+LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = Person.WorkPostId
+LEFT JOIN Base_Position AS Position ON Position.PositionId = Person.PositionId
+Left JOIN Base_PostTitle AS Title ON Title.PostTitleId = Person.PostTitleId
+Left JOIN Base_Depart AS Depart ON Depart.DepartId = Person.DepartId
+Left JOIN Sys_User AS sysUser ON sysUser.UserId = Person.AuditorId
+Left JOIN RealName_BasicData AS BasicData1 ON BasicData1.dictCode = Person.IdcardType
+Left JOIN RealName_BasicData AS BasicData2 ON BasicData2.dictCode = Person.PoliticsStatus
+Left JOIN RealName_BasicData AS BasicData3 ON BasicData3.dictCode = Person.Nation
+Left JOIN RealName_BasicData AS BasicData4 ON BasicData4.dictCode = Person.EduLevel
+Left JOIN RealName_BasicData AS BasicData5 ON BasicData5.dictCode = Person.MaritalStatus
+Left JOIN RealName_Country AS Country ON Country.CountryId = Person.CountryCode
+Left JOIN RealName_City AS City ON City.provinceCode = Person.ProvinceCode AND Country.CountryId=City.countryId
+Left JOIN Base_CNProfessional AS CNProfessional ON CNProfessional.CNProfessionalId = Person.MainCNProfessionalId
+
+
+GO
\ No newline at end of file
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-7-1-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-7-1-phf.sql
new file mode 100644
index 00000000..66fdbb0a
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-7-1-phf.sql
@@ -0,0 +1,8 @@
+--Ӻ
+ALTER TABLE siteperson_person
+ADD IsBlacklist bit NULL;
+
+--Ӻ˵
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('06A96829-08BF-4314-896A-81579039F82D','','HSSE/SitePerson/BlackPersonList.aspx',11,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1)
+go
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-7-2-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-7-2-phf.sql
new file mode 100644
index 00000000..17083aba
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-7-2-phf.sql
@@ -0,0 +1,35 @@
+INSERT INTO Base_RiskLevel(RiskLevelId,RiskLevel,RiskLevelName,MinValue,MaxValue,ControlMeasures,Days)
+values('dc123980-732c-4fdc-a08e-7d03ebd4388e','5','五级','0','0','五级','1');
+
+--删除菜单“HSE费用▷ ▷ HSE费用计划;HSE费用支出;分包商HSE费用申请”。
+update sys_menu set IsUsed=0 where menuname='HSE费用计划';
+update sys_menu set IsUsed=0 where menuname='HSE费用支出';
+update sys_menu set IsUsed=0 where menuname='分包商HSE费用申请';
+
+--合同HSE费用额登记
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('C6CF3A5C-546B-483A-B742-A77F2E152523','合同HSE费用额登记','HSSE/CostGoods/FeeRegistration.aspx',9,'20ECB69E-28C4-4FAC-941A-15F446AEB634','Menu_HSSE',0,1,1)
+go
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('8CC1F1E8-3CB4-4213-A88D-EFDDA3E2272B','C6CF3A5C-546B-483A-B742-A77F2E152523','增加',1)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('DF601450-8F0A-427A-9BB4-30E9D3A6123A','C6CF3A5C-546B-483A-B742-A77F2E152523','修改',2)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('CE006C1E-476F-4D3C-8B28-4114B5CD360F','C6CF3A5C-546B-483A-B742-A77F2E152523','删除',3)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('10C0B8CF-B32B-4D11-AACA-972D085015BB','C6CF3A5C-546B-483A-B742-A77F2E152523','保存',4)
+go
+
+CREATE TABLE [dbo].[CostGoods_FeeRegistration](
+ [Id] [nvarchar](50) NOT NULL,
+ [ProjectId] [nvarchar](50) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [Cost] [decimal](18, 2) NULL,
+ [CompileDate] [datetime] NULL,
+ [CompileMan] [nvarchar](50) NULL,
+ CONSTRAINT [PK_CostGoods_FeeRegistration] PRIMARY KEY CLUSTERED
+(
+ [Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
\ No newline at end of file
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-7-4-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-7-4-phf.sql
new file mode 100644
index 00000000..9461e26b
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-7-4-phf.sql
@@ -0,0 +1,30 @@
+--HSSE/CostGoods/PayRegistration.aspx
+update SYS_MENU set URL='HSSE/CostGoods/PayRegistrationNew.aspx' where menuid='9EFF1A0F-87AA-43E7-83B0-79EEAAC8848E';
+
+--HSSE/CostGoods/CostLedger.aspx
+update SYS_MENU set URL='HSSE/CostGoods/CostLedgerNew.aspx' where menuid='19C1370F-92C0-4E31-87B4-8BADA74113E4';
+
+CREATE TABLE [dbo].[CostGoods_HseExpense](
+ [Id] [nvarchar](50) NOT NULL,
+ [ProjectId] [nvarchar](50) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [PayDate] [datetime] NULL,
+ [PayMonth] [nvarchar](50) NULL,
+ [SMonthType1] [decimal](18, 2) NULL,
+ [SMonthType2] [decimal](18, 2) NULL,
+ [SMonthType3] [decimal](18, 2) NULL,
+ [SMonthType4] [decimal](18, 2) NULL,
+ [SMonthType5] [decimal](18, 2) NULL,
+ [SMonthType6] [decimal](18, 2) NULL,
+ [SMonthType7] [decimal](18, 2) NULL,
+ [SMonthType8] [decimal](18, 2) NULL,
+ [SMonthType9] [decimal](18, 2) NULL,
+ [SMonthType10] [decimal](18, 2) NULL,
+ [CompileMan] [nvarchar](50) NULL,
+ [CompileDate] [datetime] NULL,
+ CONSTRAINT [PK_CostGoods_HseExpense] PRIMARY KEY CLUSTERED
+(
+ [Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index b1ab29fd..4473098d 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -54,9 +54,9 @@
False
-
+
False
- ..\Lib\Microsoft.SQLServer.ManagedDTS.dll
+ C:\Windows\Microsoft.NET\assembly\GAC_MSIL\Microsoft.SqlServer.ManagedDTS\v4.0_16.0.0.0__89845dcd8080cc91\新建文件夹\Microsoft.SQLServer.ManagedDTS.dll
@@ -396,7 +396,9 @@
+
+
diff --git a/SGGL/BLL/BaseInfo/RiskLevelService.cs b/SGGL/BLL/BaseInfo/RiskLevelService.cs
index 3e92769e..289cfc25 100644
--- a/SGGL/BLL/BaseInfo/RiskLevelService.cs
+++ b/SGGL/BLL/BaseInfo/RiskLevelService.cs
@@ -22,6 +22,16 @@ namespace BLL
return Funs.DB.Base_RiskLevel.FirstOrDefault(e => e.RiskLevelId == riskLevelId);
}
+ ///
+ /// 根据主键获取许可证类型
+ ///
+ ///
+ ///
+ public static Model.Base_RiskLevel GetRiskLevelBy(string riskLevel)
+ {
+ return Funs.DB.Base_RiskLevel.FirstOrDefault(e => e.RiskLevel == Convert.ToInt32(riskLevel));
+ }
+
///
/// 添加许可证类型
///
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 6c042878..8f6e97aa 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -2279,6 +2279,11 @@ namespace BLL
/// 安全费用管理
///
public const string ProjectHSSECostManageMenuId = "5C74F09D-FDE3-4995-A1D6-0549A8693940";
+
+ ///
+ /// 合同HSE费用额登记
+ ///
+ public const string FeeRegistrationMenuId = "C6CF3A5C-546B-483A-B742-A77F2E152523";
#endregion
#region HSSE行政管理
diff --git a/SGGL/BLL/HSSE/CostGoods/FeeRegistration.cs b/SGGL/BLL/HSSE/CostGoods/FeeRegistration.cs
new file mode 100644
index 00000000..bb8a6231
--- /dev/null
+++ b/SGGL/BLL/HSSE/CostGoods/FeeRegistration.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+ ///
+ /// 合同HSE费用额登记
+ ///
+ public class FeeRegistration
+ {
+ public static bool Insert(Model.CostGoods_FeeRegistration model)
+ {
+ try
+ {
+ Funs.DB.CostGoods_FeeRegistration.InsertOnSubmit(model);
+ Funs.DB.SubmitChanges();
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"插入数据失败,原因:{ex.Message}");
+ return false;
+ }
+ }
+
+ public static bool Update(Model.CostGoods_FeeRegistration model)
+ {
+ try
+ {
+ var result = Funs.DB.CostGoods_FeeRegistration.FirstOrDefault(a => a.Id == model.Id);
+ if (result != null)
+ {
+ result.UnitId = model.UnitId;
+ result.Cost = model.Cost;
+ Funs.DB.SubmitChanges();
+ }
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"更新表数据失败,原因:{ex.Message}");
+ return false;
+ }
+ }
+
+ public static bool Delete(List newId)
+ {
+ try
+ {
+ var result = Funs.DB.CostGoods_FeeRegistration.Where(a => newId.Contains(a.Id)).ToList();
+ if (result.Count > 0)
+ {
+ Funs.DB.CostGoods_FeeRegistration.DeleteAllOnSubmit(result);
+ Funs.DB.SubmitChanges();
+ }
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"删除数据失败,原因:{ex.Message}");
+ return false;
+ }
+ }
+
+ public static bool Delete(string newId)
+ {
+ try
+ {
+ var result = Funs.DB.CostGoods_FeeRegistration.Where(a => a.Id == newId).ToList();
+ if (result.Count > 0)
+ {
+ Funs.DB.CostGoods_FeeRegistration.DeleteAllOnSubmit(result);
+ Funs.DB.SubmitChanges();
+ }
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"删除数据失败,原因:{ex.Message}");
+ return false;
+ }
+ }
+
+ public static Model.CostGoods_FeeRegistration Detail(string newId)
+ {
+ var result = Funs.DB.CostGoods_FeeRegistration.FirstOrDefault(a => a.Id == newId);
+ return result;
+ }
+ }
+}
diff --git a/SGGL/BLL/HSSE/CostGoods/HseExpenseService.cs b/SGGL/BLL/HSSE/CostGoods/HseExpenseService.cs
new file mode 100644
index 00000000..43a185b4
--- /dev/null
+++ b/SGGL/BLL/HSSE/CostGoods/HseExpenseService.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+ ///
+ /// HSE费用登记(新)
+ ///
+ public class HseExpenseService
+ {
+ public static bool Insert(Model.CostGoods_HseExpense model)
+ {
+ try
+ {
+ Funs.DB.CostGoods_HseExpense.InsertOnSubmit(model);
+ Funs.DB.SubmitChanges();
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"插入数据失败,原因:{ex.Message}");
+ return false;
+ }
+ }
+
+ public static bool Update(Model.CostGoods_HseExpense model)
+ {
+ try
+ {
+ var result = Funs.DB.CostGoods_HseExpense.FirstOrDefault(a => a.Id == model.Id);
+ if (result != null)
+ {
+ result.UnitId = model.UnitId;
+ result.PayDate = model.PayDate;
+ result.PayMonth = model.PayMonth;
+
+ result.SMonthType1 = model.SMonthType1;
+ result.SMonthType2 = model.SMonthType2;
+ result.SMonthType3 = model.SMonthType3;
+ result.SMonthType4 = model.SMonthType4;
+ result.SMonthType5 = model.SMonthType5;
+ result.SMonthType6 = model.SMonthType6;
+ result.SMonthType7 = model.SMonthType7;
+ result.SMonthType8 = model.SMonthType8;
+ result.SMonthType9 = model.SMonthType9;
+ result.SMonthType10 = model.SMonthType10;
+ Funs.DB.SubmitChanges();
+ }
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"更新表数据失败,原因:{ex.Message}");
+ return false;
+ }
+ }
+
+ public static bool Delete(List newId)
+ {
+ try
+ {
+ var result = Funs.DB.CostGoods_HseExpense.Where(a => newId.Contains(a.Id)).ToList();
+ if (result.Count > 0)
+ {
+ Funs.DB.CostGoods_HseExpense.DeleteAllOnSubmit(result);
+ Funs.DB.SubmitChanges();
+ }
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"删除数据失败,原因:{ex.Message}");
+ return false;
+ }
+ }
+
+ public static bool Delete(string newId)
+ {
+ try
+ {
+ var result = Funs.DB.CostGoods_HseExpense.Where(a => a.Id == newId).ToList();
+ if (result.Count > 0)
+ {
+ Funs.DB.CostGoods_HseExpense.DeleteAllOnSubmit(result);
+ Funs.DB.SubmitChanges();
+ }
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog($"删除数据失败,原因:{ex.Message}");
+ return false;
+ }
+ }
+
+ public static Model.CostGoods_HseExpense Detail(string newId)
+ {
+ var result = Funs.DB.CostGoods_HseExpense.FirstOrDefault(a => a.Id == newId);
+ return result;
+ }
+ }
+}
diff --git a/SGGL/BLL/HSSE/SitePerson/PersonService.cs b/SGGL/BLL/HSSE/SitePerson/PersonService.cs
index dc69e2a4..8dead899 100644
--- a/SGGL/BLL/HSSE/SitePerson/PersonService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/PersonService.cs
@@ -122,7 +122,7 @@ namespace BLL
/// 每页数量
///
public static IEnumerable getListData(string projectId, string unitId, string personName, string identityCard, string treamGroupId, string workPostIds,
- bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, Grid Grid1)
+ bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, Grid Grid1,bool isBlack=false)
{
IQueryable getPersonList = getPersonLists.Where(x => x.ProjectId == projectId);
if (!string.IsNullOrEmpty(unitId))
@@ -136,6 +136,15 @@ namespace BLL
getPersonList = getPersonList.Where(x => x.UnitId == unitId);
}
}
+
+ if (isBlack == false)
+ {
+ getPersonList = getPersonList.Where(x => x.IsBlacklist != true || x.IsBlacklist == null);
+ }
+ else {
+ getPersonList = getPersonList.Where(x => x.IsBlacklist == true);
+ }
+
if (!string.IsNullOrEmpty(personName))
{
getPersonList = getPersonList.Where(x => x.PersonName.Contains(personName));
diff --git a/SGGL/BLL/OpenService/MonitorService.cs b/SGGL/BLL/OpenService/MonitorService.cs
index 27694d35..6e1d1ee6 100644
--- a/SGGL/BLL/OpenService/MonitorService.cs
+++ b/SGGL/BLL/OpenService/MonitorService.cs
@@ -5,7 +5,7 @@ using System.Linq;
using System.Web.UI.WebControls;
using System.Collections.Generic;
using Newtonsoft.Json.Linq;
-using Microsoft.SqlServer.Dts.Runtime;
+//using Microsoft.SqlServer.Dts.Runtime;
namespace BLL
{
diff --git a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
index 8f7fdbe8..4880d08a 100644
--- a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
+++ b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
@@ -710,6 +710,74 @@ namespace FineUIPro.Web.AttachFile
///保存方法
this.SaveData(source.ToString(), attachUrl);
ShowNotify("保存成功!", MessageBoxIcon.Success);
+
+ #region 统一人员资质上传功能2024-7-1
+ if (MenuId== BLL.Const.PersonListMenuId && Request.QueryString["strParam"]=="4")
+ {
+ //如果是人员信息修改安全生产考核合格证书/特种作业操作证(同步 特种作业人员资质、安管人员资质)
+ var personId = ToKeyId.Split('#')[0].ToString();
+ var PersonQualityModel = Funs.DB.QualityAudit_PersonQuality.FirstOrDefault(x => x.PersonId == personId);
+ if (PersonQualityModel!=null)
+ {
+ UploadFileService.SaveAttachUrl(source.ToString(), attachUrl,
+ BLL.Const.PersonQualityMenuId, PersonQualityModel.PersonQualityId);
+ }
+
+ var SafePersonQualityModel = Funs.DB.QualityAudit_SafePersonQuality.FirstOrDefault(x => x.PersonId == personId);
+ if (SafePersonQualityModel != null)
+ {
+ UploadFileService.SaveAttachUrl(source.ToString(), attachUrl,
+ BLL.Const.SafePersonQualityMenuId, SafePersonQualityModel.SafePersonQualityId);
+ }
+ }
+
+ if (MenuId== BLL.Const.PersonQualityMenuId)
+ {
+ var PersonQualityModel = Funs.DB.QualityAudit_PersonQuality.FirstOrDefault(x => x.PersonQualityId == ToKeyId);
+ if (PersonQualityModel!=null)
+ {
+ var personId = PersonQualityModel.PersonId;
+
+ var SafePersonQualityModel = Funs.DB.QualityAudit_SafePersonQuality.FirstOrDefault(x => x.PersonId == personId);
+ if (SafePersonQualityModel != null)
+ {
+ UploadFileService.SaveAttachUrl(source.ToString(), attachUrl,
+ BLL.Const.SafePersonQualityMenuId, SafePersonQualityModel.SafePersonQualityId);
+ }
+
+ var SitepersonModel = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == personId);
+ if (SitepersonModel!=null)
+ {
+ UploadFileService.SaveAttachUrl(source.ToString(), attachUrl,
+ BLL.Const.PersonListMenuId, SitepersonModel.PersonId+"#4");
+ }
+ }
+ }
+
+ if (MenuId== BLL.Const.SafePersonQualityMenuId)
+ {
+ var SafePersonQualityModel = Funs.DB.QualityAudit_SafePersonQuality.FirstOrDefault(x => x.SafePersonQualityId == ToKeyId);
+ if (SafePersonQualityModel!=null)
+ {
+ var personId = SafePersonQualityModel.PersonId;
+ var PersonQualityModel = Funs.DB.QualityAudit_PersonQuality.FirstOrDefault(x => x.PersonId == personId);
+ if (PersonQualityModel != null)
+ {
+ UploadFileService.SaveAttachUrl(source.ToString(), attachUrl,
+ BLL.Const.PersonQualityMenuId, PersonQualityModel.PersonQualityId);
+ }
+
+ var SitepersonModel = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == personId);
+ if (SitepersonModel != null)
+ {
+ UploadFileService.SaveAttachUrl(source.ToString(), attachUrl,
+ BLL.Const.PersonListMenuId, SitepersonModel.PersonId + "#4");
+ }
+
+ }
+ }
+ #endregion
+
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 73113711..c7ce3afc 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -47,3 +47,258 @@ IP地址:::1
出错时间:06/26/2024 15:25:22
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\PersonList.aspx(185): error CS1061: “ASP.hsse_siteperson_personlist_aspx”不包含“btnMenuBlack_Click”的定义,并且找不到可接受类型为“ASP.hsse_siteperson_personlist_aspx”的第一个参数的扩展方法“btnMenuBlack_Click”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+ 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+ 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+ 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+ 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+ 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+ 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+ 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:07/01/2024 17:11:58
+出错文件:http://localhost:8579/HSSE/SitePerson/PersonList.aspx
+IP地址:::1
+
+出错时间:07/01/2024 17:11:58
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\PersonList.aspx(185): error CS1061: “ASP.hsse_siteperson_personlist_aspx”不包含“btnMenuBlack_Click”的定义,并且找不到可接受类型为“ASP.hsse_siteperson_personlist_aspx”的第一个参数的扩展方法“btnMenuBlack_Click”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+ 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+ 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+ 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+ 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+ 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+ 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+ 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:07/01/2024 17:14:10
+出错文件:http://localhost:8579/HSSE/SitePerson/PersonList.aspx
+IP地址:::1
+
+出错时间:07/01/2024 17:14:10
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\PersonList.aspx(185): error CS1061: “ASP.hsse_siteperson_personlist_aspx”不包含“btnMenuBlack_Click”的定义,并且找不到可接受类型为“ASP.hsse_siteperson_personlist_aspx”的第一个参数的扩展方法“btnMenuBlack_Click”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+ 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+ 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+ 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+ 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+ 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+ 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+ 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:07/01/2024 17:14:36
+出错文件:http://localhost:8579/HSSE/SitePerson/PersonList.aspx
+IP地址:::1
+
+出错时间:07/01/2024 17:14:36
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\BlackPersonList.aspx(28): error CS1061: “ASP.hsse_siteperson_blackpersonlist_aspx”不包含“drpPost_SelectedIndexChanged”的定义,并且找不到可接受类型为“ASP.hsse_siteperson_blackpersonlist_aspx”的第一个参数的扩展方法“drpPost_SelectedIndexChanged”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+ 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+ 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+ 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+ 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+ 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+ 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+ 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:07/01/2024 17:35:05
+出错文件:http://localhost:8579/HSSE/SitePerson/BlackPersonList.aspx
+IP地址:::1
+
+出错时间:07/01/2024 17:35:05
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\BlackPersonList.aspx(28): error CS1061: “ASP.hsse_siteperson_blackpersonlist_aspx”不包含“drpPost_SelectedIndexChanged”的定义,并且找不到可接受类型为“ASP.hsse_siteperson_blackpersonlist_aspx”的第一个参数的扩展方法“drpPost_SelectedIndexChanged”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+ 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+ 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+ 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+ 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+ 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+ 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+ 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:07/01/2024 17:37:14
+出错文件:http://localhost:8579/HSSE/SitePerson/BlackPersonList.aspx
+IP地址:::1
+
+出错时间:07/01/2024 17:37:14
+
+
+错误信息开始=====>
+错误类型:FormatException
+错误信息:输入字符串的格式不正确。
+错误堆栈:
+ 在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
+ 在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
+ 在 System.Int32.Parse(String s)
+ 在 FineUIPro.Web.BaseInfo.RiskLevelEdit.btnSave_Click(Object sender, EventArgs e) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BaseInfo\RiskLevelEdit.aspx.cs:行号 91
+ 在 FineUIPro.Button.OnClick(EventArgs e)
+ 在 (Button , EventArgs )
+ 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+ 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+ 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/02/2024 14:59:40
+出错文件:http://localhost:8579/BaseInfo/RiskLevelEdit.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/02/2024 14:59:40
+
+
+错误信息开始=====>
+错误类型:MissingMethodException
+错误信息:找不到方法:“Model.Base_RiskLevel BLL.RiskLevelService.GetRiskLevelBy(System.String)”。
+错误堆栈:
+ 在 FineUIPro.Web.HSSE.Hazard.HazardListEdit.Window2_Close(Object sender, WindowCloseEventArgs e)
+ 在 FineUIPro.Window.OnClose(WindowCloseEventArgs e)
+ 在 (Window , WindowCloseEventArgs )
+ 在 FineUIPro.Window.RaisePostBackEvent(String eventArgument)
+ 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+ 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/02/2024 15:07:45
+出错文件:http://localhost:8579/HSSE/Hazard/HazardListEdit.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/02/2024 15:07:45
+
+
+错误信息开始=====>
+错误类型:MissingMethodException
+错误信息:找不到方法:“Model.Base_RiskLevel BLL.RiskLevelService.GetRiskLevelBy(System.String)”。
+错误堆栈:
+ 在 FineUIPro.Web.HSSE.Hazard.HazardListEdit.Window2_Close(Object sender, WindowCloseEventArgs e)
+ 在 FineUIPro.Window.OnClose(WindowCloseEventArgs e)
+ 在 (Window , WindowCloseEventArgs )
+ 在 FineUIPro.Window.RaisePostBackEvent(String eventArgument)
+ 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+ 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/02/2024 15:07:59
+出错文件:http://localhost:8579/HSSE/Hazard/HazardListEdit.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/02/2024 15:07:59
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'CompileMan' 无效。
+错误堆栈:
+ 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+ 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+ 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+ 在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+ 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+ 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+ 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+ 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+ 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+ 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+ 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+ 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311
+ 在 FineUIPro.Web.HSSE.CostGoods.FeeRegistration.BindGrid() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\CostGoods\FeeRegistration.aspx.cs:行号 99
+ 在 FineUIPro.Web.HSSE.CostGoods.FeeRegistration.Page_Load(Object sender, EventArgs e) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\CostGoods\FeeRegistration.aspx.cs:行号 55
+ 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+ 在 System.EventHandler.Invoke(Object sender, EventArgs e)
+ 在 System.Web.UI.Control.OnLoad(EventArgs e)
+ 在 System.Web.UI.Control.LoadRecursive()
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/02/2024 16:46:52
+出错文件:http://localhost:8579/HSSE/CostGoods/FeeRegistration.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/02/2024 16:46:52
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+ 在 (Object )
+ 在 FineUIPro.GridRow.uwEUVXJIBfEGVvHqMvTlecFpBACr()
+ 在 (GridRow )
+ 在 FineUIPro.GridRow.InitTemplateContainers()
+ 在 (GridRow )
+ 在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
+ 在 (Grid , Int32 , Object )
+ 在 FineUIPro.Grid.BCddVmyfIadUytlhvgnchfKxYmAe(DataTable , Boolean )
+ 在 (Grid , DataTable , Boolean )
+ 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+ 在 (Grid , Boolean )
+ 在 FineUIPro.Grid.DataBind()
+ 在 FineUIPro.Web.HSSE.CostGoods.FeeRegistration.BindGrid()
+ 在 FineUIPro.Web.HSSE.CostGoods.FeeRegistration.Page_Load(Object sender, EventArgs e)
+ 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+ 在 System.EventHandler.Invoke(Object sender, EventArgs e)
+ 在 System.Web.UI.Control.OnLoad(EventArgs e)
+ 在 System.Web.UI.Control.LoadRecursive()
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/02/2024 16:50:32
+出错文件:http://localhost:8579/HSSE/CostGoods/FeeRegistration.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/02/2024 16:50:32
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\CostGoods\PayRegistrationNewEdit.aspx(36): error CS1061: “ASP.hsse_costgoods_payregistrationnewedit_aspx”不包含“SMonthTypeText_TextChanged”的定义,并且找不到可接受类型为“ASP.hsse_costgoods_payregistrationnewedit_aspx”的第一个参数的扩展方法“SMonthTypeText_TextChanged”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+ 在 System.Web.Compilation.BuildManager.PostProcessFoundBuildResult(BuildResult result, Boolean keyFromVPP, VirtualPath virtualPath)
+ 在 System.Web.Compilation.BuildManager.GetBuildResultFromCacheInternal(String cacheKey, Boolean keyFromVPP, VirtualPath virtualPath, Int64 hashCode, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultFromCacheInternal(VirtualPath virtualPath, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+ 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+ 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+ 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+ 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+ 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+ 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:07/04/2024 09:53:49
+出错文件:http://localhost:8579/HSSE/CostGoods/PayRegistrationNewEdit.aspx
+IP地址:::1
+
+出错时间:07/04/2024 09:53:49
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 22248929..599c2cea 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -932,6 +932,7 @@
+
@@ -942,6 +943,8 @@
+
+
@@ -949,6 +952,8 @@
+
+
@@ -1275,6 +1280,7 @@
+
@@ -10956,6 +10962,13 @@
CostLedger.aspx
+
+ CostLedgerNew.aspx
+ ASPXCodeBehind
+
+
+ CostLedgerNew.aspx
+
CostManage.aspx
ASPXCodeBehind
@@ -11026,6 +11039,20 @@
ExpenseView.aspx
+
+ FeeRegistration.aspx
+ ASPXCodeBehind
+
+
+ FeeRegistration.aspx
+
+
+ FeeRegistrationEdit.aspx
+ ASPXCodeBehind
+
+
+ FeeRegistrationEdit.aspx
+
GoodsManage.aspx
ASPXCodeBehind
@@ -11075,6 +11102,20 @@
PayRegistrationEdit.aspx
+
+ PayRegistrationNew.aspx
+ ASPXCodeBehind
+
+
+ PayRegistrationNew.aspx
+
+
+ PayRegistrationNewEdit.aspx
+ ASPXCodeBehind
+
+
+ PayRegistrationNewEdit.aspx
+
SubPayRegistration.aspx
ASPXCodeBehind
@@ -13357,6 +13398,13 @@
SafetyOrganizationEdit.aspx
+
+ BlackPersonList.aspx
+ ASPXCodeBehind
+
+
+ BlackPersonList.aspx
+
DayReport.aspx
ASPXCodeBehind
@@ -18974,7 +19022,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx
new file mode 100644
index 00000000..7f113533
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx
@@ -0,0 +1,47 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CostLedgerNew.aspx.cs" Inherits="FineUIPro.Web.HSSE.CostGoods.CostLedgerNew" %>
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx.cs
new file mode 100644
index 00000000..2e96a30f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx.cs
@@ -0,0 +1,272 @@
+using BLL;
+using System;
+using System.Data;
+using System.Linq;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+ public partial class CostLedgerNew : PageBase
+ {
+ private static string headerStr;
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ txtDate.Text = DateTime.Now.ToString("yyyy-MM");
+ loadAll();
+ }
+ }
+
+ ///
+ /// 根据日期加载所有
+ ///
+ protected void loadAll() {
+ var pid = CurrUser.LoginProjectId;
+ var result = Funs.DB.CostGoods_HseExpense.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.PayMonth == txtDate.Text);
+ if (result!=null)
+ {
+ DateTime startTime = Convert.ToDateTime(result.PayDate.Value.Year + "-" + result.PayDate.Value.Month + "-1");
+ DateTime endTime = startTime.AddMonths(1);
+
+ headerStr = string.Empty;
+ headerStr += "编号#类别";
+ DataTable dt = new DataTable();
+ dt.Columns.Add("R0"); //编号
+ dt.Columns.Add("R1"); //类别
+ var units = BLL.UnitService.GetMainAndSubUnitByProjectIdList(result.ProjectId);
+ int a = 0;
+
+ for (int i = 0; i < units.Count; i++)
+ {
+ headerStr += "#" + units[i].UnitName + " 当月累计,当年累计";
+ dt.Columns.Add("M" + a); //当月累计
+ a++;
+ dt.Columns.Add("M" + a); //当年累计
+ a++;
+ }
+
+ DataRow row1 = dt.NewRow();
+ row1[0] = "1";
+ row1[1] = "完善、改造和维护安全防护设备、设施";
+ int b = 2;
+
+ var yearHseExpense = Funs.DB.CostGoods_HseExpense.Where(x => x.ProjectId == pid && x.PayDate.Value.Year == endTime.Year);
+ var monthHseExpense = Funs.DB.CostGoods_HseExpense.Where(x => x.ProjectId == pid && x.PayDate >= startTime && x.PayDate <= endTime);
+
+ for (int i = 0; i < units.Count; i++) {
+ row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId ).Sum(x => x.SMonthType1);
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType1) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ }
+ dt.Rows.Add(row1);
+
+ b = 2;
+ row1=dt.NewRow();
+ row1[0] = "2";
+ row1[1] = "应急救援和演练";
+ for (int i = 0; i < units.Count; i++)
+ {
+ row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType2 ) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType2 ) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ }
+ dt.Rows.Add(row1);
+
+ b = 2;
+ row1 = dt.NewRow();
+ row1[0] = "3";
+ row1[1] = "重大危险源管理;隐患整改;安全生产信息化";
+ for (int i = 0; i < units.Count; i++)
+ {
+ row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType3) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType3) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ }
+ dt.Rows.Add(row1);
+
+ b = 2;
+ row1 = dt.NewRow();
+ row1[0] = "4";
+ row1[1] = "安全检查、评估评价、咨询与标准化建设";
+ for (int i = 0; i < units.Count; i++)
+ {
+ row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType4) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType4) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ }
+ dt.Rows.Add(row1);
+
+ b = 2;
+ row1 = dt.NewRow();
+ row1[0] = "5";
+ row1[1] = "作业人员防护用品";
+ for (int i = 0; i < units.Count; i++)
+ {
+ row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType5) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType5) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ }
+ dt.Rows.Add(row1);
+
+ b = 2;
+ row1 = dt.NewRow();
+ row1[0] = "6";
+ row1[1] = "安全生产宣传、教育、培训及奖励";
+ for (int i = 0; i < units.Count; i++)
+ {
+ row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType6) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType6) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ }
+ dt.Rows.Add(row1);
+
+ b = 2;
+ row1 = dt.NewRow();
+ row1[0] = "7";
+ row1[1] = "“四新”推广应用支出";
+ for (int i = 0; i < units.Count; i++)
+ {
+ row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType7 ) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType7) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ }
+ dt.Rows.Add(row1);
+
+ b = 2;
+ row1 = dt.NewRow();
+ row1[0] = "8";
+ row1[1] = "安全设施及特种设备检测检验、检定校准";
+ for (int i = 0; i < units.Count; i++)
+ {
+ row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType8) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType8) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ }
+ dt.Rows.Add(row1);
+
+ b = 2;
+ row1 = dt.NewRow();
+ row1[0] = "9";
+ row1[1] = "安全生产责任保险";
+ for (int i = 0; i < units.Count; i++)
+ {
+ row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType9) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType9) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ }
+ dt.Rows.Add(row1);
+
+ b = 2;
+ row1 = dt.NewRow();
+ row1[0] = "10";
+ row1[1] = "其他与安全生产直接相关的支出";
+ for (int i = 0; i < units.Count; i++)
+ {
+ row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType10) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType10) ?? 0;
+ row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+ b++;
+ }
+ dt.Rows.Add(row1);
+
+ this.gvTotalPayRegistration.DataSource = dt;
+ this.gvTotalPayRegistration.DataBind();
+ }
+ }
+
+ #region 在控件被绑定后激发
+ ///
+ /// 在控件被绑定后激发
+ ///
+ ///
+ ///
+ protected void gvTotalPayRegistration_DataBound(object sender, EventArgs e)
+ { }
+
+ #endregion
+ #region Grid创建行
+ ///
+ /// Grid创建行
+ ///
+ ///
+ ///
+ protected void gvTotalPayRegistration_RowCreated(object sender, GridViewRowEventArgs e)
+ {
+ if (e.Row.RowType == DataControlRowType.Header)
+ {
+ DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
+ dHelper.SplitTableHeader(e.Row, headerStr);
+ }
+ }
+ #endregion
+
+ #region 导出
+ ///
+ /// 导出
+ ///
+ ///
+ ///
+ protected void btnOut_Click(object sender, EventArgs e)
+ {
+ DateTime dt = DateTime.Now;
+ string filename = dt.Year.ToString() + dt.Month.ToString() + dt.Day.ToString() + dt.Hour.ToString() + dt.Minute.ToString() + dt.Second.ToString();
+
+ Response.Clear();
+ Response.Buffer = true;
+ Response.Charset = "GB2312";
+ Response.ContentEncoding = System.Text.Encoding.UTF8;
+ Response.Write("");
+
+ Response.AppendHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("项目HSE费用投入登记表" + filename, System.Text.Encoding.UTF8) + ".xls");
+ Response.ContentType = "application/ms-excel";
+ this.EnableViewState = false;
+ System.IO.StringWriter oStringWriter = new System.IO.StringWriter();
+ System.Web.UI.HtmlTextWriter oHtmlTextWriter = new System.Web.UI.HtmlTextWriter(oStringWriter);
+ this.gvTotalPayRegistration.RenderControl(oHtmlTextWriter);
+ Response.Write(oStringWriter.ToString());
+ Response.Flush();
+ Response.End();
+ }
+
+ ///
+ /// 重载VerifyRenderingInServerForm方法,否则运行的时候会出现如下错误提示:“类型“GridView”的控件“GridView1”必须放在具有 runat=server 的窗体标记内”
+ ///
+ ///
+ public override void VerifyRenderingInServerForm(Control control)
+ {
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx.designer.cs
new file mode 100644
index 00000000..db0a8b60
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx.designer.cs
@@ -0,0 +1,98 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+
+
+ public partial class CostLedgerNew
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// txtDate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtDate;
+
+ ///
+ /// btnOut 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnOut;
+
+ ///
+ /// ContentPanel2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ContentPanel ContentPanel2;
+
+ ///
+ /// Table5 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlTable Table5;
+
+ ///
+ /// gvTotalPayRegistration 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.GridView gvTotalPayRegistration;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistration.aspx b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistration.aspx
new file mode 100644
index 00000000..ca0c9557
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistration.aspx
@@ -0,0 +1,117 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FeeRegistration.aspx.cs" Inherits="FineUIPro.Web.HSSE.CostGoods.FeeRegistration" %>
+
+
+
+
+
+
+ 合同HSE费用额登记
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistration.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistration.aspx.cs
new file mode 100644
index 00000000..83ee2078
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistration.aspx.cs
@@ -0,0 +1,316 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+ public partial class FeeRegistration : PageBase
+ {
+ #region 项目主键
+ ///
+ /// 项目主键
+ ///
+ public string ProjectId
+ {
+ get
+ {
+ return (string)ViewState["ProjectId"];
+ }
+ set
+ {
+ ViewState["ProjectId"] = value;
+ }
+ }
+ #endregion
+
+ #region 加载页面
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ ////权限按钮方法
+ this.GetButtonPower();
+ this.ProjectId = this.CurrUser.LoginProjectId;
+ if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+ {
+ this.ProjectId = Request.Params["projectId"];
+ }
+ this.btnNew.OnClientClick = Window1.GetShowReference("FeeRegistrationEdit.aspx") + "return false;";
+ if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
+ {
+ Grid1.PageSize = this.CurrUser.PageSize.Value;
+ }
+ this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+ // 绑定表格
+ this.BindGrid();
+ }
+ }
+
+ ///
+ /// 绑定数据
+ ///
+ private void BindGrid()
+ {
+ string strSql = @" select f.*,Unit.UnitName,Users.UserName From CostGoods_FeeRegistration f
+ LEFT JOIN Sys_User AS Users ON Users.UserId = f.CompileMan
+ LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = f.UnitId WHERE 1=1 ";
+
+ List listStr = new List();
+ strSql += " AND f.ProjectId = @ProjectId";
+ if (!string.IsNullOrEmpty(Request.Params["projectId"])) ///是否文件柜查看页面传项目值
+ {
+ listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+ }
+ else
+ {
+ listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+ }
+ if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+ {
+ strSql += " AND f.UnitId = @UnitId"; ///状态为已完成
+ listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
+ }
+ if (!string.IsNullOrEmpty(this.txtUnitName.Text.Trim()))
+ {
+ strSql += " AND Unit.UnitName LIKE @UnitName ";
+ listStr.Add(new SqlParameter("@UnitName", "%" + this.txtUnitName.Text.Trim() + "%"));
+ }
+ if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
+ {
+ strSql += " AND f.CompileDate >= @StartDate ";
+ listStr.Add(new SqlParameter("@StartDate", Funs.GetNewDateTime(this.txtStartDate.Text.Trim())));
+ }
+ if (!string.IsNullOrEmpty(this.txtEndDate.Text.Trim()))
+ {
+ strSql += " AND f.CompileDate <= @EndDate ";
+ listStr.Add(new SqlParameter("@EndDate", Funs.GetNewDateTime(this.txtEndDate.Text.Trim())));
+ }
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+ Grid1.RecordCount = tb.Rows.Count;
+ //tb = GetFilteredTable(Grid1.FilteredData, tb);
+ var table = this.GetPagedDataTable(Grid1, tb);
+ Grid1.DataSource = table;
+ Grid1.DataBind();
+ }
+ #endregion
+
+ #region 获取按钮权限
+ ///
+ /// 获取按钮权限
+ ///
+ ///
+ ///
+ private void GetButtonPower()
+ {
+ if (Request.Params["value"] == "0")
+ {
+ return;
+ }
+ var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.FeeRegistrationMenuId);
+ if (buttonList.Count() > 0)
+ {
+ if (buttonList.Contains(BLL.Const.BtnAdd))
+ {
+ this.btnNew.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnModify))
+ {
+ this.btnMenuEdit.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnDelete))
+ {
+ this.btnMenuDelete.Hidden = false;
+ }
+ }
+ }
+ #endregion
+
+ #region 分页 排序
+ ///
+ /// 改变索引事件
+ ///
+ ///
+ ///
+ protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+ {
+ BindGrid();
+ }
+
+ ///
+ /// 分页下拉选择事件
+ ///
+ ///
+ ///
+ protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+ BindGrid();
+ }
+
+ ///
+ /// 排序
+ ///
+ ///
+ ///
+ protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+ {
+ this.BindGrid();
+ }
+ #endregion
+
+ #region 编辑
+ ///
+ /// 双击事件
+ ///
+ ///
+ ///
+ protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+ {
+ this.EditData();
+ }
+
+ ///
+ /// 右键编辑事件
+ ///
+ ///
+ ///
+ protected void btnMenuEdit_Click(object sender, EventArgs e)
+ {
+ this.EditData();
+ }
+
+ ///
+ /// 编辑数据方法
+ ///
+ private void EditData()
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请至少选择一条记录!", MessageBoxIcon.Warning);
+ return;
+ }
+ string id = Grid1.SelectedRowID;
+ var measuresPlan = BLL.FeeRegistration.Detail(id);
+ if (measuresPlan != null)
+ {
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("FeeRegistrationEdit.aspx?Id={0}", id, "编辑 - ")));
+ }
+ }
+ #endregion
+
+ #region 删除
+ ///
+ /// 右键删除事件
+ ///
+ ///
+ ///
+ protected void btnMenuDelete_Click(object sender, EventArgs e)
+ {
+ if (Grid1.SelectedRowIndexArray.Length > 0)
+ {
+ foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+ {
+ string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+ var getD = BLL.FeeRegistration.Detail(rowID);
+ if (getD != null)
+ {
+ BLL.LogService.AddSys_Log(this.CurrUser, getD.Id, rowID, BLL.Const.FeeRegistrationMenuId, BLL.Const.BtnDelete);
+ BLL.FeeRegistration.Delete(rowID);
+ }
+ }
+
+ this.BindGrid();
+ ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+ }
+ }
+ #endregion
+
+ #region 查询
+ ///
+ /// 查询
+ ///
+ ///
+ ///
+ protected void TextBox_TextChanged(object sender, EventArgs e)
+ {
+ if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()) && !string.IsNullOrEmpty(this.txtEndDate.Text.Trim()))
+ {
+ if (Funs.GetNewDateTime(this.txtEndDate.Text.Trim()) < Funs.GetNewDateTime(this.txtStartDate.Text.Trim()))
+ {
+ Alert.ShowInTop("开始日期不能大于结束日期!", MessageBoxIcon.Warning);
+ return;
+ }
+ }
+ BindGrid();
+ }
+ #endregion
+
+ #region 导出按钮
+ /// 导出按钮
+ ///
+ ///
+ ///
+ protected void btnOut_Click(object sender, EventArgs e)
+ {
+ Response.ClearContent();
+ string filename = Funs.GetNewFileName();
+ Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同HSE费用额登记" + filename, System.Text.Encoding.UTF8) + ".xls");
+ Response.ContentType = "application/excel";
+ Response.ContentEncoding = System.Text.Encoding.UTF8;
+ this.Grid1.PageSize = 500;
+ this.BindGrid();
+ Response.Write(GetGridTableHtml(Grid1));
+ Response.End();
+ }
+
+ ///
+ /// 导出方法
+ ///
+ ///
+ ///
+ private string GetGridTableHtml(Grid grid)
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.Append("");
+ sb.Append("");
+ sb.Append("");
+ foreach (GridColumn column in grid.Columns)
+ {
+ sb.AppendFormat("{0} | ", column.HeaderText);
+ }
+ sb.Append("
");
+ foreach (GridRow row in grid.Rows)
+ {
+ sb.Append("");
+ foreach (GridColumn column in grid.Columns)
+ {
+ string html = row.Values[column.ColumnIndex].ToString();
+ if (column.ColumnID == "tfNumber")
+ {
+ html = (row.FindControl("lblNumber") as AspNet.Label).Text;
+ }
+ sb.AppendFormat("{0} | ", html);
+ }
+
+ sb.Append("
");
+ }
+
+ sb.Append("
");
+
+ return sb.ToString();
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistration.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistration.aspx.designer.cs
new file mode 100644
index 00000000..28c5e1e4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistration.aspx.designer.cs
@@ -0,0 +1,197 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+
+
+ public partial class FeeRegistration
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// Toolbar2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar2;
+
+ ///
+ /// txtUnitName 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtUnitName;
+
+ ///
+ /// txtStartDate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtStartDate;
+
+ ///
+ /// lblTO 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label lblTO;
+
+ ///
+ /// txtEndDate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtEndDate;
+
+ ///
+ /// ToolbarFill1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+ ///
+ /// btnNew 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnNew;
+
+ ///
+ /// btnOut 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnOut;
+
+ ///
+ /// lblNumber 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lblNumber;
+
+ ///
+ /// ToolbarSeparator1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+ ///
+ /// ToolbarText1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarText ToolbarText1;
+
+ ///
+ /// ddlPageSize 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList ddlPageSize;
+
+ ///
+ /// Window1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window1;
+
+ ///
+ /// Menu1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Menu Menu1;
+
+ ///
+ /// btnMenuEdit 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuEdit;
+
+ ///
+ /// btnMenuDelete 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuDelete;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx
new file mode 100644
index 00000000..8e3f0f32
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx
@@ -0,0 +1,50 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FeeRegistrationEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.CostGoods.FeeRegistrationEdit" %>
+
+
+
+
+
+
+ 编辑合同HSE费用额登记
+
+
+
+
+
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx.cs
new file mode 100644
index 00000000..acfaf15d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx.cs
@@ -0,0 +1,134 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+ public partial class FeeRegistrationEdit : PageBase
+ {
+ #region 定义项
+ ///
+ /// 主键
+ ///
+ public string Id
+ {
+ get
+ {
+ return (string)ViewState["Id"];
+ }
+ set
+ {
+ ViewState["Id"] = value;
+ }
+ }
+ #endregion
+
+ ///
+ /// 页面加载
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+
+ BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
+ //如果不是中国五环工程有限公司,只加载自己的
+ if (CurrUser.UnitId == CommonService.GetThisUnitId() || CurrUser.UserId == Const.hfnbdId)
+ {
+ drpUnitId.Readonly = false;
+ }
+ else {
+ drpUnitId.Readonly = true;
+ drpUnitId.SelectedValue = CurrUser.UnitId;
+ }
+
+
+ this.Id = Request.Params["Id"];
+ if (!string.IsNullOrEmpty(this.Id))
+ {
+ var result = BLL.FeeRegistration.Detail(this.Id);
+ if (result != null)
+ {
+
+ if (!string.IsNullOrEmpty(result.UnitId))
+ {
+ this.drpUnitId.SelectedValue = result.UnitId;
+ }
+ if (result.CompileDate != null)
+ {
+ this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", result.CompileDate);
+ }
+ this.txtCost.Text = result.Cost.ToString();
+ }
+ }
+ else
+ {
+ this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+
+ }
+
+ if (Request.Params["value"] == "0")
+ {
+ this.btnSave.Hidden = true;
+ }
+ }
+ }
+
+ #region 保存
+ ///
+ /// 保存按钮
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ if (this.drpUnitId.SelectedValue == BLL.Const._Null)
+ {
+ Alert.ShowInTop("请选择单位名称!", MessageBoxIcon.Warning);
+ return;
+ }
+ SaveData();
+ PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+ }
+
+ ///
+ /// 保存数据
+ ///
+ ///
+ private void SaveData()
+ {
+ var model = new Model.CostGoods_FeeRegistration
+ {
+ ProjectId = this.CurrUser.LoginProjectId,
+
+ };
+ if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+ {
+ model.UnitId = this.drpUnitId.SelectedValue;
+ }
+ model.Cost =Convert.ToDecimal(this.txtCost.Text.Trim());
+ model.CompileMan = this.CurrUser.UserId;
+ model.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
+ if (!string.IsNullOrEmpty(this.Id))
+ {
+ model.Id = this.Id;
+ BLL.FeeRegistration.Update(model);
+ }
+ else
+ {
+ this.Id = SQLHelper.GetNewID(typeof(Model.CostGoods_MeasuresPlan));
+ model.Id = this.Id;
+ BLL.FeeRegistration.Insert(model);
+
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx.designer.cs
new file mode 100644
index 00000000..8fd01bd1
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx.designer.cs
@@ -0,0 +1,107 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+
+
+ public partial class FeeRegistrationEdit
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// SimpleForm1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Form SimpleForm1;
+
+ ///
+ /// drpUnitId 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpUnitId;
+
+ ///
+ /// txtCompileDate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtCompileDate;
+
+ ///
+ /// txtCost 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtCost;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// ToolbarFill1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+ ///
+ /// btnSave 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnSave;
+
+ ///
+ /// btnClose 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnClose;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNew.aspx b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNew.aspx
new file mode 100644
index 00000000..e1891455
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNew.aspx
@@ -0,0 +1,106 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PayRegistrationNew.aspx.cs" Inherits="FineUIPro.Web.HSSE.CostGoods.PayRegistrationNew" %>
+
+
+
+
+
+
+ HSE费用投入登记
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNew.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNew.aspx.cs
new file mode 100644
index 00000000..bc2f08c7
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNew.aspx.cs
@@ -0,0 +1,279 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+ public partial class PayRegistrationNew : PageBase
+ {
+ #region 项目主键
+ ///
+ /// 项目主键
+ ///
+ public string ProjectId
+ {
+ get
+ {
+ return (string)ViewState["ProjectId"];
+ }
+ set
+ {
+ ViewState["ProjectId"] = value;
+ }
+ }
+ #endregion
+
+ #region 加载
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ ////权限按钮方法
+ this.GetButtonPower();
+ this.ProjectId = this.CurrUser.LoginProjectId;
+ if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+ {
+ this.ProjectId = Request.Params["projectId"];
+ }
+ this.btnNew.OnClientClick = Window1.GetShowReference("PayRegistrationNewEdit.aspx") + "return false;";
+ if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
+ {
+ Grid1.PageSize = this.CurrUser.PageSize.Value;
+ }
+ this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+ // 绑定表格
+ this.BindGrid();
+ }
+ }
+
+ ///
+ /// 绑定数据
+ ///
+ private void BindGrid()
+ {
+ string strSql = @"select f.*,Users.UserName ,Unit.UnitName from CostGoods_HseExpense f
+ LEFT JOIN Sys_User AS Users ON Users.UserId = f.CompileMan
+ LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = f.UnitId WHERE 1=1 ";
+ List listStr = new List();
+ strSql += " AND f.ProjectId = @ProjectId";
+ if (!string.IsNullOrEmpty(Request.Params["projectId"])) ///是否文件柜查看页面传项目值
+ {
+ listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+ }
+ else
+ {
+ listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+ }
+ if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+ {
+ strSql += " AND f.UnitId = @UnitId"; ///状态为已完成
+ listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
+ }
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+ Grid1.RecordCount = tb.Rows.Count;
+ tb = GetFilteredTable(Grid1.FilteredData, tb);
+ var table = this.GetPagedDataTable(Grid1, tb);
+ Grid1.DataSource = table;
+ Grid1.DataBind();
+ }
+ #endregion
+
+ #region 获取按钮权限
+ ///
+ /// 获取按钮权限
+ ///
+ ///
+ ///
+ private void GetButtonPower()
+ {
+ if (Request.Params["value"] == "0")
+ {
+ return;
+ }
+ var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectPayRegistrationMenuId);
+ if (buttonList.Count() > 0)
+ {
+ if (buttonList.Contains(BLL.Const.BtnAdd))
+ {
+ this.btnNew.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnModify))
+ {
+ this.btnMenuEdit.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnDelete))
+ {
+ this.btnMenuDelete.Hidden = false;
+ }
+ }
+ }
+ #endregion
+
+ #region 分页 排序
+ ///
+ /// 改变索引事件
+ ///
+ ///
+ ///
+ protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+ {
+ BindGrid();
+ }
+
+ ///
+ /// 分页下拉选择事件
+ ///
+ ///
+ ///
+ protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+ BindGrid();
+ }
+
+ ///
+ /// 排序
+ ///
+ ///
+ ///
+ protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+ {
+ this.BindGrid();
+ }
+ #endregion
+
+ #region 编辑
+ ///
+ /// 双击事件
+ ///
+ ///
+ ///
+ protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+ {
+ this.EditData();
+ }
+
+ ///
+ /// 右键编辑事件
+ ///
+ ///
+ ///
+ protected void btnMenuEdit_Click(object sender, EventArgs e)
+ {
+ this.EditData();
+ }
+
+ ///
+ /// 编辑数据方法
+ ///
+ private void EditData()
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请至少选择一条记录!", MessageBoxIcon.Warning);
+ return;
+ }
+ string id = Grid1.SelectedRowID;
+ var payRegistration = HseExpenseService.Detail(id);
+ if (payRegistration != null)
+ {
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PayRegistrationNewEdit.aspx?Id={0}", id, "编辑 - ")));
+ }
+ }
+ #endregion
+
+ #region 删除
+ ///
+ /// 右键删除事件
+ ///
+ ///
+ ///
+ protected void btnMenuDelete_Click(object sender, EventArgs e)
+ {
+ if (Grid1.SelectedRowIndexArray.Length > 0)
+ {
+ foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+ {
+ string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+ var getD = HseExpenseService.Detail(rowID);
+ if (getD != null)
+ {
+ BLL.HseExpenseService.Delete(rowID);
+ }
+ }
+
+ this.BindGrid();
+ ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+ }
+ }
+ #endregion
+
+ #region 导出按钮
+ /// 导出按钮
+ ///
+ ///
+ ///
+ protected void btnOut_Click(object sender, EventArgs e)
+ {
+ Response.ClearContent();
+ string filename = Funs.GetNewFileName();
+ Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("安全费用投入登记" + filename, System.Text.Encoding.UTF8) + ".xls");
+ Response.ContentType = "application/excel";
+ Response.ContentEncoding = System.Text.Encoding.UTF8;
+ this.Grid1.PageSize = 500;
+ this.BindGrid();
+ Response.Write(GetGridTableHtml(Grid1));
+ Response.End();
+ }
+
+ ///
+ /// 导出方法
+ ///
+ ///
+ ///
+ private string GetGridTableHtml(Grid grid)
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.Append("");
+ sb.Append("");
+ sb.Append("");
+ foreach (GridColumn column in grid.Columns)
+ {
+ sb.AppendFormat("{0} | ", column.HeaderText);
+ }
+ sb.Append("
");
+ foreach (GridRow row in grid.Rows)
+ {
+ sb.Append("");
+ foreach (GridColumn column in grid.Columns)
+ {
+ string html = row.Values[column.ColumnIndex].ToString();
+ if (column.ColumnID == "tfNumber")
+ {
+ html = (row.FindControl("lblNumber") as AspNet.Label).Text;
+ }
+ sb.AppendFormat("{0} | ", html);
+ }
+
+ sb.Append("
");
+ }
+
+ sb.Append("
");
+
+ return sb.ToString();
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNew.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNew.aspx.designer.cs
new file mode 100644
index 00000000..1063e682
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNew.aspx.designer.cs
@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+
+
+ public partial class PayRegistrationNew
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// Toolbar2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar2;
+
+ ///
+ /// ToolbarFill1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+ ///
+ /// btnNew 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnNew;
+
+ ///
+ /// btnOut 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnOut;
+
+ ///
+ /// lblNumber 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lblNumber;
+
+ ///
+ /// ToolbarSeparator1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+ ///
+ /// ToolbarText1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarText ToolbarText1;
+
+ ///
+ /// ddlPageSize 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList ddlPageSize;
+
+ ///
+ /// Window1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window1;
+
+ ///
+ /// WindowAtt 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window WindowAtt;
+
+ ///
+ /// Menu1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Menu Menu1;
+
+ ///
+ /// btnMenuEdit 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuEdit;
+
+ ///
+ /// btnMenuDelete 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuDelete;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx
new file mode 100644
index 00000000..fe6dd17a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx
@@ -0,0 +1,235 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PayRegistrationNewEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.CostGoods.PayRegistrationNewEdit" %>
+
+
+
+
+
+
+ 编辑安全费用投入登记
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx.cs
new file mode 100644
index 00000000..397ee519
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx.cs
@@ -0,0 +1,178 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+ public partial class PayRegistrationNewEdit : PageBase
+ {
+ #region 定义项
+ ///
+ /// 主键
+ ///
+ public string Id
+ {
+ get
+ {
+ return (string)ViewState["Id"];
+ }
+ set
+ {
+ ViewState["Id"] = value;
+ }
+ }
+ #endregion
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+ this.Id = Request.Params["Id"];
+ ///单位下拉框
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, false);
+ if (!string.IsNullOrEmpty(this.Id)) {
+ var result = HseExpenseService.Detail(Id);
+ if (result!=null)
+ {
+ this.txtDate.Text = string.Format("{0:yyyy-MM-dd}", result.PayDate);
+ if (!string.IsNullOrEmpty(result.UnitId))
+ {
+ this.drpUnit.SelectedValue = result.UnitId;
+ }
+ this.txtSMonthType1.Text= Convert.ToString(result.SMonthType1);
+ this.txtSMonthType2.Text = Convert.ToString(result.SMonthType2);
+ this.txtSMonthType3.Text = Convert.ToString(result.SMonthType3);
+ this.txtSMonthType4.Text = Convert.ToString(result.SMonthType4);
+ this.txtSMonthType5.Text = Convert.ToString(result.SMonthType5);
+ this.txtSMonthType6.Text = Convert.ToString(result.SMonthType6);
+ this.txtSMonthType7.Text = Convert.ToString(result.SMonthType7);
+ this.txtSMonthType8.Text = Convert.ToString(result.SMonthType8);
+ this.txtSMonthType9.Text = Convert.ToString(result.SMonthType9);
+ this.txtSMonthType10.Text = Convert.ToString(result.SMonthType10);
+ txtSMonthTypeAll.Text = Convert.ToString(result.SMonthType1 + result.SMonthType2 + result.SMonthType3 + result.SMonthType4 +
+ result.SMonthType5 + result.SMonthType6 + result.SMonthType7 + result.SMonthType8
+ + result.SMonthType9 + result.SMonthType10);
+ }
+ }
+ else
+ {
+ this.txtDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+ }
+ getXmlj();
+ }
+
+ }
+
+ private void getXmlj() {
+ #region 项目累计
+ var list = (from x in Funs.DB.CostGoods_HseExpense
+ where x.ProjectId == CurrUser.LoginProjectId
+ && x.PayDate <= BLL.Funs.GetNewDateTime(this.txtDate.Text.Trim())
+ select x).ToList();
+ decimal? sMonthType1_1 = 0, sMonthType1_2 = 0, sMonthType1_3 = 0, sMonthType1_4 = 0, sMonthType1_5 = 0, sMonthType1_6 = 0, sMonthType1_7 = 0, sMonthType1_8 = 0, sMonthType1_9 = 0, sMonthType1_10 = 0;
+ foreach (var item in list) {
+ sMonthType1_1 += item.SMonthType1;
+ sMonthType1_2 += item.SMonthType2;
+ sMonthType1_3 += item.SMonthType3;
+ sMonthType1_4 += item.SMonthType4;
+ sMonthType1_5 += item.SMonthType5;
+ sMonthType1_6 += item.SMonthType6;
+ sMonthType1_7 += item.SMonthType7;
+ sMonthType1_8 += item.SMonthType8;
+ sMonthType1_9 += item.SMonthType9;
+ sMonthType1_10 += item.SMonthType10;
+ }
+ this.txtSTotalType1.Text = Convert.ToString(sMonthType1_1);
+ this.txtSTotalType2.Text = Convert.ToString(sMonthType1_2);
+ this.txtSTotalType3.Text = Convert.ToString(sMonthType1_3);
+ this.txtSTotalType4.Text = Convert.ToString(sMonthType1_4);
+ this.txtSTotalType5.Text = Convert.ToString(sMonthType1_5);
+ this.txtSTotalType6.Text = Convert.ToString(sMonthType1_6);
+ this.txtSTotalType7.Text = Convert.ToString(sMonthType1_7);
+ this.txtSTotalType8.Text = Convert.ToString(sMonthType1_8);
+ this.txtSTotalType9.Text = Convert.ToString(sMonthType1_9);
+ this.txtSTotalType10.Text = Convert.ToString(sMonthType1_10);
+
+ txtSTotalTypeAll.Text = Convert.ToString(sMonthType1_1 + sMonthType1_2 + sMonthType1_3 + sMonthType1_4 + sMonthType1_5 + sMonthType1_6 + sMonthType1_7 + sMonthType1_8 + sMonthType1_9 + sMonthType1_10);
+ #endregion
+ }
+
+ #region 保存
+ ///
+ /// 保存按钮
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ this.SaveData();
+ PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+ }
+ #endregion
+
+ #region 保存方法
+ ///
+ /// 保存方法
+ ///
+ private void SaveData()
+ {
+ var model = new Model.CostGoods_HseExpense();
+ model.UnitId = drpUnit.SelectedValue;
+ model.ProjectId = CurrUser.LoginProjectId;
+ model.PayDate = Funs.GetNewDateTime(this.txtDate.Text.Trim());
+ model.PayMonth = Convert.ToDateTime(this.txtDate.Text.Trim()).ToString("yyyy-MM");
+ model.SMonthType1 = Funs.GetNewDecimalOrZero(this.txtSMonthType1.Text.Trim());
+ model.SMonthType2 = Funs.GetNewDecimalOrZero(this.txtSMonthType2.Text.Trim());
+ model.SMonthType3 = Funs.GetNewDecimalOrZero(this.txtSMonthType3.Text.Trim());
+ model.SMonthType4 = Funs.GetNewDecimalOrZero(this.txtSMonthType4.Text.Trim());
+ model.SMonthType5 = Funs.GetNewDecimalOrZero(this.txtSMonthType5.Text.Trim());
+ model.SMonthType6 = Funs.GetNewDecimalOrZero(this.txtSMonthType6.Text.Trim());
+ model.SMonthType7 = Funs.GetNewDecimalOrZero(this.txtSMonthType7.Text.Trim());
+ model.SMonthType8 = Funs.GetNewDecimalOrZero(this.txtSMonthType8.Text.Trim());
+ model.SMonthType9 = Funs.GetNewDecimalOrZero(this.txtSMonthType9.Text.Trim());
+ model.SMonthType10 = Funs.GetNewDecimalOrZero(this.txtSMonthType10.Text.Trim());
+ model.CompileMan = this.CurrUser.UserId;
+ model.CompileDate = DateTime.Now;
+ if (!string.IsNullOrEmpty(this.Id))
+ {
+ model.Id = this.Id;
+ HseExpenseService.Update(model);
+ }
+ else
+ {
+ this.Id = SQLHelper.GetNewID(typeof(Model.CostGoods_PayRegistration));
+ model.Id = this.Id;
+ HseExpenseService.Insert(model);
+ }
+ }
+ #endregion
+
+ #region 费用统计
+ ///
+ /// 当月费用统计
+ ///
+ ///
+ ///
+ protected void SMonthTypeText_TextChanged(object sender, EventArgs e) {
+ decimal sMonthType1_1 = 0, sMonthType1_2 = 0, sMonthType1_3 = 0, sMonthType1_4 = 0, sMonthType1_5 = 0, sMonthType1_6 = 0, sMonthType1_7 = 0, sMonthType1_8 = 0, sMonthType1_9 = 0, sMonthType1_10 = 0;
+ sMonthType1_1 = Funs.GetNewDecimalOrZero(this.txtSMonthType1.Text.Trim());
+ sMonthType1_2 = Funs.GetNewDecimalOrZero(this.txtSMonthType2 .Text.Trim());
+ sMonthType1_3 = Funs.GetNewDecimalOrZero(this.txtSMonthType3 .Text.Trim());
+ sMonthType1_4 = Funs.GetNewDecimalOrZero(this.txtSMonthType4 .Text.Trim());
+ sMonthType1_5 = Funs.GetNewDecimalOrZero(this.txtSMonthType5 .Text.Trim());
+ sMonthType1_6 = Funs.GetNewDecimalOrZero(this.txtSMonthType6 .Text.Trim());
+ sMonthType1_7 = Funs.GetNewDecimalOrZero(this.txtSMonthType7 .Text.Trim());
+ sMonthType1_8 = Funs.GetNewDecimalOrZero(this.txtSMonthType8 .Text.Trim());
+ sMonthType1_9 = Funs.GetNewDecimalOrZero(this.txtSMonthType9.Text.Trim());
+ sMonthType1_10 = Funs.GetNewDecimalOrZero(this.txtSMonthType10.Text.Trim());
+
+ txtSMonthTypeAll.Text = Convert.ToString(sMonthType1_1 + sMonthType1_2 + sMonthType1_3 + sMonthType1_4 + sMonthType1_5 + sMonthType1_6 + sMonthType1_7 + sMonthType1_8 + sMonthType1_9 + sMonthType1_10);
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx.designer.cs
new file mode 100644
index 00000000..5ad8b9aa
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx.designer.cs
@@ -0,0 +1,431 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.CostGoods
+{
+
+
+ public partial class PayRegistrationNewEdit
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// txtDate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtDate;
+
+ ///
+ /// drpUnit 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpUnit;
+
+ ///
+ /// Panel2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel2;
+
+ ///
+ /// Form2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Form Form2;
+
+ ///
+ /// Label3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label3;
+
+ ///
+ /// txtSMonthType1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSMonthType1;
+
+ ///
+ /// txtSTotalType1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSTotalType1;
+
+ ///
+ /// Label1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label1;
+
+ ///
+ /// txtSMonthType2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSMonthType2;
+
+ ///
+ /// txtSTotalType2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSTotalType2;
+
+ ///
+ /// Label2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label2;
+
+ ///
+ /// txtSMonthType3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSMonthType3;
+
+ ///
+ /// txtSTotalType3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSTotalType3;
+
+ ///
+ /// Label4 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label4;
+
+ ///
+ /// txtSMonthType4 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSMonthType4;
+
+ ///
+ /// txtSTotalType4 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSTotalType4;
+
+ ///
+ /// Label5 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label5;
+
+ ///
+ /// txtSMonthType5 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSMonthType5;
+
+ ///
+ /// txtSTotalType5 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSTotalType5;
+
+ ///
+ /// Label6 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label6;
+
+ ///
+ /// txtSMonthType6 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSMonthType6;
+
+ ///
+ /// txtSTotalType6 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSTotalType6;
+
+ ///
+ /// Label7 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label7;
+
+ ///
+ /// txtSMonthType7 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSMonthType7;
+
+ ///
+ /// txtSTotalType7 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSTotalType7;
+
+ ///
+ /// Label8 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label8;
+
+ ///
+ /// txtSMonthType8 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSMonthType8;
+
+ ///
+ /// txtSTotalType8 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSTotalType8;
+
+ ///
+ /// Label9 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label9;
+
+ ///
+ /// txtSMonthType9 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSMonthType9;
+
+ ///
+ /// txtSTotalType9 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSTotalType9;
+
+ ///
+ /// Label10 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label10;
+
+ ///
+ /// txtSMonthType10 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSMonthType10;
+
+ ///
+ /// txtSTotalType10 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSTotalType10;
+
+ ///
+ /// Label21 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label21;
+
+ ///
+ /// txtSMonthTypeAll 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSMonthTypeAll;
+
+ ///
+ /// Label22 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label22;
+
+ ///
+ /// txtSTotalTypeAll 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtSTotalTypeAll;
+
+ ///
+ /// Toolbar2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar2;
+
+ ///
+ /// ToolbarFill1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+ ///
+ /// btnSave 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnSave;
+
+ ///
+ /// btnClose 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnClose;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/HazardListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/HazardListEdit.aspx.cs
index bbae60b2..b0733023 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/HazardListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/HazardListEdit.aspx.cs
@@ -322,7 +322,7 @@ namespace FineUIPro.Web.HSSE.Hazard
foreach (var item in templates)
{
Model.Technique_HazardList template = BLL.HazardListService.GetHazardListById(item.Split(',').ToList()[0]);
- Model.Base_RiskLevel riskLevel = BLL.RiskLevelService.GetRiskLevel(template.HazardLevel);
+ Model.Base_RiskLevel riskLevel = BLL.RiskLevelService.GetRiskLevelBy(template.HazardLevel);
Model.HSSE_HazardTemplate hazardTemplate = new Model.HSSE_HazardTemplate
{
HazardId = template.HazardId,
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx
index 21b83329..132fbede 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx
@@ -92,7 +92,7 @@
+ OnClick="btnAttachUrl_Click" MarginLeft="5px">
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx
index 338208d3..73c575c7 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx
@@ -92,7 +92,7 @@
+ OnClick="btnAttachUrl_Click" MarginLeft="5px">
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx
new file mode 100644
index 00000000..73db0d36
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx
@@ -0,0 +1,129 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BlackPersonList.aspx.cs" Inherits="FineUIPro.Web.HSSE.SitePerson.BlackPersonList" %>
+
+
+
+
+
+
+ 黑名单列表
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.cs
new file mode 100644
index 00000000..39f272c4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.cs
@@ -0,0 +1,232 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.SitePerson
+{
+ public partial class BlackPersonList : PageBase
+ {
+ #region 定义项
+ ///
+ /// 人员主键
+ ///
+ public string PersonId
+ {
+ get
+ {
+ return (string)ViewState["PersonId"];
+ }
+ set
+ {
+ ViewState["PersonId"] = value;
+ }
+ }
+
+ ///
+ /// 项目id
+ ///
+ public string ProjectId
+ {
+ get
+ {
+ return (string)ViewState["ProjectId"];
+ }
+ set
+ {
+ ViewState["ProjectId"] = value;
+ }
+ }
+ #endregion
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ Funs.DropDownPageSize(this.ddlPageSize);
+ this.ProjectId = this.CurrUser.LoginProjectId;
+ if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
+ {
+ this.ProjectId = Request.Params["projectId"];
+ }
+ ////权限按钮方法
+ this.GetButtonPower();
+
+ this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
+ BLL.WorkPostService.InitWorkPostDropDownList(this.drpPost, true);
+ BindGrid();
+ }
+ }
+
+ ///
+ /// 绑定数据
+ ///
+ private void BindGrid()
+ {
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ string unitId = string.Empty;
+
+ var getData = PersonService.getListData(this.ProjectId, unitId, this.txtPersonName.Text.Trim(), this.txtIdentityCard.Text.Trim(),
+ "", Funs.GetStringByArray(this.drpPost.SelectedValueArray), this.ckTrain.Checked, this.rblPost.SelectedValue, this.ckJT.Checked,
+ false, Grid1,true);
+ Grid1.RecordCount = PersonService.count;
+ Grid1.DataSource = getData;
+ Grid1.DataBind();
+ }
+ }
+
+ #region 页索引改变事件
+ ///
+ /// 页索引改变事件
+ ///
+ ///
+ ///
+ protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+ {
+ Grid1.PageIndex = e.NewPageIndex;
+ BindGrid();
+ }
+ #endregion
+
+ #region 排序
+ ///
+ /// 排序
+ ///
+ ///
+ ///
+ protected void Grid1_Sort(object sender, GridSortEventArgs e)
+ {
+ Grid1.SortDirection = e.SortDirection;
+ Grid1.SortField = e.SortField;
+ BindGrid();
+ }
+ #endregion
+
+ #region 分页选择下拉改变事件
+ ///
+ /// 分页选择下拉改变事件
+ ///
+ ///
+ ///
+ protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+ BindGrid();
+ }
+ #endregion
+
+ ///
+ /// Grid双击事件
+ ///
+ ///
+ ///
+ protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+ {
+ this.EditData();
+ }
+
+ ///
+ /// 编辑
+ ///
+ private void EditData()
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请至少选择一条记录!", MessageBoxIcon.Warning);
+ return;
+ }
+
+ this.PersonId = Grid1.SelectedRowID;
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PersonListEdit.aspx?PersonId={0}", this.PersonId, "编辑 - ")));
+ }
+
+ #region 关闭弹出窗口
+ ///
+ /// 关闭弹出窗口
+ ///
+ ///
+ ///
+ protected void Window1_Close(object sender, WindowCloseEventArgs e)
+ {
+ BindGrid();
+ }
+ #endregion
+
+ #region 解除黑名单
+ protected void btnMenuBlack_Click(object sender, EventArgs e)
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请至少选择一条记录!", MessageBoxIcon.Warning);
+ return;
+ }
+
+ this.PersonId = Grid1.SelectedRowID;
+ var result = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == PersonId);
+ if (result != null)
+ {
+ result.IsBlacklist = false;
+ Funs.DB.SubmitChanges();
+ BindGrid();
+ }
+ }
+ #endregion
+
+ protected void drpPost_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ this.drpPost.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpPost.SelectedValueArray);
+ }
+
+ #region 查询
+ ///
+ /// 查询
+ ///
+ ///
+ ///
+ protected void TextBox_TextChanged(object sender, EventArgs e)
+ {
+ this.BindGrid();
+ }
+ #endregion .
+
+ #region 判断按钮权限
+ ///
+ /// 判断按钮权限
+ ///
+ private void GetButtonPower()
+ {
+ if (Request.Params["value"] == "0")
+ {
+ return;
+ }
+ var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.PersonListMenuId);
+ if (buttonList.Count() > 0)
+ {
+ if (buttonList.Contains(BLL.Const.BtnAdd))
+ {
+
+
+ }
+ if (buttonList.Contains(BLL.Const.BtnModify))
+ {
+
+ btnMenuBlack.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnDelete))
+ {
+
+ }
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.designer.cs
new file mode 100644
index 00000000..d6b2103e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.designer.cs
@@ -0,0 +1,197 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.SitePerson
+{
+
+
+ public partial class BlackPersonList
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// Toolbar3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar3;
+
+ ///
+ /// txtPersonName 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtPersonName;
+
+ ///
+ /// drpPost 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpPost;
+
+ ///
+ /// txtIdentityCard 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtIdentityCard;
+
+ ///
+ /// btSearch 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btSearch;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// rblPost 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.RadioButtonList rblPost;
+
+ ///
+ /// ckJT 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.CheckBox ckJT;
+
+ ///
+ /// ckTrain 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.CheckBox ckTrain;
+
+ ///
+ /// ToolbarFill1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+ ///
+ /// ToolbarSeparator1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+ ///
+ /// ToolbarText1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarText ToolbarText1;
+
+ ///
+ /// ddlPageSize 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList ddlPageSize;
+
+ ///
+ /// Window1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window1;
+
+ ///
+ /// Menu1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Menu Menu1;
+
+ ///
+ /// btnMenuBlack 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuBlack;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
index 4a15f61c..4806e87c 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
@@ -181,6 +181,11 @@
+
+
+
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
index fa5341d9..1c045f2c 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
@@ -332,6 +332,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
#endregion
+
+
#region 删除
///
/// 右键删除事件
@@ -471,6 +473,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
this.btnMenuEdit.Hidden = false;
this.btnPersonUnit.Hidden = false;
+ btnMenuBlack.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnDelete))
{
@@ -702,5 +705,25 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
Alert.ShowInTop("操作完成,重置人员" + pcount.ToString() + "条", MessageBoxIcon.Success);
}
+
+ #region 加入黑名单
+ protected void btnMenuBlack_Click(object sender, EventArgs e)
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请至少选择一条记录!", MessageBoxIcon.Warning);
+ return;
+ }
+
+ this.PersonId = Grid1.SelectedRowID;
+ var result = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == PersonId);
+ if (result != null)
+ {
+ result.IsBlacklist = true;
+ Funs.DB.SubmitChanges();
+ BindGrid();
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs
index 1b726d1d..7ea50779 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs
@@ -347,6 +347,15 @@ namespace FineUIPro.Web.HSSE.SitePerson
///
protected global::FineUIPro.MenuButton btnMenuEdit;
+ ///
+ /// btnMenuBlack 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuBlack;
+
///
/// btnMenuDelete 控件。
///
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 963148f2..f50b26d3 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -77,7 +77,7 @@
-
+
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index b3dc8c83..c445bffe 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -641,9 +641,15 @@ namespace Model
partial void InsertCostGoods_ExpenseDetail(CostGoods_ExpenseDetail instance);
partial void UpdateCostGoods_ExpenseDetail(CostGoods_ExpenseDetail instance);
partial void DeleteCostGoods_ExpenseDetail(CostGoods_ExpenseDetail instance);
+ partial void InsertCostGoods_FeeRegistration(CostGoods_FeeRegistration instance);
+ partial void UpdateCostGoods_FeeRegistration(CostGoods_FeeRegistration instance);
+ partial void DeleteCostGoods_FeeRegistration(CostGoods_FeeRegistration instance);
partial void InsertCostGoods_GoodsManage(CostGoods_GoodsManage instance);
partial void UpdateCostGoods_GoodsManage(CostGoods_GoodsManage instance);
partial void DeleteCostGoods_GoodsManage(CostGoods_GoodsManage instance);
+ partial void InsertCostGoods_HseExpense(CostGoods_HseExpense instance);
+ partial void UpdateCostGoods_HseExpense(CostGoods_HseExpense instance);
+ partial void DeleteCostGoods_HseExpense(CostGoods_HseExpense instance);
partial void InsertCostGoods_MeasuresPlan(CostGoods_MeasuresPlan instance);
partial void UpdateCostGoods_MeasuresPlan(CostGoods_MeasuresPlan instance);
partial void DeleteCostGoods_MeasuresPlan(CostGoods_MeasuresPlan instance);
@@ -4348,6 +4354,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table CostGoods_FeeRegistration
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table CostGoods_GoodsManage
{
get
@@ -4356,6 +4370,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table CostGoods_HseExpense
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table CostGoods_MeasuresPlan
{
get
@@ -106241,6 +106263,188 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CostGoods_FeeRegistration")]
+ public partial class CostGoods_FeeRegistration : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _Id;
+
+ private string _ProjectId;
+
+ private string _UnitId;
+
+ private System.Nullable _Cost;
+
+ private System.Nullable _CompileDate;
+
+ private string _CompileMan;
+
+ #region 可扩展性方法定义
+ partial void OnLoaded();
+ partial void OnValidate(System.Data.Linq.ChangeAction action);
+ partial void OnCreated();
+ partial void OnIdChanging(string value);
+ partial void OnIdChanged();
+ partial void OnProjectIdChanging(string value);
+ partial void OnProjectIdChanged();
+ partial void OnUnitIdChanging(string value);
+ partial void OnUnitIdChanged();
+ partial void OnCostChanging(System.Nullable value);
+ partial void OnCostChanged();
+ partial void OnCompileDateChanging(System.Nullable value);
+ partial void OnCompileDateChanged();
+ partial void OnCompileManChanging(string value);
+ partial void OnCompileManChanged();
+ #endregion
+
+ public CostGoods_FeeRegistration()
+ {
+ OnCreated();
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+ public string Id
+ {
+ get
+ {
+ return this._Id;
+ }
+ set
+ {
+ if ((this._Id != value))
+ {
+ this.OnIdChanging(value);
+ this.SendPropertyChanging();
+ this._Id = value;
+ this.SendPropertyChanged("Id");
+ this.OnIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+ public string ProjectId
+ {
+ get
+ {
+ return this._ProjectId;
+ }
+ set
+ {
+ if ((this._ProjectId != value))
+ {
+ this.OnProjectIdChanging(value);
+ this.SendPropertyChanging();
+ this._ProjectId = value;
+ this.SendPropertyChanged("ProjectId");
+ this.OnProjectIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+ public string UnitId
+ {
+ get
+ {
+ return this._UnitId;
+ }
+ set
+ {
+ if ((this._UnitId != value))
+ {
+ this.OnUnitIdChanging(value);
+ this.SendPropertyChanging();
+ this._UnitId = value;
+ this.SendPropertyChanged("UnitId");
+ this.OnUnitIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cost", DbType="Decimal(18,2)")]
+ public System.Nullable Cost
+ {
+ get
+ {
+ return this._Cost;
+ }
+ set
+ {
+ if ((this._Cost != value))
+ {
+ this.OnCostChanging(value);
+ this.SendPropertyChanging();
+ this._Cost = value;
+ this.SendPropertyChanged("Cost");
+ this.OnCostChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
+ public System.Nullable CompileDate
+ {
+ get
+ {
+ return this._CompileDate;
+ }
+ set
+ {
+ if ((this._CompileDate != value))
+ {
+ this.OnCompileDateChanging(value);
+ this.SendPropertyChanging();
+ this._CompileDate = value;
+ this.SendPropertyChanged("CompileDate");
+ this.OnCompileDateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+ public string CompileMan
+ {
+ get
+ {
+ return this._CompileMan;
+ }
+ set
+ {
+ if ((this._CompileMan != value))
+ {
+ this.OnCompileManChanging(value);
+ this.SendPropertyChanging();
+ this._CompileMan = value;
+ this.SendPropertyChanged("CompileMan");
+ this.OnCompileManChanged();
+ }
+ }
+ }
+
+ public event PropertyChangingEventHandler PropertyChanging;
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected virtual void SendPropertyChanging()
+ {
+ if ((this.PropertyChanging != null))
+ {
+ this.PropertyChanging(this, emptyChangingEventArgs);
+ }
+ }
+
+ protected virtual void SendPropertyChanged(String propertyName)
+ {
+ if ((this.PropertyChanged != null))
+ {
+ this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CostGoods_GoodsManage")]
public partial class CostGoods_GoodsManage : INotifyPropertyChanging, INotifyPropertyChanged
{
@@ -106868,6 +107072,452 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CostGoods_HseExpense")]
+ public partial class CostGoods_HseExpense : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _Id;
+
+ private string _ProjectId;
+
+ private string _UnitId;
+
+ private System.Nullable _PayDate;
+
+ private string _PayMonth;
+
+ private System.Nullable _SMonthType1;
+
+ private System.Nullable _SMonthType2;
+
+ private System.Nullable _SMonthType3;
+
+ private System.Nullable _SMonthType4;
+
+ private System.Nullable _SMonthType5;
+
+ private System.Nullable _SMonthType6;
+
+ private System.Nullable _SMonthType7;
+
+ private System.Nullable _SMonthType8;
+
+ private System.Nullable _SMonthType9;
+
+ private System.Nullable _SMonthType10;
+
+ private string _CompileMan;
+
+ private System.Nullable _CompileDate;
+
+ #region 可扩展性方法定义
+ partial void OnLoaded();
+ partial void OnValidate(System.Data.Linq.ChangeAction action);
+ partial void OnCreated();
+ partial void OnIdChanging(string value);
+ partial void OnIdChanged();
+ partial void OnProjectIdChanging(string value);
+ partial void OnProjectIdChanged();
+ partial void OnUnitIdChanging(string value);
+ partial void OnUnitIdChanged();
+ partial void OnPayDateChanging(System.Nullable value);
+ partial void OnPayDateChanged();
+ partial void OnPayMonthChanging(string value);
+ partial void OnPayMonthChanged();
+ partial void OnSMonthType1Changing(System.Nullable value);
+ partial void OnSMonthType1Changed();
+ partial void OnSMonthType2Changing(System.Nullable value);
+ partial void OnSMonthType2Changed();
+ partial void OnSMonthType3Changing(System.Nullable value);
+ partial void OnSMonthType3Changed();
+ partial void OnSMonthType4Changing(System.Nullable value);
+ partial void OnSMonthType4Changed();
+ partial void OnSMonthType5Changing(System.Nullable value);
+ partial void OnSMonthType5Changed();
+ partial void OnSMonthType6Changing(System.Nullable value);
+ partial void OnSMonthType6Changed();
+ partial void OnSMonthType7Changing(System.Nullable value);
+ partial void OnSMonthType7Changed();
+ partial void OnSMonthType8Changing(System.Nullable value);
+ partial void OnSMonthType8Changed();
+ partial void OnSMonthType9Changing(System.Nullable value);
+ partial void OnSMonthType9Changed();
+ partial void OnSMonthType10Changing(System.Nullable value);
+ partial void OnSMonthType10Changed();
+ partial void OnCompileManChanging(string value);
+ partial void OnCompileManChanged();
+ partial void OnCompileDateChanging(System.Nullable value);
+ partial void OnCompileDateChanged();
+ #endregion
+
+ public CostGoods_HseExpense()
+ {
+ OnCreated();
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+ public string Id
+ {
+ get
+ {
+ return this._Id;
+ }
+ set
+ {
+ if ((this._Id != value))
+ {
+ this.OnIdChanging(value);
+ this.SendPropertyChanging();
+ this._Id = value;
+ this.SendPropertyChanged("Id");
+ this.OnIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+ public string ProjectId
+ {
+ get
+ {
+ return this._ProjectId;
+ }
+ set
+ {
+ if ((this._ProjectId != value))
+ {
+ this.OnProjectIdChanging(value);
+ this.SendPropertyChanging();
+ this._ProjectId = value;
+ this.SendPropertyChanged("ProjectId");
+ this.OnProjectIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+ public string UnitId
+ {
+ get
+ {
+ return this._UnitId;
+ }
+ set
+ {
+ if ((this._UnitId != value))
+ {
+ this.OnUnitIdChanging(value);
+ this.SendPropertyChanging();
+ this._UnitId = value;
+ this.SendPropertyChanged("UnitId");
+ this.OnUnitIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PayDate", DbType="DateTime")]
+ public System.Nullable PayDate
+ {
+ get
+ {
+ return this._PayDate;
+ }
+ set
+ {
+ if ((this._PayDate != value))
+ {
+ this.OnPayDateChanging(value);
+ this.SendPropertyChanging();
+ this._PayDate = value;
+ this.SendPropertyChanged("PayDate");
+ this.OnPayDateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PayMonth", DbType="NVarChar(50)")]
+ public string PayMonth
+ {
+ get
+ {
+ return this._PayMonth;
+ }
+ set
+ {
+ if ((this._PayMonth != value))
+ {
+ this.OnPayMonthChanging(value);
+ this.SendPropertyChanging();
+ this._PayMonth = value;
+ this.SendPropertyChanged("PayMonth");
+ this.OnPayMonthChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SMonthType1", DbType="Decimal(18,2)")]
+ public System.Nullable SMonthType1
+ {
+ get
+ {
+ return this._SMonthType1;
+ }
+ set
+ {
+ if ((this._SMonthType1 != value))
+ {
+ this.OnSMonthType1Changing(value);
+ this.SendPropertyChanging();
+ this._SMonthType1 = value;
+ this.SendPropertyChanged("SMonthType1");
+ this.OnSMonthType1Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SMonthType2", DbType="Decimal(18,2)")]
+ public System.Nullable SMonthType2
+ {
+ get
+ {
+ return this._SMonthType2;
+ }
+ set
+ {
+ if ((this._SMonthType2 != value))
+ {
+ this.OnSMonthType2Changing(value);
+ this.SendPropertyChanging();
+ this._SMonthType2 = value;
+ this.SendPropertyChanged("SMonthType2");
+ this.OnSMonthType2Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SMonthType3", DbType="Decimal(18,2)")]
+ public System.Nullable SMonthType3
+ {
+ get
+ {
+ return this._SMonthType3;
+ }
+ set
+ {
+ if ((this._SMonthType3 != value))
+ {
+ this.OnSMonthType3Changing(value);
+ this.SendPropertyChanging();
+ this._SMonthType3 = value;
+ this.SendPropertyChanged("SMonthType3");
+ this.OnSMonthType3Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SMonthType4", DbType="Decimal(18,2)")]
+ public System.Nullable SMonthType4
+ {
+ get
+ {
+ return this._SMonthType4;
+ }
+ set
+ {
+ if ((this._SMonthType4 != value))
+ {
+ this.OnSMonthType4Changing(value);
+ this.SendPropertyChanging();
+ this._SMonthType4 = value;
+ this.SendPropertyChanged("SMonthType4");
+ this.OnSMonthType4Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SMonthType5", DbType="Decimal(18,2)")]
+ public System.Nullable SMonthType5
+ {
+ get
+ {
+ return this._SMonthType5;
+ }
+ set
+ {
+ if ((this._SMonthType5 != value))
+ {
+ this.OnSMonthType5Changing(value);
+ this.SendPropertyChanging();
+ this._SMonthType5 = value;
+ this.SendPropertyChanged("SMonthType5");
+ this.OnSMonthType5Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SMonthType6", DbType="Decimal(18,2)")]
+ public System.Nullable SMonthType6
+ {
+ get
+ {
+ return this._SMonthType6;
+ }
+ set
+ {
+ if ((this._SMonthType6 != value))
+ {
+ this.OnSMonthType6Changing(value);
+ this.SendPropertyChanging();
+ this._SMonthType6 = value;
+ this.SendPropertyChanged("SMonthType6");
+ this.OnSMonthType6Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SMonthType7", DbType="Decimal(18,2)")]
+ public System.Nullable SMonthType7
+ {
+ get
+ {
+ return this._SMonthType7;
+ }
+ set
+ {
+ if ((this._SMonthType7 != value))
+ {
+ this.OnSMonthType7Changing(value);
+ this.SendPropertyChanging();
+ this._SMonthType7 = value;
+ this.SendPropertyChanged("SMonthType7");
+ this.OnSMonthType7Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SMonthType8", DbType="Decimal(18,2)")]
+ public System.Nullable SMonthType8
+ {
+ get
+ {
+ return this._SMonthType8;
+ }
+ set
+ {
+ if ((this._SMonthType8 != value))
+ {
+ this.OnSMonthType8Changing(value);
+ this.SendPropertyChanging();
+ this._SMonthType8 = value;
+ this.SendPropertyChanged("SMonthType8");
+ this.OnSMonthType8Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SMonthType9", DbType="Decimal(18,2)")]
+ public System.Nullable SMonthType9
+ {
+ get
+ {
+ return this._SMonthType9;
+ }
+ set
+ {
+ if ((this._SMonthType9 != value))
+ {
+ this.OnSMonthType9Changing(value);
+ this.SendPropertyChanging();
+ this._SMonthType9 = value;
+ this.SendPropertyChanged("SMonthType9");
+ this.OnSMonthType9Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SMonthType10", DbType="Decimal(18,2)")]
+ public System.Nullable SMonthType10
+ {
+ get
+ {
+ return this._SMonthType10;
+ }
+ set
+ {
+ if ((this._SMonthType10 != value))
+ {
+ this.OnSMonthType10Changing(value);
+ this.SendPropertyChanging();
+ this._SMonthType10 = value;
+ this.SendPropertyChanged("SMonthType10");
+ this.OnSMonthType10Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+ public string CompileMan
+ {
+ get
+ {
+ return this._CompileMan;
+ }
+ set
+ {
+ if ((this._CompileMan != value))
+ {
+ this.OnCompileManChanging(value);
+ this.SendPropertyChanging();
+ this._CompileMan = value;
+ this.SendPropertyChanged("CompileMan");
+ this.OnCompileManChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
+ public System.Nullable CompileDate
+ {
+ get
+ {
+ return this._CompileDate;
+ }
+ set
+ {
+ if ((this._CompileDate != value))
+ {
+ this.OnCompileDateChanging(value);
+ this.SendPropertyChanging();
+ this._CompileDate = value;
+ this.SendPropertyChanged("CompileDate");
+ this.OnCompileDateChanged();
+ }
+ }
+ }
+
+ public event PropertyChangingEventHandler PropertyChanging;
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected virtual void SendPropertyChanging()
+ {
+ if ((this.PropertyChanging != null))
+ {
+ this.PropertyChanging(this, emptyChangingEventArgs);
+ }
+ }
+
+ protected virtual void SendPropertyChanged(String propertyName)
+ {
+ if ((this.PropertyChanged != null))
+ {
+ this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CostGoods_MeasuresPlan")]
public partial class CostGoods_MeasuresPlan : INotifyPropertyChanging, INotifyPropertyChanged
{
@@ -333725,6 +334375,8 @@ namespace Model
private System.Nullable _IsSafetyMonitoring;
+ private System.Nullable _IsBlacklist;
+
private EntitySet _Accident_AccidentPersonRecord;
private EntitySet _Accident_AccidentReportOtherItem;
@@ -333909,6 +334561,8 @@ namespace Model
partial void OnRawPasswordChanged();
partial void OnIsSafetyMonitoringChanging(System.Nullable value);
partial void OnIsSafetyMonitoringChanged();
+ partial void OnIsBlacklistChanging(System.Nullable value);
+ partial void OnIsBlacklistChanged();
#endregion
public SitePerson_Person()
@@ -335197,6 +335851,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBlacklist", DbType="Bit")]
+ public System.Nullable IsBlacklist
+ {
+ get
+ {
+ return this._IsBlacklist;
+ }
+ set
+ {
+ if ((this._IsBlacklist != value))
+ {
+ this.OnIsBlacklistChanging(value);
+ this.SendPropertyChanging();
+ this._IsBlacklist = value;
+ this.SendPropertyChanged("IsBlacklist");
+ this.OnIsBlacklistChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_SitePerson_Person", Storage="_Accident_AccidentPersonRecord", ThisKey="PersonId", OtherKey="PersonId", DeleteRule="NO ACTION")]
public EntitySet Accident_AccidentPersonRecord
{
@@ -431353,6 +432027,8 @@ namespace Model
private System.Nullable _RealNameAddTime;
+ private System.Nullable _IsBlacklist;
+
public View_SitePerson_Person()
{
}
@@ -432508,6 +433184,22 @@ namespace Model
}
}
}
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBlacklist", DbType="Bit")]
+ public System.Nullable IsBlacklist
+ {
+ get
+ {
+ return this._IsBlacklist;
+ }
+ set
+ {
+ if ((this._IsBlacklist != value))
+ {
+ this._IsBlacklist = value;
+ }
+ }
+ }
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Solution_LargerHazardListItem")]