From 7e7188039ba64bebbeee992547bad037ea8a6d3b Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Tue, 28 Mar 2023 16:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9B=86=E5=9B=A2=E5=B1=95?=
=?UTF-8?q?=E7=A4=BA=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../版本日志/SGGLDB_WH_2023-03-27.sql | 358 +-
SGGL/FineUIPro.Web/DataShow/Accident.aspx | 6 +-
SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs | 1 -
SGGL/FineUIPro.Web/DataShow/Check.aspx | 6 +-
SGGL/FineUIPro.Web/DataShow/Check.aspx.cs | 1 -
.../FineUIPro.Web/DataShow/CompanyPerson.aspx | 6 +-
.../DataShow/CompanyPerson.aspx.cs | 1 -
SGGL/FineUIPro.Web/DataShow/EduTrain.aspx | 6 +-
SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs | 1 -
SGGL/FineUIPro.Web/DataShow/Emergency.aspx | 6 +-
SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs | 4 +-
.../FineUIPro.Web/DataShow/Environmental.aspx | 6 +-
.../DataShow/Environmental.aspx.cs | 1 -
SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx | 6 +-
.../FineUIPro.Web/DataShow/HJGLDefect.aspx.cs | 1 -
SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx | 6 +-
.../FineUIPro.Web/DataShow/HJGLWelder.aspx.cs | 1 -
SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx | 8 +-
.../DataShow/HJGLWelding.aspx.cs | 47 +-
.../DataShow/HiddenRectification.aspx | 18 +-
.../DataShow/HiddenRectification.aspx.cs | 24 +-
.../HiddenRectification.aspx.designer.cs | 18 +-
.../DataShow/HiddenRectificationItem.aspx | 8 +-
.../DataShow/HiddenRectificationItem.aspx.cs | 27 +-
.../HiddenRectificationItem.aspx.designer.cs | 18 +-
.../DataShow/LargeEngineering.aspx | 6 +-
.../DataShow/LargeEngineering.aspx.cs | 1 -
SGGL/FineUIPro.Web/DataShow/License.aspx | 16 +-
SGGL/FineUIPro.Web/DataShow/License.aspx.cs | 1 -
SGGL/FineUIPro.Web/DataShow/Meeting.aspx | 6 +-
SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs | 1 -
SGGL/FineUIPro.Web/DataShow/Project.aspx | 6 +-
SGGL/FineUIPro.Web/DataShow/Project.aspx.cs | 1 -
.../DataShow/ProjectDivision.aspx | 6 +-
.../FineUIPro.Web/DataShow/ProjectPerson.aspx | 6 +-
.../DataShow/ProjectPerson.aspx.cs | 1 -
.../DataShow/QualityAcceptance.aspx | 6 +-
.../DataShow/QualityAcceptance.aspx.cs | 1 -
.../DataShow/QualityControlPoint.aspx | 6 +-
.../DataShow/QualityControlPoint.aspx.cs | 1 -
.../DataShow/QualityInstruments.aspx | 6 +-
.../DataShow/QualityInstruments.aspx.cs | 1 -
.../FineUIPro.Web/DataShow/QualityPerson.aspx | 6 +-
.../DataShow/QualityPerson.aspx.cs | 1 -
.../DataShow/QualityProblem.aspx | 6 +-
.../DataShow/QualityProblem.aspx.cs | 1 -
.../DataShow/QualityTraining.aspx | 6 +-
.../DataShow/QualityTraining.aspx.cs | 6 +-
SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx | 6 +-
.../DataShow/SecurityCost.aspx.cs | 1 -
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx | 6 +-
.../DataShow/SecurityRisk.aspx.cs | 1 -
SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx | 6 +-
.../DataShow/WorkingHours.aspx.cs | 1 -
SGGL/Model/Model.cs | 6997 ++++++++++++++++-
55 files changed, 7524 insertions(+), 177 deletions(-)
diff --git a/DataBase/版本日志/SGGLDB_WH_2023-03-27.sql b/DataBase/版本日志/SGGLDB_WH_2023-03-27.sql
index 1ebe42e7..61fa492b 100644
--- a/DataBase/版本日志/SGGLDB_WH_2023-03-27.sql
+++ b/DataBase/版本日志/SGGLDB_WH_2023-03-27.sql
@@ -1,2 +1,358 @@
alter table HSSE_Hazard_HazardRegister add HazardValue nvarchar(50) null
-GO
\ No newline at end of file
+GO
+alter table HSSE_Hazard_HazardRegister add Risk_Level nvarchar(50) null
+GO
+
+
+CREATE TABLE [dbo].[Person_CompanyBranchPerson](
+ [CompanyBranchPersonId] [nvarchar](50) NOT NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [PersonName] [nvarchar](50) NULL,
+ [Sex] [char](1) NULL,
+ [IdentityCard] [nvarchar](50) NULL,
+ [WorkPostId] [nvarchar](50) NULL,
+ [Telephone] [nvarchar](50) NULL,
+ [Address] [nvarchar](500) NULL,
+ [IsOnJob] [bit] NULL,
+ [Remark] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Person_Person] PRIMARY KEY CLUSTERED
+(
+ [CompanyBranchPersonId] 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
+
+SET ANSI_PADDING OFF
+GO
+
+ALTER TABLE [dbo].[Person_CompanyBranchPerson] WITH CHECK ADD CONSTRAINT [FK_Person_CompanyBranchPerson_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[Person_CompanyBranchPerson] CHECK CONSTRAINT [FK_Person_CompanyBranchPerson_Base_Unit]
+GO
+
+ALTER TABLE [dbo].[Person_CompanyBranchPerson] WITH CHECK ADD CONSTRAINT [FK_Person_CompanyBranchPerson_Base_WorkPost] FOREIGN KEY([WorkPostId])
+REFERENCES [dbo].[Base_WorkPost] ([WorkPostId])
+GO
+
+ALTER TABLE [dbo].[Person_CompanyBranchPerson] CHECK CONSTRAINT [FK_Person_CompanyBranchPerson_Base_WorkPost]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'CompanyBranchPersonId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'PersonName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'Sex'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'IdentityCard'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'WorkPostId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'绰' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'Telephone'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ַͥ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'Address'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿְ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'IsOnJob'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'Remark'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵ֧ܲԱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson'
+GO
+
+alter table [dbo].[Supervise_SuperviseCheckReport] add CheckType char(1) null
+GO
+alter table [dbo].[InApproveManager_EquipmentInItem] add IsUsed bit null
+GO
+alter table [dbo].[InApproveManager_GeneralEquipmentInItem] add IsUsed bit null
+GO
+
+
+/**********Ѳ죨ֻˣͼ*************/
+ALTER VIEW [dbo].[View_Hazard_HazardRegister]
+AS
+SELECT Registration.HazardRegisterId,
+ Registration.HazardCode,
+ Registration.RegisterDate,
+ Registration.RegisterDef,
+ Registration.Rectification,
+ Registration.Place,
+ Registration.ResponsibleUnit,
+ Registration.Observer,
+ Registration.RectifiedDate,
+ Registration.ProjectId,
+ Registration.states,
+ Registration.IsEffective,
+ Registration.ResponsibleMan,
+ Registration.CheckManId,
+ Registration.CheckTime,
+ Registration.RectificationPeriod,
+ Registration.ImageUrl,
+ Registration.RectificationImageUrl,
+ Registration.RectificationTime,
+ Registration.ConfirmMan,
+ Registration.ConfirmDate,
+ Registration.HandleIdea,
+ Registration.CutPayment,
+ Registration.ProblemTypes,
+ Registration.CheckSpecialId,
+ Registration.CheckItemDetailId,
+ Registration.SupCheckItemSetId,
+ Registration.CheckItemSetId,
+ Registration.SafeSupervisionId,
+ Registration.SafeSupervisionIsOK,
+ Registration.Risk_Level,
+ Project.ProjectName,
+ Registration.CheckCycle,
+ ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName,
+ Unit.UnitName AS ResponsibilityUnitName,
+ ISNULL(User1.UserName,'') AS ResponsibilityManName,
+ ISNULL(User1.Telephone,'') AS ResponsibilityManTel,
+ ISNULL(User2.UserName,'') AS CheckManName,
+ ISNULL(User2.Telephone,'') AS CheckManTel,
+ User2.UnitId AS SendUnitId,
+ ISNULL(User3.UserName,'') AS ConfirmManName,
+ ISNULL(User3.Telephone,'') AS ConfirmManTel,
+ ISNULL(User4.UserName,'') AS ResponsibilityManName2,
+ ISNULL(User4.Telephone,'') AS ResponsibilityMan2Tel,
+ (CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN ''
+ WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN 'ϸ'
+ WHEN Registration.states='2' THEN ''
+ WHEN Registration.states='3' THEN 'ѱջ'
+ ELSE '' END ) AS StatesStr,
+ RegisterTypes.RegisterTypesId,
+ RegisterTypes.RegisterTypesName,
+ Registration.DIC_ID,
+ Registration.CCManIds,
+ CCManNames = STUFF(( SELECT ',' + UserName FROM Sys_User
+ where PATINDEX('%,' + RTRIM(Sys_User.UserId) + ',%',',' + Registration.CCManIds + ',')>0
+ ORDER BY PATINDEX('%,' + RTRIM(Registration.CCManIds) + ',%',',' + Registration.CCManIds + ',')
+ FOR XML PATH('')), 1, 1,''),
+ Registration.Requirements
+FROM dbo.HSSE_Hazard_HazardRegister AS Registration
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId
+LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place
+LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId
+LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit
+LEFT JOIN dbo.Sys_User AS User1 ON User1.UserId = Registration.ResponsibleMan
+LEFT JOIN dbo.Sys_User AS User2 ON User2.UserId = Registration.CheckManId
+LEFT JOIN dbo.Sys_User AS User3 ON User3.UserId = Registration.ConfirmMan
+LEFT JOIN dbo.Sys_User AS User4 ON User4.UserId = Registration.ResponsibleMan2
+
+
+
+
+GO
+
+
+CREATE TABLE [dbo].[CH_Check](
+ [CHT_CheckID] [varchar](50) NOT NULL,
+ [CH_TrustID] [varchar](50) NULL,
+ [ProjectId] [nvarchar](50) NOT NULL,
+ [UnitId] [nvarchar](50) NOT NULL,
+ [InstallationId] [nvarchar](50) NULL,
+ [CHT_CheckCode] [varchar](50) NULL,
+ [CHT_CheckDate] [datetime] NULL,
+ [CHT_CheckType] [char](2) NULL,
+ [CHT_CheckMan] [varchar](50) NULL,
+ [CHT_Tabler] [varchar](50) NULL,
+ [CHT_TableDate] [datetime] NULL,
+ [CHT_AuditMan] [varchar](50) NULL,
+ [CHT_AuditDate] [datetime] NULL,
+ [CHT_Remark] [varchar](100) NULL,
+ [RepairTrustId] [nvarchar](50) NULL,
+ [ContractualUnits] [nvarchar](50) NULL,
+ CONSTRAINT [PK_CH_Check] PRIMARY KEY CLUSTERED
+(
+ [CHT_CheckID] 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
+
+SET ANSI_PADDING OFF
+GO
+
+ALTER TABLE [dbo].[CH_Check] WITH CHECK ADD CONSTRAINT [FK_CH_Check_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[CH_Check] CHECK CONSTRAINT [FK_CH_Check_Base_Project]
+GO
+
+ALTER TABLE [dbo].[CH_Check] WITH CHECK ADD CONSTRAINT [FK_CH_Check_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[CH_Check] CHECK CONSTRAINT [FK_CH_Check_Base_Unit]
+GO
+
+ALTER TABLE [dbo].[CH_Check] WITH CHECK ADD CONSTRAINT [FK_CH_Check_Base_Unit1] FOREIGN KEY([ContractualUnits])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[CH_Check] CHECK CONSTRAINT [FK_CH_Check_Base_Unit1]
+GO
+
+ALTER TABLE [dbo].[CH_Check] WITH CHECK ADD CONSTRAINT [FK_CH_Check_CH_Trust] FOREIGN KEY([CH_TrustID])
+REFERENCES [dbo].[CH_Trust] ([CH_TrustID])
+GO
+
+ALTER TABLE [dbo].[CH_Check] CHECK CONSTRAINT [FK_CH_Check_CH_Trust]
+GO
+
+
+
+CREATE TABLE [dbo].[CH_CheckItem](
+ [CHT_CheckItemID] [varchar](50) NOT NULL,
+ [CHT_CheckID] [varchar](50) NOT NULL,
+ [JOT_ID] [varchar](50) NULL,
+ [CH_TrustItemID] [varchar](50) NULL,
+ [CHT_CheckMethod] [varchar](50) NOT NULL,
+ [CHT_RequestDate] [datetime] NULL,
+ [CHT_RepairLocation] [varchar](20) NULL,
+ [CHT_TotalFilm] [int] NULL,
+ [CHT_PassFilm] [int] NULL,
+ [CHT_CheckResult] [varchar](20) NULL,
+ [CHT_CheckNo] [varchar](30) NULL,
+ [CHT_FilmDate] [datetime] NULL,
+ [CHT_ReportDate] [datetime] NULL,
+ [CHT_Remark] [varchar](100) NULL,
+ [CHT_FloorWelder1] [varchar](20) NULL,
+ [CHT_FloorWelder2] [varchar](20) NULL,
+ [CHT_AuditTime] [datetime] NULL,
+ [FilmSpecifications] [nvarchar](50) NULL,
+ [DefectLength] [decimal](9, 2) NULL,
+ [ExtendingRice] [decimal](9, 2) NULL,
+ [Defects_Definition] [varchar](50) NULL,
+ [DefectDepth] [decimal](9, 2) NULL,
+ [DefectHeight] [decimal](9, 2) NULL,
+ CONSTRAINT [PK_CH_CheckItem] PRIMARY KEY CLUSTERED
+(
+ [CHT_CheckItemID] 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
+
+SET ANSI_PADDING OFF
+GO
+
+ALTER TABLE [dbo].[CH_CheckItem] WITH CHECK ADD CONSTRAINT [FK_CH_CHECK_REFERENCE_CH_CHECK] FOREIGN KEY([CHT_CheckID])
+REFERENCES [dbo].[CH_Check] ([CHT_CheckID])
+GO
+
+ALTER TABLE [dbo].[CH_CheckItem] CHECK CONSTRAINT [FK_CH_CHECK_REFERENCE_CH_CHECK]
+GO
+
+ALTER TABLE [dbo].[CH_CheckItem] WITH CHECK ADD CONSTRAINT [FK_CH_CHECK_REFERENCE_CH_TRUST] FOREIGN KEY([CH_TrustItemID])
+REFERENCES [dbo].[CH_TrustItem] ([CH_TrustItemID])
+GO
+
+ALTER TABLE [dbo].[CH_CheckItem] CHECK CONSTRAINT [FK_CH_CHECK_REFERENCE_CH_TRUST]
+GO
+
+ALTER TABLE [dbo].[CH_CheckItem] WITH CHECK ADD CONSTRAINT [FK_CH_CHECK_REFERENCE_PW_JOINT] FOREIGN KEY([JOT_ID])
+REFERENCES [dbo].[PW_JointInfo] ([JOT_ID])
+GO
+
+ALTER TABLE [dbo].[CH_CheckItem] CHECK CONSTRAINT [FK_CH_CHECK_REFERENCE_PW_JOINT]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƭ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CH_CheckItem', @level2type=N'COLUMN',@level2name=N'FilmSpecifications'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȱݳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CH_CheckItem', @level2type=N'COLUMN',@level2name=N'DefectLength'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ӳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CH_CheckItem', @level2type=N'COLUMN',@level2name=N'ExtendingRice'
+GO
+
+
+alter table BS_Welder add TeamGroupId nvarchar(50) null
+GO
+alter table BS_Welder add WederType char(1) null
+GO
+
+
+ALTER VIEW [dbo].[View_License_LicenseManager]
+AS
+/*ֳȫ֤*/
+SELECT LicenseManager.LicenseManagerId,
+ LicenseManager.ProjectId,
+ LicenseManager.LicenseTypeId,
+ LicenseManager.LicenseManagerCode,
+ LicenseManager.LicenseManageName,
+ LicenseManager.UnitId,
+ LicenseManager.LicenseManageContents,
+ LicenseManager.CompileMan,
+ LicenseManager.CompileDate,
+ LicenseManager.CNProfessionalId,
+ CN.ProfessionalName,
+ LicenseManager.States,
+ Project.ProjectCode,
+ Project.ProjectName,
+ LicenseType.LicenseTypeName,
+ Unit.UnitName,
+ UnitType.UnitTypeId,
+ UnitType.UnitTypeName,
+ Users.UserName,
+ LicenseManager.WorkAreaId,
+ --WorkArea.WorkAreaName,
+ case LicenseManager.WorkStates when '1' then ''
+ when '2' then 'ҵ'
+ when '3' then 'ѹر'
+ when '-1' then 'ȡ'
+ else '' end as WorkStatesStr,
+ LicenseManager.StartDate,
+ LicenseManager.EndDate,
+ LicenseManager.ApplicantMan,
+ WorkAreaName = STUFF(( SELECT ',' + UnitWorkName FROM WBS_UnitWork
+ where PATINDEX('%,' + RTRIM(WBS_UnitWork.UnitWorkId) + ',%',',' + LicenseManager.WorkAreaId + ',')>0
+ ORDER BY PATINDEX('%,' + RTRIM(LicenseManager.WorkAreaId) + ',%',',' + LicenseManager.WorkAreaId + ',')
+ FOR XML PATH('')), 1, 1,'')
+FROM dbo.License_LicenseManager AS LicenseManager
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = LicenseManager.ProjectId
+LEFT JOIN dbo.Base_LicenseType AS LicenseType ON LicenseType.LicenseTypeId = LicenseManager.LicenseTypeId
+LEFT JOIN dbo.Base_CNProfessional AS CN ON CN.CNProfessionalId = LicenseManager.CNProfessionalId
+LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = LicenseManager.UnitId
+LEFT JOIN dbo.Sys_User AS Users ON Users.UserId = LicenseManager.CompileMan
+LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = LicenseManager.WorkAreaId
+LEFT JOIN dbo.Base_UnitType as UnitType ON UnitType.UnitTypeId=Unit.UnitTypeId
+
+
+GO
+
+
+alter table Base_Project add ProjectAttribute nvarchar(50) null
+GO
+update Base_Project set ProjectAttribute='GONGCHENG'
+GO
+
+alter table [dbo].[WBS_DivisionProject] add [SubItemType] char(1) null
+GO
+alter table [dbo].WBS_BreakdownProject add CheckAcceptType char(1) null
+GO
+alter table [dbo].Comprehensive_InspectionMachine add Status nvarchar(2) null
+GO
+alter table [dbo].Comprehensive_InspectionPerson add Status nvarchar(2) null
+GO
+alter table [dbo].Comprehensive_DesignDetails add Status nvarchar(2) null
+GO
+alter table [dbo].Hazard_HazardSelectedItem add HazardSelectedItemId nvarchar(50) null
+GO
+
+
diff --git a/SGGL/FineUIPro.Web/DataShow/Accident.aspx b/SGGL/FineUIPro.Web/DataShow/Accident.aspx
index 9c3085f2..ae1532fc 100644
--- a/SGGL/FineUIPro.Web/DataShow/Accident.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/Accident.aspx
@@ -38,7 +38,7 @@
-
+
@@ -111,13 +111,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
- function close(event) {
+ function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
- if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+ if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
diff --git a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
index 3c48c3b1..828a7bd9 100644
--- a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
@@ -23,7 +23,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
- btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
diff --git a/SGGL/FineUIPro.Web/DataShow/Check.aspx b/SGGL/FineUIPro.Web/DataShow/Check.aspx
index 070d979e..9a68b38d 100644
--- a/SGGL/FineUIPro.Web/DataShow/Check.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/Check.aspx
@@ -44,7 +44,7 @@
Width="130px">
-
+
@@ -110,13 +110,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
- function close(event) {
+ function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
- if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+ if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
diff --git a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
index 14be1c57..0114067e 100644
--- a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
@@ -24,7 +24,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
- btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
diff --git a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx
index 81b8e027..1e738c86 100644
--- a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx
@@ -35,7 +35,7 @@
-
+
@@ -96,13 +96,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
- function close(event) {
+ function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
- if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+ if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
diff --git a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
index fa5dc7ef..008e2f4d 100644
--- a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
- btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格t
BindGrid();
diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
index 32b611d3..f2e3f055 100644
--- a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
@@ -43,7 +43,7 @@
Width="130px">
-
+
@@ -113,13 +113,13 @@
}
// 点击标题栏工具图标 - 退出
- function close(event) {
+ function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
- if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+ if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
index 551eb391..065d83b0 100644
--- a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
@@ -19,7 +19,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
- // btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
diff --git a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx
index 98748361..61b6967a 100644
--- a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx
@@ -38,7 +38,7 @@
Width="130px">
-
+
@@ -195,13 +195,13 @@
}
// 点击标题栏工具图标 - 退出
- function close(event) {
+ function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
- if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+ if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
diff --git a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs
index 3cf3a8f4..262fd200 100644
--- a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs
@@ -19,9 +19,7 @@ namespace FineUIPro.Web.DataShow
{
if (!IsPostBack)
{
- Funs.DropDownPageSize(this.ddlPageSize);
- btnClose.OnClientClick = ActiveWindow.GetHideReference();
-
+ Funs.DropDownPageSize(this.ddlPageSize);
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
diff --git a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx
index 80785d6a..54f5ac7a 100644
--- a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx
@@ -38,7 +38,7 @@
Width="130px">
-
+
@@ -109,13 +109,13 @@
}
// 点击标题栏工具图标 - 退出
- function close(event) {
+ function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
- if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+ if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
diff --git a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs
index 5e316a2e..25bf4e16 100644
--- a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs
@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
- // btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格t
BindGrid();
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx
index 69378869..bcfa4311 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx
@@ -35,7 +35,7 @@
Width="130px">
--%>
-
+
@@ -95,13 +95,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
- function close(event) {
+ function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
- if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+ if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
index 787f61e2..5cb335d8 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
- btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx
index 7cbd5210..a5a4c52e 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx
@@ -29,7 +29,7 @@
-
+
@@ -109,13 +109,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
- function close(event) {
+ function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
- if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+ if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
index 35c4c2b1..9056aff7 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
- btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx
index f288b3c2..f61beb76 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx
@@ -35,7 +35,7 @@
Width="130px">
-
+
@@ -95,7 +95,7 @@