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

提交代码

This commit is contained in:
高飞 2024-06-27 15:35:38 +08:00
parent d0f94051b7
commit b09d7f3f70
11 changed files with 349 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SGGL/BLL/JDGL/Check/MonthPlanService.cs
View File

@ -52,6 +52,7 @@ namespace BLL
Remark = MonthPlan.Remark,
CompileMan = MonthPlan.CompileMan,
CompileDate = MonthPlan.CompileDate,
SortIndex = MonthPlan.SortIndex,
};
db.JDGL_MonthPlan.InsertOnSubmit(newMonthPlan);
db.SubmitChanges();
@ -75,7 +76,7 @@ namespace BLL
newMonthPlan.Remark = MonthPlan.Remark;
newMonthPlan.CompileMan = MonthPlan.CompileMan;
newMonthPlan.CompileDate = MonthPlan.CompileDate;
db.SubmitChanges();
}
}

49
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -0,0 +1,49 @@
错误信息开始=====>
错误类型:HttpParseException
错误信息:无法从其“Hidden”属性的字符串表示形式“500px”创建“System.Boolean”类型的对象。
错误堆栈:
在 System.Web.UI.TemplateParser.ProcessException(Exception ex)
在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding)
----错误类型:HttpException
----错误信息:
----无法从其“Hidden”属性的字符串表示形式“500px”创建“System.Boolean”类型的对象。
----错误堆栈:
在 System.Web.UI.PropertyConverter.ObjectFromString(Type objType, MemberInfo propertyInfo, String value)
在 System.Web.UI.ControlBuilder.AddProperty(String filter, String name, String value, Boolean mainDirectiveMode)
在 System.Web.UI.ControlBuilder.PreprocessAttribute(String filter, String attribname, String attribvalue, Boolean mainDirectiveMode, Int32 line, Int32 column)
在 System.Web.UI.ControlBuilder.PreprocessAttributes(ParsedAttributeCollection attribs)
在 System.Web.UI.ControlBuilder.Init(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs)
在 System.Web.UI.ControlBuilder.CreateBuilderFromType(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs, Int32 line, String sourceFileName)
在 System.Web.UI.ControlBuilder.CreateChildBuilder(String filter, String tagName, IDictionary attribs, TemplateParser parser, ControlBuilder parentBuilder, String id, Int32 line, VirtualPath virtualPath, Type& childType, Boolean defaultProperty)
在 System.Web.UI.TemplateParser.ProcessBeginTag(Match match, String inputText)
在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
出错时间:06/26/2024 15:05:45
出错文件:http://localhost:8579/JDGL/Check/WeekPlan.aspx
IP地址:::1
出错时间:06/26/2024 15:05:45
错误信息开始=====>
错误类型:ArgumentOutOfRangeException
错误信息:索引超出范围。必须为非负值并小于集合大小。
参数名: index
错误堆栈:
在 System.ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument argument, ExceptionResource resource)
在 System.Collections.Generic.List`1.get_Item(Int32 index)
在 FineUIPro.Web.JDGL.Check.WeekPlanEdit.Grid2_RowCommand(Object sender, GridCommandEventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\JDGL\Check\WeekPlanEdit.aspx.cs:行号 450
在 FineUIPro.Grid.OnRowCommand(GridCommandEventArgs e)
在 (Grid , GridCommandEventArgs )
在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:06/26/2024 15:25:22
出错文件:http://localhost:8579/JDGL/Check/WeekPlanEdit.aspx
IP地址:::1
操作人员:JT
出错时间:06/26/2024 15:25:22

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />

19
SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx.cs
View File

@ -374,10 +374,12 @@ namespace FineUIPro.Web.JDGL.Check
Model.SGGLDB db = Funs.DB;
var projectUnits = from x in db.Project_ProjectUnit
join y in db.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId select new { x.UnitId,y.UnitName};
where x.ProjectId == this.CurrUser.LoginProjectId
select new { x.UnitId, y.UnitName };
var projectUsers = from x in db.Project_ProjectUser
join y in db.Sys_User on x.UserId equals y.UserId
where x.ProjectId == this.CurrUser.LoginProjectId select new { x.UserId,y.UserName};
where x.ProjectId == this.CurrUser.LoginProjectId
select new { x.UserId, y.UserName };
DateTime month = Convert.ToDateTime(this.txtMonth.Text.Trim());
if (pds != null && ir > 0)
{
@ -392,7 +394,7 @@ namespace FineUIPro.Web.JDGL.Check
string col5 = pds.Rows[i][5].ToString().Trim();
if (!string.IsNullOrEmpty(col0))//责任单位
{
var projectUnit = projectUnits.FirstOrDefault(x=>x.UnitName==col0);
var projectUnit = projectUnits.FirstOrDefault(x => x.UnitName == col0);
if (projectUnit != null)
{
MonthPlan.UnitId = projectUnit.UnitId;
@ -402,11 +404,11 @@ namespace FineUIPro.Web.JDGL.Check
{
MonthPlan.NodeContent = col1;
}
if (!string.IsNullOrEmpty(col2))//计划完成时间
{
MonthPlan.PlanDate = Funs.GetNewDateTime(col2);
}
if (!string.IsNullOrEmpty(col3))//计划完成
{
@ -424,8 +426,7 @@ namespace FineUIPro.Web.JDGL.Check
{
MonthPlan.Remark = col5;
}
int num = (from x in Funs.DB.JDGL_MonthPlan where x.Months == month && x.ProjectId == this.CurrUser.LoginProjectId select x).Count();
MonthPlan.SortIndex = num + 1;
MonthPlan.SortIndex = i + 1;
MonthPlan.MonthPlanId = SQLHelper.GetNewID(typeof(Model.JDGL_MonthPlan));
MonthPlans.Add(MonthPlan);
}
@ -466,7 +467,7 @@ namespace FineUIPro.Web.JDGL.Check
DateTime month = Convert.ToDateTime(this.txtMonth.Text.Trim());
for (int i = 0; i < a; i++)
{
var oldMonthPlan = monthPlanLists.FirstOrDefault(x => x.ProjectId == this.ProjectId && x.Months == month && x.UnitId == MonthPlans[i].UnitId && x.NodeContent== MonthPlans[i].NodeContent);
var oldMonthPlan = monthPlanLists.FirstOrDefault(x => x.ProjectId == this.ProjectId && x.Months == month && x.UnitId == MonthPlans[i].UnitId && x.NodeContent == MonthPlans[i].NodeContent);
if (oldMonthPlan == null)
{
Model.JDGL_MonthPlan newMonthPlan = new Model.JDGL_MonthPlan();
@ -479,7 +480,7 @@ namespace FineUIPro.Web.JDGL.Check
newMonthPlan.DutyPerson = MonthPlans[i].DutyPerson;
newMonthPlan.RealDate = MonthPlans[i].RealDate;
newMonthPlan.Remark = MonthPlans[i].Remark;
newMonthPlan.SortIndex= MonthPlans[i].SortIndex;
newMonthPlan.SortIndex = MonthPlans[i].SortIndex;
newMonthPlan.CompileMan = this.CurrUser.UserId;
newMonthPlan.CompileDate = DateTime.Now;
BLL.MonthPlanService.AddMonthPlan(newMonthPlan);

8
SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx
View File

@ -42,10 +42,10 @@
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
<Tabs>
<f:Tab ID="Tab1" Title="本周计划完成情况" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
<f:Tab ID="Tab1" Title="本周计划完成情况" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server"
TitleToolTip="本周计划完成情况">
<Items>
<f:Grid ID="Grid2" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false"
<f:Grid ID="Grid2" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false" Height="500px"
DataKeyNames="WeekPlanId" DataIDField="WeekPlanId" EnableColumnLines="true" ForceFit="true" AllowCellEditing="true" ClicksToEdit="1">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
@ -92,11 +92,11 @@
</f:Grid>
</Items>
</f:Tab>
<f:Tab ID="Tab2" Title="下周计划" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" TitleToolTip="下周计划"
<f:Tab ID="Tab2" Title="下周计划" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" TitleToolTip="下周计划"
runat="server">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="周进度计划" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="WeekPlanId" AllowCellEditing="true" ForceFit="true"
runat="server" BoxFlex="1" DataKeyNames="WeekPlanId" AllowCellEditing="true" ForceFit="true" Height="500px"
ClicksToEdit="1" DataIDField="WeekPlanId" AllowSorting="true" SortField="SortIndex"
SortDirection="ASC" EnableColumnLines="true"
PageSize="1000"

38
SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx
View File

@ -37,8 +37,17 @@
<f:Tab ID="Tab1" Title="本周计划完成情况" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
TitleToolTip="本周计划完成情况">
<Items>
<f:Grid ID="Grid2" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false"
<f:Grid ID="Grid2" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false" OnRowCommand="Grid2_RowCommand"
DataKeyNames="WeekPlanId" DataIDField="WeekPlanId" EnableColumnLines="true" ForceFit="true" AllowCellEditing="true" ClicksToEdit="1">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnNew2" ToolTip="新增" Text="" Icon="Add" EnablePostBack="true"
runat="server" OnClick="btnNew2_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
@ -49,30 +58,51 @@
<f:RenderField Width="100px" ColumnID="UnitWork" DataField="UnitWork"
FieldType="String" HeaderText="工序/单位工程" TextAlign="Center"
HeaderTextAlign="Center">
<Editor>
<f:DropDownList runat="server" ID="drpUnitWork2" EnableEdit="true"></f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="80px" ColumnID="Major" DataField="Major"
FieldType="String" HeaderText="专业" TextAlign="Center"
HeaderTextAlign="Center">
<Editor>
<f:DropDownList runat="server" ID="drpMajor2" EnableEdit="true"></f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="WorkContent" DataField="WorkContent"
FieldType="String" HeaderText="工作项" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="txtWorkContent2" runat="server" Text='<%# Bind("WorkContent") %>'>
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="UnitId" DataField="UnitId"
FieldType="String" HeaderText="责任单位" TextAlign="Center"
HeaderTextAlign="Center">
<Editor>
<f:DropDownList runat="server" ID="drpUnitId2" EnableEdit="true"></f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DutyPerson" DataField="DutyPerson"
FieldType="String" HeaderText="五环责任人" TextAlign="Center"
HeaderTextAlign="Center">
<Editor>
<f:DropDownList runat="server" ID="drpDutyPerson2" EnableEdit="true"></f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="95px" ColumnID="PlanDate" DataField="PlanDate" Renderer="Date" RendererArgument="yyyy-MM-dd"
FieldType="Date" HeaderText="计划完成时间" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:DatePicker ID="txtPlanDate2" runat="server" ShowRedStar="true" Required="true"
EnableEdit="true" DateFormatString="yyyy-MM-dd">
</f:DatePicker>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="IsOK" DataField="IsOK"
FieldType="String" HeaderText="完成状态" TextAlign="Center"
HeaderTextAlign="Center">
<Editor>
<f:DropDownList runat="server" ID="DropDownList5" EnableEdit="true">
<f:DropDownList runat="server" ID="drpIsOK2" EnableEdit="true">
<f:ListItem Text="已完成" Value="已完成" />
<f:ListItem Text="未完成" Value="未完成" />
</f:DropDownList>
@ -81,10 +111,12 @@
<f:RenderField Width="100px" ColumnID="Remark" DataField="Remark"
FieldType="String" HeaderText="备注" TextAlign="Center" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox2" runat="server" Text='<%# Bind("Remark") %>'>
<f:TextBox ID="txtRemark2" runat="server" Text='<%# Bind("Remark") %>'>
</f:TextBox>
</Editor>
</f:RenderField>
<f:LinkButtonField Width="40px" TextAlign="Center" HeaderText="删除" ToolTip="删除" CommandName="del"
Icon="Delete" />
</Columns>
</f:Grid>
</Items>

177
SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.cs
View File

@ -38,6 +38,10 @@ namespace FineUIPro.Web.JDGL.Check
CNProfessionalService.InitCNProfessional(drpMajor, false);
BLL.ProjectUnitService.InitUnitDropDownList2(drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false);
UserService.Init(drpDutyPerson, CurrUser.LoginProjectId, false);
UnitWorkService.InitUnitWorkList2(drpUnitWork2, this.CurrUser.LoginProjectId, false);
CNProfessionalService.InitCNProfessional(drpMajor2, false);
BLL.ProjectUnitService.InitUnitDropDownList2(drpUnitId2, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false);
UserService.Init(drpDutyPerson2, CurrUser.LoginProjectId, false);
this.txtWeekNo.Text = weekNo;
var weekPlan = Funs.DB.JDGL_WeekPlan.FirstOrDefault(x => x.WeekNo == this.txtWeekNo.Text);
if (weekPlan != null)
@ -54,6 +58,16 @@ namespace FineUIPro.Web.JDGL.Check
if (lastWeekPlan != null)
{
BindGrid2(lastWeekPlan.WeekNo);
if (lastWeekPlan.WeekNo != "0")
{
this.Toolbar1.Hidden = true;
this.Grid2.Columns[9].Hidden = true;
}
}
else
{
this.Toolbar1.Hidden = false;
this.Grid2.Columns[9].Hidden = false;
}
}
else
@ -64,6 +78,13 @@ namespace FineUIPro.Web.JDGL.Check
if (lastWeekPlan != null)
{
BindGrid2(lastWeekPlan.WeekNo);
this.Toolbar1.Hidden = true;
this.Grid2.Columns[9].Hidden = true;
}
else
{
this.Toolbar1.Hidden = false;
this.Grid2.Columns[9].Hidden = false;
}
}
BindGrid();
@ -222,18 +243,65 @@ namespace FineUIPro.Web.JDGL.Check
BLL.WeekPlanService.AddWeekPlan(WeekPlan);
i++;
}
foreach (JObject mergedRow in Grid2.GetMergedData())
var list2 = GetDetails2();
int j = 1;
string lastWeekNo = "0";
foreach (var item in list2)
{
JObject values = mergedRow.Value<JObject>("values");
int a = mergedRow.Value<int>("index");
Model.JDGL_WeekPlan ql = BLL.WeekPlanService.GetWeekPlanById(Grid2.Rows[a].RowID);
if (!string.IsNullOrEmpty(values.Value<string>("IsOK")))
Model.JDGL_WeekPlan WeekPlan = new Model.JDGL_WeekPlan();
WeekPlan.WeekPlanId = item.WeekPlanId;
WeekPlan.ProjectId = this.CurrUser.LoginProjectId;
WeekPlan.WeekNo = lastWeekNo;
WeekPlan.StartDate = startDate.AddDays(-7);
WeekPlan.EndDate = endDate.AddDays(-7);
if (unitWorks.FirstOrDefault(x => x.UnitWorkName == item.UnitWork) != null)
{
ql.IsOK = values.Value<string>("IsOK") == "已完成" ? true : false;
WeekPlan.UnitWork = unitWorks.FirstOrDefault(x => x.UnitWorkName == item.UnitWork).UnitWorkId;
}
ql.Remark = values.Value<string>("Remark");
BLL.WeekPlanService.UpdateWeekPlan(ql);
if (cns.FirstOrDefault(x => x.ProfessionalName == item.Major) != null)
{
WeekPlan.Major = cns.FirstOrDefault(x => x.ProfessionalName == item.Major).CNProfessionalId;
}
var unit = units.FirstOrDefault(x => x.UnitName == item.UnitId);
if (unit != null)
{
WeekPlan.UnitId = unit.UnitId;
}
WeekPlan.WorkContent = item.WorkContent;
WeekPlan.PlanDate = item.PlanDate;
var user = users.FirstOrDefault(x => x.UserName == item.DutyPerson);
if (user != null)
{
WeekPlan.DutyPerson = user.UserId;
}
WeekPlan.IsOK = item.IsOK;
WeekPlan.Remark = item.Remark;
WeekPlan.CompileMan = this.CurrUser.UserId;
WeekPlan.CompileDate = DateTime.Now;
WeekPlan.SortIndex = j;
var oldWeekPlan = BLL.WeekPlanService.GetWeekPlanById(WeekPlan.WeekPlanId);
if (oldWeekPlan == null)
{
BLL.WeekPlanService.AddWeekPlan(WeekPlan);
}
else
{
BLL.WeekPlanService.UpdateWeekPlan(WeekPlan);
}
j++;
}
//foreach (JObject mergedRow in Grid2.GetMergedData())
//{
// JObject values = mergedRow.Value<JObject>("values");
// int a = mergedRow.Value<int>("index");
// Model.JDGL_WeekPlan ql = BLL.WeekPlanService.GetWeekPlanById(Grid2.Rows[a].RowID);
// if (!string.IsNullOrEmpty(values.Value<string>("IsOK")))
// {
// ql.IsOK = values.Value<string>("IsOK") == "已完成" ? true : false;
// }
// ql.Remark = values.Value<string>("Remark");
// BLL.WeekPlanService.UpdateWeekPlan(ql);
//}
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
@ -270,6 +338,37 @@ namespace FineUIPro.Web.JDGL.Check
};
Grid1.DataBind();
}
/// <summary>
/// 增加按钮事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnNew2_Click(object sender, EventArgs e)
{
var list = GetDetails2();
Model.JDGL_WeekPlan ql = new Model.JDGL_WeekPlan();
ql.WeekPlanId = SQLHelper.GetNewID();
list.Add(ql);
Model.SGGLDB db = Funs.DB;
Grid2.DataSource = from x in list
select new
{
x.WeekPlanId,
x.ProjectId,
x.WeekNo,
x.StartDate,
x.EndDate,
x.UnitWork,
x.Major,
x.UnitId,
x.WorkContent,
x.PlanDate,
x.DutyPerson,
IsOK = ConvertIsOK(x.IsOK),
x.Remark,
};
Grid2.DataBind();
}
private List<Model.JDGL_WeekPlan> GetDetails()
{
List<Model.JDGL_WeekPlan> list = new List<Model.JDGL_WeekPlan>();
@ -294,6 +393,30 @@ namespace FineUIPro.Web.JDGL.Check
}
return list;
}
private List<Model.JDGL_WeekPlan> GetDetails2()
{
List<Model.JDGL_WeekPlan> list = new List<Model.JDGL_WeekPlan>();
foreach (JObject mergedRow in Grid2.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
int i = mergedRow.Value<int>("index");
Model.JDGL_WeekPlan ql = new Model.JDGL_WeekPlan();
ql.WeekPlanId = Grid2.Rows[i].RowID;
ql.UnitWork = values.Value<string>("UnitWork");
ql.Major = values.Value<string>("Major");
ql.UnitId = values.Value<string>("UnitId");
ql.WorkContent = values.Value<string>("WorkContent");
ql.PlanDate = Funs.GetNewDateTime(values.Value<string>("PlanDate"));
ql.DutyPerson = values.Value<string>("DutyPerson");
if (!string.IsNullOrEmpty(values.Value<string>("IsOK")))
{
ql.IsOK = values.Value<string>("IsOK") == "已完成" ? true : false;
}
ql.Remark = values.Value<string>("Remark");
list.Add(ql);
}
return list;
}
#endregion
#region 行点击事件
@ -334,6 +457,44 @@ namespace FineUIPro.Web.JDGL.Check
this.Grid1.DataBind();
}
}
/// <summary>
/// Grid行点击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid2_RowCommand(object sender, GridCommandEventArgs e)
{
string WeekPlanId = Grid2.DataKeys[e.RowIndex][0].ToString();
var list = GetDetails2();
if (e.CommandName == "del")//删除
{
var Report = list.FirstOrDefault(x => x.WeekPlanId == WeekPlanId);
if (Report != null)
{
list.Remove(Report);
}
Model.SGGLDB db = Funs.DB;
Grid2.DataSource = from x in list
select new
{
x.WeekPlanId,
x.ProjectId,
x.WeekNo,
x.StartDate,
x.EndDate,
x.UnitWork,
x.Major,
x.UnitId,
x.WorkContent,
x.PlanDate,
x.DutyPerson,
IsOK = ConvertIsOK(x.IsOK),
x.Remark,
};
this.Grid2.DataBind();
}
}
#endregion
}
}

80
SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.designer.cs generated
View File

@ -120,6 +120,24 @@ namespace FineUIPro.Web.JDGL.Check {
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnNew2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew2;
/// <summary>
/// Label2 控件。
/// </summary>
@ -130,22 +148,76 @@ namespace FineUIPro.Web.JDGL.Check {
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// DropDownList5 控件。
/// drpUnitWork2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList5;
protected global::FineUIPro.DropDownList drpUnitWork2;
/// <summary>
/// TextBox2 控件。
/// drpMajor2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox2;
protected global::FineUIPro.DropDownList drpMajor2;
/// <summary>
/// txtWorkContent2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkContent2;
/// <summary>
/// drpUnitId2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId2;
/// <summary>
/// drpDutyPerson2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDutyPerson2;
/// <summary>
/// txtPlanDate2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPlanDate2;
/// <summary>
/// drpIsOK2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsOK2;
/// <summary>
/// txtRemark2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark2;
/// <summary>
/// Tab2 控件。

3
SGGL/FineUIPro.Web/JDGL/Check/WeekPlanIn.aspx.cs
View File

@ -476,8 +476,7 @@ namespace FineUIPro.Web.JDGL.Check
{
WeekPlan.Remark = col7;
}
int num = (from x in Funs.DB.JDGL_WeekPlan where x.WeekNo == weekNo && x.ProjectId == this.CurrUser.LoginProjectId select x).Count();
WeekPlan.SortIndex = num + 1;
WeekPlan.SortIndex = i + 1;
WeekPlan.WeekPlanId = SQLHelper.GetNewID(typeof(Model.JDGL_WeekPlan));
WeekPlans.Add(WeekPlan);
}

2
SGGL/FineUIPro.Web/Web.config
View File

@ -77,7 +77,7 @@
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers>
<compilation debug="false" targetFramework="4.6.1"/>
<compilation debug="true" targetFramework="4.6.1"/>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />