lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2023-11-06 15:45:52 +08:00
parent 0b84177640
commit 47921967d7
15 changed files with 909 additions and 540 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DataBase/版本日志/SGGLDB_WH_2023-11-06.sql
View File

@ -16,3 +16,14 @@ GO
--统一流转审核意见 --统一流转审核意见
alter table PreRun_SubInspectTerm add UnifyWanderAboutOpinion varchar(max) null alter table PreRun_SubInspectTerm add UnifyWanderAboutOpinion varchar(max) null
GO GO
--清空数据
delete from CQMS_Performance
delete from CQMS_Performance_Child1
delete from CQMS_Performance_Child2
delete from CQMS_Performance_Child3
GO
--主表增加施工进度数量
alter table CQMS_Performance add SgCount int null
GO

26
SGGL/FineUIPro.Web/CQMS/Performance/MonthTargetEdit.aspx
View File

@ -24,9 +24,11 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtMonthTarget1" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true" <%-- <f:TextBox ID="txtMonthTarget1" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true"
> >
</f:TextBox> </f:TextBox>--%>
<f:TextArea ID="txtMonthTarget1" ShowRedStar="true" Required="true" runat="server" Label="月节点目标" MaxLength="500">
</f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -37,8 +39,8 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtMonthTarget2" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true"> <f:TextArea ID="txtMonthTarget2" ShowRedStar="true" Required="true" runat="server" Label="月节点目标" MaxLength="500">
</f:TextBox> </f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -50,8 +52,8 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtMonthTarget3" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true"> <f:TextArea ID="txtMonthTarget3" ShowRedStar="true" Required="true" runat="server" Label="月节点目标" MaxLength="500">
</f:TextBox> </f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -63,8 +65,8 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtMonthTarget4" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true"> <f:TextArea ID="txtMonthTarget4" ShowRedStar="true" Required="true" runat="server" Label="月节点目标" MaxLength="500">
</f:TextBox> </f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -76,8 +78,8 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtMonthTarget5" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true"> <f:TextArea ID="txtMonthTarget5" ShowRedStar="true" Required="true" runat="server" Label="月节点目标" MaxLength="500">
</f:TextBox> </f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -89,8 +91,8 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtMonthTarget6" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true"> <f:TextArea ID="txtMonthTarget6" ShowRedStar="true" Required="true" runat="server" Label="月节点目标" MaxLength="500">
</f:TextBox> </f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>

12
SGGL/FineUIPro.Web/CQMS/Performance/MonthTargetEdit.aspx.designer.cs generated
View File

@ -66,7 +66,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMonthTarget1; protected global::FineUIPro.TextArea txtMonthTarget1;
/// <summary> /// <summary>
/// SimpleForm3 控件。 /// SimpleForm3 控件。
@ -84,7 +84,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMonthTarget2; protected global::FineUIPro.TextArea txtMonthTarget2;
/// <summary> /// <summary>
/// SimpleForm4 控件。 /// SimpleForm4 控件。
@ -102,7 +102,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMonthTarget3; protected global::FineUIPro.TextArea txtMonthTarget3;
/// <summary> /// <summary>
/// SimpleForm5 控件。 /// SimpleForm5 控件。
@ -120,7 +120,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMonthTarget4; protected global::FineUIPro.TextArea txtMonthTarget4;
/// <summary> /// <summary>
/// SimpleForm6 控件。 /// SimpleForm6 控件。
@ -138,7 +138,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMonthTarget5; protected global::FineUIPro.TextArea txtMonthTarget5;
/// <summary> /// <summary>
/// SimpleForm7 控件。 /// SimpleForm7 控件。
@ -156,7 +156,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMonthTarget6; protected global::FineUIPro.TextArea txtMonthTarget6;
/// <summary> /// <summary>
/// Toolbar4 控件。 /// Toolbar4 控件。

55
SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx.cs
View File

@ -1038,31 +1038,38 @@ namespace FineUIPro.Web.CQMS.Performance
//根据gid获取CQMS_Performance_Child2 施工进度管理的子表数据，大于一条，就要多增加数据到List中 //根据gid获取CQMS_Performance_Child2 施工进度管理的子表数据，大于一条，就要多增加数据到List中
var ChildSgjdCount = db.CQMS_Performance_Child2.Where(x => x.NowWeek == 1 && x.PerformanceGid == PerformanceGid var ChildSgjdCount = db.CQMS_Performance_Child2.Where(x => x.NowWeek == 1 && x.PerformanceGid == PerformanceGid
&&x.Performance_ChildGid1== OneGid).ToList().Count(); &&x.Performance_ChildGid1== OneGid).ToList().Count();
var addList = db.CQMS_Performance_Child1.Where(x => x.PerformanceGid == PerformanceGid && x.SortIndex==1)
.Select(x => new GridModels for (int i = 0; i < ChildSgjdCount-1; i++)
{
Performance_ChildGid1 = x.Performance_ChildGid1,
PerformanceGid = x.PerformanceGid,
PType = x.PType,
EvaScore = x.EvaScore,
Itemize = x.Itemize,
WorkArea = x.WorkArea,
MonthTarget = x.MonthTarget,
SortIndex = x.SortIndex
}).ToList();
if (ChildSgjdCount == 2)
{ {
addList[0].Performance_ChildGid1 = addList[0].Performance_ChildGid1 + "one"; var addList = db.CQMS_Performance_Child1.Where(x => x.PerformanceGid == PerformanceGid && x.SortIndex == 1)
listChild1.InsertRange(1, addList); .Select(x => new GridModels
} {
else if (ChildSgjdCount == 3) Performance_ChildGid1 = x.Performance_ChildGid1,
{ PerformanceGid = x.PerformanceGid,
var pgid = addList[0].Performance_ChildGid1; PType = x.PType,
addList[0].Performance_ChildGid1 = pgid + "one"; EvaScore = x.EvaScore,
listChild1.InsertRange(1, addList); Itemize = x.Itemize,
addList[0].Performance_ChildGid1 = pgid + "two"; WorkArea = x.WorkArea,
listChild1.InsertRange(2, addList); MonthTarget = x.MonthTarget,
SortIndex = x.SortIndex
}).ToList();
addList[0].Performance_ChildGid1 = addList[0].Performance_ChildGid1 + "one"+i.ToString();
listChild1.InsertRange(i+1, addList);
} }
//if (ChildSgjdCount == 2)
//{
// addList[0].Performance_ChildGid1 = addList[0].Performance_ChildGid1 + "one";
// listChild1.InsertRange(1, addList);
//}
//else if (ChildSgjdCount == 3)
//{
// var pgid = addList[0].Performance_ChildGid1;
// addList[0].Performance_ChildGid1 = pgid + "one";
// listChild1.InsertRange(1, addList);
// addList[0].Performance_ChildGid1 = pgid + "two";
// listChild1.InsertRange(2, addList);
//}
//循环list给每周任务、工程量、资源需求计划、本周工作任务完成情况 ,每日工作计划、完成情况赋值 //循环list给每周任务、工程量、资源需求计划、本周工作任务完成情况 ,每日工作计划、完成情况赋值
//获取周数 //获取周数
@ -1089,7 +1096,7 @@ namespace FineUIPro.Web.CQMS.Performance
var chilGid = listChild1[i].Performance_ChildGid1; var chilGid = listChild1[i].Performance_ChildGid1;
if (chilGid.IndexOf("one")>-1|| chilGid.IndexOf("two") > -1) if (chilGid.IndexOf("one")>-1|| chilGid.IndexOf("two") > -1)
{ {
chilGid = chilGid.Substring(0, chilGid.Length - 3); chilGid = chilGid.Substring(0, chilGid.Length - 4);
} }
//根据周数获取数据 //根据周数获取数据

143
SGGL/FineUIPro.Web/CQMS/Performance/PerformanceEdit.aspx
View File

@ -73,9 +73,11 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtMonthTarget1" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true" <%-- <f:TextBox ID="txtMonthTarget1" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true"
> >
</f:TextBox> </f:TextBox>--%>
<f:TextArea ID="txtMonthTarget1" ShowRedStar="true" Required="true" runat="server" Label="月节点目标" MaxLength="500">
</f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -86,8 +88,10 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtMonthTarget2" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true"> <%-- <f:TextBox ID="txtMonthTarget2" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true">
</f:TextBox> </f:TextBox>--%>
<f:TextArea ID="txtMonthTarget2" ShowRedStar="true" Required="true" runat="server" Label="月节点目标" MaxLength="500">
</f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -99,8 +103,10 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtMonthTarget3" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true"> <%-- <f:TextBox ID="txtMonthTarget3" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true">
</f:TextBox> </f:TextBox>--%>
<f:TextArea ID="txtMonthTarget3" ShowRedStar="true" Required="true" runat="server" Label="月节点目标" MaxLength="500">
</f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -112,8 +118,10 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtMonthTarget4" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true"> <%-- <f:TextBox ID="txtMonthTarget4" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true">
</f:TextBox> </f:TextBox>--%>
<f:TextArea ID="txtMonthTarget4" ShowRedStar="true" Required="true" runat="server" Label="月节点目标" MaxLength="500">
</f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -125,8 +133,10 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtMonthTarget5" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true"> <%-- <f:TextBox ID="txtMonthTarget5" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true">
</f:TextBox> </f:TextBox>--%>
<f:TextArea ID="txtMonthTarget5" ShowRedStar="true" Required="true" runat="server" Label="月节点目标" MaxLength="500">
</f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -138,8 +148,11 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtMonthTarget6" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true"> <%-- <f:TextBox ID="txtMonthTarget6" runat="server" Label="月节点目标" MaxLength="500" LabelWidth="100px" Required="true" ShowRedStar="true">
</f:TextBox> </f:TextBox>--%>
<f:TextArea ID="txtMonthTarget6" ShowRedStar="true" Required="true" runat="server" Label="月节点目标" MaxLength="500">
</f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -158,22 +171,78 @@
<f:Form ID="pForm1" ShowBorder="false" ShowHeader="true" AutoScroll="true" <f:Form ID="pForm1" ShowBorder="false" ShowHeader="true" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Hidden="true" Title="1、施工进度管理"> BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Hidden="true" Title="1、施工进度管理">
<Rows> <Rows>
<f:FormRow ColumnWidths="10%">
<Items>
<f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnAdd_Click">
</f:Button>
</Items>
</f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtTaskContent1" runat="server" Label="工作任务安排" MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px">
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Performance_ChildGid2"
DataKeyNames="Performance_ChildGid2" ShowGridHeader="true"
SortField="SortIndex" SortDirection="ASC"
MinHeight="150px" AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
EnableTextSelection="True" OnPreDataBound="Grid1_PreDataBound">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="150px" ColumnID="TaskContent" DataField="TaskContent"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="工作任务安排">
<Editor>
<f:TextBox ID="txtTaskContent" runat="server" ShowRedStar="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ProjectQuantity" DataField="ProjectQuantity"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="工程量">
<Editor>
<f:TextBox ID="txtProjectQuantity" runat="server" ShowRedStar="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="160px" ColumnID="DemandPlan" DataField="DemandPlan"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="人材机资源需求计划">
<Editor>
<f:TextBox ID="txtDemandPlan" runat="server" ShowRedStar="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:LinkButtonField ColumnID="Delete" Width="50px" EnablePostBack="false" Icon="Delete"
HeaderTextAlign="Center" HeaderText="删除" />
</Columns>
</f:Grid>
<%-- <f:TextBox ID="txtTaskContent1" runat="server" Label="工作任务安排" Required="true" ShowRedStar="true" LabelWidth="120px">
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtProjectQuantity1" runat="server" Label="工程量" MaxLength="50" LabelWidth="80px" > <f:TextBox ID="txtProjectQuantity1" runat="server" Label="工程量" MaxLength="50" LabelWidth="80px" >
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtDemandPlan1" runat="server" Label="人材机资源需求计划" MaxLength="50" LabelWidth="160px" > <f:TextBox ID="txtDemandPlan1" runat="server" Label="人材机资源需求计划" MaxLength="50" LabelWidth="160px" >
</f:TextBox> </f:TextBox>
<f:Button runat="server" Icon="Add" OnClientClick="addpFrom1"></f:Button>--%>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow>
<%-- <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtTaskContent2" runat="server" Label="工作任务安排" MaxLength="50" Required="true" LabelWidth="120px"> <f:TextBox ID="txtTaskContent2" runat="server" Label="工作任务安排" Required="true" LabelWidth="120px">
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtProjectQuantity2" runat="server" Label="工程量" MaxLength="50" LabelWidth="80px" > <f:TextBox ID="txtProjectQuantity2" runat="server" Label="工程量" MaxLength="50" LabelWidth="80px" >
@ -186,7 +255,7 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtTaskContent3" runat="server" Label="工作任务安排" MaxLength="50" Required="true" LabelWidth="120px"> <f:TextBox ID="txtTaskContent3" runat="server" Label="工作任务安排" Required="true" LabelWidth="120px">
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtProjectQuantity3" runat="server" Label="工程量" MaxLength="50" LabelWidth="80px" > <f:TextBox ID="txtProjectQuantity3" runat="server" Label="工程量" MaxLength="50" LabelWidth="80px" >
@ -196,7 +265,7 @@
</f:TextBox> </f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>--%>
<%-- <f:FormRow CssStyle="text-align:right"> <%-- <f:FormRow CssStyle="text-align:right">
<Items> <Items>
<f:Button ID="btnadd" Icon="Add" ToolTip="添加新列" runat="server" ValidateForms="SimpleForm1" <f:Button ID="btnadd" Icon="Add" ToolTip="添加新列" runat="server" ValidateForms="SimpleForm1"
@ -212,10 +281,11 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtTaskContentHse" runat="server" Label="工作任务安排" MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px"> <%-- <f:TextBox ID="txtTaskContentHse" runat="server" Label="工作任务安排" Required="true" ShowRedStar="true" LabelWidth="120px">
</f:TextBox> </f:TextBox>--%>
<f:TextArea ID="txtTaskContentHse" ShowRedStar="true" Required="true" runat="server" Label="工作任务安排" MaxLength="500">
</f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -226,10 +296,11 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtTaskContentZl" runat="server" Label="工作任务安排" MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px"> <%-- <f:TextBox ID="txtTaskContentZl" runat="server" Label="工作任务安排" Required="true" ShowRedStar="true" LabelWidth="120px">
</f:TextBox> </f:TextBox>--%>
<f:TextArea ID="txtTaskContentZl" ShowRedStar="true" Required="true" runat="server" Label="工作任务安排" MaxLength="500">
</f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -240,9 +311,10 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtTaskContentTz" runat="server" Label="工作任务安排" MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px"> <%-- <f:TextBox ID="txtTaskContentTz" runat="server" Label="工作任务安排" Required="true" ShowRedStar="true" LabelWidth="120px">
</f:TextBox> </f:TextBox>--%>
<f:TextArea ID="txtTaskContentTz" ShowRedStar="true" Required="true" runat="server" Label="工作任务安排" MaxLength="500">
</f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
@ -254,9 +326,10 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtTaskContentGjsx" runat="server" Label="工作任务安排" MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px"> <%-- <f:TextBox ID="txtTaskContentGjsx" runat="server" Label="工作任务安排" Required="true" ShowRedStar="true" LabelWidth="120px">
</f:TextBox> </f:TextBox>--%>
<f:TextArea ID="txtTaskContentGjsx" ShowRedStar="true" Required="true" runat="server" Label="工作任务安排" MaxLength="500">
</f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
@ -268,9 +341,10 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtTaskContentJf" runat="server" Label="工作任务安排" MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px"> <%-- <f:TextBox ID="txtTaskContentJf" runat="server" Label="工作任务安排" Required="true" ShowRedStar="true" LabelWidth="120px">
</f:TextBox> </f:TextBox>--%>
<f:TextArea ID="txtTaskContentJf" ShowRedStar="true" Required="true" runat="server" Label="工作任务安排" MaxLength="500">
</f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
@ -304,10 +378,13 @@
</f:Window> </f:Window>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">
function CloseRefresh() { function CloseRefresh() {
$("#btnClose").click(); $("#btnClose").click();
} }
</script> </script>
</body> </body>
</html> </html>

