diff --git a/DataBase/FCLDB_20240528.bak b/DataBase/FCLDB_20240528.bak new file mode 100644 index 0000000..0504053 Binary files /dev/null and b/DataBase/FCLDB_20240528.bak differ diff --git a/DataBase/FCLDB_20240528.zip b/DataBase/FCLDB_20240528.zip new file mode 100644 index 0000000..abea19f Binary files /dev/null and b/DataBase/FCLDB_20240528.zip differ diff --git a/DataBase/版本日志/FCLDB_2024.05.16.sql b/DataBase/版本日志/FCLDB_2024.05.16.sql new file mode 100644 index 0000000..3476c18 --- /dev/null +++ b/DataBase/版本日志/FCLDB_2024.05.16.sql @@ -0,0 +1,42 @@ +ALTER TABLE dbo.Base_FileType ADD IsExport BIT NULL +GO +UPDATE dbo.Base_FileType SET IsExport=0 +GO + +ALTER VIEW [dbo].[View_FC_ContractManagement] +AS +SELECT cm.OccurDate,fc.FO_NO,dis.Discipline AS DisciplineEn,dis.DisciplineCN,con.Contractor AS ContractorEn,con.ContractorCN, + (CASE WHEN con.Contractor IS NULL THEN con.ContractorCN WHEN con.ContractorCN IS NULL THEN con.Contractor ELSE con.Contractor+con.ContractorCN END)AS Contractor, + (CASE WHEN dis.Discipline IS NULL THEN dis.DisciplineCN WHEN dis.DisciplineCN IS NULL THEN dis.Discipline ELSE dis.Discipline+dis.DisciplineCN END) AS Discipline, + cm.Remark,ftype.FileType,u.UserName AS Contract_Admin, u2.UserName AS Main_Coordinator,mcdep.DepartName AS MCDept, + u3.UserName AS User_Representative, bycDep.DepartCode AS BycDept,ftype.IsExport +FROM dbo.FC_ContractManagement cm +LEFT JOIN dbo.FC_SESRelatedData fc ON fc.ID = cm.FC_ID +LEFT JOIN dbo.Base_Discipline AS dis ON dis.DisciplineId = fc.DisciplineId +LEFT JOIN dbo.Base_Contractor AS con ON con.ContractorId = fc.Contractor +LEFT JOIN dbo.Base_FileType ftype ON ftype.FileTypeId = cm.FileTypeId +LEFT JOIN dbo.Sys_User AS u ON u.UserId = fc.Contract_Admin +LEFT JOIN dbo.Sys_User AS u2 ON u2.UserId = fc.Main_Coordinator +LEFT JOIN dbo.Sys_User AS u3 ON u3.UserId=fc.User_Representative +LEFT JOIN dbo.Base_Depart mcdep ON mcdep.DepartId = u2.DepartId +LEFT JOIN dbo.Base_Depart bycDep ON bycDep.DepartId=cm.BycDept + + +GO + +CREATE VIEW [dbo].[View_EMC_Contractor_Qualification] +AS +SELECT cm.FoId,fc.FO_NO,cm.QueName,cm.QueDef,cm.QueType,cm.LimitStartDate,cm.LimitEndDate,cm.Remark, + (CASE WHEN con.Contractor IS NULL THEN con.ContractorCN WHEN con.ContractorCN IS NULL THEN con.Contractor ELSE con.Contractor+con.ContractorCN END)AS Contractor, + (CASE WHEN dis.Discipline IS NULL THEN dis.DisciplineCN WHEN dis.DisciplineCN IS NULL THEN dis.Discipline ELSE dis.Discipline+dis.DisciplineCN END) AS Discipline, + u.UserName AS Contract_Admin, u2.UserName AS Main_Coordinator,fc.Expire_Date,fc.Contractor AS ContractorId ,fc.FC_Status +FROM dbo.EMC_Contractor_Qualification cm +LEFT JOIN dbo.FC_SESRelatedData fc ON fc.ID = cm.FoId +LEFT JOIN dbo.Base_Discipline AS dis ON dis.DisciplineId = fc.DisciplineId +LEFT JOIN dbo.Base_Contractor AS con ON con.ContractorId = fc.Contractor +LEFT JOIN dbo.Sys_User AS u ON u.UserId = fc.Contract_Admin +LEFT JOIN dbo.Sys_User AS u2 ON u2.UserId = fc.Main_Coordinator + +GO + + diff --git a/DataBase/版本日志/FCLDB_2024.02.29.sql b/DataBase/版本日志/已更新/FCLDB_2024.02.29.sql similarity index 100% rename from DataBase/版本日志/FCLDB_2024.02.29.sql rename to DataBase/版本日志/已更新/FCLDB_2024.02.29.sql diff --git a/DataBase/版本日志/FCLDB_2024.03.11.sql b/DataBase/版本日志/已更新/FCLDB_2024.03.11.sql similarity index 100% rename from DataBase/版本日志/FCLDB_2024.03.11.sql rename to DataBase/版本日志/已更新/FCLDB_2024.03.11.sql diff --git a/DataBase/版本日志/FCLDB_2024.04.03.sql b/DataBase/版本日志/已更新/FCLDB_2024.04.03.sql similarity index 100% rename from DataBase/版本日志/FCLDB_2024.04.03.sql rename to DataBase/版本日志/已更新/FCLDB_2024.04.03.sql diff --git a/DataBase/版本日志/FCLDB_2024.05.08.sql b/DataBase/版本日志/已更新/FCLDB_2024.05.08.sql similarity index 100% rename from DataBase/版本日志/FCLDB_2024.05.08.sql rename to DataBase/版本日志/已更新/FCLDB_2024.05.08.sql diff --git a/DataBase/版本日志/FCLDB_API_2023.11.20.sql b/DataBase/版本日志/已更新/FCLDB_API_2023.11.20.sql similarity index 100% rename from DataBase/版本日志/FCLDB_API_2023.11.20.sql rename to DataBase/版本日志/已更新/FCLDB_API_2023.11.20.sql diff --git a/DataBase/版本日志/FCLDB_SynHR_2023.11.09.sql b/DataBase/版本日志/已更新/FCLDB_SynHR_2023.11.09.sql similarity index 100% rename from DataBase/版本日志/FCLDB_SynHR_2023.11.09.sql rename to DataBase/版本日志/已更新/FCLDB_SynHR_2023.11.09.sql diff --git a/FCL/BLL/BaseInfo/FileTypeService.cs b/FCL/BLL/BaseInfo/FileTypeService.cs index f1c5c7b..276e746 100644 --- a/FCL/BLL/BaseInfo/FileTypeService.cs +++ b/FCL/BLL/BaseInfo/FileTypeService.cs @@ -30,6 +30,7 @@ namespace BLL newFileType.FileTypeId = fileType.FileTypeId; newFileType.FileType = fileType.FileType; newFileType.Remark = fileType.Remark; + newFileType.IsExport = fileType.IsExport; Funs.DB.Base_FileType.InsertOnSubmit(newFileType); Funs.DB.SubmitChanges(); } @@ -45,6 +46,7 @@ namespace BLL { newFileType.FileType = fileType.FileType; newFileType.Remark = fileType.Remark; + newFileType.IsExport = fileType.IsExport; Funs.DB.SubmitChanges(); } } diff --git a/FCL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json b/FCL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json new file mode 100644 index 0000000..26e2e82 --- /dev/null +++ b/FCL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json @@ -0,0 +1 @@ +{"RootPath":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\FineUIPro.Web","ProjectFileName":"FineUIPro.Web.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"App_GlobalResources\\Lan.en-US.designer.cs"},{"SourceFile":"App_GlobalResources\\Lan.zh-CN.designer.cs"},{"SourceFile":"App_GlobalResources\\Lan.Designer.cs"},{"SourceFile":"AttachFile\\fileupload.ashx.cs"},{"SourceFile":"AttachFile\\webuploader2.aspx.cs"},{"SourceFile":"AttachFile\\webuploader2.aspx.designer.cs"},{"SourceFile":"AttachFile\\webuploader.aspx.cs"},{"SourceFile":"AttachFile\\webuploader.aspx.designer.cs"},{"SourceFile":"AttachFile\\webuploader3.aspx.cs"},{"SourceFile":"AttachFile\\webuploader3.aspx.designer.cs"},{"SourceFile":"BaseInfo\\ContractorList.aspx.cs"},{"SourceFile":"BaseInfo\\ContractorList.aspx.designer.cs"},{"SourceFile":"BaseInfo\\Currency.aspx.cs"},{"SourceFile":"BaseInfo\\Currency.aspx.designer.cs"},{"SourceFile":"BaseInfo\\Department.aspx.cs"},{"SourceFile":"BaseInfo\\Department.aspx.designer.cs"},{"SourceFile":"BaseInfo\\Discipline.aspx.cs"},{"SourceFile":"BaseInfo\\Discipline.aspx.designer.cs"},{"SourceFile":"BaseInfo\\DisciplineCategory.aspx.cs"},{"SourceFile":"BaseInfo\\DisciplineCategory.aspx.designer.cs"},{"SourceFile":"BaseInfo\\FileType.aspx.cs"},{"SourceFile":"BaseInfo\\FileType.aspx.designer.cs"},{"SourceFile":"BaseInfo\\FOOffset.aspx.cs"},{"SourceFile":"BaseInfo\\FOOffset.aspx.designer.cs"},{"SourceFile":"BaseInfo\\FOType.aspx.cs"},{"SourceFile":"BaseInfo\\FOType.aspx.designer.cs"},{"SourceFile":"BaseInfo\\Item.aspx.cs"},{"SourceFile":"BaseInfo\\Item.aspx.designer.cs"},{"SourceFile":"BaseInfo\\PriceScheme.aspx.cs"},{"SourceFile":"BaseInfo\\PriceScheme.aspx.designer.cs"},{"SourceFile":"BaseInfo\\TaxRate.aspx.cs"},{"SourceFile":"BaseInfo\\TaxRate.aspx.designer.cs"},{"SourceFile":"BaseInfo\\TemplateType.aspx.cs"},{"SourceFile":"BaseInfo\\TemplateType.aspx.designer.cs"},{"SourceFile":"BaseInfo\\Type.aspx.cs"},{"SourceFile":"BaseInfo\\Type.aspx.designer.cs"},{"SourceFile":"CCP\\CcpEdit.aspx.cs"},{"SourceFile":"CCP\\CcpEdit.aspx.designer.cs"},{"SourceFile":"CCP\\CcpList.aspx.cs"},{"SourceFile":"CCP\\CcpList.aspx.designer.cs"},{"SourceFile":"CCP\\CCPUpload.aspx.cs"},{"SourceFile":"CCP\\CCPUpload.aspx.designer.cs"},{"SourceFile":"CCP\\CcpViewList.aspx.cs"},{"SourceFile":"CCP\\CcpViewList.aspx.designer.cs"},{"SourceFile":"common\\LdapAuthentication.cs"},{"SourceFile":"common\\LDAPUser.cs"},{"SourceFile":"common\\main.ashx.cs"},{"SourceFile":"common\\MainSearch.aspx.cs"},{"SourceFile":"common\\MainSearch.aspx.designer.cs"},{"SourceFile":"common\\PageBase.cs"},{"SourceFile":"CPT\\CPTReportList.aspx.cs"},{"SourceFile":"CPT\\CPTReportList.aspx.designer.cs"},{"SourceFile":"CPT\\SESReportToCPT.aspx.cs"},{"SourceFile":"CPT\\SESReportToCPT.aspx.designer.cs"},{"SourceFile":"CPT\\SESReportToCPTEdit.aspx.cs"},{"SourceFile":"CPT\\SESReportToCPTEdit.aspx.designer.cs"},{"SourceFile":"Encrypt.aspx.cs"},{"SourceFile":"Encrypt.aspx.designer.cs"},{"SourceFile":"common\\loading.aspx.cs"},{"SourceFile":"common\\loading.aspx.designer.cs"},{"SourceFile":"common\\Main.aspx.cs"},{"SourceFile":"common\\Main.aspx.designer.cs"},{"SourceFile":"common\\main_bootstrap_pure.aspx.cs"},{"SourceFile":"common\\main_bootstrap_pure.aspx.designer.cs"},{"SourceFile":"common\\main_bootstrap_pure_login.aspx.cs"},{"SourceFile":"common\\main_bootstrap_pure_login.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\CalculateChinaEx.aspx.cs"},{"SourceFile":"common\\ReportPrint\\CalculateChinaEx.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\ExPrintSet.aspx.cs"},{"SourceFile":"common\\ReportPrint\\ExPrintSet.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\ExReportPrint.aspx.cs"},{"SourceFile":"common\\ReportPrint\\ExReportPrint.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\PrintDesigner.aspx.cs"},{"SourceFile":"common\\ReportPrint\\PrintDesigner.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\ReadExReportFile.aspx.cs"},{"SourceFile":"common\\ReportPrint\\ReadExReportFile.aspx.designer.cs"},{"SourceFile":"common\\ReportPrint\\SaveTabFile.aspx.cs"},{"SourceFile":"common\\ReportPrint\\SaveTabFile.aspx.designer.cs"},{"SourceFile":"common\\source.aspx.cs"},{"SourceFile":"common\\source.aspx.designer.cs"},{"SourceFile":"common\\source_file.aspx.cs"},{"SourceFile":"common\\source_file.aspx.designer.cs"},{"SourceFile":"common\\themes.aspx.cs"},{"SourceFile":"common\\themes.aspx.designer.cs"},{"SourceFile":"config\\ajax.aspx.cs"},{"SourceFile":"config\\ajax.aspx.designer.cs"},{"SourceFile":"config\\enable_gzip_iis6.aspx.cs"},{"SourceFile":"config\\enable_gzip_iis6.aspx.designer.cs"},{"SourceFile":"config\\icons.aspx.cs"},{"SourceFile":"config\\icons.aspx.designer.cs"},{"SourceFile":"config\\icons_font.aspx.cs"},{"SourceFile":"config\\icons_font.aspx.designer.cs"},{"SourceFile":"config\\install_toolbox.aspx.cs"},{"SourceFile":"config\\install_toolbox.aspx.designer.cs"},{"SourceFile":"config\\loading.aspx.cs"},{"SourceFile":"config\\loading.aspx.designer.cs"},{"SourceFile":"config\\modify_webconfig.aspx.cs"},{"SourceFile":"config\\modify_webconfig.aspx.designer.cs"},{"SourceFile":"Controls\\ChartControl.ascx.cs"},{"SourceFile":"Controls\\ChartControl.ascx.designer.cs"},{"SourceFile":"Controls\\ClientJs\\ClientJs.ascx.cs"},{"SourceFile":"Controls\\ClientJs\\ClientJs.ascx.designer.cs"},{"SourceFile":"Controls\\GridNavgator.ascx.cs"},{"SourceFile":"Controls\\GridNavgator.ascx.designer.cs"},{"SourceFile":"Controls\\JDGL\\ChartControl.ascx.cs"},{"SourceFile":"Controls\\JDGL\\ChartControl.ascx.designer.cs"},{"SourceFile":"Controls\\ProgressBox.ascx.cs"},{"SourceFile":"Controls\\ProgressBox.ascx.designer.cs"},{"SourceFile":"Evaluation\\ContractorEvaluation.aspx.cs"},{"SourceFile":"Evaluation\\ContractorEvaluation.aspx.designer.cs"},{"SourceFile":"Evaluation\\ContractorEvaluationEdit.aspx.cs"},{"SourceFile":"Evaluation\\ContractorEvaluationEdit.aspx.designer.cs"},{"SourceFile":"Evaluation\\Evaluation.aspx.cs"},{"SourceFile":"Evaluation\\Evaluation.aspx.designer.cs"},{"SourceFile":"Evaluation\\EvaluationNew.aspx.cs"},{"SourceFile":"Evaluation\\EvaluationNew.aspx.designer.cs"},{"SourceFile":"Evaluation\\EvaluationReport.aspx.cs"},{"SourceFile":"Evaluation\\EvaluationReport.aspx.designer.cs"},{"SourceFile":"Evaluation\\EvaluationUpload.aspx.cs"},{"SourceFile":"Evaluation\\EvaluationUpload.aspx.designer.cs"},{"SourceFile":"Evaluation\\ExportDetails.aspx.cs"},{"SourceFile":"Evaluation\\ExportDetails.aspx.designer.cs"},{"SourceFile":"Evaluation\\FilesManagement.aspx.cs"},{"SourceFile":"Evaluation\\FilesManagement.aspx.designer.cs"},{"SourceFile":"Evaluation\\PerformanceReport.aspx.cs"},{"SourceFile":"Evaluation\\PerformanceReport.aspx.designer.cs"},{"SourceFile":"Evaluation\\SafetyEvaluation.aspx.cs"},{"SourceFile":"Evaluation\\SafetyEvaluation.aspx.designer.cs"},{"SourceFile":"FileManage\\editCAD.aspx.cs"},{"SourceFile":"FileManage\\editCAD.aspx.designer.cs"},{"SourceFile":"FileManage\\EditOffice.aspx.cs"},{"SourceFile":"FileManage\\EditOffice.aspx.designer.cs"},{"SourceFile":"FileManage\\FileManageList.aspx.cs"},{"SourceFile":"FileManage\\FileManageList.aspx.designer.cs"},{"SourceFile":"FileManage\\Read.aspx.cs"},{"SourceFile":"FileManage\\Read.aspx.designer.cs"},{"SourceFile":"FileManage\\ReadCad.aspx.cs"},{"SourceFile":"FileManage\\ReadCad.aspx.designer.cs"},{"SourceFile":"FileManage\\Save.aspx.cs"},{"SourceFile":"FileManage\\Save.aspx.designer.cs"},{"SourceFile":"FileManage\\SaveCAD.aspx.cs"},{"SourceFile":"FileManage\\SaveCAD.aspx.designer.cs"},{"SourceFile":"Global.asax.cs"},{"SourceFile":"index.aspx.cs"},{"SourceFile":"index.aspx.designer.cs"},{"SourceFile":"KPI\\KPI.aspx.cs"},{"SourceFile":"KPI\\KPI.aspx.designer.cs"},{"SourceFile":"Login.aspx.cs"},{"SourceFile":"Login.aspx.designer.cs"},{"SourceFile":"LogOff.aspx.cs"},{"SourceFile":"LogOff.aspx.designer.cs"},{"SourceFile":"MyWebService.asmx.cs"},{"SourceFile":"OperationError.aspx.cs"},{"SourceFile":"OperationError.aspx.designer.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Report\\FCLDS.cs"},{"SourceFile":"Report\\FCLDS.Designer.cs"},{"SourceFile":"Report\\ReportPrint.aspx.cs"},{"SourceFile":"Report\\ReportPrint.aspx.designer.cs"},{"SourceFile":"Report\\ScoreDataSet.Designer.cs"},{"SourceFile":"Scripts\\index.aspx.cs"},{"SourceFile":"Scripts\\index.aspx.designer.cs"},{"SourceFile":"SendEmail\\SelectUserControl.ascx.cs"},{"SourceFile":"SendEmail\\SelectUserControl.ascx.designer.cs"},{"SourceFile":"SendEmail\\SendEmail.aspx.cs"},{"SourceFile":"SendEmail\\SendEmail.aspx.designer.cs"},{"SourceFile":"SendEmail\\SendEmailLog.aspx.cs"},{"SourceFile":"SendEmail\\SendEmailLog.aspx.designer.cs"},{"SourceFile":"SendEmail\\SendEmailPop.aspx.cs"},{"SourceFile":"SendEmail\\SendEmailPop.aspx.designer.cs"},{"SourceFile":"SendEmail\\SendEmailTemplate.aspx.cs"},{"SourceFile":"SendEmail\\SendEmailTemplate.aspx.designer.cs"},{"SourceFile":"SendEmail\\SendEmailTemplateList.aspx.cs"},{"SourceFile":"SendEmail\\SendEmailTemplateList.aspx.designer.cs"},{"SourceFile":"SES\\ContractorQualification.aspx.cs"},{"SourceFile":"SES\\ContractorQualification.aspx.designer.cs"},{"SourceFile":"SES\\ContractorQualificationEdit.aspx.cs"},{"SourceFile":"SES\\ContractorQualificationEdit.aspx.designer.cs"},{"SourceFile":"SES\\ContractorQueCopy.aspx.cs"},{"SourceFile":"SES\\ContractorQueCopy.aspx.designer.cs"},{"SourceFile":"SES\\CQualityPunish.aspx.cs"},{"SourceFile":"SES\\CQualityPunish.aspx.designer.cs"},{"SourceFile":"SES\\CQualityPunishEdit.aspx.cs"},{"SourceFile":"SES\\CQualityPunishEdit.aspx.designer.cs"},{"SourceFile":"SES\\CSafePunishEdit.aspx.cs"},{"SourceFile":"SES\\CSafePunishEdit.aspx.designer.cs"},{"SourceFile":"SES\\CTSalesContractManagement.aspx.cs"},{"SourceFile":"SES\\CTSalesContractManagement.aspx.designer.cs"},{"SourceFile":"SES\\CTSalesContracts.aspx.cs"},{"SourceFile":"SES\\CTSalesContracts.aspx.designer.cs"},{"SourceFile":"SES\\CTSalesContractsEdit.aspx.cs"},{"SourceFile":"SES\\CTSalesContractsEdit.aspx.designer.cs"},{"SourceFile":"SES\\CTSalesSignedContracts.aspx.cs"},{"SourceFile":"SES\\CTSalesSignedContracts.aspx.designer.cs"},{"SourceFile":"SES\\FCList.aspx.cs"},{"SourceFile":"SES\\FCList.aspx.designer.cs"},{"SourceFile":"SES\\FCListEdit.aspx.cs"},{"SourceFile":"SES\\FCListEdit.aspx.designer.cs"},{"SourceFile":"SES\\OneTimeContractManagement.aspx.cs"},{"SourceFile":"SES\\OneTimeContractManagement.aspx.designer.cs"},{"SourceFile":"SES\\OneTimeContracts.aspx.cs"},{"SourceFile":"SES\\OneTimeContracts.aspx.designer.cs"},{"SourceFile":"SES\\OneTimeContractsEdit.aspx.cs"},{"SourceFile":"SES\\OneTimeContractsEdit.aspx.designer.cs"},{"SourceFile":"SES\\OneTimeSignedContracts.aspx.cs"},{"SourceFile":"SES\\OneTimeSignedContracts.aspx.designer.cs"},{"SourceFile":"SES\\CSafePunish.aspx.cs"},{"SourceFile":"SES\\CSafePunish.aspx.designer.cs"},{"SourceFile":"SES\\SESEvaluateList.aspx.cs"},{"SourceFile":"SES\\SESEvaluateList.aspx.designer.cs"},{"SourceFile":"SES\\SESRelatedData.aspx.cs"},{"SourceFile":"SES\\SESRelatedData.aspx.designer.cs"},{"SourceFile":"SES\\SESRelatedDataContractManage.aspx.cs"},{"SourceFile":"SES\\SESRelatedDataContractManage.aspx.designer.cs"},{"SourceFile":"SES\\SESRelatedDataEdit.aspx.cs"},{"SourceFile":"SES\\SESRelatedDataEdit.aspx.designer.cs"},{"SourceFile":"SES\\SESRelatedDataSearch.aspx.cs"},{"SourceFile":"SES\\SESRelatedDataSearch.aspx.designer.cs"},{"SourceFile":"SES\\SESRelatedDataSigned.aspx.cs"},{"SourceFile":"SES\\SESRelatedDataSigned.aspx.designer.cs"},{"SourceFile":"SES\\SESReport.ashx.cs"},{"SourceFile":"SES\\SESReport.aspx.cs"},{"SourceFile":"SES\\SESReport.aspx.designer.cs"},{"SourceFile":"SES\\SESReportEdit.aspx.cs"},{"SourceFile":"SES\\SESReportEdit.aspx.designer.cs"},{"SourceFile":"SES\\SSR.aspx.cs"},{"SourceFile":"SES\\SSR.aspx.designer.cs"},{"SourceFile":"SES\\SSREdit.aspx.cs"},{"SourceFile":"SES\\SSREdit.aspx.designer.cs"},{"SourceFile":"SES\\StandardTemplate.aspx.cs"},{"SourceFile":"SES\\StandardTemplate.aspx.designer.cs"},{"SourceFile":"SES\\StandardTemplateEdit.aspx.cs"},{"SourceFile":"SES\\StandardTemplateEdit.aspx.designer.cs"},{"SourceFile":"ssocallback.aspx.cs"},{"SourceFile":"ssocallback.aspx.designer.cs"},{"SourceFile":"Styles\\index.aspx.cs"},{"SourceFile":"Styles\\index.aspx.designer.cs"},{"SourceFile":"SysManage\\DataBackup.aspx.cs"},{"SourceFile":"SysManage\\DataBackup.aspx.designer.cs"},{"SourceFile":"SysManage\\LogList.aspx.cs"},{"SourceFile":"SysManage\\LogList.aspx.designer.cs"},{"SourceFile":"SysManage\\RoleList.aspx.cs"},{"SourceFile":"SysManage\\RoleList.aspx.designer.cs"},{"SourceFile":"SysManage\\RoleListEdit.aspx.cs"},{"SourceFile":"SysManage\\RoleListEdit.aspx.designer.cs"},{"SourceFile":"SysManage\\RolePower.aspx.cs"},{"SourceFile":"SysManage\\RolePower.aspx.designer.cs"},{"SourceFile":"SysManage\\SelectUserToEMail.aspx.cs"},{"SourceFile":"SysManage\\SelectUserToEMail.aspx.designer.cs"},{"SourceFile":"SysManage\\SysSet.aspx.cs"},{"SourceFile":"SysManage\\SysSet.aspx.designer.cs"},{"SourceFile":"SysManage\\UpdatePassword.aspx.cs"},{"SourceFile":"SysManage\\UpdatePassword.aspx.designer.cs"},{"SourceFile":"SysManage\\UpdatePasswordEdit.aspx.cs"},{"SourceFile":"SysManage\\UpdatePasswordEdit.aspx.designer.cs"},{"SourceFile":"SysManage\\UserList.aspx.cs"},{"SourceFile":"SysManage\\UserList.aspx.designer.cs"},{"SourceFile":"SysManage\\UserListEdit.aspx.cs"},{"SourceFile":"SysManage\\UserListEdit.aspx.designer.cs"},{"SourceFile":"SysManage\\UserToEMial.aspx.cs"},{"SourceFile":"SysManage\\UserToEMial.aspx.designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\FineUIPro.Web\\bin\\AxInterop.SYNCARDOCXLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\BLL\\bin\\Debug\\BLL.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\Portable.BouncyCastle.1.8.9\\lib\\net40\\BouncyCastle.Crypto.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\FineUIPro\\FineUIPro.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\SharpZipLib.1.3.2\\lib\\net45\\ICSharpCode.SharpZipLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.JScript.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\FineUIPro.Web\\bin\\Microsoft.QualityTools.Testing.Fakes.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\FineUIPro.Web\\FakesAssemblies\\Microsoft.ReportViewer.Common.15.0.0.0.Fakes.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1484.0\\lib\\net40\\Microsoft.ReportViewer.Common.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1484.0\\lib\\net40\\Microsoft.ReportViewer.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1484.0\\lib\\net40\\Microsoft.ReportViewer.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1484.0\\lib\\net40\\Microsoft.ReportViewer.ProcessingObjectModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1484.0\\lib\\net40\\Microsoft.ReportViewer.WebDesign.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.1484.0\\lib\\net40\\Microsoft.ReportViewer.WebForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\Microsoft.SqlServer.Types.14.0.1016.290\\lib\\net40\\Microsoft.SqlServer.Types.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\Model\\bin\\Debug\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\Newtonsoft.Json.13.0.1\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.OOXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.OpenXml4Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.OpenXmlFormats.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.DirectoryServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.DirectoryServices.Protocols.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.EnterpriseServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.IO.Compression.FileSystem.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.ApplicationServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.DynamicData.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Entity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\FineUIPro.Web\\bin\\ThoughtWorks.QRCode.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\FineUIPro.Web\\bin\\FineUIPro.Web.dll","OutputItemRelativePath":"FineUIPro.Web.dll"},{"OutputItemFullPath":"E:\\MyProject\\FCL\\Basf_FCL\\FCL\\FineUIPro.Web\\bin\\FineUIPro.Web.pdb","OutputItemRelativePath":"FineUIPro.Web.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/FCL/FineUIPro.Web/BaseInfo/FileType.aspx b/FCL/FineUIPro.Web/BaseInfo/FileType.aspx index c75f851..a47cf9e 100644 --- a/FCL/FineUIPro.Web/BaseInfo/FileType.aspx +++ b/FCL/FineUIPro.Web/BaseInfo/FileType.aspx @@ -21,6 +21,8 @@ + + @@ -47,9 +49,10 @@ + runat="server" LabelAlign="right" LabelWidth="100px" > - + + diff --git a/FCL/FineUIPro.Web/BaseInfo/FileType.aspx.cs b/FCL/FineUIPro.Web/BaseInfo/FileType.aspx.cs index 9b42536..fb8d616 100644 --- a/FCL/FineUIPro.Web/BaseInfo/FileType.aspx.cs +++ b/FCL/FineUIPro.Web/BaseInfo/FileType.aspx.cs @@ -133,6 +133,15 @@ namespace FineUIPro.Web.BaseInfo { this.txtFileType.Text = fileType.FileType; this.txtRemark.Text = fileType.Remark; + if (fileType.IsExport == true) + { + cbIsExport.Checked = true; + } + else + { + cbIsExport.Checked = false; + } + hfFormID.Text = Id; this.btnDelete.Enabled = true; } @@ -152,8 +161,9 @@ namespace FineUIPro.Web.BaseInfo { Model.Base_FileType fileType = new Model.Base_FileType { - FileType=this.txtFileType.Text.Trim(), - Remark = this.txtRemark.Text.Trim() + FileType = this.txtFileType.Text.Trim(), + Remark = this.txtRemark.Text.Trim(), + IsExport = cbIsExport.Checked }; if (string.IsNullOrEmpty(strRowID)) { @@ -222,6 +232,7 @@ namespace FineUIPro.Web.BaseInfo this.hfFormID.Text = string.Empty; this.txtFileType.Text = string.Empty; this.txtRemark.Text = string.Empty; + cbIsExport.Checked = false; this.btnDelete.Enabled = false; } #endregion diff --git a/FCL/FineUIPro.Web/BaseInfo/FileType.aspx.designer.cs b/FCL/FineUIPro.Web/BaseInfo/FileType.aspx.designer.cs index 5f242a5..3ab2c67 100644 --- a/FCL/FineUIPro.Web/BaseInfo/FileType.aspx.designer.cs +++ b/FCL/FineUIPro.Web/BaseInfo/FileType.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.BaseInfo { - - - public partial class FileType { - +namespace FineUIPro.Web.BaseInfo +{ + + + public partial class FileType + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// ToolbarSeparator1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// SimpleForm1 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.SimpleForm SimpleForm1; - + /// /// hfFormID 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hfFormID; - + /// /// txtFileType 控件。 /// @@ -101,7 +103,16 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtFileType; - + + /// + /// cbIsExport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox cbIsExport; + /// /// txtRemark 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemark; - + /// /// Toolbar1 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// btnNew 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnDelete 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnDelete; - + /// /// ToolbarFill1 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -155,7 +166,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// Menu1 控件。 /// @@ -164,7 +175,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuEdit 控件。 /// @@ -173,7 +184,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuEdit; - + /// /// btnMenuDelete 控件。 /// diff --git a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs index 1628275..4e395b3 100644 --- a/FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs +++ b/FCL/FineUIPro.Web/Evaluation/ContractorEvaluation.aspx.cs @@ -147,7 +147,7 @@ namespace FineUIPro.Web.Evaluation // 过期提示,30天范围 var foList = from x in Funs.DB.FC_SESRelatedData where x.Expire_Date != null - && x.Expire_Date.Value.AddMonths(-6).Date <= DateTime.Now.Date + && x.Expire_Date.Value.AddMonths(-6).AddDays(-7).Date <= DateTime.Now.Date && x.Expire_Date.Value.Date >= DateTime.Now.Date select x; if (foList.Count() > 0) diff --git a/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs b/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs index 19440e0..dbdae45 100644 --- a/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs +++ b/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs @@ -1804,8 +1804,8 @@ namespace FineUIPro.Web.Evaluation percent = 0; url = ""; List punishList = (from x in Funs.DB.View_EMC_Punishment where x.Flag == "1" select x).ToList(); - List cmList = (from x in Funs.DB.View_FC_ContractManagement orderby x.FO_NO, x.FileType select x).ToList(); - List conList = (from x in Funs.DB.View_FC_Contractor orderby x.Contractor, x.Expire_Date select x).ToList(); + List cmList = (from x in Funs.DB.View_FC_ContractManagement where x.IsExport==true orderby x.FO_NO, x.FileType select x).ToList(); + List conList = (from x in Funs.DB.View_FC_Contractor where x.FC_Status=="Valid" || x.FC_Status == "Expired Soon" orderby x.Contractor, x.Expire_Date select x).ToList(); List overviewReport = (from x in Funs.DB.FC_OverviewReport where x.IsSafe == false orderby x.ReportMonth, x.FO_NO select x).ToList(); List safeOverviewReport = (from x in Funs.DB.FC_OverviewReport where x.IsSafe == true orderby x.ReportMonth, x.FO_NO select x).ToList(); List noEvaluatedUser= (from x in Funs.DB.FC_NoEvaluatedUser orderby x.ReportMonth, x.IsSafe select x).ToList(); @@ -1820,8 +1820,8 @@ namespace FineUIPro.Web.Evaluation percent = 0; url = ""; List punishList = (from x in Funs.DB.View_EMC_Punishment where x.Flag == "1" select x).ToList(); - List cmList = (from x in Funs.DB.View_FC_ContractManagement orderby x.FO_NO, x.FileType select x).ToList(); - List conList = (from x in Funs.DB.View_FC_Contractor orderby x.Contractor, x.Expire_Date select x).ToList(); + List cmList = (from x in Funs.DB.View_FC_ContractManagement where x.IsExport == true orderby x.FO_NO, x.FileType select x).ToList(); + List conList = (from x in Funs.DB.View_FC_Contractor where x.FC_Status == "Valid" || x.FC_Status == "Expired Soon" orderby x.Contractor, x.Expire_Date select x).ToList(); List overviewReport = (from x in Funs.DB.FC_OverviewReport where x.IsSafe == false orderby x.ReportMonth, x.FO_NO select x).ToList(); List safeOverviewReport = (from x in Funs.DB.FC_OverviewReport where x.IsSafe == true orderby x.ReportMonth, x.FO_NO select x).ToList(); List noEvaluatedUser = (from x in Funs.DB.FC_NoEvaluatedUser orderby x.ReportMonth, x.IsSafe select x).ToList(); @@ -1849,7 +1849,7 @@ namespace FineUIPro.Web.Evaluation { Directory.CreateDirectory(filePath); } - string ReportFileName = filePath + "Performance Report_CN" + DateTime.Now.ToString("yyyyMMddhhmmss") + ".xlsx"; + string ReportFileName = filePath + "承包商现场绩效评估报告" + DateTime.Now.ToString("yyyyMMddhhmmss") + ".xlsx"; FileStream file = new FileStream(TempletFileName, FileMode.Open, FileAccess.Read); XSSFWorkbook hssfworkbook = new XSSFWorkbook(file); @@ -2131,7 +2131,7 @@ namespace FineUIPro.Web.Evaluation XSSFSheet wss = (XSSFSheet)hssfworkbook.GetSheet("非安全监护框架承包商绩效"); if (overviewCount > 0) { - var rowIndex = 2; + var rowIndex = 1; foreach(var vs in OverviewReport) { if (wss.GetRow(rowIndex) == null) wss.CreateRow(rowIndex); @@ -2241,7 +2241,7 @@ namespace FineUIPro.Web.Evaluation XSSFSheet wssafe = (XSSFSheet)hssfworkbook.GetSheet("安全监护框架承包商绩效"); if (safeOverviewCount > 0) { - var rowIndex = 2; + var rowIndex = 1; foreach (var vs in safeOverviewReport) { if (wssafe.GetRow(rowIndex) == null) wssafe.CreateRow(rowIndex); @@ -2384,6 +2384,10 @@ namespace FineUIPro.Web.Evaluation { if (findex < 250) { + if (wsevalu.GetRow(0).GetCell(7 + findex) == null) wsevalu.GetRow(0).CreateCell(7 + findex); + wsevalu.GetRow(0).GetCell(7 + findex).SetCellValue("未评价合同号"+ (findex+1).ToString()); + wsevalu.GetRow(0).GetCell(7 + findex).CellStyle = wsevalu.GetRow(0).GetCell(7).CellStyle; + if (wsevalu.GetRow(rowEvalIndex).GetCell(7 + findex) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(7 + findex); wsevalu.GetRow(rowEvalIndex).GetCell(7 + findex).SetCellValue(itemFoNo); wsevalu.GetRow(rowEvalIndex).GetCell(7 + findex).CellStyle = fontStyle; @@ -2731,7 +2735,7 @@ namespace FineUIPro.Web.Evaluation XSSFSheet wss = (XSSFSheet)hssfworkbook.GetSheet("Non-Safety Contr. Performance"); if (overviewCount > 0) { - var rowIndex = 2; + var rowIndex = 1; foreach (var vs in OverviewReport) { if (wss.GetRow(rowIndex) == null) wss.CreateRow(rowIndex); @@ -2841,7 +2845,7 @@ namespace FineUIPro.Web.Evaluation XSSFSheet wssafe = (XSSFSheet)hssfworkbook.GetSheet("Safety Contr. Performance"); if (safeOverviewCount > 0) { - var rowIndex = 2; + var rowIndex = 1; foreach (var vs in safeOverviewReport) { if (wssafe.GetRow(rowIndex) == null) wssafe.CreateRow(rowIndex); @@ -2984,6 +2988,10 @@ namespace FineUIPro.Web.Evaluation { if (findex < 250) { + if (wsevalu.GetRow(0).GetCell(7 + findex) == null) wsevalu.GetRow(0).CreateCell(7 + findex); + wsevalu.GetRow(0).GetCell(7 + findex).SetCellValue("Contract No. \r\nNot Evaluated" + (findex + 1).ToString()); + wsevalu.GetRow(0).GetCell(7 + findex).CellStyle = wsevalu.GetRow(0).GetCell(7).CellStyle; + if (wsevalu.GetRow(rowEvalIndex).GetCell(7 + findex) == null) wsevalu.GetRow(rowEvalIndex).CreateCell(7 + findex); wsevalu.GetRow(rowEvalIndex).GetCell(7 + findex).SetCellValue(itemFoNo); wsevalu.GetRow(rowEvalIndex).GetCell(7 + findex).CellStyle = fontStyle; diff --git a/FCL/FineUIPro.Web/File/Excel/20240515025748/Performance Report_CN20240515025748.xlsx b/FCL/FineUIPro.Web/File/Excel/20240515025748/Performance Report_CN20240515025748.xlsx deleted file mode 100644 index ac77c1c..0000000 Binary files a/FCL/FineUIPro.Web/File/Excel/20240515025748/Performance Report_CN20240515025748.xlsx and /dev/null differ diff --git a/FCL/FineUIPro.Web/File/Excel/Contractor_Qualification.xlsx b/FCL/FineUIPro.Web/File/Excel/Contractor_Qualification.xlsx index 9f18c37..d83e26e 100644 Binary files a/FCL/FineUIPro.Web/File/Excel/Contractor_Qualification.xlsx and b/FCL/FineUIPro.Web/File/Excel/Contractor_Qualification.xlsx differ diff --git a/FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx b/FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx index e19ab18..aa70386 100644 Binary files a/FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx and b/FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx differ diff --git a/FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx b/FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx index dec1b5c..eafe9d6 100644 Binary files a/FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx and b/FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx differ diff --git a/FCL/FineUIPro.Web/FineUIPro.Web.csproj b/FCL/FineUIPro.Web/FineUIPro.Web.csproj index 42d069b..ffa1ef7 100644 --- a/FCL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/FCL/FineUIPro.Web/FineUIPro.Web.csproj @@ -2512,6 +2512,7 @@ + @@ -3231,6 +3232,13 @@ ContractorQualificationEdit.aspx + + ContractorQueCopy.aspx + ASPXCodeBehind + + + ContractorQueCopy.aspx + CQualityPunish.aspx ASPXCodeBehind diff --git a/FCL/FineUIPro.Web/Global.asax.cs b/FCL/FineUIPro.Web/Global.asax.cs index 17f9ff2..b217c50 100644 --- a/FCL/FineUIPro.Web/Global.asax.cs +++ b/FCL/FineUIPro.Web/Global.asax.cs @@ -690,8 +690,8 @@ { // 过期提示,30天范围 var foList = from x in Funs.DB.FC_SESRelatedData where x.Expire_Date != null - && x.Expire_Date.Value.AddMonths(-6).Date <= DateTime.Now.Date - && x.Expire_Date.Value.AddMonths(-5).Date >= DateTime.Now.Date + && x.Expire_Date.Value.AddMonths(-6).AddDays(-7).Date <= DateTime.Now.Date + && x.Expire_Date.Value.AddMonths(-5).AddDays(-7).Date >= DateTime.Now.Date select x; if (foList.Count() > 0) { @@ -833,8 +833,8 @@ // 过期提示,30天范围 var foList = from x in Funs.DB.FC_SESRelatedData where x.Expire_Date != null - && x.Expire_Date.Value.AddMonths(-6).Date <= DateTime.Now.Date - && x.Expire_Date.Value.AddMonths(-5).Date >= DateTime.Now.Date + && x.Expire_Date.Value.AddMonths(-6).AddDays(-7).Date <= DateTime.Now.Date + && x.Expire_Date.Value.AddMonths(-5).AddDays(-7).Date >= DateTime.Now.Date select x; if (foList.Count() > 0) { @@ -1469,6 +1469,9 @@ NameValueCollection myPram = new NameValueCollection(); myPram.Add("ContractNo", fo.FO_NO); myPram.Add("Contractor", contractor); + myPram.Add("Date", ses.PunishDate != null ? ses.PunishDate.Value.ToString("yyyy-MM-dd") : ""); + myPram.Add("Time", ses.PunishDate != null ? ses.PunishDate.Value.ToString("HH:mm") : ""); + myPram.Add("Violation Description", ses.Description); bool result = MailHelper.SendPunishSesMail(pops, myPram, "承包商EHSS违规关联SES号的填写通知", mailTo, mailCC, out resultMessage); if (result) diff --git a/FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.cs b/FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.cs index 3e11e22..7ac4626 100644 --- a/FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.cs +++ b/FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.cs @@ -333,7 +333,7 @@ namespace FineUIPro.Web.SES // select x; // if (userTo != null) // { - // mailTo= userTo.Select(x => x.Email).ToArray(); + // mailTo = userTo.Select(x => x.Email).ToArray(); // } // var fo = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(drpFO_No.SelectedValue); @@ -351,6 +351,9 @@ namespace FineUIPro.Web.SES // NameValueCollection myPram = new NameValueCollection(); // myPram.Add("ContractNo", fo.FO_NO); // myPram.Add("Contractor", drpContractor.SelectedText); + // myPram.Add("Date", punishment.PunishDate != null ? punishment.PunishDate.Value.ToString("yyyy-MM-dd") : ""); + // myPram.Add("Time", punishment.PunishDate != null ? punishment.PunishDate.Value.ToString("HH:mm") : ""); + // myPram.Add("Violation Description", punishment.Description); // MailHelper.SendPunishSesMail(pops, myPram, "承包商EHSS违规关联SES号的填写通知", mailTo, mailCC, out resultMessage); // } // } diff --git a/FCL/FineUIPro.Web/SES/ContractorQualification.aspx b/FCL/FineUIPro.Web/SES/ContractorQualification.aspx index 6371330..493cb5b 100644 --- a/FCL/FineUIPro.Web/SES/ContractorQualification.aspx +++ b/FCL/FineUIPro.Web/SES/ContractorQualification.aspx @@ -39,7 +39,8 @@ SortField="FC_Status" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange" OnRowDataBound="Grid1_RowDataBound" - EnableRowSelectEvent="true" OnRowSelect="Grid1_RowSelect"> + EnableRowSelectEvent="true" OnRowSelect="Grid1_RowSelect" EnableRowDoubleClickEvent="true" + OnRowDoubleClick="Grid1_RowDoubleClick"> @@ -57,6 +58,10 @@ + + + + @@ -545,7 +550,9 @@ - + + + @@ -761,6 +768,10 @@ + - + + + + + + + + + - + @@ -809,6 +833,13 @@ + + diff --git a/FCLPackFile_2024.05.24/PackFile/Evaluation/ContractorEvaluation.aspx b/FCLPackFile_2024.05.24/PackFile/Evaluation/ContractorEvaluation.aspx new file mode 100644 index 0000000..8a064c5 --- /dev/null +++ b/FCLPackFile_2024.05.24/PackFile/Evaluation/ContractorEvaluation.aspx @@ -0,0 +1,120 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractorEvaluation.aspx.cs" Inherits="FineUIPro.Web.Evaluation.ContractorEvaluation" %> + + + + + + Frame Contractor Evaluation Form + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCLPackFile_2024.05.24/PackFile/Evaluation/ContractorEvaluationEdit.aspx b/FCLPackFile_2024.05.24/PackFile/Evaluation/ContractorEvaluationEdit.aspx new file mode 100644 index 0000000..b1dcf29 --- /dev/null +++ b/FCLPackFile_2024.05.24/PackFile/Evaluation/ContractorEvaluationEdit.aspx @@ -0,0 +1,305 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractorEvaluationEdit.aspx.cs" Inherits="FineUIPro.Web.Evaluation.ContractorEvaluationEdit" %> + + + + + 项目经理编辑器 + + <%----%> + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + + + + + + + + + + + + + + + + + + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCLPackFile_2024.05.24/PackFile/File/Excel/Contractor_Qualification.xlsx b/FCLPackFile_2024.05.24/PackFile/File/Excel/Contractor_Qualification.xlsx new file mode 100644 index 0000000..d83e26e Binary files /dev/null and b/FCLPackFile_2024.05.24/PackFile/File/Excel/Contractor_Qualification.xlsx differ diff --git a/FCLPackFile_2024.05.24/PackFile/File/Excel/Performance Report_CN.xlsx b/FCLPackFile_2024.05.24/PackFile/File/Excel/Performance Report_CN.xlsx new file mode 100644 index 0000000..aa70386 Binary files /dev/null and b/FCLPackFile_2024.05.24/PackFile/File/Excel/Performance Report_CN.xlsx differ diff --git a/FCLPackFile_2024.05.24/PackFile/File/Excel/Performance Report_EN.xlsx b/FCLPackFile_2024.05.24/PackFile/File/Excel/Performance Report_EN.xlsx new file mode 100644 index 0000000..eafe9d6 Binary files /dev/null and b/FCLPackFile_2024.05.24/PackFile/File/Excel/Performance Report_EN.xlsx differ diff --git a/FCLPackFile_2024.05.24/PackFile/File/Excel/Punishment.xlsx b/FCLPackFile_2024.05.24/PackFile/File/Excel/Punishment.xlsx new file mode 100644 index 0000000..9405ffd Binary files /dev/null and b/FCLPackFile_2024.05.24/PackFile/File/Excel/Punishment.xlsx differ diff --git a/FCLPackFile_2024.05.24/PackFile/File/Excel/承包商评估表.xlsx b/FCLPackFile_2024.05.24/PackFile/File/Excel/承包商评估表.xlsx new file mode 100644 index 0000000..6d5e382 Binary files /dev/null and b/FCLPackFile_2024.05.24/PackFile/File/Excel/承包商评估表.xlsx differ diff --git a/FCLPackFile_2024.05.24/PackFile/SES/CSafePunish.aspx b/FCLPackFile_2024.05.24/PackFile/SES/CSafePunish.aspx new file mode 100644 index 0000000..e3c0cf2 --- /dev/null +++ b/FCLPackFile_2024.05.24/PackFile/SES/CSafePunish.aspx @@ -0,0 +1,181 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CSafePunish.aspx.cs" Inherits="FineUIPro.Web.SES.CSafePunish" %> + + + + + + + + Contractor Safety Punishment + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCLPackFile_2024.05.24/PackFile/SES/CSafePunishEdit.aspx b/FCLPackFile_2024.05.24/PackFile/SES/CSafePunishEdit.aspx new file mode 100644 index 0000000..1d69937 --- /dev/null +++ b/FCLPackFile_2024.05.24/PackFile/SES/CSafePunishEdit.aspx @@ -0,0 +1,144 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CSafePunishEdit.aspx.cs" Inherits="FineUIPro.Web.SES.CSafePunishEdit" %> + + + + + + + Contractor Safety Punishment Edit + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCLPackFile_2024.05.24/PackFile/SES/ContractorQualification.aspx b/FCLPackFile_2024.05.24/PackFile/SES/ContractorQualification.aspx new file mode 100644 index 0000000..493cb5b --- /dev/null +++ b/FCLPackFile_2024.05.24/PackFile/SES/ContractorQualification.aspx @@ -0,0 +1,888 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractorQualification.aspx.cs" Inherits="FineUIPro.Web.SES.ContractorQualification" %> + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCLPackFile_2024.05.24/PackFile/SES/ContractorQualificationEdit.aspx b/FCLPackFile_2024.05.24/PackFile/SES/ContractorQualificationEdit.aspx new file mode 100644 index 0000000..35195ba --- /dev/null +++ b/FCLPackFile_2024.05.24/PackFile/SES/ContractorQualificationEdit.aspx @@ -0,0 +1,76 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractorQualificationEdit.aspx.cs" Inherits="FineUIPro.Web.SES.ContractorQualificationEdit" %> + + + + + + + Signed Contracts + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCLPackFile_2024.05.24/PackFile/SES/ContractorQueCopy.aspx b/FCLPackFile_2024.05.24/PackFile/SES/ContractorQueCopy.aspx new file mode 100644 index 0000000..2074a30 --- /dev/null +++ b/FCLPackFile_2024.05.24/PackFile/SES/ContractorQueCopy.aspx @@ -0,0 +1,36 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractorQueCopy.aspx.cs" Inherits="FineUIPro.Web.SES.ContractorQueCopy" %> + + + + + + RT委托替换 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FCLPackFile_2024.05.24/PackFile/bin/App_GlobalResources.compiled b/FCLPackFile_2024.05.24/PackFile/bin/App_GlobalResources.compiled new file mode 100644 index 0000000..bb5af6b --- /dev/null +++ b/FCLPackFile_2024.05.24/PackFile/bin/App_GlobalResources.compiled @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/FCLPackFile_2024.05.24/PackFile/bin/App_global.asax.compiled b/FCLPackFile_2024.05.24/PackFile/bin/App_global.asax.compiled new file mode 100644 index 0000000..7759987 --- /dev/null +++ b/FCLPackFile_2024.05.24/PackFile/bin/App_global.asax.compiled @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/FCLPackFile_2024.05.24/PackFile/bin/BLL.dll b/FCLPackFile_2024.05.24/PackFile/bin/BLL.dll new file mode 100644 index 0000000..2ab4c1f Binary files /dev/null and b/FCLPackFile_2024.05.24/PackFile/bin/BLL.dll differ diff --git a/FCLPackFile_2024.05.24/PackFile/bin/FineUIPro.Web.dll b/FCLPackFile_2024.05.24/PackFile/bin/FineUIPro.Web.dll new file mode 100644 index 0000000..b6b8a57 Binary files /dev/null and b/FCLPackFile_2024.05.24/PackFile/bin/FineUIPro.Web.dll differ diff --git a/FCLPackFile_2024.05.24/PackFile/bin/Model.dll b/FCLPackFile_2024.05.24/PackFile/bin/Model.dll new file mode 100644 index 0000000..9ec851c Binary files /dev/null and b/FCLPackFile_2024.05.24/PackFile/bin/Model.dll differ diff --git a/FCLPackFile_2024.05.24/PackFile/bin/UI.dll b/FCLPackFile_2024.05.24/PackFile/bin/UI.dll new file mode 100644 index 0000000..d3b8323 Binary files /dev/null and b/FCLPackFile_2024.05.24/PackFile/bin/UI.dll differ diff --git a/FCLPackFile_2024.05.24/版本日志/FCLDB_2024.05.16.sql b/FCLPackFile_2024.05.24/版本日志/FCLDB_2024.05.16.sql new file mode 100644 index 0000000..ef49a2d --- /dev/null +++ b/FCLPackFile_2024.05.24/版本日志/FCLDB_2024.05.16.sql @@ -0,0 +1,44 @@ +ALTER TABLE dbo.FC_SESRelatedData ADD OtherDef NVARCHAR(300) NULL +GO +ALTER TABLE dbo.Base_FileType ADD IsExport BIT NULL +GO +UPDATE dbo.Base_FileType SET IsExport=0 +GO + +ALTER VIEW [dbo].[View_FC_ContractManagement] +AS +SELECT cm.OccurDate,fc.FO_NO,dis.Discipline AS DisciplineEn,dis.DisciplineCN,con.Contractor AS ContractorEn,con.ContractorCN, + (CASE WHEN con.Contractor IS NULL THEN con.ContractorCN WHEN con.ContractorCN IS NULL THEN con.Contractor ELSE con.Contractor+con.ContractorCN END)AS Contractor, + (CASE WHEN dis.Discipline IS NULL THEN dis.DisciplineCN WHEN dis.DisciplineCN IS NULL THEN dis.Discipline ELSE dis.Discipline+dis.DisciplineCN END) AS Discipline, + cm.Remark,ftype.FileType,u.UserName AS Contract_Admin, u2.UserName AS Main_Coordinator,mcdep.DepartName AS MCDept, + u3.UserName AS User_Representative, bycDep.DepartCode AS BycDept,ftype.IsExport +FROM dbo.FC_ContractManagement cm +LEFT JOIN dbo.FC_SESRelatedData fc ON fc.ID = cm.FC_ID +LEFT JOIN dbo.Base_Discipline AS dis ON dis.DisciplineId = fc.DisciplineId +LEFT JOIN dbo.Base_Contractor AS con ON con.ContractorId = fc.Contractor +LEFT JOIN dbo.Base_FileType ftype ON ftype.FileTypeId = cm.FileTypeId +LEFT JOIN dbo.Sys_User AS u ON u.UserId = fc.Contract_Admin +LEFT JOIN dbo.Sys_User AS u2 ON u2.UserId = fc.Main_Coordinator +LEFT JOIN dbo.Sys_User AS u3 ON u3.UserId=fc.User_Representative +LEFT JOIN dbo.Base_Depart mcdep ON mcdep.DepartId = u2.DepartId +LEFT JOIN dbo.Base_Depart bycDep ON bycDep.DepartId=cm.BycDept + + +GO + +CREATE VIEW [dbo].[View_EMC_Contractor_Qualification] +AS +SELECT cm.FoId,fc.FO_NO,cm.QueName,cm.QueDef,cm.QueType,cm.LimitStartDate,cm.LimitEndDate,cm.Remark, + (CASE WHEN con.Contractor IS NULL THEN con.ContractorCN WHEN con.ContractorCN IS NULL THEN con.Contractor ELSE con.Contractor+con.ContractorCN END)AS Contractor, + (CASE WHEN dis.Discipline IS NULL THEN dis.DisciplineCN WHEN dis.DisciplineCN IS NULL THEN dis.Discipline ELSE dis.Discipline+dis.DisciplineCN END) AS Discipline, + u.UserName AS Contract_Admin, u2.UserName AS Main_Coordinator,fc.Expire_Date,fc.Contractor AS ContractorId ,fc.FC_Status +FROM dbo.EMC_Contractor_Qualification cm +LEFT JOIN dbo.FC_SESRelatedData fc ON fc.ID = cm.FoId +LEFT JOIN dbo.Base_Discipline AS dis ON dis.DisciplineId = fc.DisciplineId +LEFT JOIN dbo.Base_Contractor AS con ON con.ContractorId = fc.Contractor +LEFT JOIN dbo.Sys_User AS u ON u.UserId = fc.Contract_Admin +LEFT JOIN dbo.Sys_User AS u2 ON u2.UserId = fc.Main_Coordinator + +GO + +