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

提交代码

Browse Source
This commit is contained in:
高飞
2023-10-31 11:45:17 +08:00
parent ef21f58a61 8d25d69061
commit 6e575bf185
77 changed files with 1842 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
+3 -3
View File
@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -45,7 +45,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId
LEFT JOIN SitePerson_Person AS Person ON Person.PersonId = Record.PersonId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId
WHERE 1=1 ";
WHERE IsCNCECShow=1 ";
if (rbType.SelectedValue == "0")
{
@@ -67,7 +67,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Sys_Const AS AccidentType ON AccidentType.ConstValue = Record.AccidentTypeId AND GroupId='AccidentReportRegistration'
LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Record.UnitId
WHERE 1 = 1 ";
WHERE IsCNCECShow=1 ";
if (rbType.SelectedValue == "2")
{
strSql += " AND Record.AccidentDegree ='1'";
SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
+5 -5
View File
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow
+ @" FROM dbo.Supervise_SuperviseCheckReport AS S"
+ @" LEFT JOIN dbo.Base_Project AS P ON P.ProjectId=S.ProjectId"
+ @" LEFT JOIN dbo.Base_Unit AS U ON U.UnitId=S.UnitId"
+ @" WHERE 1=1 ";
+ @" WHERE IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND S.CheckType= @CheckType";
listStr.Add(new SqlParameter("@CheckType", this.rbCom.SelectedValue));
@@ -74,7 +74,7 @@ namespace FineUIPro.Web.DataShow
,CheckTeam= STUFF((SELECT ',' + PersonName FROM dbo.Person_Persons where PATINDEX('%,' + RTRIM(PersonId) + ',%',',' +C.LeaderIds + ',')>0 FOR XML PATH('')), 1, 1,'')
from Check_ProjectLeaderCheck AS C
LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
where 1=1 ";
where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
@@ -108,7 +108,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
LEFT JOIN Person_Persons AS U ON C.CheckManId=U.PersonId
LEFT JOIN Base_Unit AS Ut ON C.ResponsibleUnit=Ut.UnitId
where 1=1 ";
where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
@@ -141,7 +141,7 @@ namespace FineUIPro.Web.DataShow
,UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +(C.PartInUnits) + ',')>0 FOR XML PATH('')), 1, 1,'')
from Check_CheckSpecial AS C
LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
where 1=1 ";
where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
+4 -4
View File
@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -38,20 +38,20 @@ namespace FineUIPro.Web.DataShow
strSql = @"SELECT ID,ProjectId,ProjectCode,ProjectName,UnitId,UnitName,SpecialEquipmentId,SpecialEquipmentName,SizeModel,OwnerCheck,CertificateNum,CompileDate,EQType
FROM (SELECT Item.EquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId
,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'特种设备' AS EQType
,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'特种设备' AS EQType,IsCNCECShow
FROM InApproveManager_EquipmentInItem AS Item
LEFT JOIN InApproveManager_EquipmentIn AS EQ ON EQ.EquipmentInId = Item.EquipmentInId
LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId
LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId
UNION ALL SELECT Item.GeneralEquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId
,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'一般设备' AS EQType
,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'一般设备' AS EQType,IsCNCECShow
FROM InApproveManager_GeneralEquipmentInItem AS Item
LEFT JOIN InApproveManager_GeneralEquipmentIn AS EQ ON EQ.GeneralEquipmentInId = Item.GeneralEquipmentInId
LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId
LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId ) V
WHERE 1=1 ";
WHERE IsCNCECShow=1 ";
//strSql += " AND V.IsUsed = @IsUsed";
//listStr.Add(new SqlParameter("@IsUsed", "1"));
SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
+2 -2
View File
@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
from EduTrain_TrainRecord AS TrainRecord
LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId
LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId
WHERE 1=1 ";
WHERE IsCNCECShow=1 ";
strSql += " AND TrainType.TrainType =@TrainType";
listStr.Add(new SqlParameter("@TrainType", this.rbType.SelectedValue));
SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs
+3 -3
View File
@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
ddlPageSize2.SelectedValue = Grid2.PageSize.ToString();
@@ -97,7 +97,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Unit AS Unit ON Em.UnitId=Unit.UnitId
LEFT JOIN Base_Project AS Project ON Em.ProjectId=Project.ProjectId
LEFT JOIN Base_EmergencyType AS EmergencyType ON Em.EmergencyTypeId=EmergencyType.EmergencyTypeId
WHERE 1=1 ";
WHERE IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
@@ -257,7 +257,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS Project ON List.Projectid = Project.ProjectId
LEFT JOIN Sys_Const AS DrillRecordType ON DrillRecordType.ConstValue = List.DrillRecordType
and DrillRecordType.GroupId='DrillRecordType'
WHERE 1=1 ";
WHERE IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
+2 -2
View File
@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow
FROM HJGL_Batch_NDEItem AS Item
LEFT JOIN HJGL_Batch_NDE AS Checks ON Item.NDEID =Checks.NDEID
LEFT JOIN Base_Project AS Project ON Checks.ProjectId =Project.ProjectId
WHERE 1=1 ";
WHERE IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
+2 -2
View File
@@ -21,7 +21,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS Project ON Welder.ProjectId = Project.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Welder.UnitId
LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId = Welder.TeamGroupId
WHERE Welder.WorkPostId=@WorkPostId AND Welder.ProjectId IS NOT NULL";
WHERE IsCNCECShow=1 AND Welder.WorkPostId=@WorkPostId AND Welder.ProjectId IS NOT NULL";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@WorkPostId", Const.WorkPost_Welder));
if (this.drpProject.SelectedValue !=Const._Null)
SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
+2 -2
View File
@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
+2 -2
View File
@@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
+2 -2
View File
@@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
LargerHazard = (from x in Funs.DB.Solution_LargerHazard
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/License.aspx.cs
+3 -3
View File
@@ -22,8 +22,8 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格
BindGrid();
}
}
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
,V.WorkAreaName,V.CompileDate,V.StartDate,V.EndDate,V.LicenseTypeId,V.UnitId,V.LicenseManageContents
,V.CompileMan,V.CompileDate,V.States
FROM View_License_LicenseManager AS V
WHERE 1=1";
WHERE IsCNCECShow=1 ";
if (this.rbType.SelectedValue=="2")
{
strSql += " AND V.States = @WorkStates";
SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs
+5 -5
View File
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -96,7 +96,7 @@ namespace FineUIPro.Web.DataShow
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson
FROM Meeting_SafetyLeaderGroupMeeting AS Meeting
LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId
where 1=1 ";
where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
@@ -127,15 +127,15 @@ namespace FineUIPro.Web.DataShow
{
string strSql = @"SELECT ProjectId,ProjectName, ID, MeetingName, MeetingDate,MeetingHours,HostMan,AttentPersonNum,AttentPerson
FROM (SELECT Project.ProjectId,Project.ProjectName,Meeting.MonthMeetingId AS ID,Meeting.MonthMeetingName AS MeetingName,Meeting.MonthMeetingDate AS MeetingDate,Meeting.MeetingHours
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson,IsCNCECShow
FROM Meeting_MonthMeeting AS Meeting
LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId
union all
SELECT Project.ProjectId,Project.ProjectName,Meeting.WeekMeetingId AS ID,Meeting.WeekMeetingName AS MeetingName,Meeting.WeekMeetingDate AS MeetingDate,Meeting.MeetingHours
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson,IsCNCECShow
FROM Meeting_WeekMeeting AS Meeting
LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId ) V
where 1=1 ";
where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
+1 -1
View File
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow
, ProjectMoney, DATEDIFF(DAY, Project.StartDate, GETDATE()) AS DayCount, ProjectType.ProjectTypeName AS ProjectTypeName
FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId = Project.UnitId
LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType = ProjectType.ProjectTypeId
WHERE 1 = 1";
WHERE IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.ckState.SelectedValue != "0")
SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs
+2 -2
View File
@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow
,(SELECT COUNT(*) FROM WBS_ControlItemProject AS D WHERE D.ProjectId =P.ProjectId ) AS count4
,(SELECT COUNT(*) FROM WBS_ControlItemAndCycle AS E WHERE E.ProjectId =P.ProjectId ) AS count5
FROM Base_Project AS P
WHERE P.ProjectState = 1 ";
WHERE P.IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs
+2 -2
View File
@@ -21,7 +21,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS Project ON Person.ProjectId =Project.ProjectId
LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
WHERE States=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) ";
WHERE IsCNCECShow=1 AND States=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue !=Const._Null)
{
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
+2 -2
View File
@@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
+2 -2
View File
@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
+2 -2
View File
@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
+2 -2
View File
@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -61,7 +61,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Person_Persons AS Persons ON Persons.PersonId=Person.PersonId
LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 ";
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 AND IsCNCECShow=1 ";
if (this.drpProject.SelectedValue != Const._Null)
{
strSql += " AND Person.ProjectId = @ProjectId";
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
+2 -2
View File
@@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
+2 -2
View File
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs
+2 -2
View File
@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
FROM CostGoods_CostSmallDetail as cost
left join Base_Project as p on cost.ProjectId =p.ProjectId
left join Base_Unit as Unit on cost.UnitId =Unit.UnitId
WHERE 1=1";
WHERE IsCNCECShow=1 ";
if (this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
+2 -2
View File
@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
+2 -2
View File
@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/File/Excel/DataIn/合同价格信息导入模板.xlsx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx
+1 -1
View File
@@ -60,7 +60,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="right">
<Items>
<f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="图纸预制率"></f:Label>
<f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="图纸预制率" Hidden="True"></f:Label>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSetShop" ToolTip="工厂预制" Text="工厂预制" Icon="ApplicationEdit"
EnablePostBack="true" OnClick="btnSetShop_Click" runat="server">
SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx
+4
View File
@@ -24,6 +24,10 @@
<f:TextBox runat="server" Label="评定编号" ID="txtWeldingProcedureCode" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="300px" LabelAlign="right">
</f:TextBox>
<f:DropDownList ID="drpUnit" runat="server" Required="true" ShowRedStar="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="True"
Label="工艺规程编制单位" LabelAlign="Right" LabelWidth="180px">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" Text="增加" Icon="Add" runat="server" OnClick="btnNew_Click">
SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.cs
+7
View File
@@ -21,6 +21,7 @@ namespace FineUIPro.Web.HJGL.WPQ
if (!IsPostBack)
{
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
// 绑定表格
BindGrid();
}
@@ -39,6 +40,12 @@ namespace FineUIPro.Web.HJGL.WPQ
strSql += " AND WPQCode LIKE @WPQCode";
listStr.Add(new SqlParameter("@WPQCode", "%" + this.txtWeldingProcedureCode.Text.Trim() + "%"));
}
if (drpUnit.SelectedValue!=Const._Null)
{
strSql += " AND UnitId =@UnitId";
listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.designer.cs
Generated
+37 -26
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WPQ {
public partial class WPQList {
namespace FineUIPro.Web.HJGL.WPQ
{
public partial class WPQList
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtWeldingProcedureCode 控件。
/// </summary>
@@ -65,7 +67,16 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldingProcedureCode;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -74,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnImport 控件。
/// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnExport 控件。
/// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnExport;
/// <summary>
/// lblNumber 控件。
/// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label41 控件。
/// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label41;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuView 控件。
/// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WPQ {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuView;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
+34 -16
View File
@@ -18,21 +18,32 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="250px" Title="管线" ShowBorder="true" Layout="VBox"
EnableCollapse="true" Width="280px" Title="管线" ShowBorder="true" Layout="VBox"
ShowHeader="false" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线"
EmptyText="输入查询条件" Width="190px" LabelWidth="80px"
LabelAlign="Right">
LabelAlign="Left">
</f:TextBox>
<f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
EnablePostBack="true" OnClick="btnQuery_Click" runat="server" >
</f:Button>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Left" >
<Items >
<f:DropDownList ID="drpFlowingSection" Label="流水段" AutoPostBack="true"
runat="server" LabelWidth="80px"
Width="180px" LabelAlign="Left">
</f:DropDownList>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="管线列表"
@@ -42,7 +53,7 @@
</f:Tree>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊口信息"
TitleToolTip="焊口信息" AutoScroll="true">
<Toolbars >
@@ -63,11 +74,11 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1" OnRowDataBound="Grid1_RowDataBound" DisableUnselectableRows="true"
DataKeyNames="WeldJointId" AllowColumnLocking="true" EnableColumnLines="true"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1" OnRowDataBound="Grid1_RowDataBound" DisableUnselectableRows="true"
DataKeyNames="WeldJointId" EnableColumnLines="true"
DataIDField="WeldJointId" EnableTextSelection="True" AllowSorting="true" SortField="WeldJointNum"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="true"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="true" OnRowCommand="Grid1_RowCommand"
PageSize="1000" EnableCheckBoxSelect="true">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
@@ -104,34 +115,39 @@
<Columns>
<f:RenderField HeaderText="焊口序号" ColumnID="WeldJointNum"
DataField="WeldJointNum" SortField="WeldJointNum" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px" Locked="true">
TextAlign="Center" Width="50px" >
</f:RenderField>
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="140px" Locked="true">
TextAlign="Center" Width="80px" >
</f:RenderField>
<f:RenderField HeaderText="备注" ColumnID="Remark"
DataField="Remark" SortField="Remark" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="140px" Locked="true">
TextAlign="Center" Width="80px" >
</f:RenderField>
<f:RenderField HeaderText="材质1" ColumnID="Material1Code"
DataField="Material1Code" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
HeaderTextAlign="Center" TextAlign="Center" Width="150px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField HeaderText="材质2" ColumnID="Material2Code"
DataField="Material2Code" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="140px" ExpandUnusedSpace="true">
HeaderTextAlign="Center" TextAlign="Center" Width="140px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField HeaderText="达因" ColumnID="Size"
DataField="Size" SortField="Size" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
HeaderTextAlign="Center" TextAlign="Center" Width="120px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="Dia" DataField="Dia" SortField="Dia"
FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="120px" >
FieldType="Double" HeaderTextAlign="Center" TextAlign="Center" Width="80px" >
</f:RenderField>
<f:RenderField HeaderText="公称直径" ColumnID="DNDia" DataField="DNDia" SortField="DNDia"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px" >
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="120px" >
</f:RenderField>
<f:TemplateField ColumnID="WPQCode" Width="160px" HeaderText="评定编号" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# BLL.WeldJointService.GetWPQCodeByWeldJointId(Eval("WeldJointId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="壁厚" ColumnID="Thickness"
DataField="Thickness" SortField="Thickness" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Left" Width="120px" Hidden="true">
@@ -152,6 +168,8 @@
DataField="WeldingRodCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true" Hidden="true">
</f:RenderField>
<f:LinkButtonField Width="60px" TextAlign="Center" ConfirmText="是否确认重置焊评？" ConfirmTarget="Top" Text="重置焊评"
CommandName="ResetWpq" />
</Columns>
</f:Grid>
</Items>
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
+59
View File
@@ -1,6 +1,7 @@
using Aspose.Words;
using BLL;
using Model;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data;
@@ -119,6 +120,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//this.SelectedList = new List<string>();
//this.NoSelectedList = new List<string>();
string strList = Request.Params["strList"];
List<string> list = Funs.GetStrListByStr(strList, '|');
if (list.Count() == 2)
@@ -126,6 +128,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.UnitWorkId = list[0];
TaskDate = list[1];
InitDropList();
Model.WBS_UnitWork UnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId);
BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, UnitWork.UnitId, false);//单位
@@ -207,6 +210,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
&& x.PipeArea == PipeArea
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
orderby x.PipelineCode select x).ToList();
if (!string .IsNullOrEmpty( drpFlowingSection.SelectedValue)&& drpFlowingSection.SelectedValue!=Const._Null)
{
pipeline = pipeline.Where(x => x.FlowingSection == drpFlowingSection.SelectedValue).ToList();
}
var joints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
int pageindex = int.Parse(node.CommandName.Split('|')[0]);
int pageCount = int.Parse(node.CommandName.Split('|')[1]);
@@ -351,6 +359,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//}
//Grid1.SelectedRowIDArray = arr;
}
private void InitDropList()
{
var pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == this.UnitWorkId
select x.FlowingSection).Distinct().ToList();
this.drpFlowingSection.DataTextField = "Value";
this.drpFlowingSection.DataValueField = "Value";
this.drpFlowingSection.DataSource = pipeline;
this.drpFlowingSection.DataBind();
Funs.FineUIPleaseSelect(drpFlowingSection);
}
#endregion
#region 管线查询
@@ -621,5 +643,42 @@ namespace FineUIPro.Web.HJGL.WeldingManage
};
}
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
if (e.CommandName == "ResetWpq")
{
var weldJointId = e.RowID;
var model = WeldJointService.GetWeldJointByWeldJointId(weldJointId);
if (model != null)
{
model.WPQId = null;
WeldJointService.UpdateWeldJoint(model);
List<Model.View_HJGL_WPQ> wpqList = BLL.WPQListServiceService.GetMatchWPQ(model, this.CurrUser.LoginProjectId, drpUnit.SelectedValue);
if (wpqList != null)
{
Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint();
Model.WPQ_WPQList wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId);
newJot.WPQId = wps.WPQId;
newJot.WeldJointId = model.WeldJointId;
newJot.WeldingRod = wps.WeldingRod;
newJot.WeldingWire = wps.WeldingWire;
newJot.WeldingMethodId = wps.WeldingMethodId;
newJot.GrooveTypeId = wps.GrooveType;
newJot.PreTemperature = wps.PreTemperature;
newJot.IsHotProess = wps.IsHotProess;
newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode));
BLL.WeldJointService.UpdateConWeldJoint(newJot);
}
BindGrid();
ShowNotify("焊评已重置！", MessageBoxIcon.Success);
}
}
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs
Generated
+27
View File
@@ -77,6 +77,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// Toolbar4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar4;
/// <summary>
/// drpFlowingSection 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpFlowingSection;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@@ -220,5 +238,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAccept;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (flag == "2")
{
GroupPanel2.Hidden = false;
IsReadOnly(true);
IsReadOnly(false);
}
else
{
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
+22 -7
View File
@@ -14,7 +14,7 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="200px" Title="WBS目录"
EnableCollapse="true" Width="320px" Title="WBS目录"
ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px"
IconFont="ArrowCircleLeft">
<Toolbars>
@@ -27,7 +27,7 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="500px" Title="焊接日报"
<f:Tree ID="tvControlItem" ShowHeader="false" Height="700px" Title="焊接日报"
OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true"
EnableTextSelection="true">
@@ -117,7 +117,7 @@
DataField="BackingWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="焊口机动化程度" ColumnID="WeldingMode" DataField="WeldingMode"
<f:RenderField HeaderText="焊口机动化程度" ColumnID="WeldingMode" DataField="WeldingMode" Hidden="True"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="材质1" ColumnID="Material1Code"
@@ -154,15 +154,21 @@
TextAlign="Center" Width="160px">
</f:RenderField>
<f:RenderField HeaderText="焊丝" ColumnID="WeldingWireCode"
<f:RenderField HeaderText="焊丝" ColumnID="WeldingWireCode" Hidden="True"
DataField="WeldingWireCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="焊条" ColumnID="WeldingRodCode" DataField="WeldingRodCode"
<f:RenderField HeaderText="焊条" ColumnID="WeldingRodCode" DataField="WeldingRodCode" Hidden="True"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute"
DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
@@ -203,16 +209,25 @@
runat="server" Text="删除">
</f:MenuButton>
</f:Menu>
<f:Menu ID="Menu2" runat="server">
<f:MenuButton ID="btnMenuDeleteDetail"
EnablePostBack="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" OnClick="btnMenuDeleteDetail_Click">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
var menuID2 = '<%= Menu2.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onTreeNodeContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
function onRowContextMenu(event, rowId) {
F(menuID2).show(); //showAt(event.pageX, event.pageY);
return false;
}
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+23 -2
View File
@@ -1,5 +1,6 @@
using BLL;
using MiniExcelLibs;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data;
@@ -123,7 +124,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (var item in p)
{
TreeNode newNode = new TreeNode();
newNode.Text = item.WeldingDailyCode;
newNode.Text = item.WeldingDailyCode+"("+BLL.UnitService.getUnitNamesUnitIds(item.UnitId)+")";
newNode.NodeID = item.WeldingDailyId;
newNode.EnableClickEvent = true;
newNode.CommandName = "WeldingDaily";
@@ -191,7 +192,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string strSql = @"SELECT WeldingDailyId,WeldJointId,PipelineCode,WeldJointCode,
BackingWelderCode,CoverWelderCode,Material1Code,Material2Code,
Dia,DNDia,Thickness,WeldTypeCode,WeldingMethodCode,WeldingWireCode,WeldingMode,
WeldingRodCode,Size
WeldingRodCode,Size,JointAttribute
FROM dbo.View_HJGL_WeldJoint
WHERE WeldingDailyId=@WeldingDailyId";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -542,5 +544,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
protected void btnMenuDeleteDetail_Click(object sender, EventArgs e)
{
if (!string .IsNullOrEmpty(Grid1.SelectedRowID))
{
string errlog= BLL.WeldingDailyService.DeleteWeldingDailyItemByweldJointId(Grid1.SelectedRowID);
if (string.IsNullOrEmpty(errlog) )
{
BindGrid();
ShowNotify("删除明细成功",MessageBoxIcon.Success);
}
else
{
ShowNotify(errlog, MessageBoxIcon.Error);
}
}
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.designer.cs
Generated
+18
View File
@@ -292,5 +292,23 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDelete;
/// <summary>
/// Menu2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu2;
/// <summary>
/// btnMenuDeleteDetail 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDeleteDetail;
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
+18 -12
View File
@@ -74,13 +74,18 @@
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow ColumnWidths="50% 0% 25% 25% 25%" >
<Items>
<f:TextBox ID="txtRemark" Label="备注" runat="server" LabelWidth="120px">
</f:TextBox>
<f:Label ID="lbAmount" Label="超量焊工" runat="server" LabelWidth="120px"
Hidden="true" CssClass="customlabel">
</f:Label>
<f:Button ID="btnSelectWelder" runat="server" Text="选择焊工批量填充" OnClick="btnSelectWelder_Click" >
</f:Button>
<f:DropDownList ID="drpCanWelder" EnableEdit="true" runat="server" LabelWidth="140px">
</f:DropDownList>
<f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click"></f:Button>
</Items>
</f:FormRow>
</Rows>
@@ -96,32 +101,32 @@
<Columns>
<f:RenderField HeaderText="焊口序号" ColumnID="WeldJointNum"
DataField="WeldJointNum" SortField="WeldJointNum" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="140px">
TextAlign="Center" Width="50px">
</f:RenderField>
<f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="180px" ExpandUnusedSpace="true">
TextAlign="Center" Width="180px" ExpandUnusedSpace="true">
</f:RenderField>
<f:TemplateField ColumnID="tfPipeArea" Width="180px" HeaderText="管线划分" HeaderTextAlign="Center" Hidden="true"
TextAlign="Left">
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbPipeArea" runat="server" Text='<%# ConvertPipeArea(Eval("PipeArea")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="180px">
TextAlign="Center" Width="180px">
</f:RenderField>
<f:RenderField HeaderText="可焊焊工号" ColumnID="CanWelderCode" Hidden="true"
DataField="CanWelderCode" SortField="CanWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="300px">
TextAlign="Center" Width="300px">
</f:RenderField>
<%--<f:RenderField HeaderText="可焊焊工ID" ColumnID="CanWelderId"
DataField="CanWelderId" FieldType="String" Hidden="true">
</f:RenderField>--%>
<f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="150px">
TextAlign="Center" Width="150px">
<Editor>
<f:DropDownList ID="drpCoverWelderId" EnableEdit="true" Required="true" runat="server"
ShowRedStar="true">
@@ -130,7 +135,7 @@
</f:RenderField>
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode"
DataField="BackingWelderCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
HeaderTextAlign="Center" TextAlign="Center" Width="150px">
<Editor>
<f:DropDownList ID="drpBackingWelderId" EnableEdit="true" Required="true" runat="server"
ShowRedStar="true">
@@ -145,16 +150,16 @@
DataField="BackingWelderCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="110px">
</f:RenderField>--%>
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" Hidden="true"
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute"
DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
TextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="焊接类型" ColumnID="WeldTypeCode" Hidden="true"
DataField="WeldTypeCode" SortField="WeldTypeCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
TextAlign="Center" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="达因" ColumnID="Size"
DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Center"
Width="70px">
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="Dia" Hidden="true"
@@ -190,6 +195,7 @@
<f:RenderField HeaderText="打底焊工ID" ColumnID="BackingWelderId" DataField="BackingWelderId"
FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+443 -411
View File
@@ -1,5 +1,6 @@
using BLL;
using FineUIPro.Web.HJGL.WeldingManage;
using Microsoft.Office.Interop.Word;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -195,7 +196,6 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// </summary>
private void BindGrid(List<Model.SpWeldingDailyItem> weldingDailyItem)
{
var aw = this.Grid1.SelectedRowIDArray;
var task = new List<Model.View_HJGL_WeldingTask>();
var list = from x in Funs.DB.View_HJGL_WeldingTask where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId select x;
@@ -203,7 +203,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
var weldJointIds = (from x in list
where (x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
&& x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/) || x.WeldingDailyId == this.WeldingDailyId
&& x.WeldingDailyId == null/*|| x.WeldingDailyId == this.WeldingDailyId*/)
select x).ToList();
weldJointIds= weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.OrderByDescending(x=>x.TaskDate).First()).ToList();
@@ -253,13 +253,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
//dt = this.LINQToDataTable(task);
}
// 2.获取当前分页数据
//var table = this.GetPagedDataTable(GridNewDynamic, tb1);
// Grid1.RecordCount = dt.Rows.Count;
// tb = GetFilteredTable(Grid1.FilteredData, tb);
//var table = this.GetPagedDataTable(Grid1, dt);
Grid1.RecordCount = task.Count;
// var table = task.Skip(Grid1.PageSize * (Grid1.PageIndex)).Take(Grid1.PageSize).ToList();
Grid1.RecordCount = task.Count;
Grid1.DataSource = task;
Grid1.DataBind();
@@ -276,23 +271,23 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
// // Grid1.Rows[i].RowSelectable = false;
// }
//}
if (weldingDailyItem != null)
{
var Dailytask = (from x in Funs.DB.View_HJGL_WeldingTask
where x.WeldingDailyId == this.WeldingDailyId
select new
{
x.PipelineCode,
x.WeldTaskId
}).Distinct().ToList();
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
{
Dailytask = Dailytask.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
}
var weldTaskIds = Dailytask.Select(x => x.WeldTaskId).ToArray();
this.Grid1.SelectedRowIDArray = weldTaskIds;
var a = this.Grid1.SelectedRowIDArray;
}
//if (weldingDailyItem != null)
//{
// var Dailytask = (from x in Funs.DB.View_HJGL_WeldingTask
// where x.WeldingDailyId == this.WeldingDailyId
// select new
// {
// x.PipelineCode,
// x.WeldTaskId
// }).Distinct().ToList();
// if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
// {
// Dailytask = Dailytask.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
// }
// var weldTaskIds = Dailytask.Select(x => x.WeldTaskId).ToArray();
// this.Grid1.SelectedRowIDArray = weldTaskIds;
// var a = this.Grid1.SelectedRowIDArray;
//}
}
#endregion
@@ -334,339 +329,346 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldTaskMenuId, Const.BtnSave))
{
if (BLL.WeldingDailyService.IsExistWeldingDailyCode(this.txtWeldingDailyCode.Text, !string.IsNullOrEmpty(this.WeldingDailyId) ? this.WeldingDailyId : "", CurrUser.LoginProjectId))
{
ShowNotify("日报编号已存在，请重新录入", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrEmpty(this.txtWeldingDate.Text) || string.IsNullOrEmpty(this.txtWeldingDailyCode.Text.Trim()))
{
ShowNotify("日报告号、焊接日期不能为空", MessageBoxIcon.Warning);
return;
}
Model.HJGL_WeldingDaily newWeldingDaily = new Model.HJGL_WeldingDaily();
newWeldingDaily.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim();
newWeldingDaily.ProjectId = CurrUser.LoginProjectId;
newWeldingDaily.UnitWorkId = this.UnitWorkId;
if (this.drpUnitWork.SelectedValue != BLL.Const._Null)
{
newWeldingDaily.UnitWorkId = this.drpUnitWork.SelectedValue;
}
newWeldingDaily.UnitId = this.drpUnit.SelectedValue;
DateTime? weldDate = Funs.GetNewDateTime(this.txtWeldingDate.Text);
if (weldDate.HasValue)
{
newWeldingDaily.WeldingDate = weldDate.Value;
}
else
{
newWeldingDaily.WeldingDate = System.DateTime.Now;
}
newWeldingDaily.Tabler = this.hdTablerId.Text;
newWeldingDaily.TableDate = Funs.GetNewDateTime(this.txtTableDate.Text);
newWeldingDaily.Remark = this.txtRemark.Text.Trim();
//List<Model.SpWeldingDailyItem> GetWeldingDailyItem = this.CollectGridJointInfo();
string errlog = string.Empty;
var weldJointView = (from x in BLL.Funs.DB.View_HJGL_WeldJoint where x.WeldingDailyId == this.WeldingDailyId orderby x.PipelineCode, x.WeldJointCode select x).ToList();
string eventArg = string.Empty;
#region 焊工资质判断这里取消
//foreach (var item in GetWeldingDailyItem)
//{
// bool canSave = false;
// var jot = BLL.WeldJointService.GetWeldJointByWeldJointId(item.WeldJointId);
// var joty = BLL.Base_WeldTypeService.GetWeldTypeByWeldTypeId(jot.WeldTypeId);
// string weldType = string.Empty;
// if (joty != null && joty.WeldTypeCode.Contains("B"))
// {
// weldType = "对接焊缝";
// }
// else
// {
// weldType = "角焊缝";
// }
// string floorWelder = item.BackingWelderId;
// string cellWelder = item.CoverWelderId;
// decimal? dia = item.Dia;
// decimal? sch = Funs.GetNewDecimal(item.Thickness.HasValue ? item.Thickness.Value.ToString() : "");
// string wmeCode = string.Empty;
// var wm = BLL.Base_WeldingMethodService.GetWeldingMethodByWeldingMethodId(jot.WeldingMethodId);
// if (wm != null)
// {
// wmeCode = wm.WeldingMethodCode;
// }
// string[] wmeCodes = wmeCode.Split('+');
// //string location = item.JOT_Location;
// string ste = jot.Material1Id;
// string jointAttribute = jot.JointAttribute;
// List<Model.Welder_WelderQualify> floorWelderQualifys = (from x in Funs.DB.Welder_WelderQualify
// where x.WelderId == floorWelder && x.WeldingMethod != null
// && x.MaterialType != null && x.WeldType != null
// && x.ThicknessMax != null && x.SizesMin != null
// select x).ToList();
// List<Model.Welder_WelderQualify> cellWelderQualifys = (from x in Funs.DB.Welder_WelderQualify
// where x.WelderId == cellWelder && x.WeldingMethod != null
// && x.MaterialType != null && x.WeldType != null
// && x.ThicknessMax != null && x.SizesMin != null
// select x).ToList();
// // 打底和盖面同一焊工
// if (floorWelder == cellWelder)
// {
// if (floorWelderQualifys != null && floorWelderQualifys.Count() > 0)
// {
// if (wmeCodes.Count() <= 1) // 一种焊接方法
// {
// canSave = OneWmeIsOK(floorWelderQualifys, wmeCode, jointAttribute, weldType, ste, dia, sch);
// }
// else // 大于一种焊接方法，如氩电联焊
// {
// canSave = TwoWmeIsOK(floorWelderQualifys, cellWelderQualifys, wmeCodes[0], wmeCodes[1], jointAttribute, weldType, ste, dia, sch);
// }
// }
// }
// // 打底和盖面焊工不同
// else
// {
// bool isok1 = false;
// bool isok2 = false;
// if (wmeCodes.Count() <= 1) // 一种焊接方法
// {
// if (floorWelderQualifys != null && floorWelderQualifys.Count() > 0)
// {
// isok1 = OneWmeIsOK(floorWelderQualifys, wmeCode, jointAttribute, weldType, ste, dia, sch);
// }
// if (cellWelderQualifys != null && cellWelderQualifys.Count() > 0)
// {
// isok2 = OneWmeIsOK(cellWelderQualifys, wmeCode, jointAttribute, weldType, ste, dia, sch);
// }
// if (isok1 && isok2)
// {
// canSave = true;
// }
// }
// else
// {
// canSave = TwoWmeIsOK(floorWelderQualifys, cellWelderQualifys, wmeCodes[0], wmeCodes[1], jointAttribute, weldType, ste, dia, sch);
// }
// }
// if (canSave == false)
// {
// eventArg = eventArg + jot.WeldJointCode + ",";
// }
//}
#endregion
if (eventArg == string.Empty) //焊工焊接的所有焊口资质都符合要求）
{
if (!string.IsNullOrEmpty(this.WeldingDailyId))
{
newWeldingDaily.WeldingDailyId = this.WeldingDailyId;
BLL.WeldingDailyService.UpdateWeldingDaily(newWeldingDaily);
//BLL.Sys_LogService.AddLog(BLL.Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldReportMenuId, Const.BtnModify, this.WeldingDailyId);
}
else
{
this.WeldingDailyId = SQLHelper.GetNewID(typeof(Model.HJGL_WeldingDaily));
newWeldingDaily.WeldingDailyId = this.WeldingDailyId;
BLL.WeldingDailyService.AddWeldingDaily(newWeldingDaily);
//BLL.Sys_LogService.AddLog(BLL.Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldReportMenuId, Const.BtnAdd, this.WeldingDailyId);
}
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
int i = mergedRow.Value<int>("index");
string rowId = Grid1.Rows[i].RowID;
if (this.Grid1.SelectedRowIDArray.Contains(rowId))
{
var t = BLL.WeldTaskService.GetWeldTaskById(rowId);
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId);
if (newWeldJoint != null)
{
var coverWelderCode = (from x in Funs.DB.SitePerson_Person
where x.ProjectId == CurrUser.LoginProjectId && x.WelderCode == values.Value<string>("CoverWelderCode")
select x).FirstOrDefault();
if (coverWelderCode != null)
{
t.CoverWelderId = coverWelderCode.PersonId;
newWeldJoint.CoverWelderId = coverWelderCode.PersonId;
}
var backingWelderCode = (from x in Funs.DB.SitePerson_Person
where x.ProjectId == CurrUser.LoginProjectId && x.WelderCode == values.Value<string>("BackingWelderCode")
select x).FirstOrDefault();
if (backingWelderCode != null)
{
t.BackingWelderId = backingWelderCode.PersonId;
newWeldJoint.BackingWelderId = backingWelderCode.PersonId;
}
WeldTaskService.UpdateWeldTask(t);
WeldJointService.UpdateWeldJoint(newWeldJoint);
//if (!string.IsNullOrEmpty(values.Value<string>("JointAttribute").ToString()))
//{
// newWeldJoint.JointAttribute = values.Value<string>("JointAttribute").ToString();
//}
//BLL.WeldJointService.UpdateWeldJoint(newWeldJoint);
BLL.WeldJointService.UpdateWeldJointAddG(newWeldJoint.WeldJointId, newWeldJoint.JointAttribute, Const.BtnAdd);
}
}
}
// 获取组批条件
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", CurrUser.LoginProjectId);
if (batchC != null)
{
string batchCondition = batchC.SetValue;
// 新建日报
if (weldJointView.Count() == 0)
{
foreach (string row in Grid1.SelectedRowIDArray)
{
var t = BLL.WeldTaskService.GetWeldTaskById(row);
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
}
}
else
{
for (int i = 0; i < Grid1.Rows.Count; i++)
{
if (Grid1.SelectedRowIDArray.Contains(Grid1.Rows[i].RowID))
{
var t = BLL.WeldTaskService.GetWeldTaskById(Grid1.Rows[i].RowID);
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
}
else
{
var t = BLL.WeldTaskService.GetWeldTaskById(Grid1.Rows[i].RowID);
errlog += DeleteWeldingDailyItem(t.WeldJointId);
}
}
}
// 日报已存在的情况 暂时
//else
//{
// var weldJoints = from x in weldJointView select x.WeldJointId;
// foreach (var item in GetWeldingDailyItem)
// {
// // 如日报明细存在则只更新焊口信息，如进批条件改变，则只有删除后再重新增加
// if (weldJoints.Contains(item.WeldJointId))
// {
// var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(item.WeldJointId);
// newWeldJoint.WeldingDailyId = this.WeldingDailyId;
// newWeldJoint.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim();
// newWeldJoint.CoverWelderId = item.CoverWelderId;
// newWeldJoint.BackingWelderId = item.BackingWelderId;
// if (!string.IsNullOrEmpty(item.JointAttribute))
// {
// newWeldJoint.JointAttribute = item.JointAttribute;
// }
// BLL.WeldJointService.UpdateWeldJoint(newWeldJoint);
// //更新焊口号 修改固定焊口号后 +G
// BLL.WeldJointService.UpdateWeldJointAddG(newWeldJoint.WeldJointId, newWeldJoint.JointAttribute, Const.BtnAdd);
// }
// else
// {
// errlog += InsertWeldingDailyItem(item, newWeldingDaily.WeldingDate, batchCondition, true);
// }
// }
//}
}
else
{
errlog += "请设置项目的组批条件";
}
#region 焊工每天超过60达因的提示（暂不用）
// 焊工每天超过60达因的提示（暂不用）
//foreach (var item in GetWeldingDailyItem)
//{
// if (!string.IsNullOrEmpty(item.CoverWelderId) && !string.IsNullOrEmpty(item.BackingWelderId))
// {
// bool cWelder = BLL.Pipeline_WeldJointService.GetWelderLimitDN(this.ProjectId, item.CoverWelderId, newWeldingDaily.WeldingDate.Value);
// bool bWelder = cWelder;
// if (item.CoverWelderId != item.BackingWelderId)
// {
// bWelder = BLL.Pipeline_WeldJointService.GetWelderLimitDN(this.ProjectId, item.BackingWelderId, newWeldingDaily.WeldingDate.Value);
// }
// if (cWelder || bWelder)
// {
// if (cWelder)
// {
// var coverWelder = BLL.SitePerson_PersonService.GetSitePersonById(item.CoverWelderId);
// if (coverWelder != null)
// {
// string txt = Resources.Lan.WelderCode + coverWelder.WelderCode + Resources.Lan.WeldingDiameter;
// if (!errlog.Contains(txt))
// {
// errlog += txt;
// }
// }
// }
// if (bWelder)
// {
// var backingWelder = BLL.SitePerson_PersonService.GetSitePersonById(item.BackingWelderId);
// if (backingWelder != null)
// {
// string txt = Resources.Lan.WelderCode + backingWelder.WelderCode + Resources.Lan.WeldingDiameter;
// if (!errlog.Contains(txt))
// {
// errlog += txt;
// }
// }
// }
// }
// }
//}
#endregion
ChanggeState();//更新焊口属性
//更新焊口属性
if (string.IsNullOrEmpty(errlog))
{
ShowNotify("保存成功！", MessageBoxIcon.Success);
drpJointAttribute_SelectedIndexChanged(null, null);
//PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
else
{
// string okj = ActiveWindow.GetWriteBackValueReference(newWeldReportMain.WeldingDailyId) + ActiveWindow.GetHidePostBackReference();
Alert.ShowInTop("保存成功！" + "焊接明细中" + errlog, "提交结果", MessageBoxIcon.Warning);
drpJointAttribute_SelectedIndexChanged(null, null);
// ShowAlert("焊接明细中" + errlog, MessageBoxIcon.Warning);
}
}
else
{
Alert.ShowInTop("焊工无资质焊接的焊口：" + eventArg, "提交结果", MessageBoxIcon.Warning);
}
}
else
if (!CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, this.CurrUser.PersonId,
Const.HJGL_WeldTaskMenuId, Const.BtnSave))
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
if (BLL.WeldingDailyService.IsExistWeldingDailyCode(this.txtWeldingDailyCode.Text,
!string.IsNullOrEmpty(this.WeldingDailyId) ? this.WeldingDailyId : "", CurrUser.LoginProjectId))
{
ShowNotify("日报编号已存在，请重新录入", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrEmpty(this.txtWeldingDate.Text) ||
string.IsNullOrEmpty(this.txtWeldingDailyCode.Text.Trim()))
{
ShowNotify("日报告号、焊接日期不能为空", MessageBoxIcon.Warning);
return;
}
Model.HJGL_WeldingDaily newWeldingDaily = new Model.HJGL_WeldingDaily
{
WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim(),
ProjectId = CurrUser.LoginProjectId,
UnitWorkId = this.UnitWorkId,
WeldingDate = Funs.GetNewDateTime(this.txtWeldingDate.Text) ?? DateTime.Now,
Tabler = this.hdTablerId.Text,
TableDate = Funs.GetNewDateTime(this.txtTableDate.Text),
Remark = this.txtRemark.Text.Trim(),
UnitId = this.drpUnit.SelectedValue
};
if (this.drpUnitWork.SelectedValue != BLL.Const._Null)
{
newWeldingDaily.UnitWorkId = this.drpUnitWork.SelectedValue;
}
//List<Model.SpWeldingDailyItem> GetWeldingDailyItem = this.CollectGridJointInfo();
string errlog = string.Empty;
var weldJointView = (from x in BLL.Funs.DB.View_HJGL_WeldJoint where x.WeldingDailyId == this.WeldingDailyId orderby x.PipelineCode, x.WeldJointCode
select x).ToList();
string eventArg = string.Empty;
#region 焊工资质判断这里取消
//foreach (var item in GetWeldingDailyItem)
//{
// bool canSave = false;
// var jot = BLL.WeldJointService.GetWeldJointByWeldJointId(item.WeldJointId);
// var joty = BLL.Base_WeldTypeService.GetWeldTypeByWeldTypeId(jot.WeldTypeId);
// string weldType = string.Empty;
// if (joty != null && joty.WeldTypeCode.Contains("B"))
// {
// weldType = "对接焊缝";
// }
// else
// {
// weldType = "角焊缝";
// }
// string floorWelder = item.BackingWelderId;
// string cellWelder = item.CoverWelderId;
// decimal? dia = item.Dia;
// decimal? sch = Funs.GetNewDecimal(item.Thickness.HasValue ? item.Thickness.Value.ToString() : "");
// string wmeCode = string.Empty;
// var wm = BLL.Base_WeldingMethodService.GetWeldingMethodByWeldingMethodId(jot.WeldingMethodId);
// if (wm != null)
// {
// wmeCode = wm.WeldingMethodCode;
// }
// string[] wmeCodes = wmeCode.Split('+');
// //string location = item.JOT_Location;
// string ste = jot.Material1Id;
// string jointAttribute = jot.JointAttribute;
// List<Model.Welder_WelderQualify> floorWelderQualifys = (from x in Funs.DB.Welder_WelderQualify
// where x.WelderId == floorWelder && x.WeldingMethod != null
// && x.MaterialType != null && x.WeldType != null
// && x.ThicknessMax != null && x.SizesMin != null
// select x).ToList();
// List<Model.Welder_WelderQualify> cellWelderQualifys = (from x in Funs.DB.Welder_WelderQualify
// where x.WelderId == cellWelder && x.WeldingMethod != null
// && x.MaterialType != null && x.WeldType != null
// && x.ThicknessMax != null && x.SizesMin != null
// select x).ToList();
// // 打底和盖面同一焊工
// if (floorWelder == cellWelder)
// {
// if (floorWelderQualifys != null && floorWelderQualifys.Count() > 0)
// {
// if (wmeCodes.Count() <= 1) // 一种焊接方法
// {
// canSave = OneWmeIsOK(floorWelderQualifys, wmeCode, jointAttribute, weldType, ste, dia, sch);
// }
// else // 大于一种焊接方法，如氩电联焊
// {
// canSave = TwoWmeIsOK(floorWelderQualifys, cellWelderQualifys, wmeCodes[0], wmeCodes[1], jointAttribute, weldType, ste, dia, sch);
// }
// }
// }
// // 打底和盖面焊工不同
// else
// {
// bool isok1 = false;
// bool isok2 = false;
// if (wmeCodes.Count() <= 1) // 一种焊接方法
// {
// if (floorWelderQualifys != null && floorWelderQualifys.Count() > 0)
// {
// isok1 = OneWmeIsOK(floorWelderQualifys, wmeCode, jointAttribute, weldType, ste, dia, sch);
// }
// if (cellWelderQualifys != null && cellWelderQualifys.Count() > 0)
// {
// isok2 = OneWmeIsOK(cellWelderQualifys, wmeCode, jointAttribute, weldType, ste, dia, sch);
// }
// if (isok1 && isok2)
// {
// canSave = true;
// }
// }
// else
// {
// canSave = TwoWmeIsOK(floorWelderQualifys, cellWelderQualifys, wmeCodes[0], wmeCodes[1], jointAttribute, weldType, ste, dia, sch);
// }
// }
// if (canSave == false)
// {
// eventArg = eventArg + jot.WeldJointCode + ",";
// }
//}
#endregion
if (eventArg == string.Empty) //焊工焊接的所有焊口资质都符合要求）
{
if (!string.IsNullOrEmpty(this.WeldingDailyId))
{
newWeldingDaily.WeldingDailyId = this.WeldingDailyId;
BLL.WeldingDailyService.UpdateWeldingDaily(newWeldingDaily);
//BLL.Sys_LogService.AddLog(BLL.Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldReportMenuId, Const.BtnModify, this.WeldingDailyId);
}
else
{
this.WeldingDailyId = SQLHelper.GetNewID(typeof(Model.HJGL_WeldingDaily));
newWeldingDaily.WeldingDailyId = this.WeldingDailyId;
BLL.WeldingDailyService.AddWeldingDaily(newWeldingDaily);
//BLL.Sys_LogService.AddLog(BLL.Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldReportMenuId, Const.BtnAdd, this.WeldingDailyId);
}
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
int i = mergedRow.Value<int>("index");
string rowId = Grid1.Rows[i].RowID;
if (this.Grid1.SelectedRowIDArray.Contains(rowId))
{
var t = BLL.WeldTaskService.GetWeldTaskById(rowId);
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId);
if (newWeldJoint != null)
{
var coverWelderCode = (from x in Funs.DB.SitePerson_Person
where x.ProjectId == CurrUser.LoginProjectId &&
x.WelderCode == values.Value<string>("CoverWelderCode")
select x).FirstOrDefault();
if (coverWelderCode != null)
{
t.CoverWelderId = coverWelderCode.PersonId;
newWeldJoint.CoverWelderId = coverWelderCode.PersonId;
}
var backingWelderCode = (from x in Funs.DB.SitePerson_Person
where x.ProjectId == CurrUser.LoginProjectId &&
x.WelderCode == values.Value<string>("BackingWelderCode")
select x).FirstOrDefault();
if (backingWelderCode != null)
{
t.BackingWelderId = backingWelderCode.PersonId;
newWeldJoint.BackingWelderId = backingWelderCode.PersonId;
}
WeldTaskService.UpdateWeldTask(t);
WeldJointService.UpdateWeldJoint(newWeldJoint);
//if (!string.IsNullOrEmpty(values.Value<string>("JointAttribute").ToString()))
//{
// newWeldJoint.JointAttribute = values.Value<string>("JointAttribute").ToString();
//}
//BLL.WeldJointService.UpdateWeldJoint(newWeldJoint);
BLL.WeldJointService.UpdateWeldJointAddG(newWeldJoint.WeldJointId,
newWeldJoint.JointAttribute, Const.BtnAdd);
}
}
}
// 获取组批条件
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", CurrUser.LoginProjectId);
if (batchC != null)
{
string batchCondition = batchC.SetValue;
// 新建日报
if (weldJointView.Count() == 0)
{
foreach (string row in Grid1.SelectedRowIDArray)
{
var t = BLL.WeldTaskService.GetWeldTaskById(row);
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId,
t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
}
}
else
{
for (int i = 0; i < Grid1.Rows.Count; i++)
{
if (Grid1.SelectedRowIDArray.Contains(Grid1.Rows[i].RowID))
{
var t = BLL.WeldTaskService.GetWeldTaskById(Grid1.Rows[i].RowID);
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId,
t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
}
else
{
var t = BLL.WeldTaskService.GetWeldTaskById(Grid1.Rows[i].RowID);
errlog += BLL.WeldingDailyService
.DeleteWeldingDailyItemByweldJointId(t.WeldJointId);
}
}
}
// 日报已存在的情况 暂时
//else
//{
// var weldJoints = from x in weldJointView select x.WeldJointId;
// foreach (var item in GetWeldingDailyItem)
// {
// // 如日报明细存在则只更新焊口信息，如进批条件改变，则只有删除后再重新增加
// if (weldJoints.Contains(item.WeldJointId))
// {
// var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(item.WeldJointId);
// newWeldJoint.WeldingDailyId = this.WeldingDailyId;
// newWeldJoint.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim();
// newWeldJoint.CoverWelderId = item.CoverWelderId;
// newWeldJoint.BackingWelderId = item.BackingWelderId;
// if (!string.IsNullOrEmpty(item.JointAttribute))
// {
// newWeldJoint.JointAttribute = item.JointAttribute;
// }
// BLL.WeldJointService.UpdateWeldJoint(newWeldJoint);
// //更新焊口号 修改固定焊口号后 +G
// BLL.WeldJointService.UpdateWeldJointAddG(newWeldJoint.WeldJointId, newWeldJoint.JointAttribute, Const.BtnAdd);
// }
// else
// {
// errlog += InsertWeldingDailyItem(item, newWeldingDaily.WeldingDate, batchCondition, true);
// }
// }
//}
}
else
{
errlog += "请设置项目的组批条件";
}
#region 焊工每天超过60达因的提示（暂不用）
// 焊工每天超过60达因的提示（暂不用）
//foreach (var item in GetWeldingDailyItem)
//{
// if (!string.IsNullOrEmpty(item.CoverWelderId) && !string.IsNullOrEmpty(item.BackingWelderId))
// {
// bool cWelder = BLL.Pipeline_WeldJointService.GetWelderLimitDN(this.ProjectId, item.CoverWelderId, newWeldingDaily.WeldingDate.Value);
// bool bWelder = cWelder;
// if (item.CoverWelderId != item.BackingWelderId)
// {
// bWelder = BLL.Pipeline_WeldJointService.GetWelderLimitDN(this.ProjectId, item.BackingWelderId, newWeldingDaily.WeldingDate.Value);
// }
// if (cWelder || bWelder)
// {
// if (cWelder)
// {
// var coverWelder = BLL.SitePerson_PersonService.GetSitePersonById(item.CoverWelderId);
// if (coverWelder != null)
// {
// string txt = Resources.Lan.WelderCode + coverWelder.WelderCode + Resources.Lan.WeldingDiameter;
// if (!errlog.Contains(txt))
// {
// errlog += txt;
// }
// }
// }
// if (bWelder)
// {
// var backingWelder = BLL.SitePerson_PersonService.GetSitePersonById(item.BackingWelderId);
// if (backingWelder != null)
// {
// string txt = Resources.Lan.WelderCode + backingWelder.WelderCode + Resources.Lan.WeldingDiameter;
// if (!errlog.Contains(txt))
// {
// errlog += txt;
// }
// }
// }
// }
// }
//}
#endregion
ChanggeState(); //更新焊口属性
//更新焊口属性
if (string.IsNullOrEmpty(errlog))
{
ShowNotify("保存成功！", MessageBoxIcon.Success);
drpJointAttribute_SelectedIndexChanged(null, null);
BindGrid(null);
//PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
else
{
// string okj = ActiveWindow.GetWriteBackValueReference(newWeldReportMain.WeldingDailyId) + ActiveWindow.GetHidePostBackReference();
Alert.ShowInTop("保存成功！" + "焊接明细中" + errlog, "提交结果", MessageBoxIcon.Warning);
drpJointAttribute_SelectedIndexChanged(null, null);
BindGrid(null);
// ShowAlert("焊接明细中" + errlog, MessageBoxIcon.Warning);
}
}
else
{
Alert.ShowInTop("焊工无资质焊接的焊口：" + eventArg, "提交结果", MessageBoxIcon.Warning);
}
}
protected void btnAccept_Click(object sender, EventArgs e)
@@ -859,59 +861,6 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
#endregion
#region 日报明细删除（更新焊口信息），组批等
/// <summary>
/// 日报明细删除（更新焊口信息），组批等
/// </summary>
/// <param name="item"></param>
/// <param name="weldingDailyId"></param>
///
/// <returns></returns>
private string DeleteWeldingDailyItem(string weldJointId)
{
string errlog = string.Empty;
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
var pipeline = BLL.PipelineService.GetPipelineByPipelineId(newWeldJoint.PipelineId);
if (newWeldJoint != null && !string.IsNullOrEmpty(newWeldJoint.WeldingDailyId))
{
var isTrust = from x in Funs.DB.HJGL_Batch_BatchTrustItem
where x.WeldJointId == weldJointId
select x; ;
if (isTrust.Count() == 0)
{
var updateWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
if (updateWeldJoint != null)
{
updateWeldJoint.WeldingDailyId = null;
updateWeldJoint.WeldingDailyCode = null;
updateWeldJoint.CoverWelderId = null;
updateWeldJoint.BackingWelderId = null;
BLL.WeldJointService.UpdateWeldJoint(updateWeldJoint);
var pointBatchItems = from x in Funs.DB.HJGL_Batch_PointBatchItem where x.WeldJointId == weldJointId select x;
string pointBatchId = pointBatchItems.FirstOrDefault().PointBatchId;
// 删除焊口所在批明细信息
BLL.PointBatchDetailService.DeleteBatchDetail(weldJointId);
// 删除批信息
var batch = from x in Funs.DB.HJGL_Batch_PointBatchItem where x.PointBatchId == pointBatchId select x;
if (pointBatchId != null && batch.Count() == 0)
{
BLL.PointBatchService.DeleteBatch(pointBatchId);
}
}
}
else
{
errlog += "焊口【" + newWeldJoint.WeldJointCode + "】已进委托单了，不能删除。";
}
}
return errlog;
}
#endregion
#region 收集Grid页面信息
/// <summary>
@@ -1087,16 +1036,27 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
private void ChanggeState()
{
if (!string.IsNullOrEmpty(this.WeldingDailyId))
if (!string.IsNullOrEmpty(this.WeldingDailyId) && Grid1.SelectedRowIDArray.Length > 0)
{
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
foreach (var rowId in Grid1.SelectedRowIDArray)
{
var t = BLL.WeldTaskService.GetWeldTaskById(rowId);
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId);
var daily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(WeldingDailyId);
BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(newWeldJoint.WeldJointId, (DateTime)daily.WeldingDate);//更改预制口实际时间和状态
PipelineService.UpdataDateByWeldJointId(newWeldJoint.WeldJointId);//更改安装口时间和状态
}
/*List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
foreach (var item in GetWeldingDailyItem)
{
var daily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(WeldingDailyId);
BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(item.WeldJointId, (DateTime)daily.WeldingDate);//更改预制口实际时间和状态
PipelineService.UpdataDateByWeldJointId(item.WeldJointId);//更改安装口时间和状态
}
}*/
}
}
@@ -1152,5 +1112,77 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
}
#endregion
#region 批量填充焊工
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSaveWelder_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(drpCanWelder.SelectedValue))
{
string[] selectedRowId = Grid1.SelectedRowIDArray;
for (int i = 0; i < selectedRowId.Count(); i++)
{
string weldTaskId = selectedRowId[i];
BLL.WeldTaskService.UpdateWelderTask(weldTaskId, drpCanWelder.SelectedValue);
}
this.BindGrid(null);
drpCanWelder.Items.Clear();
}
}
protected void btnSelectWelder_Click(object sender, EventArgs e)
{
GetCanWelderDropDownList();
}
/// <summary>
/// 获取能焊焊工下拉列表
/// </summary>
/// <param name="weldingTask"></param>
private void GetCanWelderDropDownList()
{
drpCanWelder.Items.Clear();
string[] selectedRowId = Grid1.SelectedRowIDArray;
List<string> canWelder = null;
var taskList = from x in Funs.DB.HJGL_WeldTask where x.ProjectId == this.CurrUser.LoginProjectId select x;
for (int i = 0; i < selectedRowId.Count(); i++)
{
Model.HJGL_WeldTask task = taskList.FirstOrDefault(x => x.WeldTaskId == selectedRowId[i]);
if (!string.IsNullOrEmpty(task.CanWelderId))
{
List<string> jotCanWelder = task.CanWelderId.Split(',').ToList();
if (i == 0)
{
canWelder = jotCanWelder;
}
else
{
canWelder = canWelder.Intersect(jotCanWelder).ToList();
}
}
else
{
canWelder = null;
break;
}
}
if (canWelder != null)
{
var welder = from x in canWelder
join y in Funs.DB.SitePerson_Person on x equals y.PersonId
select new { WelderId = x, y.WelderCode };
drpCanWelder.DataValueField = "WelderId";
drpCanWelder.DataTextField = "WelderCode";
drpCanWelder.DataSource = welder;
drpCanWelder.DataBind();
}
}
#endregion
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs
Generated
+27
View File
@@ -203,6 +203,33 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// </remarks>
protected global::FineUIPro.Label lbAmount;
/// <summary>
/// btnSelectWelder 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSelectWelder;
/// <summary>
/// drpCanWelder 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCanWelder;
/// <summary>
/// btnSaveWelder 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSaveWelder;
/// <summary>
/// Grid1 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
+9 -9
View File
@@ -20,7 +20,7 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="200px" Title="WBS目录"
EnableCollapse="true" Width="250px" Title="WBS目录"
ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px"
IconFont="ArrowCircleLeft">
<Toolbars>
@@ -34,7 +34,7 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="500px" Title="焊接任务单" runat="server" ShowBorder="false" EnableCollapse="true"
<f:Tree ID="tvControlItem" ShowHeader="false" Height="700px" Title="焊接任务单" runat="server" ShowBorder="false" EnableCollapse="true"
EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true"
EnableTextSelection="true" OnNodeCommand="tvControlItem_NodeCommand" EnableExpandEvent="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
<Listeners>
@@ -59,11 +59,11 @@
<f:HiddenField runat="server" ID="hdItemsString"></f:HiddenField>
<f:HiddenField runat="server" ID="hdTaskWeldJoint"></f:HiddenField>
<f:Button runat="server" ID="CreatWeldableWeldJoint" Icon="ChartPie" Text="生成可焊焊工" OnClick="CreatWeldableWeldJoint_Click"></f:Button>
<f:Button ID="btnSelectWelder" runat="server" Text="选择焊工批量填充" OnClick="btnSelectWelder_Click">
<f:Button ID="btnSelectWelder" runat="server" Text="选择焊工批量填充" OnClick="btnSelectWelder_Click" Hidden="True">
</f:Button>
<f:DropDownList ID="drpCanWelder" EnableEdit="true" runat="server" LabelWidth="140px">
<f:DropDownList ID="drpCanWelder" EnableEdit="true" runat="server" LabelWidth="140px" Hidden="True">
</f:DropDownList>
<f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click"> </f:Button>
<f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click" Hidden="True"></f:Button>
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线号" EmptyText="输入查询条件" LabelAlign="Right"></f:TextBox>
<f:Button runat="server" ID="btnSearch" Icon="SystemSearch" ToolTip="查询" Text="查询" OnClick="btnSearch_Click">
@@ -74,7 +74,7 @@
</f:DatePicker>
<%-- <f:Button runat="server" ID="ckSelect" Icon="Find" ToolTip="查找" Text="查找" OnClick="ckSelect_Click" Hidden="true">
</f:Button>--%>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" OnClick="btnSave_Click">
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" OnClick="btnSave_Click" Hidden="True">
</f:Button>
</Items>
@@ -158,7 +158,7 @@
<f:RenderField HeaderText="可焊焊工ID" ColumnID="CanWelderId"
DataField="CanWelderId" FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
<f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode" Hidden="True"
DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="110px">
<Editor>
@@ -167,7 +167,7 @@
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode"
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode" Hidden="True"
DataField="BackingWelderCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="110px">
<Editor>
@@ -212,7 +212,7 @@
</f:Panel>
<f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
IsModal="true" Width="1200px" Height="650px" OnClose="Window1_Close">
IsModal="true" Width="1300px" Height="650px" OnClose="Window1_Close">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuAdd" EnablePostBack="true" runat="server" Text="新增" Hidden="true" Icon="Add" OnClick="btnMenuAdd_Click">
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+3 -3
View File
@@ -190,15 +190,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
where x.UnitWorkId == node.NodeID
&& x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1)
&& x.TaskDate >= Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01")
select x.TaskDate.Value.Date).Distinct();
select new { x.TaskDate.Value.Date ,x.UnitId}).Distinct();
if (p.Count() > 0)
{
foreach (var item in p)
{
TreeNode newNode = new TreeNode();
newNode.CommandName = "Date";
newNode.Text = string.Format("{0:yyyy-MM-dd}", item);
newNode.NodeID = node.NodeID + "|" + string.Format("{0:yyyy-MM-dd}", item);
newNode.Text = string.Format("{0:yyyy-MM-dd}", item.Date)+"("+BLL.UnitService.getUnitNamesUnitIds(item.UnitId)+")";
newNode.NodeID = node.NodeID + "|" + string.Format("{0:yyyy-MM-dd}", item.Date);
newNode.EnableClickEvent = true;
node.Nodes.Add(newNode);
}
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx
+71 -73
View File
@@ -75,127 +75,125 @@
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="80px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber"
FieldType="String" HeaderText="序号" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode" EnableColumnEdit="False"
FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox2" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainItemName" DataField="MainItemName" SortField="MainItemName" EnableColumnEdit="False"
FieldType="String" HeaderText="主项名称" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox3" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MajorName" DataField="MajorName" SortField="MajorName" EnableColumnEdit="False"
FieldType="String" HeaderText="专业工程名称" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox4" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode" EnableColumnEdit="False"
FieldType="String" HeaderText="专业代码" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox5" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject" EnableColumnEdit="False"
FieldType="String" HeaderText="分部工程" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox6" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject" EnableColumnEdit="False"
FieldType="String" HeaderText="子分部工程" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"
FieldType="String" HeaderText="主项号" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox2" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainItemName" DataField="MainItemName" SortField="MainItemName"
FieldType="String" HeaderText="主项名称" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox3" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MajorName" DataField="MajorName" SortField="MajorName"
FieldType="String" HeaderText="专业工程名称" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox4" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode"
FieldType="String" HeaderText="专业代码" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox5" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject"
FieldType="String" HeaderText="分部工程" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox6" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject"
FieldType="String" HeaderText="子分部工程" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" EnableColumnEdit="False"
FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="项目编码" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName" EnableColumnEdit="False"
FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="项目名称" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox8" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ProjectDescription" DataField="ProjectDescription" SortField="ProjectDescription" EnableColumnEdit="False"
FieldType="String" HeaderText="项目特征描述" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="项目特征描述" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox9" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement" EnableColumnEdit="False"
FieldType="String" HeaderText="计量单位" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="80px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement" EnableColumnEdit="False"
FieldType="String" HeaderText="计量单位" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox10" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Quantity" DataField="Quantity" SortField="Quantity" EnableColumnEdit="False"
FieldType="String" HeaderText="工程量" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="100px" ColumnID="Quantity" DataField="Quantity" SortField="Quantity" EnableColumnEdit="False"
FieldType="String" HeaderText="工程量" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox11" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
FieldType="String" HeaderText="全费用固定综合单价(元)" TextAlign="Left" HeaderTextAlign="Center" EnableColumnEdit="False">
<f:RenderField Width="100px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
FieldType="String" HeaderText="全费用固定综合单价(元)" TextAlign="Right" HeaderTextAlign="Center" EnableColumnEdit="False">
<Editor>
<f:TextBox ID="TextBox12" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost" EnableColumnEdit="False"
FieldType="String" HeaderText="其中:主材费(元)" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="100px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost" EnableColumnEdit="False"
FieldType="String" HeaderText="其中:主材费(元)" TextAlign="Right" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox13" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice" EnableColumnEdit="False"
FieldType="String" HeaderText="合价(元)" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="100px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice" EnableColumnEdit="False"
FieldType="String" HeaderText="合价(元)" TextAlign="Right" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox14" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CalculationRule" DataField="CalculationRule" SortField="CalculationRule" EnableColumnEdit="False" Hidden="True"
FieldType="String" HeaderText="计算规则" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="计算规则" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox15" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="WorkContent" DataField="WorkContent" SortField="WorkContent" EnableColumnEdit="False" Hidden="True"
FieldType="String" HeaderText="工作内容" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="工作内容" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox16" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks" SortField="Remarks" EnableColumnEdit="False" Hidden="True"
FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="备注" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox17" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ConstructionSubcontractor" DataField="ConstructionSubcontractor" SortField="ConstructionSubcontractor"
FieldType="String" HeaderText="施工分包商" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="施工分包商" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox18" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ContractWeight" DataField="ContractWeight" SortField="ContractWeight" EnableColumnEdit="False"
FieldType="String" HeaderText="合同权重/% " TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="80px" ColumnID="ContractWeight" DataField="ContractWeight" SortField="ContractWeight" EnableColumnEdit="False"
FieldType="String" HeaderText="合同权重/% " TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox19" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialSupplier" DataField="MaterialSupplier" SortField="MaterialSupplier"
FieldType="String" HeaderText="主材供应方 " TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="主材供应方 " TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox20" runat="server" Required="true"></f:TextBox>
</Editor>
@@ -203,39 +201,39 @@
<f:RenderCheckField Width="100px" ColumnID="IsWithinGeneralContractScope" DataField="IsWithinGeneralContractScope" HeaderText="是否总包合同范围内" />
<f:RenderField Width="150px" ColumnID="EstimatedQuantity" DataField="EstimatedQuantity" SortField="EstimatedQuantity"
FieldType="String" HeaderText="概算工程量" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="概算工程量" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox22" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="EstimatedAmount" DataField="EstimatedAmount" SortField="EstimatedAmount"
FieldType="String" HeaderText="概算金额(元)" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="100px" ColumnID="EstimatedAmount" DataField="EstimatedAmount" SortField="EstimatedAmount"
FieldType="String" HeaderText="概算金额(元)" TextAlign="Right" HeaderTextAlign="Center">
<Editor>
<f:NumberBox ID="NumberBox2" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SettledQuantity" DataField="SettledQuantity" SortField="SettledQuantity"
FieldType="String" HeaderText="预算工程量" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="120px" ColumnID="SettledQuantity" DataField="SettledQuantity" SortField="SettledQuantity"
FieldType="String" HeaderText="预算工程量" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox24" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SettledAmount" DataField="SettledAmount" SortField="SettledAmount" EnableColumnEdit="False"
FieldType="String" HeaderText="预算金额(元) " TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="120px" ColumnID="SettledAmount" DataField="SettledAmount" SortField="SettledAmount" EnableColumnEdit="False"
FieldType="String" HeaderText="预算金额(元) " TextAlign="Right" HeaderTextAlign="Center">
<Editor>
<f:NumberBox ID="NumberBox3" runat="server" NoDecimal="false" NoNegative="false" DecimalPrecision="2" Increment="0.01">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:TemplateField ColumnID="QuantityOffset" Width="120px" HeaderText="工程量偏差" HeaderTextAlign="Center" TextAlign="Right">
<f:TemplateField ColumnID="QuantityOffset" Width="100px" HeaderText="工程量偏差" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# BLL.PhtglContractTrackService.GetQuantityOffset(Eval("Id")) %>'></asp:Label>
<asp:Label ID="lbQuantityOffset" runat="server" Text='<%# BLL.PhtglContractTrackService.GetQuantityOffset(Eval("Id")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="AmountOffset" Width="120px" HeaderText="费用偏差" HeaderTextAlign="Center" TextAlign="Right">
<f:TemplateField ColumnID="AmountOffset" Width="100px" HeaderText="费用偏差(元)" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.PhtglContractTrackService.GetAmountOffset(Eval("Id")) %>'></asp:Label>
<asp:Label ID="lbAmountOffset" runat="server" Text='<%# BLL.PhtglContractTrackService.GetAmountOffset(Eval("Id")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
+9 -1
View File
@@ -363,7 +363,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同执行跟踪表" + filename, System.Text.Encoding.UTF8) + ".xls");
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;
@@ -398,6 +398,14 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
{
html = (row.FindControl("lblNumber") as System.Web.UI.WebControls.Label).Text;
}
else if (column.ColumnID == "QuantityOffset")
{
html = (row.FindControl("lbQuantityOffset") as System.Web.UI.WebControls.Label).Text;
}
else if (column.ColumnID == "AmountOffset")
{
html = (row.FindControl("lbAmountOffset") as System.Web.UI.WebControls.Label).Text;
}
sb.AppendFormat("<td>{0}</td>", html);
}
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.designer.cs
Generated
+4 -13
View File
@@ -140,15 +140,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// TextBox2 控件。
/// </summary>
@@ -357,22 +348,22 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
protected global::FineUIPro.NumberBox NumberBox3;
/// <summary>
/// Label2 控件。
/// lbQuantityOffset 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
protected global::System.Web.UI.WebControls.Label lbQuantityOffset;
/// <summary>
/// Label1 控件。
/// lbAmountOffset 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
protected global::System.Web.UI.WebControls.Label lbAmountOffset;
/// <summary>
/// ToolbarSeparator1 控件。
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
+31 -26
View File
@@ -22,6 +22,10 @@
.f-grid-row.red {
background-color: Yellow;
}
.customlabel span {
color: red;
font-weight: bold;
}
</style>
</head>
<body>
@@ -45,6 +49,7 @@
LabelWidth="140px" OnSelectedIndexChanged="DropMainContractCode_SelectedIndexChanged">
</f:DropDownList>
<f:Label ID="txtContractName" runat="server" Label="合同名称" LabelAlign="Right" LabelWidth="140px"></f:Label>
<f:Label ID="lbTotalPrice" CssClass="customlabel" runat="server" Label="合价" LabelWidth="70px"></f:Label>
<f:ToolbarFill runat="server" />
<f:Button ID="btnNew" ToolTip="新增" Text="新增" Hidden="true" Icon="Add" runat="server"
@@ -75,112 +80,112 @@
</Toolbars>
<Columns>
<f:RenderField Width="150px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber"
FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="80px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber"
FieldType="String" HeaderText="序号" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"
FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="100px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"
FieldType="String" HeaderText="主项号" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox2" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainItemName" DataField="MainItemName" SortField="MainItemName"
FieldType="String" HeaderText="主项名称" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="主项名称" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox3" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MajorName" DataField="MajorName" SortField="MajorName"
FieldType="String" HeaderText="专业工程名称" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="专业工程名称" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox4" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode"
FieldType="String" HeaderText="专业代码" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="专业代码" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox5" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject"
FieldType="String" HeaderText="分部工程" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="分部工程" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox6" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject"
FieldType="String" HeaderText="子分部工程" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="子分部工程" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:WindowField ColumnID="ProjectCode" HeaderTextAlign="Center" TextAlign="Left"
<f:WindowField ColumnID="ProjectCode" HeaderTextAlign="Center" TextAlign="Center"
Width="150px" WindowID="Window1" HeaderText="项目编码" DataTextField="ProjectCode"
DataIFrameUrlFields="Id" DataIFrameUrlFormatString="ContractTrackMatchWBS.aspx?ContractTrackId={0}"
Title="项目编码" DataToolTipField="ProjectCode" SortField="ProjectCode"
Locked="true">
</f:WindowField>
<%-- <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode"
FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center" >
FieldType="String" HeaderText="项目编码" TextAlign="Center" HeaderTextAlign="Center" >
</f:RenderField>--%>
<f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="项目名称" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox8" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ProjectDescription" DataField="ProjectDescription" SortField="ProjectDescription"
FieldType="String" HeaderText="项目特征描述" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="项目特征描述" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox9" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement"
FieldType="String" HeaderText="计量单位" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="80px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement"
FieldType="String" HeaderText="计量单位" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox10" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Quantity" DataField="Quantity" SortField="Quantity"
FieldType="String" HeaderText="工程量" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="100px" ColumnID="Quantity" DataField="Quantity" SortField="Quantity"
FieldType="String" HeaderText="工程量" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox11" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
FieldType="String" HeaderText="全费用固定综合单价(元)" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="100px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
FieldType="String" HeaderText="全费用固定综合单价(元)" TextAlign="Right" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox12" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost"
FieldType="String" HeaderText="其中:主材费(元)" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="100px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost"
FieldType="String" HeaderText="其中:主材费(元)" TextAlign="Right" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox13" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice"
FieldType="String" HeaderText="合价(元)" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="100px" ColumnID="TotalPrice" DataField="TotalPrice" SortField="TotalPrice"
FieldType="String" HeaderText="合价(元)" TextAlign="Right" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox14" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CalculationRule" DataField="CalculationRule" SortField="CalculationRule"
FieldType="String" HeaderText="计算规则" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="计算规则" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox15" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="WorkContent" DataField="WorkContent" SortField="WorkContent"
FieldType="String" HeaderText="工作内容" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="工作内容" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox16" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks" SortField="Remarks"
FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="备注" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox17" runat="server" Required="true"></f:TextBox>
</Editor>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
+3 -2
View File
@@ -53,7 +53,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
//tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb;
Grid1.DataBind();
var sumTotalPricea = tb.Select(x =>Funs.GetNewDecimalOrZero(x.TotalPrice) ).ToList().Sum();
lbTotalPrice.Text = sumTotalPricea.ToString();
}
#endregion
@@ -545,7 +546,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同执行跟踪表" + filename, System.Text.Encoding.UTF8) + ".xls");
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;
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs
Generated
+9
View File
@@ -86,6 +86,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.Label txtContractName;
/// <summary>
/// lbTotalPrice 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbTotalPrice;
/// <summary>
/// btnNew 控件。
/// </summary>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx
+5 -1
View File
@@ -22,6 +22,10 @@
.f-grid-row.red {
background-color: Yellow;
}
.f-grid-cell[data-color=color1] {
background-color: Yellow;
color: #000000;
}
</style>
</head>
<body>
@@ -36,7 +40,7 @@
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="1" DataIDField="Id" AllowSorting="true" SortField="Id"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
AllowPaging="False" IsDatabasePaging="true" PageSize="10"
AllowPaging="False" IsDatabasePaging="true" PageSize="10" OnRowDataBound="Grid1_OnRowDataBound"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableRowClickEvent="True">
<Toolbars>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressDetectionGrid.aspx.cs
+109 -7
View File
@@ -332,6 +332,47 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
}
protected void Grid1_OnRowDataBound(object sender, GridRowEventArgs e)
{
if (!string.IsNullOrEmpty(ContractId))
{
Model.PHTGL_ContractTrack queryContractTrack = new Model.PHTGL_ContractTrack();
queryContractTrack.ProjectId = this.CurrUser.LoginProjectId;
queryContractTrack.ContractId = this.ContractId;
var modelContractTracks = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackByModle(queryContractTrack);
foreach (var item in modelContractTracks)
{
Model.PHTGL_ContractTrackProgress qContractTrackProgress = new Model.PHTGL_ContractTrackProgress();
qContractTrackProgress.ContractTrackId = item.Id;
var modelContractTrackProgresses = BLL.PhtglContracttrackprogressService.GetPHTGL_ContractTrackProgressByModle(qContractTrackProgress);
foreach (var detail in modelContractTrackProgresses)
{
var date = detail.Date + "#";
RenderField rfRenderField1 = Grid1.FindColumn(date + "BCWS_Quantity") as RenderField;
BoundField bf1 = Grid1.FindColumn(date + "BCWS_OutputValue") as BoundField;
BoundField bf2 = Grid1.FindColumn(date + "BCWS_Percentage") as BoundField;
e.CellAttributes[rfRenderField1.ColumnIndex]["data-color"] = "color1";
e.CellAttributes[bf1.ColumnIndex]["data-color"] = "color1";
e.CellAttributes[bf2.ColumnIndex]["data-color"] = "color1";
RenderField rfRenderField2 = Grid1.FindColumn(date + "SumBCWS_Quantity") as RenderField;
BoundField bf3 = Grid1.FindColumn(date + "SumBCWS_OutputValue") as BoundField;
BoundField bf4 = Grid1.FindColumn(date + "SumBCWS_Percentage") as BoundField;
e.CellAttributes[rfRenderField2.ColumnIndex]["data-color"] = "color1";
e.CellAttributes[bf3.ColumnIndex]["data-color"] = "color1";
e.CellAttributes[bf4.ColumnIndex]["data-color"] = "color1";
}
}
}
}
#endregion
#region GV 数据操作
@@ -552,7 +593,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同执行跟踪表" + filename, System.Text.Encoding.UTF8) + ".xls");
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;
@@ -566,27 +607,87 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
//private string GetGridTableHtml(Grid grid)
//{
// StringBuilder sb = new StringBuilder();
// sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
// sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
// sb.Append("<tr>");
// foreach (GridColumn column in grid.Columns)
// {
// sb.AppendFormat("<td>{0}</td>", column.HeaderText);
// }
// sb.Append("</tr>");
// foreach (GridRow row in grid.Rows)
// {
// sb.Append("<tr>");
// foreach (GridColumn column in grid.Columns)
// {
// string html = row.Values[column.ColumnIndex].ToString();
// if (column.ColumnID == "tfNumber")
// {
// html = (row.FindControl("lblNumber") as System.Web.UI.WebControls.Label).Text;
// }
// sb.AppendFormat("<td>{0}</td>", html);
// }
// sb.Append("</tr>");
// }
// sb.Append("</table>");
// return sb.ToString();
//}
private string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
MultiHeaderTable mht = new MultiHeaderTable();
mht.ResolveMultiHeaderTable(Grid1.Columns);
sb.Append("<meta http-equiv=\"Content-Type\" content=\"application/vnd.ms-excel;charset=utf-8\"/>");
sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
foreach (List<object[]> rows in mht.MultiTable)
{
sb.AppendFormat("<td>{0}</td>", column.HeaderText);
sb.Append("<tr>");
foreach (object[] cell in rows)
{
int rowspan = Convert.ToInt32(cell[0]);
int colspan = Convert.ToInt32(cell[1]);
GridColumn column = cell[2] as GridColumn;
sb.AppendFormat("<th{0}{1}{2}>{3}</th>",
rowspan != 1 ? " rowspan=\"" + rowspan + "\"" : "",
colspan != 1 ? " colspan=\"" + colspan + "\"" : "",
colspan != 1 ? " style=\"text-align:center;\"" : "",
column.HeaderText);
}
sb.Append("</tr>");
}
sb.Append("</tr>");
foreach (GridRow row in grid.Rows)
{
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
foreach (GridColumn column in mht.Columns)
{
string html = row.Values[column.ColumnIndex].ToString();
if (column.ColumnID == "tfNumber")
{
html = (row.FindControl("lblNumber") as System.Web.UI.WebControls.Label).Text;
}
else if (column.ColumnID == "tfGender")
{
html = (row.FindControl("labGender") as System.Web.UI.WebControls.Label).Text;
}
sb.AppendFormat("<td>{0}</td>", html);
}
@@ -600,5 +701,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
#endregion
}
}
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx
+34 -34
View File
@@ -33,11 +33,11 @@
Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px" IconFont="_RoundPlus">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="合同执行跟踪表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id,MatchWbsId" AllowCellEditing="true"
ClicksToEdit="1" AllowSorting="true" SortField="Id"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
runat="server" BoxFlex="1" DataKeyNames="Id,MatchWbsId" AllowCellEditing="true"
ClicksToEdit="1" AllowSorting="true" SortField="Id"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
AllowPaging="False" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableRowClickEvent="True">
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableRowClickEvent="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
@@ -47,10 +47,10 @@
<f:Label ID="txtContractName" runat="server" Label="合同名称" LabelAlign="Right" LabelWidth="140px"></f:Label>
<f:ToolbarFill runat="server" />
<f:Button ID="btnNew" ToolTip="匹配WBS" Text="匹配WBS" Hidden="true" Icon="ApplicationEdit" runat="server"
<f:Button ID="btnNew" ToolTip="匹配WBS" Text="匹配WBS" Hidden="true" Icon="ApplicationEdit" runat="server"
OnClick="btnNew_Click">
</f:Button>
</Items>
</f:Toolbar>
@@ -67,77 +67,76 @@
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="150px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber"
FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="80px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber"
FieldType="String" HeaderText="序号" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode" EnableColumnEdit="False"
FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="100px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"
FieldType="String" HeaderText="主项号" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox2" runat="server" Required="true" Readonly="True"></f:TextBox>
<f:TextBox ID="TextBox2" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainItemName" DataField="MainItemName" SortField="MainItemName" EnableColumnEdit="False"
FieldType="String" HeaderText="主项名称" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="MainItemName" DataField="MainItemName" SortField="MainItemName"
FieldType="String" HeaderText="主项名称" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox3" runat="server" Required="true" Readonly="True"></f:TextBox>
<f:TextBox ID="TextBox3" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MajorName" DataField="MajorName" SortField="MajorName" EnableColumnEdit="False"
FieldType="String" HeaderText="专业工程名称" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="MajorName" DataField="MajorName" SortField="MajorName"
FieldType="String" HeaderText="专业工程名称" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox4" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode" EnableColumnEdit="False"
FieldType="String" HeaderText="专业代码" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode"
FieldType="String" HeaderText="专业代码" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox5" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject" EnableColumnEdit="False"
FieldType="String" HeaderText="分部工程" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject"
FieldType="String" HeaderText="分部工程" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox6" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject" EnableColumnEdit="False"
FieldType="String" HeaderText="子分部工程" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject"
FieldType="String" HeaderText="子分部工程" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:WindowField ColumnID="ProjectCode" HeaderTextAlign="Center" TextAlign="Left"
Width="150px" WindowID="Window1" HeaderText="项目编码" DataTextField="ProjectCode"
<f:WindowField ColumnID="ProjectCode" HeaderTextAlign="Center" TextAlign="Center"
Width="150px" WindowID="Window1" HeaderText="项目编码" DataTextField="ProjectCode"
DataIFrameUrlFields="Id" DataIFrameUrlFormatString="ContractTrackMatchWBS.aspx?ContractTrackId={0}"
Title="项目编码" DataToolTipField="ProjectCode" SortField="ProjectCode"
Title="项目编码" DataToolTipField="ProjectCode" SortField="ProjectCode"
Locked="true">
</f:WindowField>
<%-- <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode"
FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center" >
FieldType="String" HeaderText="项目编码" TextAlign="Center" HeaderTextAlign="Center" >
</f:RenderField>--%>
<f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName" EnableColumnEdit="False"
FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="项目名称" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox8" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ProjectDescription" DataField="ProjectDescription" SortField="ProjectDescription" EnableColumnEdit="False"
FieldType="String" HeaderText="项目特征描述" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="项目特征描述" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox9" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="WBSCode" DataField="WBSCode" SortField="WBSCode"
FieldType="String" HeaderText="WBS编号" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="WBS编号" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ControlItemContent" DataField="ControlItemContent" SortField="ControlItemContent"
FieldType="String" HeaderText="工作包名称" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="工作包名称" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="60px" ColumnID="Weights" DataField="Weights" SortField="Weights"
FieldType="String" HeaderText="权重" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="权重" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="WorkPackageEstimate" DataField="WorkPackageEstimate" FieldType="Double"
HeaderText="概算(元)" HeaderTextAlign="Center">
@@ -148,7 +147,7 @@
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="dataload" Handler="onGridDataLoad" />
</Listeners>
<PageItems>
@@ -204,7 +203,8 @@
'SubItemProject',
'ProjectName',
'ProjectDescription'], {
dependsFirst: true });
dependsFirst: true
});
}
</script>
</body>
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx
+12 -7
View File
@@ -20,7 +20,7 @@
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch" >
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目信息"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true"
DataKeyNames="ProjectId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="ProjectId"
AllowSorting="true" SortField="ProjectCode" SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
@@ -34,10 +34,12 @@
<f:RadioItem Text="在建" Value="1" Selected="true" />
<f:RadioItem Text="停工" Value="2" />
<f:RadioItem Text="竣工" Value="3" />
</f:RadioButtonList>
</f:RadioButtonList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:TextBox runat="server" Label="名称" ID="txtProjectName" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="50px"></f:TextBox>
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="50px"></f:TextBox>
<f:CheckBox runat="server" ID="rbIsCNCECShow" Label="集团穿透展示" LabelWidth="110px"
AutoPostBack="true" OnCheckedChanged="rbIsCNCECShow_CheckedChanged"></f:CheckBox>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" Hidden="true" runat="server">
</f:Button>
@@ -54,14 +56,14 @@
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
<f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
HeaderText="项目号">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectRealCode" DataField="ProjectRealCode" SortField="ProjectRealCode" FieldType="String"
<f:RenderField Width="150px" ColumnID="ProjectRealCode" DataField="ProjectRealCode" SortField="ProjectRealCode" FieldType="String"
HeaderText="项目编码">
</f:RenderField>
<f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<%-- <f:RenderField Width="200px" ColumnID="ShortName" DataField="ShortName" SortField="ShortName"
FieldType="String" HeaderText="简称" HeaderTextAlign="Center" TextAlign="Left" >
@@ -100,7 +102,10 @@
</f:RenderField> --%>
<f:RenderField Width="250px" ColumnID="ProjectAddress" DataField="ProjectAddress" SortField="ProjectAddress" FieldType="String"
HeaderText="项目地址" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</f:RenderField>
<f:CheckBoxField Width="90px" SortField="IsCNCECShow" RenderAsStaticField="true" DataField="IsCNCECShow"
HeaderText="集团展示" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
+11 -2
View File
@@ -36,7 +36,7 @@ namespace FineUIPro.Web.ProjectData
private void BindGrid()
{
string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,Project.ProjectRealCode,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ProjectType.ProjectTypeName AS ProjectTypeName,ShortName, "
+ @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState"
+ @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState,IsCNCECShow"
+ @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId"
+ @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId"
+ @" WHERE 1=1 ";
@@ -51,6 +51,10 @@ namespace FineUIPro.Web.ProjectData
// strSql += " AND ProjectId = @ProjectId";
// listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
//}
if (this.rbIsCNCECShow.Checked)
{
strSql += " AND IsCNCECShow=1 ";
}
if (!string.IsNullOrEmpty(this.txtProjectName.Text.Trim()))
{
@@ -344,6 +348,11 @@ namespace FineUIPro.Web.ProjectData
{
this.BindGrid();
}
protected void rbIsCNCECShow_CheckedChanged(object sender, CheckedEventArgs e)
{
this.BindGrid();
}
#endregion
#region 项目管理人员
@@ -415,6 +424,6 @@ namespace FineUIPro.Web.ProjectData
ShowNotify("请选择项目进入！", MessageBoxIcon.Warning);
}
}
}
}
}
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs
Generated
+33 -22
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.ProjectData {
public partial class ProjectSet {
namespace FineUIPro.Web.ProjectData
{
public partial class ProjectSet
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// ckState 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList ckState;
/// <summary>
/// txtProjectName 控件。
/// </summary>
@@ -74,7 +76,16 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectName;
/// <summary>
/// rbIsCNCECShow 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox rbIsCNCECShow;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblNumber 控件。
/// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnEnter 控件。
/// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnEnter;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
+11 -9
View File
@@ -10,7 +10,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="150px">
<rows>
<f:FormRow>
<Items>
@@ -24,7 +24,7 @@
ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"></f:TextBox>
</Items>
<Items>
<f:TextBox ID="txtShortName" runat="server" Label="简称" LabelWidth="150px"
<f:TextBox ID="txtShortName" runat="server" Label="简称"
MaxLength="6" Required="true" ShowRedStar="true"></f:TextBox>
</Items>
</f:FormRow>
@@ -60,7 +60,7 @@
<f:DropDownList ID="drpUnit" Label="所属单位" runat="server" EnableEdit="true" AutoPostBack="true"
OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
</f:DropDownList>
<f:CheckBox runat="server" ID="ckbIsForeign" Label="海外项目" LabelWidth="150px" AutoPostBack="true" OnCheckedChanged="ckbIsForeign_CheckedChanged"></f:CheckBox>
<f:CheckBox runat="server" ID="ckbIsForeign" Label="海外项目" AutoPostBack="true" OnCheckedChanged="ckbIsForeign_CheckedChanged"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
@@ -68,7 +68,7 @@
<f:DropDownList ID="drpProjectManager" runat="server" Label="项目经理"
EnableEdit="true" Required="true" ShowRedStar="true">
</f:DropDownList>
<f:DropDownList ID="drpConstructionManager" runat="server" Label="施工经理" LabelWidth="150px" EnableEdit="true">
<f:DropDownList ID="drpConstructionManager" runat="server" Label="施工经理" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
@@ -76,7 +76,7 @@
<Items>
<f:DropDownList ID="drpHSSEManager" runat="server" Label="安全经理" EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" LabelWidth="150px" MaxLength="500" ></f:TextBox>
<f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" MaxLength="500" ></f:TextBox>
</Items>
</f:FormRow>
@@ -104,7 +104,7 @@
></f:TextBox>
</Items>
<Items>
<f:TextBox ID="txtCountry" runat="server" Label="国家" MaxLength="50" LabelWidth="150px" ></f:TextBox>
<f:TextBox ID="txtCountry" runat="server" Label="国家" MaxLength="50" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
@@ -122,7 +122,7 @@
<f:ContentPanel ID="bottomPanel" RegionPosition="Bottom" ShowBorder="false" ShowHeader="false" EnableCollapse="false" runat="server">
<a href="http://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank" >拾取坐标</a>
</f:ContentPanel>
<f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" MaxLength="3" LabelWidth="150px" Width="300px"></f:TextBox>
<f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" MaxLength="3" Width="300px"></f:TextBox>
</Items>
</f:FormRow>
@@ -132,8 +132,10 @@
></f:TextBox>
</Items>
<Items>
<f:TextBox ID="TextBox2" runat="server" Label="" LabelWidth="150px" Hidden="true"
MaxLength="6" Required="true" ShowRedStar="true"></f:TextBox>
<f:RadioButtonList runat="server" ID="rbIsCNCECShow" Label="集团展示(穿透页面)" ShowRedStar="true" >
<f:RadioItem Value="True" Text="是" Selected="true"/>
<f:RadioItem Value="False" Text="否"/>
</f:RadioButtonList>
</Items>
</f:FormRow>
</rows>
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
+9
View File
@@ -101,6 +101,14 @@ namespace FineUIPro.Web.ProjectData
this.txtCity.Text = project.City;
this.txtEnglishRemark.Text = project.EnglishRemark;
this.txtProjectRealCode.Text = project.ProjectRealCode;
if (project.IsCNCECShow == true)
{
this.rbIsCNCECShow.SelectedValue = "True";
}
else
{
this.rbIsCNCECShow.SelectedValue = "False";
}
}
}
else
@@ -143,6 +151,7 @@ namespace FineUIPro.Web.ProjectData
City = this.txtCity.Text.Trim(),
EnglishRemark = this.txtEnglishRemark.Text.Trim(),
ProjectRealCode=this.txtProjectRealCode.Text.Trim(),
IsCNCECShow=Convert.ToBoolean( this.rbIsCNCECShow.SelectedValue),
};
if (!string.IsNullOrEmpty(txtStartDate.Text.Trim()))
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs
Generated
+44 -42
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.ProjectData {
public partial class ProjectSetSave {
namespace FineUIPro.Web.ProjectData
{
public partial class ProjectSetSave
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtProjectName 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectName;
/// <summary>
/// txtProjectCode 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectCode;
/// <summary>
/// txtShortName 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtShortName;
/// <summary>
/// drpProjectType 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectType;
/// <summary>
/// drpProjectState 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectState;
/// <summary>
/// txtStartDate 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartDate;
/// <summary>
/// txtEndDate 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndDate;
/// <summary>
/// txtContractNo 控件。
/// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtContractNo;
/// <summary>
/// txtDuration 控件。
/// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtDuration;
/// <summary>
/// drpUnit 控件。
/// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// ckbIsForeign 控件。
/// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsForeign;
/// <summary>
/// drpProjectManager 控件。
/// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectManager;
/// <summary>
/// drpConstructionManager 控件。
/// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpConstructionManager;
/// <summary>
/// drpHSSEManager 控件。
/// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpHSSEManager;
/// <summary>
/// txtProjectAddress 控件。
/// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectAddress;
/// <summary>
/// txtWorkRange 控件。
/// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtWorkRange;
/// <summary>
/// txtRemark 控件。
/// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// txtProjectMoney 控件。
/// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtProjectMoney;
/// <summary>
/// txtConstructionMoney 控件。
/// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtConstructionMoney;
/// <summary>
/// txtTelephone 控件。
/// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTelephone;
/// <summary>
/// txtCountry 控件。
/// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCountry;
/// <summary>
/// drpProvince 控件。
/// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProvince;
/// <summary>
/// txtCity 控件。
/// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCity;
/// <summary>
/// txtMapCoordinates 控件。
/// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMapCoordinates;
/// <summary>
/// bottomPanel 控件。
/// </summary>
@@ -263,7 +265,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel bottomPanel;
/// <summary>
/// txtEnglishRemark 控件。
/// </summary>
@@ -272,7 +274,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtEnglishRemark;
/// <summary>
/// txtProjectRealCode 控件。
/// </summary>
@@ -281,16 +283,16 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectRealCode;
/// <summary>
/// TextBox2 控件。
/// rbIsCNCECShow 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox2;
protected global::FineUIPro.RadioButtonList rbIsCNCECShow;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -299,7 +301,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ckIsUpTotalMonth 控件。
/// </summary>
@@ -308,7 +310,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsUpTotalMonth;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -317,7 +319,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
@@ -326,7 +328,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// hdCompileMan 控件。
/// </summary>
SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx
+6 -6
View File
@@ -102,12 +102,12 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectRealCode" runat="server" Label="项目编码" MaxLength="50" Readonly="true" LabelWidth="150px"
></f:TextBox>
</Items>
<Items>
<f:TextBox ID="TextBox2" runat="server" Label="" LabelWidth="150px" Hidden="true"
MaxLength="6" Required="true" ShowRedStar="true"></f:TextBox>
<f:TextBox ID="txtProjectRealCode" runat="server" Label="项目编码" Required="true" MaxLength="50" Readonly="true" LabelWidth="150px"
ShowRedStar="true"></f:TextBox>
<f:RadioButtonList runat="server" ID="rbIsCNCECShow" Label="集团展示(穿透页面)" Readonly="true">
<f:RadioItem Value="True" Text="是" Selected="true"/>
<f:RadioItem Value="False" Text="否"/>
</f:RadioButtonList>
</Items>
</f:FormRow>
</rows>
SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs
+8
View File
@@ -90,6 +90,14 @@ namespace FineUIPro.Web.ProjectData
this.txtCity.Text = project.City;
this.txtEnglishRemark.Text = project.EnglishRemark;
this.txtProjectRealCode.Text = project.ProjectRealCode;
if (project.IsCNCECShow == true)
{
this.rbIsCNCECShow.SelectedValue = "True";
}
else
{
this.rbIsCNCECShow.SelectedValue = "False";
}
}
}
}
SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs
Generated
+42 -40
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.ProjectData {
public partial class ProjectSetView {
namespace FineUIPro.Web.ProjectData
{
public partial class ProjectSetView
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtProjectName 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectName;
/// <summary>
/// txtProjectCode 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectCode;
/// <summary>
/// txtShortName 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtShortName;
/// <summary>
/// txtProjectType 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectType;
/// <summary>
/// txtProjectState 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectState;
/// <summary>
/// txtStartDate 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtStartDate;
/// <summary>
/// txtEndDate 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtEndDate;
/// <summary>
/// txtDuration 控件。
/// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDuration;
/// <summary>
/// txtProjectManager 控件。
/// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectManager;
/// <summary>
/// txtConstructionManager 控件。
/// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtConstructionManager;
/// <summary>
/// txtHSSEManager 控件。
/// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtHSSEManager;
/// <summary>
/// txtProjectAddress 控件。
/// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectAddress;
/// <summary>
/// txtUnitName 控件。
/// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUnitName;
/// <summary>
/// txtWorkRange 控件。
/// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtWorkRange;
/// <summary>
/// txtRemark 控件。
/// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// txtProjectMoney 控件。
/// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectMoney;
/// <summary>
/// txtConstructionMoney 控件。
/// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtConstructionMoney;
/// <summary>
/// txtTelephone 控件。
/// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTelephone;
/// <summary>
/// txtCountry 控件。
/// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCountry;
/// <summary>
/// txtProvince 控件。
/// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProvince;
/// <summary>
/// txtCity 控件。
/// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCity;
/// <summary>
/// ckbIsForeign 控件。
/// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsForeign;
/// <summary>
/// txtMapCoordinates 控件。
/// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMapCoordinates;
/// <summary>
/// txtEnglishRemark 控件。
/// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtEnglishRemark;
/// <summary>
/// lb1 控件。
/// </summary>
@@ -263,7 +265,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lb1;
/// <summary>
/// txtProjectRealCode 控件。
/// </summary>
@@ -272,16 +274,16 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectRealCode;
/// <summary>
/// TextBox2 控件。
/// rbIsCNCECShow 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox2;
protected global::FineUIPro.RadioButtonList rbIsCNCECShow;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -290,7 +292,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnAttachUrl 控件。
/// </summary>
@@ -299,7 +301,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnClose 控件。
/// </summary>
@@ -308,7 +310,7 @@ namespace FineUIPro.Web.ProjectData {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// WindowAtt 控件。
/// </summary>
SGGL/FineUIPro.Web/common/Menu_DigData.xml
+54 -9
View File
@@ -1,9 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl="">
<TreeNode id="0E9C6A47-E410-43C4-95D1-1EC1C01E9967" Text="WBS数据仓库" NavigateUrl="DigData/WBSDW.aspx">
</TreeNode>
<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl="">
<TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl="">
<TreeNode id="8B550B58-C681-4F34-83F0-F1E99CE04A47" Text="国内标准" NavigateUrl="">
</TreeNode>
<TreeNode id="97D1E401-EA0F-4C90-B7DC-61D568BAE617" Text="国外标准" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""><TreeNode id="2C7F78D3-DA7B-4193-A37F-CC479E4B9583" Text="法律法规" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""><TreeNode id="406EBAAB-05B2-4249-BAC2-5589F50AE365" Text="企业标准" NavigateUrl=""></TreeNode>
<TreeNode id="59F3FA81-7D08-4611-A3FF-22BFA656A940" Text="企业制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
</TreeNode>
<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
</TreeNode>
<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
</TreeNode>
<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
<TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
<TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
<TreeNode id="24939ABD-E174-4C3D-8B04-494917B7BE40" Text="HSE隐患整改问题分析" NavigateUrl="DigData/RectifyProblemAnalysis.aspx"></TreeNode>
<TreeNode id="4B2E7EE5-AC7C-4143-B5BC-60080C763A24" Text="HSE教育培训统计" NavigateUrl="DigData/TrainRecordAnalysis.aspx"></TreeNode>
@@ -16,12 +58,15 @@
<TreeNode id="A20E2443-A118-4C67-9084-FFEB685CA539" Text="清单子目使用率及价格走势图" NavigateUrl=""></TreeNode>
<TreeNode id="6D1F3A3F-EFD1-420A-87E7-8CFAEF971165" Text="日工效统计" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="5BE7F83B-C02D-4481-815F-153279B44C39" Text="劳务数据库" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="AF5C32FD-F0CB-404E-B56D-C4AE79A8A050" Text="人员功效分析" NavigateUrl=""></TreeNode>
<TreeNode id="0DB6BB5F-B17A-4A38-AABB-278300EA9E39" Text="员工产值分析" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="CFEF47C0-8EFA-46FF-8648-5B1922519DCC" Text="WBS数据分析" NavigateUrl="DigData/WBSAnalysis.aspx"></TreeNode>
<TreeNode id="B146FC96-B199-426B-8504-4BE093C0DCB1" Text="项目数据汇总分析" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
<TreeNode id="DD960B76-1F33-468B-9FEF-76328235C079" Text="项目质量数据汇总" NavigateUrl="DigData/CQMSDataCollect.aspx"></TreeNode>
<TreeNode id="A705738B-D0A2-41D2-A01A-18774B5AED49" Text="项目施工数据汇总" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
</TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/Menu_HTGL.xml
+9 -4
View File
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl="">
<TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx">
</TreeNode>
<TreeNode id="E9D387EB-2797-43E3-AACE-93413839CCF7" Text="合同管理" NavigateUrl="">
</TreeNode>
<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl=""><TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx"></TreeNode>
<TreeNode id="C5560FF5-8181-4BA2-8326-D2B49E45660C" Text="合同协议书" NavigateUrl="PHTGL/ContractCompile/ContractAgreementEdit.aspx"></TreeNode>
<TreeNode id="98573D16-3310-4292-96A5-A59B9A5E6B6B" Text="通用条款" NavigateUrl="PHTGL/ContractCompile/GeneralTermsConditions.aspx"></TreeNode>
<TreeNode id="98367C43-9C85-467E-9144-288D80101E41" Text="专用条款" NavigateUrl="PHTGL/ContractCompile/SpecialTermsConditions.aspx"></TreeNode>
</TreeNode>
<TreeNode id="E3978B9E-89D7-4B23-B44B-A680FAFA0443" Text="施工长名单管理" NavigateUrl=""><TreeNode id="9C4E7381-4080-4082-8C4D-B041149D48C7" Text="施工长名单入网申请" NavigateUrl="PHTGL/LongListManager/LongListNetApplication.aspx"></TreeNode>
</TreeNode>
<TreeNode id="C18B4A2E-7BE7-43E6-A969-8A6292D19987" Text="招标工作台账" NavigateUrl="PHTGL/Filing/BidDocumentsStandingBook.aspx"></TreeNode>
<TreeNode id="0A5DF9F5-B6B5-41B8-8951-C203C5749495" Text="合同台账" NavigateUrl="PHTGL/Filing/ContractStandingBook.aspx"></TreeNode>
<TreeNode id="8213BE20-2680-4A13-91B8-49028BB89869" Text="工程量清单" NavigateUrl=""><TreeNode id="326AA80C-6B01-4214-ACF2-B29595BA28D5" Text="土建工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=0"></TreeNode>
@@ -14,7 +16,10 @@
<TreeNode id="0E04FA16-FFA6-4987-A0A5-A4658F0099F2" Text="工艺管道安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=2"></TreeNode>
<TreeNode id="FAC4F0F7-A7C0-4F66-8BCB-846C082BCA40" Text="工艺设备安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=3"></TreeNode>
<TreeNode id="10586190-0FDD-4DA8-A877-CE4599D6F0DF" Text="非标设备现场制作安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=4"></TreeNode>
<TreeNode id="1C770E20-7912-484C-9739-499B1B2F8DEB" Text="电仪安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5"></TreeNode>
<TreeNode id="1C770E20-7912-484C-9739-499B1B2F8DEB" Text="电仪安装工程" NavigateUrl=""><TreeNode id="3593DF22-78C1-4A73-8468-B20CB44D88C9" Text="电气工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.1"></TreeNode>
<TreeNode id="3ECE6333-6785-424D-996E-B923A650D8C7" Text="仪表工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.2"></TreeNode>
<TreeNode id="480F8C85-F5F2-4C5C-BE72-2ADABB7250CF" Text="电信工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.3"></TreeNode>
</TreeNode>
<TreeNode id="92101A90-9C22-4B43-B012-9AFF8402F85D" Text="水暖安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=6"></TreeNode>
<TreeNode id="33A03E2C-4E00-4722-AA14-F50419468154" Text="防腐绝热工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=7"></TreeNode>
<TreeNode id="A5A31FE8-0643-4396-99E3-A4A31A947789" Text="无损检测工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=8"></TreeNode>
SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+5 -1
View File
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划编制" NavigateUrl="JDGL/Check/PlanSet.aspx">
<TreeNode id="BAC3D994-03A8-466C-8975-A31039998BCC" Text="施工进度统计" NavigateUrl="JDGL/Check/ProgressShow.aspx">
</TreeNode>
<TreeNode id="1172B112-2A12-4410-AD66-E5BA6B461475" Text="施工进度赢得值曲线" NavigateUrl="JDGL/Check/ProgressStatistics.aspx"></TreeNode>
<TreeNode id="B479EC55-E12A-4F91-AF3F-864DAAA136FB" Text="进度完成情况录入" NavigateUrl="JDGL/Check/CompleteInput.aspx"></TreeNode>
<TreeNode id="4288426D-E49B-4E5D-A495-7E6A76F269B5" Text="周计划" NavigateUrl=""></TreeNode>
<TreeNode id="F0E296C3-6499-43E5-88CD-E00C5180D3BC" Text="赢得值曲线" NavigateUrl="JDGL/Check/EarnedValueCurve.aspx"></TreeNode>
<TreeNode id="C75F0853-8A2B-4B32-83B7-509278D11957" Text="项目里程碑节点" NavigateUrl=""></TreeNode>
<TreeNode id="3550F422-E520-4962-9816-B691B0EE2865" Text="形象进度照片" NavigateUrl=""></TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
+11 -10
View File
@@ -17,19 +17,20 @@
<TreeNode id="dedaf6f6-af14-4e4e-9fc6-164aa808cab9" Text="合同台账" NavigateUrl="PHTGL/Filing/ContractFile.aspx"></TreeNode>
<TreeNode id="9a772430-8a74-4d70-876d-136db8ce01a4" Text="文件归档" NavigateUrl="PHTGL/Filing/Files.aspx"></TreeNode>
</TreeNode>
<TreeNode id="7D8CF5B4-B945-4254-B134-4ABF55255497" Text="价格体系" NavigateUrl=""><TreeNode id="C8C719BC-450F-43AB-B17F-AB5DECD83E17" Text="土建" NavigateUrl=""></TreeNode>
<TreeNode id="BBA09E69-5017-411C-A516-64D0140AF70E" Text="工艺" NavigateUrl=""></TreeNode>
<TreeNode id="999FCA97-E28A-46FA-9293-0399D1172AC9" Text="电气" NavigateUrl=""></TreeNode>
<TreeNode id="838ED633-B375-4937-A4E1-F95FCCF640A0" Text="仪表" NavigateUrl=""></TreeNode>
<TreeNode id="AD5C7CBB-310D-4D15-9AFF-530BF765F460" Text="给排水" NavigateUrl=""></TreeNode>
<TreeNode id="0141B1F4-970A-4C23-B58A-BDF0785CA96E" Text="暖通" NavigateUrl=""></TreeNode>
<TreeNode id="8A1D2885-2584-44AD-A4DD-ED3F98198C8A" Text="防腐保温" NavigateUrl=""></TreeNode>
<TreeNode id="48216E20-7103-48AB-A12F-237E28605952" Text="消防电信" NavigateUrl=""></TreeNode>
<TreeNode id="5EB73242-63F0-402C-A42B-2BCDC0AC2229" Text="临建设施" NavigateUrl=""></TreeNode>
<TreeNode id="7D8CF5B4-B945-4254-B134-4ABF55255497" Text="价格体系" NavigateUrl=""><TreeNode id="C8C719BC-450F-43AB-B17F-AB5DECD83E17" Text="土建工程" NavigateUrl=""></TreeNode>
<TreeNode id="BBA09E69-5017-411C-A516-64D0140AF70E" Text="钢结构预制工程" NavigateUrl=""></TreeNode>
<TreeNode id="999FCA97-E28A-46FA-9293-0399D1172AC9" Text="工艺管道安装工程" NavigateUrl=""></TreeNode>
<TreeNode id="838ED633-B375-4937-A4E1-F95FCCF640A0" Text="工艺设备安装工程" NavigateUrl=""></TreeNode>
<TreeNode id="AD5C7CBB-310D-4D15-9AFF-530BF765F460" Text="非标设备现场制作安装工程" NavigateUrl=""></TreeNode>
<TreeNode id="0141B1F4-970A-4C23-B58A-BDF0785CA96E" Text="电仪安装工程" NavigateUrl=""></TreeNode>
<TreeNode id="8A1D2885-2584-44AD-A4DD-ED3F98198C8A" Text="水暖安装工程" NavigateUrl=""></TreeNode>
<TreeNode id="48216E20-7103-48AB-A12F-237E28605952" Text="防腐绝热工程" NavigateUrl=""></TreeNode>
<TreeNode id="5EB73242-63F0-402C-A42B-2BCDC0AC2229" Text="无损检测工程" NavigateUrl=""></TreeNode>
<TreeNode id="2A5A325E-C3C2-4412-9F5D-FB9185E9EB9B" Text="消防工程" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="73B84D49-940A-42DF-AC14-F4C75E10EC39" Text="合同执行跟踪" NavigateUrl=""><TreeNode id="D9BAB30E-3255-4EA0-8631-EF15C9203EFD" Text="合同价格信息" NavigateUrl="PHTGL/ContractCompile/ContractTrackList.aspx"></TreeNode>
<TreeNode id="98269480-3F36-4169-A91D-16144D903C6C" Text="WBS工作包" NavigateUrl="PHTGL/ContractCompile/ContractWBS.aspx"></TreeNode>
<TreeNode id="D715B66F-8E99-498F-87DA-E85B4B8EB923" Text="费用对比统计" NavigateUrl="PHTGL/ContractCompile/ContractTrackComparison.aspx"></TreeNode>
<TreeNode id="98269480-3F36-4169-A91D-16144D903C6C" Text="WBS工作包" NavigateUrl="PHTGL/ContractCompile/ContractWBS.aspx"></TreeNode>
<TreeNode id="F545E899-B3B5-4B49-A741-DE19356553D5" Text="进度检测" NavigateUrl="PHTGL/ContractCompile/ContractTrackProgressDetection.aspx"></TreeNode>
</TreeNode>
<TreeNode id="A9BBF623-83AC-4353-A010-07A5D4CEB7D1" Text="工效统计" NavigateUrl=""><TreeNode id="118B3E91-073B-468C-BDE3-DD6DCF6034C6" Text="日工效统计" NavigateUrl="PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx"></TreeNode>
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
-37
View File
@@ -48,43 +48,6 @@
<TreeNode id="3BBFCD70-D7A3-435C-9571-DD499D5ED7B8" Text="应急信息" NavigateUrl=""><TreeNode id="D12C2412-E12A-4F78-9AEF-1EE8AC84A561" Text="应急预案管理清单" NavigateUrl="ZHGL/Emergency/EmergencyList.aspx"></TreeNode>
<TreeNode id="172F25E0-F5E2-42E3-AD67-AC824D4E0FBB" Text="应急演练开展情况" NavigateUrl="ZHGL/Emergency/DrillRecordList.aspx"></TreeNode>
</TreeNode>
<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl=""><TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl=""></TreeNode>
<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""></TreeNode>
<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""></TreeNode>
<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""></TreeNode>
<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
</TreeNode>
<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
</TreeNode>
<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
<TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
<TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>