246
SGGL/FineUIPro.Web/CQMS/Performance/PerformanceEdit.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL; using BLL;
using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -73,6 +74,20 @@ namespace FineUIPro.Web.CQMS.Performance
ViewState["CreateProject"] = value; ViewState["CreateProject"] = value;
} }
} }
public int TaskCount
{
get
{
return (int)ViewState["TaskCount"];
}
set
{
ViewState["TaskCount"] = value;
}
}
#endregion #endregion
/// <summary> /// <summary>
@ -84,6 +99,42 @@ namespace FineUIPro.Web.CQMS.Performance
{ {
if (!IsPostBack) if (!IsPostBack)
{ {
JArray teamGroupData = Grid1.GetMergedData();
List<JObject> list = new List<JObject>();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Performance_ChildGid2", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
{ { "Performance_ChildGid2",Guid.NewGuid() },
{ "TaskContent", "" },
{ "ProjectQuantity", "" },
{ "DemandPlan",""},
{ "Delete", String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>", GetDeleteScript(), IconHelper.GetResolvedIconUrl(Icon.Delete)) }
};
list.Add(defaultObj);
Grid1.DataSource = list;
Grid1.DataBind();
#region 测试
//stepIndex = 2;
//SimpleForm1.Hidden = true;
//SimpleForm2.Hidden = true;
//SimpleForm3.Hidden = true;
//SimpleForm4.Hidden = true;
//SimpleForm5.Hidden = true;
//SimpleForm6.Hidden = true;
//SimpleForm7.Hidden = true;
//pForm1.Hidden = false;
//Form2.Hidden = false;
//Form3.Hidden = false;
//Form4.Hidden = false;
//Form5.Hidden = false;
//Form6.Hidden = false;
#endregion
CreateDateMonth = Request.Params["CreateDateMonth"]; CreateDateMonth = Request.Params["CreateDateMonth"];
this.drpCompileDateMonth.Text = CreateDateMonth; this.drpCompileDateMonth.Text = CreateDateMonth;
@ -213,7 +264,7 @@ namespace FineUIPro.Web.CQMS.Performance
#region 插入子表1 #region 插入子表1
List<Model.CQMS_Performance_Child1> listC1 = new List<Model.CQMS_Performance_Child1>(); List<Model.CQMS_Performance_Child1> listC1 = new List<Model.CQMS_Performance_Child1>();
Model.CQMS_Performance_Child1 modelP1 = new Model.CQMS_Performance_Child1(); Model.CQMS_Performance_Child1 modelP1 = new Model.CQMS_Performance_Child1();
Performance_ChildGid1Sg= Guid.NewGuid().ToString(); Performance_ChildGid1Sg = Guid.NewGuid().ToString();
modelP1.Performance_ChildGid1 = Performance_ChildGid1Sg; modelP1.Performance_ChildGid1 = Performance_ChildGid1Sg;
modelP1.PerformanceGid = PerformanceGid; modelP1.PerformanceGid = PerformanceGid;
modelP1.PType = "进度、质量、费用管理综合"; modelP1.PType = "进度、质量、费用管理综合";
@ -226,7 +277,7 @@ namespace FineUIPro.Web.CQMS.Performance
listC1.Add(modelP1); listC1.Add(modelP1);
modelP1 = new Model.CQMS_Performance_Child1(); modelP1 = new Model.CQMS_Performance_Child1();
Performance_ChildGid1Hse= Guid.NewGuid().ToString(); Performance_ChildGid1Hse = Guid.NewGuid().ToString();
modelP1.Performance_ChildGid1 = Performance_ChildGid1Hse; modelP1.Performance_ChildGid1 = Performance_ChildGid1Hse;
modelP1.PerformanceGid = PerformanceGid; modelP1.PerformanceGid = PerformanceGid;
modelP1.PType = "进度、质量、费用管理综合"; modelP1.PType = "进度、质量、费用管理综合";
@ -265,7 +316,7 @@ namespace FineUIPro.Web.CQMS.Performance
listC1.Add(modelP1); listC1.Add(modelP1);
modelP1 = new Model.CQMS_Performance_Child1(); modelP1 = new Model.CQMS_Performance_Child1();
Performance_ChildGid1Gj= Guid.NewGuid().ToString(); Performance_ChildGid1Gj = Guid.NewGuid().ToString();
modelP1.Performance_ChildGid1 = Performance_ChildGid1Gj; modelP1.Performance_ChildGid1 = Performance_ChildGid1Gj;
modelP1.PerformanceGid = PerformanceGid; modelP1.PerformanceGid = PerformanceGid;
modelP1.PType = "进度、质量、费用管理综合"; modelP1.PType = "进度、质量、费用管理综合";
@ -309,7 +360,7 @@ namespace FineUIPro.Web.CQMS.Performance
string[] ValidateForms = { "SimpleForm2", "SimpleForm3", "SimpleForm4", "SimpleForm5", "SimpleForm6", "SimpleForm7" }; string[] ValidateForms = { "SimpleForm2", "SimpleForm3", "SimpleForm4", "SimpleForm5", "SimpleForm6", "SimpleForm7" };
Button2.ValidateForms = ValidateForms; Button2.ValidateForms = ValidateForms;
} }
else if (stepIndex==1) else if (stepIndex == 1)
{ {
#region 判断参数 #region 判断参数
if (string.IsNullOrEmpty(txtWorkArea.Text)) if (string.IsNullOrEmpty(txtWorkArea.Text))
@ -409,21 +460,21 @@ namespace FineUIPro.Web.CQMS.Performance
Button2.ValidateForms = ValidateForms; Button2.ValidateForms = ValidateForms;
} }
else if (stepIndex==2) else if (stepIndex == 2)
{ {
#region 参数 #region 参数
var TaskContent1 = txtTaskContent1.Text.Trim(); //var TaskContent1 = txtTaskContent1.Text.Trim();
var ProjectQuantity1 = txtProjectQuantity1.Text.Trim(); //var ProjectQuantity1 = txtProjectQuantity1.Text.Trim();
var DemandPlan1 = txtDemandPlan1.Text.Trim(); //var DemandPlan1 = txtDemandPlan1.Text.Trim();
var TaskContent2 = txtTaskContent2.Text.Trim(); //var TaskContent2 = txtTaskContent2.Text.Trim();
var ProjectQuantity2 = txtProjectQuantity2.Text.Trim(); //var ProjectQuantity2 = txtProjectQuantity2.Text.Trim();
var DemandPlan2 = txtDemandPlan2.Text.Trim(); //var DemandPlan2 = txtDemandPlan2.Text.Trim();
var TaskContent3 = txtTaskContent3.Text.Trim(); //var TaskContent3 = txtTaskContent3.Text.Trim();
var ProjectQuantity3 = txtProjectQuantity3.Text.Trim(); //var ProjectQuantity3 = txtProjectQuantity3.Text.Trim();
var DemandPlan3 = txtDemandPlan3.Text.Trim(); //var DemandPlan3 = txtDemandPlan3.Text.Trim();
var TaskContentHse = txtTaskContentHse.Text.Trim(); var TaskContentHse = txtTaskContentHse.Text.Trim();
@ -436,11 +487,11 @@ namespace FineUIPro.Web.CQMS.Performance
var TaskContentJf = txtTaskContentJf.Text.Trim(); var TaskContentJf = txtTaskContentJf.Text.Trim();
#endregion #endregion
#region 判断参数 #region 判断参数
if (string.IsNullOrEmpty(TaskContent1)) //if (string.IsNullOrEmpty(TaskContent1))
{ //{
Alert.ShowInTop("施工进度管理-各周工作任务安排不能为空。", MessageBoxIcon.Warning); // Alert.ShowInTop("施工进度管理-各周工作任务安排不能为空。", MessageBoxIcon.Warning);
return; // return;
} //}
if (string.IsNullOrEmpty(TaskContentHse)) if (string.IsNullOrEmpty(TaskContentHse))
{ {
Alert.ShowInTop("HSE管理-各周工作任务安排不能为空。", MessageBoxIcon.Warning); Alert.ShowInTop("HSE管理-各周工作任务安排不能为空。", MessageBoxIcon.Warning);
@ -474,65 +525,94 @@ namespace FineUIPro.Web.CQMS.Performance
{ {
Month = datesConfig.Month + 1; Month = datesConfig.Month + 1;
} }
else { else
{
nowYear += 1; nowYear += 1;
} }
var Child2SortIndex = 1; var Child2SortIndex = 1;
//按照日期查询是否有设置 //按照日期查询是否有设置
var modelConfig = Funs.DB.CQMS_Performance_SetUp.FirstOrDefault(x => x.CreateYear == nowYear.ToString() && x.SortIndex == Month); var modelConfig = Funs.DB.CQMS_Performance_SetUp.FirstOrDefault(x => x.CreateYear == nowYear.ToString() && x.SortIndex == Month);
if (modelConfig!=null) if (modelConfig != null)
{ {
//根据设置的周数插入表格CQMS_Performance_Child2 //根据设置的周数插入表格CQMS_Performance_Child2
List<Model.CQMS_Performance_Child2> listChild2 = new List<Model.CQMS_Performance_Child2>(); List<Model.CQMS_Performance_Child2> listChild2 = new List<Model.CQMS_Performance_Child2>();
for (int i = 0; i < modelConfig.SetUpWeek; i++) for (int i = 0; i < modelConfig.SetUpWeek; i++)
{ {
//施工进度管理
Model.CQMS_Performance_Child2 modelChild2 = new Model.CQMS_Performance_Child2(); Model.CQMS_Performance_Child2 modelChild2 = new Model.CQMS_Performance_Child2();
modelChild2.Performance_ChildGid2 = Guid.NewGuid().ToString(); #region 添加施工进度
modelChild2.Performance_ChildGid1 = Performance_ChildGid1Sg; JArray teamGroupData = Grid1.GetMergedData();
modelChild2.PerformanceGid = PerformanceGid; foreach (JObject teamGroupRow in teamGroupData)
modelChild2.TaskContent = TaskContent1; {
modelChild2.ProjectQuantity = ProjectQuantity1; JObject values = teamGroupRow.Value<JObject>("values");
modelChild2.DemandPlan = DemandPlan1; int rowIndex = teamGroupRow.Value<int>("index");
modelChild2.NowWeek = (i + 1); modelChild2 = new Model.CQMS_Performance_Child2();
modelChild2.Performance_ChildGid2 = Guid.NewGuid().ToString();
modelChild2.Performance_ChildGid1 = Performance_ChildGid1Sg;
modelChild2.PerformanceGid = PerformanceGid;
modelChild2.TaskContent = values.Value<string>("TaskContent");
modelChild2.ProjectQuantity = values.Value<string>("ProjectQuantity");
modelChild2.DemandPlan = values.Value<string>("DemandPlan");
modelChild2.NowWeek = (i + 1);
modelChild2.SortIndex = Child2SortIndex;
modelChild2.CreateMan = CreateUser;
listChild2.Add(modelChild2);
Child2SortIndex += 1;
}
var SgCountModel = db.CQMS_Performance.FirstOrDefault(x => x.PerformanceGid == PerformanceGid);
if (Child2SortIndex!=1)
{
Child2SortIndex = Child2SortIndex - 1;
}
SgCountModel.SgCount = Child2SortIndex;
db.SubmitChanges();
#endregion
//施工进度管理
modelChild2.SortIndex= Child2SortIndex; //modelChild2.Performance_ChildGid2 = Guid.NewGuid().ToString();
modelChild2.CreateMan = CreateUser; //modelChild2.Performance_ChildGid1 = Performance_ChildGid1Sg;
listChild2.Add(modelChild2); //modelChild2.PerformanceGid = PerformanceGid;
////modelChild2.TaskContent = TaskContent1;
////modelChild2.ProjectQuantity = ProjectQuantity1;
////modelChild2.DemandPlan = DemandPlan1;
//modelChild2.NowWeek = (i + 1);
//modelChild2.SortIndex = Child2SortIndex;
//modelChild2.CreateMan = CreateUser;
//listChild2.Add(modelChild2);
#region 判断如果施工进度下面2个有值，也要插入 #region 判断如果施工进度下面2个有值，也要插入
if (!string.IsNullOrEmpty(TaskContent2)) //if (!string.IsNullOrEmpty(TaskContent2))
{ //{
modelChild2 = new Model.CQMS_Performance_Child2(); // modelChild2 = new Model.CQMS_Performance_Child2();
modelChild2.Performance_ChildGid2 = Guid.NewGuid().ToString(); // modelChild2.Performance_ChildGid2 = Guid.NewGuid().ToString();
modelChild2.Performance_ChildGid1 = Performance_ChildGid1Sg; // modelChild2.Performance_ChildGid1 = Performance_ChildGid1Sg;
modelChild2.PerformanceGid = PerformanceGid; // modelChild2.PerformanceGid = PerformanceGid;
modelChild2.TaskContent = TaskContent2; // modelChild2.TaskContent = TaskContent2;
modelChild2.ProjectQuantity = ProjectQuantity2; // modelChild2.ProjectQuantity = ProjectQuantity2;
modelChild2.DemandPlan = DemandPlan2; // modelChild2.DemandPlan = DemandPlan2;
modelChild2.NowWeek = (i + 1); // modelChild2.NowWeek = (i + 1);
Child2SortIndex += 1; // Child2SortIndex += 1;
modelChild2.CreateMan = CreateUser; // modelChild2.CreateMan = CreateUser;
modelChild2.SortIndex = Child2SortIndex; // modelChild2.SortIndex = Child2SortIndex;
listChild2.Add(modelChild2); // listChild2.Add(modelChild2);
} //}
if (!string.IsNullOrEmpty(TaskContent3)) //if (!string.IsNullOrEmpty(TaskContent3))
{ //{
modelChild2 = new Model.CQMS_Performance_Child2(); // modelChild2 = new Model.CQMS_Performance_Child2();
modelChild2.Performance_ChildGid2 = Guid.NewGuid().ToString(); // modelChild2.Performance_ChildGid2 = Guid.NewGuid().ToString();
modelChild2.Performance_ChildGid1 = Performance_ChildGid1Sg; // modelChild2.Performance_ChildGid1 = Performance_ChildGid1Sg;
modelChild2.PerformanceGid = PerformanceGid; // modelChild2.PerformanceGid = PerformanceGid;
modelChild2.TaskContent = TaskContent3; // modelChild2.TaskContent = TaskContent3;
modelChild2.ProjectQuantity = ProjectQuantity3; // modelChild2.ProjectQuantity = ProjectQuantity3;
modelChild2.DemandPlan = DemandPlan3; // modelChild2.DemandPlan = DemandPlan3;
modelChild2.NowWeek = (i + 1); // modelChild2.NowWeek = (i + 1);
Child2SortIndex += 1; // Child2SortIndex += 1;
modelChild2.SortIndex = Child2SortIndex; // modelChild2.SortIndex = Child2SortIndex;
modelChild2.CreateMan = CreateUser; // modelChild2.CreateMan = CreateUser;
listChild2.Add(modelChild2); // listChild2.Add(modelChild2);
} //}
#endregion #endregion
//HSE管理 //HSE管理
modelChild2 = new Model.CQMS_Performance_Child2(); modelChild2 = new Model.CQMS_Performance_Child2();
@ -638,7 +718,7 @@ namespace FineUIPro.Web.CQMS.Performance
if (item.NowWeek == 4) if (item.NowWeek == 4)
{ {
OneWeekDate2 = OneWeekDate1; OneWeekDate2 = OneWeekDate1;
for (var i = OneWeekDate2.AddDays(1); i <=EndDate; i=i.AddDays(1)) for (var i = OneWeekDate2.AddDays(1); i <= EndDate; i = i.AddDays(1))
{ {
modelChild3 = new Model.CQMS_Performance_Child3(); modelChild3 = new Model.CQMS_Performance_Child3();
StartDate = i; StartDate = i;
@ -673,7 +753,8 @@ namespace FineUIPro.Web.CQMS.Performance
} }
} }
else { else
{
switch (item.NowWeek) switch (item.NowWeek)
{ {
case 1: case 1:
@ -807,5 +888,42 @@ namespace FineUIPro.Web.CQMS.Performance
} }
protected void btnAdd_Click(object sender, EventArgs e)
{
JArray teamGroupData = Grid1.GetMergedData();
List<JObject> list = new List<JObject>();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Performance_ChildGid2", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
{ { "Performance_ChildGid2",Guid.NewGuid() },
{ "TaskContent", "" },
{ "ProjectQuantity", "" },
{ "DemandPlan",""},
{ "Delete", String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>", GetDeleteScript(), IconHelper.GetResolvedIconUrl(Icon.Delete)) }
};
list.Add(defaultObj);
Grid1.DataSource = list;
Grid1.DataBind();
}
/// <summary>
/// 删除提示
/// </summary>
/// <returns></returns>
private string GetDeleteScript()
{
return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, Grid1.GetDeleteSelectedRowsReference(), String.Empty);
}
protected void Grid1_PreDataBound(object sender, EventArgs e)
{
// 设置LinkButtonField的点击客户端事件
LinkButtonField deleteField = Grid1.FindColumn("Delete") as LinkButtonField;
deleteField.OnClientClick = GetDeleteScript();
}
} }
} }

78
SGGL/FineUIPro.Web/CQMS/Performance/PerformanceEdit.aspx.designer.cs generated
View File

@ -120,7 +120,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMonthTarget1; protected global::FineUIPro.TextArea txtMonthTarget1;
/// <summary> /// <summary>
/// SimpleForm3 控件。 /// SimpleForm3 控件。
@ -138,7 +138,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMonthTarget2; protected global::FineUIPro.TextArea txtMonthTarget2;
/// <summary> /// <summary>
/// SimpleForm4 控件。 /// SimpleForm4 控件。
@ -156,7 +156,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMonthTarget3; protected global::FineUIPro.TextArea txtMonthTarget3;
/// <summary> /// <summary>
/// SimpleForm5 控件。 /// SimpleForm5 控件。
@ -174,7 +174,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMonthTarget4; protected global::FineUIPro.TextArea txtMonthTarget4;
/// <summary> /// <summary>
/// SimpleForm6 控件。 /// SimpleForm6 控件。
@ -192,7 +192,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMonthTarget5; protected global::FineUIPro.TextArea txtMonthTarget5;
/// <summary> /// <summary>
/// SimpleForm7 控件。 /// SimpleForm7 控件。
@ -210,7 +210,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtMonthTarget6; protected global::FineUIPro.TextArea txtMonthTarget6;
/// <summary> /// <summary>
/// pForm1 控件。 /// pForm1 控件。
@ -222,85 +222,49 @@ namespace FineUIPro.Web.CQMS.Performance
protected global::FineUIPro.Form pForm1; protected global::FineUIPro.Form pForm1;
/// <summary> /// <summary>
/// txtTaskContent1 控件。 /// btnNew 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtTaskContent1; protected global::FineUIPro.Button btnNew;
/// <summary> /// <summary>
/// txtProjectQuantity1 控件。 /// Grid1 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtProjectQuantity1; protected global::FineUIPro.Grid Grid1;
/// <summary> /// <summary>
/// txtDemandPlan1 控件。 /// txtTaskContent 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtDemandPlan1; protected global::FineUIPro.TextBox txtTaskContent;
/// <summary> /// <summary>
/// txtTaskContent2 控件。 /// txtProjectQuantity 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtTaskContent2; protected global::FineUIPro.TextBox txtProjectQuantity;
/// <summary> /// <summary>
/// txtProjectQuantity2 控件。 /// txtDemandPlan 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtProjectQuantity2; protected global::FineUIPro.TextBox txtDemandPlan;
/// <summary>
/// txtDemandPlan2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDemandPlan2;
/// <summary>
/// txtTaskContent3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTaskContent3;
/// <summary>
/// txtProjectQuantity3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectQuantity3;
/// <summary>
/// txtDemandPlan3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDemandPlan3;
/// <summary> /// <summary>
/// Form2 控件。 /// Form2 控件。
@ -318,7 +282,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtTaskContentHse; protected global::FineUIPro.TextArea txtTaskContentHse;
/// <summary> /// <summary>
/// Form3 控件。 /// Form3 控件。
@ -336,7 +300,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtTaskContentZl; protected global::FineUIPro.TextArea txtTaskContentZl;
/// <summary> /// <summary>
/// Form4 控件。 /// Form4 控件。
@ -354,7 +318,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtTaskContentTz; protected global::FineUIPro.TextArea txtTaskContentTz;
/// <summary> /// <summary>
/// Form5 控件。 /// Form5 控件。
@ -372,7 +336,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtTaskContentGjsx; protected global::FineUIPro.TextArea txtTaskContentGjsx;
/// <summary> /// <summary>
/// Form6 控件。 /// Form6 控件。
@ -390,7 +354,7 @@ namespace FineUIPro.Web.CQMS.Performance
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtTaskContentJf; protected global::FineUIPro.TextArea txtTaskContentJf;
/// <summary> /// <summary>
/// Toolbar4 控件。 /// Toolbar4 控件。

45
SGGL/FineUIPro.Web/CQMS/Performance/TaskContentEdit.aspx
View File

@ -22,6 +22,49 @@
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="1、施工进度管理"> BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="1、施工进度管理">
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Performance_ChildGid2"
DataKeyNames="Performance_ChildGid2" ShowGridHeader="true"
SortField="SortIndex" SortDirection="ASC"
MinHeight="150px" AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="150px" ColumnID="TaskContent" DataField="TaskContent"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="工作任务安排">
<Editor>
<f:TextBox ID="txtTaskContent" runat="server" ShowRedStar="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ProjectQuantity" DataField="ProjectQuantity"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="工程量">
<Editor>
<f:TextBox ID="txtProjectQuantity" runat="server" ShowRedStar="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="160px" ColumnID="DemandPlan" DataField="DemandPlan"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="人材机资源需求计划">
<Editor>
<f:TextBox ID="txtDemandPlan" runat="server" ShowRedStar="true">
</f:TextBox>
</Editor>
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:FormRow>
<%-- <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtTaskContent1" runat="server" Label="工作任务安排" MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px"> <f:TextBox ID="txtTaskContent1" runat="server" Label="工作任务安排" MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px">
</f:TextBox> </f:TextBox>
@ -59,7 +102,7 @@
</f:TextBox> </f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>--%>
<%-- <f:FormRow CssStyle="text-align:right"> <%-- <f:FormRow CssStyle="text-align:right">
<Items> <Items>
<f:Button ID="btnadd" Icon="Add" ToolTip="添加新列" runat="server" ValidateForms="SimpleForm1" <f:Button ID="btnadd" Icon="Add" ToolTip="添加新列" runat="server" ValidateForms="SimpleForm1"

185
SGGL/FineUIPro.Web/CQMS/Performance/TaskContentEdit.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL; using BLL;
using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -125,41 +126,51 @@ namespace FineUIPro.Web.CQMS.Performance
txtTaskContentZl.Text = child2List[3].TaskContent; txtTaskContentZl.Text = child2List[3].TaskContent;
txtTaskContentHse.Text = child2List[4].TaskContent; txtTaskContentHse.Text = child2List[4].TaskContent;
//如果数量是6 就按顺序来，7 8 则是多2条数据 //加载grid
if (child2List.Count == 6) var Sgcount = Funs.DB.CQMS_Performance.FirstOrDefault(x => x.PerformanceGid == PerformanceGid).SgCount;
{ var list = (from x in Funs.DB.CQMS_Performance_Child2
txtTaskContent1.Text = child2List[5].TaskContent; where x.PerformanceGid == PerformanceGid
txtProjectQuantity1.Text = child2List[5].ProjectQuantity; && x.NowWeek == Convert.ToInt32(ddlNowWeek.SelectedValue) && x.SortIndex <= Sgcount
txtDemandPlan1.Text = child2List[5].DemandPlan; orderby x.SortIndex select x)
fr1.Hidden = true; .ToList();
fr2.Hidden = true; Grid1.DataSource = list;
} Grid1.DataBind();
else if (child2List.Count == 7)
{
txtTaskContent2.Text = child2List[5].TaskContent;
txtProjectQuantity2.Text = child2List[5].ProjectQuantity;
txtDemandPlan2.Text = child2List[5].DemandPlan;
txtTaskContent1.Text = child2List[6].TaskContent; ////如果数量是6 就按顺序来，7 8 则是多2条数据
txtProjectQuantity1.Text = child2List[6].ProjectQuantity; //if (child2List.Count == 6)
txtDemandPlan1.Text = child2List[6].DemandPlan; //{
fr2.Hidden = true; // txtTaskContent1.Text = child2List[5].TaskContent;
} // txtProjectQuantity1.Text = child2List[5].ProjectQuantity;
else if (child2List.Count == 8) // txtDemandPlan1.Text = child2List[5].DemandPlan;
{ // fr1.Hidden = true;
// fr2.Hidden = true;
//}
//else if (child2List.Count == 7)
//{
// txtTaskContent2.Text = child2List[5].TaskContent;
// txtProjectQuantity2.Text = child2List[5].ProjectQuantity;
// txtDemandPlan2.Text = child2List[5].DemandPlan;
txtTaskContent3.Text = child2List[5].TaskContent; // txtTaskContent1.Text = child2List[6].TaskContent;
txtProjectQuantity3.Text = child2List[5].ProjectQuantity; // txtProjectQuantity1.Text = child2List[6].ProjectQuantity;
txtDemandPlan3.Text = child2List[5].DemandPlan; // txtDemandPlan1.Text = child2List[6].DemandPlan;
// fr2.Hidden = true;
//}
//else if (child2List.Count == 8)
//{
txtTaskContent2.Text = child2List[6].TaskContent; // txtTaskContent3.Text = child2List[5].TaskContent;
txtProjectQuantity2.Text = child2List[6].ProjectQuantity; // txtProjectQuantity3.Text = child2List[5].ProjectQuantity;
txtDemandPlan2.Text = child2List[6].DemandPlan; // txtDemandPlan3.Text = child2List[5].DemandPlan;
txtTaskContent1.Text = child2List[7].TaskContent; // txtTaskContent2.Text = child2List[6].TaskContent;
txtProjectQuantity1.Text = child2List[7].ProjectQuantity; // txtProjectQuantity2.Text = child2List[6].ProjectQuantity;
txtDemandPlan1.Text = child2List[7].DemandPlan; // txtDemandPlan2.Text = child2List[6].DemandPlan;
}
// txtTaskContent1.Text = child2List[7].TaskContent;
// txtProjectQuantity1.Text = child2List[7].ProjectQuantity;
// txtDemandPlan1.Text = child2List[7].DemandPlan;
//}
} }
else else
{ {
@ -187,17 +198,17 @@ namespace FineUIPro.Web.CQMS.Performance
{ {
//依次修改各周任务安排 //依次修改各周任务安排
#region 参数 #region 参数
var TaskContent1 = txtTaskContent1.Text.Trim(); //var TaskContent1 = txtTaskContent1.Text.Trim();
var ProjectQuantity1 = txtProjectQuantity1.Text.Trim(); //var ProjectQuantity1 = txtProjectQuantity1.Text.Trim();
var DemandPlan1 = txtDemandPlan1.Text.Trim(); //var DemandPlan1 = txtDemandPlan1.Text.Trim();
var TaskContent2 = txtTaskContent2.Text.Trim(); //var TaskContent2 = txtTaskContent2.Text.Trim();
var ProjectQuantity2 = txtProjectQuantity2.Text.Trim(); //var ProjectQuantity2 = txtProjectQuantity2.Text.Trim();
var DemandPlan2 = txtDemandPlan2.Text.Trim(); //var DemandPlan2 = txtDemandPlan2.Text.Trim();
var TaskContent3 = txtTaskContent3.Text.Trim(); //var TaskContent3 = txtTaskContent3.Text.Trim();
var ProjectQuantity3 = txtProjectQuantity3.Text.Trim(); //var ProjectQuantity3 = txtProjectQuantity3.Text.Trim();
var DemandPlan3 = txtDemandPlan3.Text.Trim(); //var DemandPlan3 = txtDemandPlan3.Text.Trim();
var TaskContentHse = txtTaskContentHse.Text.Trim(); var TaskContentHse = txtTaskContentHse.Text.Trim();
@ -233,48 +244,66 @@ namespace FineUIPro.Web.CQMS.Performance
child2Model.TaskContent = TaskContentHse; child2Model.TaskContent = TaskContentHse;
db.SubmitChanges(); db.SubmitChanges();
if (child2List.Count == 8)
{
child2Model = child2List[5];
child2Model.TaskContent = TaskContent3;
child2Model.ProjectQuantity = ProjectQuantity3;
child2Model.DemandPlan = DemandPlan3;
db.SubmitChanges();
child2Model = child2List[6]; child2List = db.CQMS_Performance_Child2.Where(x => x.NowWeek == Convert.ToInt32(ddlNowWeek.SelectedValue) && x.PerformanceGid == PerformanceGid).
child2Model.TaskContent = TaskContent2; OrderBy(x => x.SortIndex).ToList();
child2Model.ProjectQuantity = ProjectQuantity2; var ji = 0;
child2Model.DemandPlan = DemandPlan2; //根据grid 里的进行修改
db.SubmitChanges(); JArray teamGroupData = Grid1.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
child2Model = child2List[7];
child2Model.TaskContent = TaskContent1;
child2Model.ProjectQuantity = ProjectQuantity1;
child2Model.DemandPlan = DemandPlan1;
db.SubmitChanges();
}
else if (child2List.Count==7)
{ {
child2Model = child2List[5]; JObject values = teamGroupRow.Value<JObject>("values");
child2Model.TaskContent = TaskContent2; int rowIndex = teamGroupRow.Value<int>("index");
child2Model.ProjectQuantity = ProjectQuantity2; child2Model = child2List[ji];
child2Model.DemandPlan = DemandPlan2; child2Model.TaskContent = values.Value<string>("TaskContent");
child2Model.ProjectQuantity = values.Value<string>("ProjectQuantity");
child2Model.DemandPlan = values.Value<string>("DemandPlan");
db.SubmitChanges(); db.SubmitChanges();
ji += 1;
}
child2Model = child2List[6]; //if (child2List.Count == 8)
child2Model.TaskContent = TaskContent1; //{
child2Model.ProjectQuantity = ProjectQuantity1; // child2Model = child2List[5];
child2Model.DemandPlan = DemandPlan1; // child2Model.TaskContent = TaskContent3;
db.SubmitChanges(); // child2Model.ProjectQuantity = ProjectQuantity3;
} // child2Model.DemandPlan = DemandPlan3;
else if (child2List.Count==6) // db.SubmitChanges();
{
child2Model = child2List[5]; // child2Model = child2List[6];
child2Model.TaskContent = TaskContent1; // child2Model.TaskContent = TaskContent2;
child2Model.ProjectQuantity = ProjectQuantity1; // child2Model.ProjectQuantity = ProjectQuantity2;
child2Model.DemandPlan = DemandPlan1; // child2Model.DemandPlan = DemandPlan2;
db.SubmitChanges(); // db.SubmitChanges();
}
// child2Model = child2List[7];
// child2Model.TaskContent = TaskContent1;
// child2Model.ProjectQuantity = ProjectQuantity1;
// child2Model.DemandPlan = DemandPlan1;
// db.SubmitChanges();
//}
//else if (child2List.Count==7)
//{
// child2Model = child2List[5];
// child2Model.TaskContent = TaskContent2;
// child2Model.ProjectQuantity = ProjectQuantity2;
// child2Model.DemandPlan = DemandPlan2;
// db.SubmitChanges();
// child2Model = child2List[6];
// child2Model.TaskContent = TaskContent1;
// child2Model.ProjectQuantity = ProjectQuantity1;
// child2Model.DemandPlan = DemandPlan1;
// db.SubmitChanges();
//}
//else if (child2List.Count==6)
//{
// child2Model = child2List[5];
// child2Model.TaskContent = TaskContent1;
// child2Model.ProjectQuantity = ProjectQuantity1;
// child2Model.DemandPlan = DemandPlan1;
// db.SubmitChanges();
//}
ShowNotify("修改成功。", MessageBoxIcon.Success); ShowNotify("修改成功。", MessageBoxIcon.Success);
} }
} }

79
SGGL/FineUIPro.Web/CQMS/Performance/TaskContentEdit.aspx.designer.cs generated
View File

@ -60,103 +60,40 @@ namespace FineUIPro.Web.CQMS.Performance
protected global::FineUIPro.Form pForm1; protected global::FineUIPro.Form pForm1;
/// <summary> /// <summary>
/// txtTaskContent1 控件。 /// Grid1 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtTaskContent1; protected global::FineUIPro.Grid Grid1;
/// <summary> /// <summary>
/// txtProjectQuantity1 控件。 /// txtTaskContent 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtProjectQuantity1; protected global::FineUIPro.TextBox txtTaskContent;
/// <summary> /// <summary>
/// txtDemandPlan1 控件。 /// txtProjectQuantity 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtDemandPlan1; protected global::FineUIPro.TextBox txtProjectQuantity;
/// <summary> /// <summary>
/// fr1 控件。 /// txtDemandPlan 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.FormRow fr1; protected global::FineUIPro.TextBox txtDemandPlan;
/// <summary>
/// txtTaskContent2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTaskContent2;
/// <summary>
/// txtProjectQuantity2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectQuantity2;
/// <summary>
/// txtDemandPlan2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDemandPlan2;
/// <summary>
/// fr2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow fr2;
/// <summary>
/// txtTaskContent3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTaskContent3;
/// <summary>
/// txtProjectQuantity3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectQuantity3;
/// <summary>
/// txtDemandPlan3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDemandPlan3;
/// <summary> /// <summary>
/// Form2 控件。 /// Form2 控件。

56
SGGL/FineUIPro.Web/CQMS/Performance/WorkPlanEdit.aspx
View File

@ -20,7 +20,59 @@
<f:Form ID="SimpleForm2" ShowBorder="false" ShowHeader="true" AutoScroll="true" <f:Form ID="SimpleForm2" ShowBorder="false" ShowHeader="true" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="1、施工进度管理"> BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="1、施工进度管理">
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Performance_ChildGid2"
DataKeyNames="Performance_ChildGid2" ShowGridHeader="true"
SortField="SortIndex" SortDirection="ASC"
MinHeight="150px" AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="150px" ColumnID="Performance_ChildGid2" DataField="Performance_ChildGid2"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="" Hidden="true">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TaskContent" DataField="TaskContent"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本周任务安排">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="WorkPlan" DataField="WorkPlan"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本日工作计划">
<Editor>
<f:TextBox ID="txtWorkPlan" runat="server" ShowRedStar="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CompletStatus" DataField="CompletStatus"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本日完成情况">
<Editor>
<f:TextBox ID="txtCompletStatus" runat="server" ShowRedStar="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="160px" ColumnID="TaskCompletContent" DataField="TaskCompletContent"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本周工作任务完成情况">
<Editor>
<f:TextBox ID="txtTaskCompletContent" runat="server" ShowRedStar="true">
</f:TextBox>
</Editor>
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:FormRow>
<%--<f:FormRow>
<Items> <Items>
<f:TextBox ID="txtWorkPlan1" runat="server" Label="本日工作计划" MaxLength="500" LabelWidth="120px"> <f:TextBox ID="txtWorkPlan1" runat="server" Label="本日工作计划" MaxLength="500" LabelWidth="120px">
</f:TextBox> </f:TextBox>
@ -36,7 +88,7 @@
<f:TextBox ID="txtTaskCompletContent1" runat="server" Label="本周工作任务完成情况" MaxLength="500" LabelWidth="120px"> <f:TextBox ID="txtTaskCompletContent1" runat="server" Label="本周工作任务完成情况" MaxLength="500" LabelWidth="120px">
</f:TextBox> </f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>--%>
</Rows> </Rows>
</f:Form> </f:Form>

368
SGGL/FineUIPro.Web/CQMS/Performance/WorkPlanEdit.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL; using BLL;
using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -57,6 +58,14 @@ namespace FineUIPro.Web.CQMS.Performance
} }
} }
public class ShowList {
public string WorkPlan { get; set; }
public string CompletStatus { get; set; }
public string TaskCompletContent { get; set; }
public string TaskContent { get; set; }
public string Performance_ChildGid2 { get; set; }
}
/// <summary> /// <summary>
/// 绑定数据 /// 绑定数据
/// </summary> /// </summary>
@ -79,110 +88,158 @@ namespace FineUIPro.Web.CQMS.Performance
//加载数据。 //加载数据。
//判断施工管理工作任务安排有几个 //判断施工管理工作任务安排有几个
var child2List = Funs.DB.CQMS_Performance_Child2.Where(x => x.PerformanceGid == PerformanceGid && x.NowWeek var child2List = Funs.DB.CQMS_Performance_Child2.Where(x => x.PerformanceGid == PerformanceGid && x.NowWeek
== NowWeek).OrderBy(x => x.SortIndex).ToList(); == NowWeek).OrderByDescending(x => x.SortIndex).ToList();
var objModel = db.CQMS_Performance_Child3.Where(x => x.PerformanceGid == PerformanceGid var objModel = db.CQMS_Performance_Child3.Where(x => x.PerformanceGid == PerformanceGid
&& x.CurrentDate == TodayDate); && x.CurrentDate == TodayDate);
if (child2List.Count == 6)
this.txtWorkPlan6.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).WorkPlan;
this.txtTaskCompletContent8.Text = child2List[0].TaskCompletContent;
this.SimpleForm7.Title = "6、可交付成果（本周任务安排：" + child2List[0].TaskContent + "）";
this.txtWorkPlan5.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).WorkPlan;
this.txtTaskCompletContent7.Text = child2List[1].TaskCompletContent;
this.SimpleForm6.Title = "5、关键事项跟踪（本周任务安排：" + child2List[1].TaskContent + "）";
this.txtWorkPlan4.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[2].Performance_ChildGid2).WorkPlan;
this.txtTaskCompletContent6.Text = child2List[2].TaskCompletContent;
this.SimpleForm5.Title = "4、图纸、材料状态跟踪（本周任务安排：" + child2List[2].TaskContent + "）";
this.txtWorkPlan3.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[3].Performance_ChildGid2).WorkPlan;
this.txtTaskCompletContent5.Text = child2List[3].TaskCompletContent;
this.SimpleForm4.Title = "3、质量管理情况（本周任务安排：" + child2List[3].TaskContent + "）";
this.txtWorkPlan2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[4].Performance_ChildGid2).WorkPlan;
this.txtTaskCompletContent4.Text = child2List[4].TaskCompletContent;
this.SimpleForm3.Title = "2、HSE管理（本周任务安排：" + child2List[2].TaskContent + "）";
child2List = Funs.DB.CQMS_Performance_Child2.Where(x => x.PerformanceGid == PerformanceGid && x.NowWeek
== NowWeek).OrderBy(x => x.SortIndex).ToList();
var Sgcount = Funs.DB.CQMS_Performance.FirstOrDefault(x => x.PerformanceGid == PerformanceGid).SgCount;
var Gid2 = "";
for (int i = 0; i < Sgcount; i++)
{ {
this.SimpleForm2.Title = "1、施工进度管理（本周任务安排：" + child2List[0].TaskContent + "）"; Gid2 += child2List[i].Performance_ChildGid2 + ",";
this.SimpleForm3.Title = "2、HSE管理（本周任务安排：" + child2List[1].TaskContent + "）";
this.SimpleForm4.Title = "3、质量管理情况（本周任务安排：" + child2List[2].TaskContent + "）";
this.SimpleForm5.Title = "4、图纸、材料状态跟踪（本周任务安排：" + child2List[3].TaskContent + "）";
this.SimpleForm6.Title = "5、关键事项跟踪（本周任务安排：" + child2List[4].TaskContent + "）";
this.SimpleForm7.Title = "6、可交付成果（本周任务安排：" + child2List[5].TaskContent + "）";
this.txtWorkPlan1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).WorkPlan;
this.txtCompletStatus1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).CompletStatus;
this.txtWorkPlan2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).WorkPlan;
this.txtWorkPlan3.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[2].Performance_ChildGid2).WorkPlan;
this.txtWorkPlan4.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[3].Performance_ChildGid2).WorkPlan;
this.txtWorkPlan5.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[4].Performance_ChildGid2).WorkPlan;
this.txtWorkPlan6.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2).WorkPlan;
this.txtTaskCompletContent1.Text = child2List[0].TaskCompletContent;
this.txtTaskCompletContent4.Text = child2List[1].TaskCompletContent;
this.txtTaskCompletContent5.Text = child2List[2].TaskCompletContent;
this.txtTaskCompletContent6.Text = child2List[3].TaskCompletContent;
this.txtTaskCompletContent7.Text = child2List[4].TaskCompletContent;
this.txtTaskCompletContent8.Text = child2List[5].TaskCompletContent;
//txtCompletStatus2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).CompletStatus;
//txtCompletStatus3.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[2].Performance_ChildGid2).CompletStatus;
//txtCompletStatus4.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[3].Performance_ChildGid2).CompletStatus;
//txtCompletStatus5.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[4].Performance_ChildGid2).CompletStatus;
//txtCompletStatus6.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2).CompletStatus;
} }
else if (child2List.Count == 7) Gid2 = Gid2.Substring(0, Gid2.Length - 1);
{ //加载施工情况
this.Form2.Hidden = false; var GridList = (from x in db.CQMS_Performance_Child3
this.SimpleForm2.Title = "1、施工进度管理（本周任务安排：" + child2List[0].TaskContent + "）"; join y in db.CQMS_Performance_Child2 on x.Performance_ChildGid2 equals y.Performance_ChildGid2
this.Form2.Title = "2、施工进度管理（本周任务安排：" + child2List[1].TaskContent + "）"; where x.PerformanceGid == PerformanceGid && x.CurrentDate == TodayDate && Gid2.Split(',').Contains(x.Performance_ChildGid2)
this.SimpleForm3.Title = "3、HSE管理（本周任务安排：" + child2List[2].TaskContent + "）"; orderby y.SortIndex
this.SimpleForm4.Title = "4、质量管理情况（本周任务安排：" + child2List[3].TaskContent + "）"; select new ShowList
this.SimpleForm5.Title = "5、图纸、材料状态跟踪（本周任务安排：" + child2List[4].TaskContent + "）"; {
this.SimpleForm6.Title = "6、关键事项跟踪（本周任务安排：" + child2List[5].TaskContent + "）"; CompletStatus = x.CompletStatus,
this.SimpleForm7.Title = "7、可交付成果（本周任务安排：" + child2List[6].TaskContent + "）"; WorkPlan = x.WorkPlan,
TaskCompletContent = y.TaskCompletContent,
this.txtWorkPlan1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).WorkPlan; TaskContent = y.TaskContent,
this.txtCompletStatus1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).CompletStatus; Performance_ChildGid2=x.Performance_ChildGid2
}).ToList();
this.TextBox1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).WorkPlan; Grid1.DataSource = GridList;
this.TextBox2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).CompletStatus; Grid1.DataBind();
this.txtWorkPlan2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[2].Performance_ChildGid2).WorkPlan;
this.txtWorkPlan3.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[3].Performance_ChildGid2).WorkPlan;
this.txtWorkPlan4.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[4].Performance_ChildGid2).WorkPlan;
this.txtWorkPlan5.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2).WorkPlan;
this.txtWorkPlan6.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[6].Performance_ChildGid2).WorkPlan;
this.txtTaskCompletContent1.Text = child2List[0].TaskCompletContent;
this.txtTaskCompletContent2.Text = child2List[1].TaskCompletContent;
this.txtTaskCompletContent4.Text = child2List[2].TaskCompletContent;
this.txtTaskCompletContent5.Text = child2List[3].TaskCompletContent;
this.txtTaskCompletContent6.Text = child2List[4].TaskCompletContent;
this.txtTaskCompletContent7.Text = child2List[5].TaskCompletContent;
this.txtTaskCompletContent8.Text = child2List[6].TaskCompletContent;
}
else if (child2List.Count == 8)
{
this.Form2.Hidden = false;
this.Form3.Hidden = false;
this.SimpleForm2.Title = "1、施工进度管理（本周任务安排：" + child2List[0].TaskContent + "）";
this.Form2.Title = "2、施工进度管理（本周任务安排：" + child2List[1].TaskContent + "）";
this.Form3.Title = "3、施工进度管理（本周任务安排：" + child2List[2].TaskContent + "）";
this.SimpleForm3.Title = "4、HSE管理（本周任务安排：" + child2List[3].TaskContent + "）";
this.SimpleForm4.Title = "5、质量管理情况（本周任务安排：" + child2List[4].TaskContent + "）";
this.SimpleForm5.Title = "6、图纸、材料状态跟踪（本周任务安排：" + child2List[5].TaskContent + "）";
this.SimpleForm6.Title = "7、关键事项跟踪（本周任务安排：" + child2List[6].TaskContent + "）";
this.SimpleForm7.Title = "8、可交付成果（本周任务安排：" + child2List[7].TaskContent + "）";
this.txtWorkPlan1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).WorkPlan;
this.txtCompletStatus1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).CompletStatus;
this.TextBox1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).WorkPlan;
this.TextBox2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).CompletStatus;
this.TextBox3.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[2].Performance_ChildGid2).WorkPlan;
this.TextBox4.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[2].Performance_ChildGid2).CompletStatus;
this.txtWorkPlan2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[3].Performance_ChildGid2).WorkPlan;
this.txtWorkPlan3.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[4].Performance_ChildGid2).WorkPlan;
this.txtWorkPlan4.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2).WorkPlan;
this.txtWorkPlan5.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[6].Performance_ChildGid2).WorkPlan;
this.txtWorkPlan6.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[7].Performance_ChildGid2).WorkPlan;
this.txtTaskCompletContent1.Text = child2List[0].TaskCompletContent;
this.txtTaskCompletContent2.Text = child2List[1].TaskCompletContent;
this.txtTaskCompletContent3.Text = child2List[2].TaskCompletContent;
this.txtTaskCompletContent4.Text = child2List[3].TaskCompletContent;
this.txtTaskCompletContent5.Text = child2List[4].TaskCompletContent;
this.txtTaskCompletContent6.Text = child2List[5].TaskCompletContent;
this.txtTaskCompletContent7.Text = child2List[6].TaskCompletContent;
this.txtTaskCompletContent8.Text = child2List[7].TaskCompletContent;
} //if (child2List.Count == 6)
//{
// this.SimpleForm2.Title = "1、施工进度管理（本周任务安排：" + child2List[0].TaskContent + "）";
// this.SimpleForm3.Title = "2、HSE管理（本周任务安排：" + child2List[1].TaskContent + "）";
// this.SimpleForm4.Title = "3、质量管理情况（本周任务安排：" + child2List[2].TaskContent + "）";
// this.SimpleForm5.Title = "4、图纸、材料状态跟踪（本周任务安排：" + child2List[3].TaskContent + "）";
// this.SimpleForm6.Title = "5、关键事项跟踪（本周任务安排：" + child2List[4].TaskContent + "）";
// this.SimpleForm7.Title = "6、可交付成果（本周任务安排：" + child2List[5].TaskContent + "）";
// this.txtWorkPlan1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).WorkPlan;
// this.txtCompletStatus1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).CompletStatus;
// this.txtWorkPlan2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).WorkPlan;
// this.txtWorkPlan3.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[2].Performance_ChildGid2).WorkPlan;
// this.txtWorkPlan4.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[3].Performance_ChildGid2).WorkPlan;
// this.txtWorkPlan5.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[4].Performance_ChildGid2).WorkPlan;
// this.txtWorkPlan6.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2).WorkPlan;
// this.txtTaskCompletContent1.Text = child2List[0].TaskCompletContent;
// this.txtTaskCompletContent4.Text = child2List[1].TaskCompletContent;
// this.txtTaskCompletContent5.Text = child2List[2].TaskCompletContent;
// this.txtTaskCompletContent6.Text = child2List[3].TaskCompletContent;
// this.txtTaskCompletContent7.Text = child2List[4].TaskCompletContent;
// this.txtTaskCompletContent8.Text = child2List[5].TaskCompletContent;
// //txtCompletStatus2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).CompletStatus;
// //txtCompletStatus3.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[2].Performance_ChildGid2).CompletStatus;
// //txtCompletStatus4.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[3].Performance_ChildGid2).CompletStatus;
// //txtCompletStatus5.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[4].Performance_ChildGid2).CompletStatus;
// //txtCompletStatus6.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2).CompletStatus;
//}
//else if (child2List.Count == 7)
//{
// this.Form2.Hidden = false;
// this.SimpleForm2.Title = "1、施工进度管理（本周任务安排：" + child2List[0].TaskContent + "）";
// this.Form2.Title = "2、施工进度管理（本周任务安排：" + child2List[1].TaskContent + "）";
// this.SimpleForm3.Title = "3、HSE管理（本周任务安排：" + child2List[2].TaskContent + "）";
// this.SimpleForm4.Title = "4、质量管理情况（本周任务安排：" + child2List[3].TaskContent + "）";
// this.SimpleForm5.Title = "5、图纸、材料状态跟踪（本周任务安排：" + child2List[4].TaskContent + "）";
// this.SimpleForm6.Title = "6、关键事项跟踪（本周任务安排：" + child2List[5].TaskContent + "）";
// this.SimpleForm7.Title = "7、可交付成果（本周任务安排：" + child2List[6].TaskContent + "）";
// this.txtWorkPlan1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).WorkPlan;
// this.txtCompletStatus1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).CompletStatus;
// this.TextBox1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).WorkPlan;
// this.TextBox2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).CompletStatus;
// this.txtWorkPlan2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[2].Performance_ChildGid2).WorkPlan;
// this.txtWorkPlan3.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[3].Performance_ChildGid2).WorkPlan;
// this.txtWorkPlan4.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[4].Performance_ChildGid2).WorkPlan;
// this.txtWorkPlan5.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2).WorkPlan;
// this.txtWorkPlan6.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[6].Performance_ChildGid2).WorkPlan;
// this.txtTaskCompletContent1.Text = child2List[0].TaskCompletContent;
// this.txtTaskCompletContent2.Text = child2List[1].TaskCompletContent;
// this.txtTaskCompletContent4.Text = child2List[2].TaskCompletContent;
// this.txtTaskCompletContent5.Text = child2List[3].TaskCompletContent;
// this.txtTaskCompletContent6.Text = child2List[4].TaskCompletContent;
// this.txtTaskCompletContent7.Text = child2List[5].TaskCompletContent;
// this.txtTaskCompletContent8.Text = child2List[6].TaskCompletContent;
//}
//else if (child2List.Count == 8)
//{
// this.Form2.Hidden = false;
// this.Form3.Hidden = false;
// this.SimpleForm2.Title = "1、施工进度管理（本周任务安排：" + child2List[0].TaskContent + "）";
// this.Form2.Title = "2、施工进度管理（本周任务安排：" + child2List[1].TaskContent + "）";
// this.Form3.Title = "3、施工进度管理（本周任务安排：" + child2List[2].TaskContent + "）";
// this.SimpleForm3.Title = "4、HSE管理（本周任务安排：" + child2List[3].TaskContent + "）";
// this.SimpleForm4.Title = "5、质量管理情况（本周任务安排：" + child2List[4].TaskContent + "）";
// this.SimpleForm5.Title = "6、图纸、材料状态跟踪（本周任务安排：" + child2List[5].TaskContent + "）";
// this.SimpleForm6.Title = "7、关键事项跟踪（本周任务安排：" + child2List[6].TaskContent + "）";
// this.SimpleForm7.Title = "8、可交付成果（本周任务安排：" + child2List[7].TaskContent + "）";
// this.txtWorkPlan1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).WorkPlan;
// this.txtCompletStatus1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[0].Performance_ChildGid2).CompletStatus;
// this.TextBox1.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).WorkPlan;
// this.TextBox2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[1].Performance_ChildGid2).CompletStatus;
// this.TextBox3.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[2].Performance_ChildGid2).WorkPlan;
// this.TextBox4.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[2].Performance_ChildGid2).CompletStatus;
// this.txtWorkPlan2.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[3].Performance_ChildGid2).WorkPlan;
// this.txtWorkPlan3.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[4].Performance_ChildGid2).WorkPlan;
// this.txtWorkPlan4.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2).WorkPlan;
// this.txtWorkPlan5.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[6].Performance_ChildGid2).WorkPlan;
// this.txtWorkPlan6.Text = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[7].Performance_ChildGid2).WorkPlan;
// this.txtTaskCompletContent1.Text = child2List[0].TaskCompletContent;
// this.txtTaskCompletContent2.Text = child2List[1].TaskCompletContent;
// this.txtTaskCompletContent3.Text = child2List[2].TaskCompletContent;
// this.txtTaskCompletContent4.Text = child2List[3].TaskCompletContent;
// this.txtTaskCompletContent5.Text = child2List[4].TaskCompletContent;
// this.txtTaskCompletContent6.Text = child2List[5].TaskCompletContent;
// this.txtTaskCompletContent7.Text = child2List[6].TaskCompletContent;
// this.txtTaskCompletContent8.Text = child2List[7].TaskCompletContent;
//}
} }
} }
@ -278,66 +335,89 @@ namespace FineUIPro.Web.CQMS.Performance
Child4Model.TaskCompletContent = txtTaskCompletContent4.Text; Child4Model.TaskCompletContent = txtTaskCompletContent4.Text;
PerformanceService.UpdateChild2(Child4Model); PerformanceService.UpdateChild2(Child4Model);
if (child2List.Count == 6)
//施工进度
child2List = Funs.DB.CQMS_Performance_Child2.Where(x => x.PerformanceGid == PerformanceGid && x.NowWeek
== NowWeek).OrderBy(x => x.SortIndex).ToList();
var ji = 0;
//根据grid 里的进行修改
JArray teamGroupData = Grid1.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{ {
Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2); JObject values = teamGroupRow.Value<JObject>("values");
Child3Model.WorkPlan = txtWorkPlan1.Text; int rowIndex = teamGroupRow.Value<int>("index");
Child3Model.CompletStatus = txtCompletStatus1.Text; Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == values.Value<string>("Performance_ChildGid2"));
Child3Model.WorkPlan = values.Value<string>("WorkPlan");
Child3Model.CompletStatus = values.Value<string>("CompletStatus");
db.SubmitChanges(); db.SubmitChanges();
Child4Model = child2List[5]; Child4Model = child2List[ji];
Child4Model.TaskCompletContent = txtTaskCompletContent1.Text; Child4Model.TaskCompletContent = values.Value<string>("TaskCompletContent");
PerformanceService.UpdateChild2(Child4Model); PerformanceService.UpdateChild2(Child4Model);
ji += 1;
} }
else if (child2List.Count == 7)
{
Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2);
Child3Model.WorkPlan = TextBox1.Text;
Child3Model.CompletStatus = TextBox2.Text;
db.SubmitChanges();
Child4Model = child2List[5];
Child4Model.TaskCompletContent = txtTaskCompletContent2.Text;
PerformanceService.UpdateChild2(Child4Model);
Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[6].Performance_ChildGid2); //if (child2List.Count == 6)
Child3Model.WorkPlan = txtWorkPlan1.Text; //{
Child3Model.CompletStatus = txtCompletStatus1.Text; // Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2);
db.SubmitChanges(); // Child3Model.WorkPlan = txtWorkPlan1.Text;
// Child3Model.CompletStatus = txtCompletStatus1.Text;
// db.SubmitChanges();
Child4Model = child2List[6]; // Child4Model = child2List[5];
Child4Model.TaskCompletContent = txtTaskCompletContent1.Text; // Child4Model.TaskCompletContent = txtTaskCompletContent1.Text;
PerformanceService.UpdateChild2(Child4Model); // PerformanceService.UpdateChild2(Child4Model);
} //}
else if (child2List.Count == 8) //else if (child2List.Count == 7)
{ //{
Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2); // Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2);
Child3Model.WorkPlan = TextBox3.Text; // Child3Model.WorkPlan = TextBox1.Text;
Child3Model.CompletStatus = TextBox4.Text; // Child3Model.CompletStatus = TextBox2.Text;
db.SubmitChanges(); // db.SubmitChanges();
Child4Model = child2List[5]; // Child4Model = child2List[5];
Child4Model.TaskCompletContent = txtTaskCompletContent3.Text; // Child4Model.TaskCompletContent = txtTaskCompletContent2.Text;
PerformanceService.UpdateChild2(Child4Model); // PerformanceService.UpdateChild2(Child4Model);
Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[6].Performance_ChildGid2); // Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[6].Performance_ChildGid2);
Child3Model.WorkPlan = TextBox1.Text; // Child3Model.WorkPlan = txtWorkPlan1.Text;
Child3Model.CompletStatus = TextBox2.Text; // Child3Model.CompletStatus = txtCompletStatus1.Text;
db.SubmitChanges(); // db.SubmitChanges();
Child4Model = child2List[6]; // Child4Model = child2List[6];
Child4Model.TaskCompletContent = txtTaskCompletContent2.Text; // Child4Model.TaskCompletContent = txtTaskCompletContent1.Text;
PerformanceService.UpdateChild2(Child4Model); // PerformanceService.UpdateChild2(Child4Model);
//}
//else if (child2List.Count == 8)
//{
// Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2);
// Child3Model.WorkPlan = TextBox3.Text;
// Child3Model.CompletStatus = TextBox4.Text;
// db.SubmitChanges();
Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[7].Performance_ChildGid2); // Child4Model = child2List[5];
Child3Model.WorkPlan = txtWorkPlan1.Text; // Child4Model.TaskCompletContent = txtTaskCompletContent3.Text;
Child3Model.CompletStatus = txtCompletStatus1.Text; // PerformanceService.UpdateChild2(Child4Model);
db.SubmitChanges();
Child4Model = child2List[7]; // Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[6].Performance_ChildGid2);
Child4Model.TaskCompletContent = txtTaskCompletContent1.Text; // Child3Model.WorkPlan = TextBox1.Text;
PerformanceService.UpdateChild2(Child4Model); // Child3Model.CompletStatus = TextBox2.Text;
} // db.SubmitChanges();
// Child4Model = child2List[6];
// Child4Model.TaskCompletContent = txtTaskCompletContent2.Text;
// PerformanceService.UpdateChild2(Child4Model);
// Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[7].Performance_ChildGid2);
// Child3Model.WorkPlan = txtWorkPlan1.Text;
// Child3Model.CompletStatus = txtCompletStatus1.Text;
// db.SubmitChanges();
// Child4Model = child2List[7];
// Child4Model.TaskCompletContent = txtTaskCompletContent1.Text;
// PerformanceService.UpdateChild2(Child4Model);
//}
ShowNotify("修改成功。", MessageBoxIcon.Success); ShowNotify("修改成功。", MessageBoxIcon.Success);
} }
} }

21
SGGL/FineUIPro.Web/CQMS/Performance/WorkPlanEdit.aspx.designer.cs generated
View File

@ -60,31 +60,40 @@ namespace FineUIPro.Web.CQMS.Performance
protected global::FineUIPro.Form SimpleForm2; protected global::FineUIPro.Form SimpleForm2;
/// <summary> /// <summary>
/// txtWorkPlan1 控件。 /// Grid1 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtWorkPlan1; protected global::FineUIPro.Grid Grid1;
/// <summary> /// <summary>
/// txtCompletStatus1 控件。 /// txtWorkPlan 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtCompletStatus1; protected global::FineUIPro.TextBox txtWorkPlan;
/// <summary> /// <summary>
/// txtTaskCompletContent1 控件。 /// txtCompletStatus 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtTaskCompletContent1; protected global::FineUIPro.TextBox txtCompletStatus;
/// <summary>
/// txtTaskCompletContent 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTaskCompletContent;
/// <summary> /// <summary>
/// Form2 控件。 /// Form2 控件。

24
SGGL/Model/Model.cs
View File

@ -110974,6 +110974,8 @@ namespace Model
private string _ScorMan; private string _ScorMan;
private System.Nullable<int> _SgCount;
#region 可扩展性方法定义 #region 可扩展性方法定义
partial void OnLoaded(); partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -111008,6 +111010,8 @@ namespace Model
partial void OnWorkRangeChanged(); partial void OnWorkRangeChanged();
partial void OnScorManChanging(string value); partial void OnScorManChanging(string value);
partial void OnScorManChanged(); partial void OnScorManChanged();
partial void OnSgCountChanging(System.Nullable<int> value);
partial void OnSgCountChanged();
#endregion #endregion
public CQMS_Performance() public CQMS_Performance()
@ -111315,6 +111319,26 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SgCount", DbType="Int")]
public System.Nullable<int> SgCount
{
get
{
return this._SgCount;
}
set
{
if ((this._SgCount != value))
{
this.OnSgCountChanging(value);
this.SendPropertyChanging();
this._SgCount = value;
this.SendPropertyChanged("SgCount");
this.OnSgCountChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;

110
SGGL/WebAPI/Controllers/CQMS/PerformanceController.cs
View File

@ -235,66 +235,82 @@ namespace WebAPI.Controllers.CQMS
Child4Model.TaskCompletContent = AddList[AddList.Count - 5].TaskCompletContent; Child4Model.TaskCompletContent = AddList[AddList.Count - 5].TaskCompletContent;
PerformanceService.UpdateChild2(Child4Model); PerformanceService.UpdateChild2(Child4Model);
if (child2List.Count == 6) var Sgcount = Funs.DB.CQMS_Performance.FirstOrDefault(x => x.PerformanceGid == PerformanceGid).SgCount;
child2List = Funs.DB.CQMS_Performance_Child2.Where(x => x.PerformanceGid == PerformanceGid && x.NowWeek
== NowWeek).OrderBy(x => x.SortIndex).ToList();
for (int i = 0; i < Sgcount; i++)
{ {
Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2); Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[i].Performance_ChildGid2);
Child3Model.WorkPlan = AddList[AddList.Count - 6].WorkPlan; Child3Model.WorkPlan = AddList[i].WorkPlan;
Child3Model.CompletStatus = AddList[AddList.Count - 6].CompletStatus; Child3Model.CompletStatus = AddList[i].CompletStatus;
db.SubmitChanges(); db.SubmitChanges();
Child4Model = child2List[5]; Child4Model = child2List[i];
Child4Model.TaskCompletContent = AddList[AddList.Count - 6].TaskCompletContent; Child4Model.TaskCompletContent = AddList[i].TaskCompletContent;
PerformanceService.UpdateChild2(Child4Model); PerformanceService.UpdateChild2(Child4Model);
} }
else if (child2List.Count == 7)
{
Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2);
Child3Model.WorkPlan = AddList[AddList.Count - 6].WorkPlan;
Child3Model.CompletStatus = AddList[AddList.Count - 6].CompletStatus;
db.SubmitChanges();
Child4Model = child2List[5]; //if (child2List.Count == 6)
Child4Model.TaskCompletContent = AddList[AddList.Count -6].TaskCompletContent; //{
PerformanceService.UpdateChild2(Child4Model); // Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2);
// Child3Model.WorkPlan = AddList[AddList.Count - 6].WorkPlan;
// Child3Model.CompletStatus = AddList[AddList.Count - 6].CompletStatus;
// db.SubmitChanges();
Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[6].Performance_ChildGid2); // Child4Model = child2List[5];
Child3Model.WorkPlan = AddList[AddList.Count - 7].WorkPlan; // Child4Model.TaskCompletContent = AddList[AddList.Count - 6].TaskCompletContent;
Child3Model.CompletStatus = AddList[AddList.Count - 7].CompletStatus; // PerformanceService.UpdateChild2(Child4Model);
db.SubmitChanges(); //}
//else if (child2List.Count == 7)
//{
// Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2);
// Child3Model.WorkPlan = AddList[AddList.Count - 6].WorkPlan;
// Child3Model.CompletStatus = AddList[AddList.Count - 6].CompletStatus;
// db.SubmitChanges();
Child4Model = child2List[6]; // Child4Model = child2List[5];
Child4Model.TaskCompletContent = AddList[AddList.Count - 7].TaskCompletContent; // Child4Model.TaskCompletContent = AddList[AddList.Count -6].TaskCompletContent;
PerformanceService.UpdateChild2(Child4Model); // PerformanceService.UpdateChild2(Child4Model);
}
else if (child2List.Count == 8)
{
Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2);
Child3Model.WorkPlan = AddList[AddList.Count - 6].WorkPlan;
Child3Model.CompletStatus = AddList[AddList.Count - 6].CompletStatus;
db.SubmitChanges();
Child4Model = child2List[5]; // Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[6].Performance_ChildGid2);
Child4Model.TaskCompletContent = AddList[AddList.Count - 6].TaskCompletContent; // Child3Model.WorkPlan = AddList[AddList.Count - 7].WorkPlan;
PerformanceService.UpdateChild2(Child4Model); // Child3Model.CompletStatus = AddList[AddList.Count - 7].CompletStatus;
// db.SubmitChanges();
Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[6].Performance_ChildGid2); // Child4Model = child2List[6];
Child3Model.WorkPlan = AddList[AddList.Count - 7].WorkPlan; // Child4Model.TaskCompletContent = AddList[AddList.Count - 7].TaskCompletContent;
Child3Model.CompletStatus = AddList[AddList.Count - 7].CompletStatus; // PerformanceService.UpdateChild2(Child4Model);
db.SubmitChanges(); //}
//else if (child2List.Count == 8)
//{
// Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[5].Performance_ChildGid2);
// Child3Model.WorkPlan = AddList[AddList.Count - 6].WorkPlan;
// Child3Model.CompletStatus = AddList[AddList.Count - 6].CompletStatus;
// db.SubmitChanges();
Child4Model = child2List[6]; // Child4Model = child2List[5];
Child4Model.TaskCompletContent = AddList[AddList.Count - 7].CompletStatus; // Child4Model.TaskCompletContent = AddList[AddList.Count - 6].TaskCompletContent;
PerformanceService.UpdateChild2(Child4Model); // PerformanceService.UpdateChild2(Child4Model);
Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[7].Performance_ChildGid2); // Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[6].Performance_ChildGid2);
Child3Model.WorkPlan = AddList[AddList.Count - 8].WorkPlan; // Child3Model.WorkPlan = AddList[AddList.Count - 7].WorkPlan;
Child3Model.CompletStatus = AddList[AddList.Count - 8].CompletStatus; // Child3Model.CompletStatus = AddList[AddList.Count - 7].CompletStatus;
db.SubmitChanges(); // db.SubmitChanges();
Child4Model = child2List[7]; // Child4Model = child2List[6];
Child4Model.TaskCompletContent = AddList[AddList.Count - 8].CompletStatus; // Child4Model.TaskCompletContent = AddList[AddList.Count - 7].CompletStatus;
PerformanceService.UpdateChild2(Child4Model); // PerformanceService.UpdateChild2(Child4Model);
}
// Child3Model = objModel.FirstOrDefault(x => x.Performance_ChildGid2 == child2List[7].Performance_ChildGid2);
// Child3Model.WorkPlan = AddList[AddList.Count - 8].WorkPlan;
// Child3Model.CompletStatus = AddList[AddList.Count - 8].CompletStatus;
// db.SubmitChanges();
// Child4Model = child2List[7];
// Child4Model.TaskCompletContent = AddList[AddList.Count - 8].CompletStatus;
// PerformanceService.UpdateChild2(Child4Model);
//}
} }
responeData.message = "保存成功"; responeData.message = "保存成功";
} }