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

20240318 开车报告 总结

Browse Source
This commit is contained in:
毕文静
2024-03-18 15:59:06 +08:00
parent 4d8f810268
commit b625a475e2
57 changed files with 7034 additions and 3490 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx
+6 -6
View File
@@ -20,7 +20,7 @@
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>
<%--<f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>--%>
<f:TextBox ID="txtSummary" runat="server" Label="完工总结" LabelAlign="Right"></f:TextBox>
<f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索"
EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
@@ -38,20 +38,20 @@
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
<%--<f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" Width="120px">
</f:RenderField>--%>
<f:RenderField ColumnID="DriverSummaryCode" DataField="DriverSummaryCode"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Summary" DataField="Summary"
FieldType="String" HeaderText="完工总结" HeaderTextAlign="Center" Width="280px">
</f:RenderField>
<f:RenderField ColumnID="DriverSummaryCode" DataField="DriverSummaryCode"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="SummaryPersonName" DataField="SummaryPersonName"
FieldType="String" HeaderText="总结人" HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="SubmitDate" DataField="SubmitDate"
FieldType="Date" Renderer="Date" HeaderText="提交日期" HeaderTextAlign="Center" Width="110px">
FieldType="Date" Renderer="Date" HeaderText="总结日期" HeaderTextAlign="Center" Width="110px">
</f:RenderField>
<f:RenderField ColumnID="Remark" DataField="Remark"
FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.cs
+6 -6
View File
@@ -17,7 +17,7 @@ namespace FineUIPro.Web.TestRun.DriverSummary
GetButtonPower();
BindGrid();
btnNew.OnClientClick = Window1.GetShowReference("CompleteSummaryEdit.aspx") + "return false;";
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
//BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
}
}
#endregion
@@ -43,11 +43,11 @@ namespace FineUIPro.Web.TestRun.DriverSummary
+ @" WHERE summary.ProjectId=@projectId AND summary.SummaryType='2'";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
{
strSql += " AND summary.UnitWorkId=@unitWorkId";
listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
}
//if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
//{
// strSql += " AND summary.UnitWorkId=@unitWorkId";
// listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
//}
if (!string.IsNullOrEmpty(this.txtSummary.Text.Trim()))
{
strSql += " AND summary.Summary LIKE @Summary";
SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.designer.cs
Generated
-9
View File
@@ -57,15 +57,6 @@ namespace FineUIPro.Web.TestRun.DriverSummary {
/// </remarks>
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// drpUnitWorkId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWorkId;
/// <summary>
/// txtSummary 控件。
/// </summary>
SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx
+8 -8
View File
@@ -34,10 +34,16 @@
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<%--<f:FormRow>
<Items>
<f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right" LabelWidth="150px"></f:DropDownList>
</Items>
</f:FormRow>--%>
<f:FormRow>
<Items>
<f:TextBox ID="txtDriverSummaryCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
@@ -45,12 +51,6 @@
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDriverSummaryCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtSummaryPerson" runat="server" Label="总结人" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Readonly="true">
@@ -59,7 +59,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtSubmitDate" runat="server" Label="提交日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
<f:DatePicker ID="txtSubmitDate" runat="server" Label="总结日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.cs
+9 -9
View File
@@ -15,7 +15,7 @@ namespace FineUIPro.Web.TestRun.DriverSummary
{
if (!IsPostBack)
{
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
//BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
string id = Request.Params["id"];
if (!string.IsNullOrEmpty(id))
@@ -24,10 +24,10 @@ namespace FineUIPro.Web.TestRun.DriverSummary
if (data != null)
{
this.hdId.Text = id;
if (!string.IsNullOrEmpty(data.UnitWorkId))
{
this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
}
//if (!string.IsNullOrEmpty(data.UnitWorkId))
//{
// this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
//}
this.txtDriverSummaryCode.Text = data.DriverSummaryCode;
this.txtSummary.Text = data.Summary;
this.txtSummaryPerson.Text = BLL.UserService.GetUserNameByUserId(data.SummaryPerson);
@@ -70,10 +70,10 @@ namespace FineUIPro.Web.TestRun.DriverSummary
{
string id = Request.Params["id"];
Model.Driver_DriverSummary newData = new Model.Driver_DriverSummary();
if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
{
newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
}
//if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
//{
// newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
//}
newData.DriverSummaryCode = this.txtDriverSummaryCode.Text.Trim();
newData.Summary = this.txtSummary.Text.Trim();
newData.SummaryPerson = this.CurrUser.UserId;
SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.designer.cs
Generated
+2 -11
View File
@@ -103,13 +103,13 @@ namespace FineUIPro.Web.TestRun.DriverSummary {
protected global::FineUIPro.Form Form2;
/// <summary>
/// drpUnitWorkId 控件。
/// txtDriverSummaryCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWorkId;
protected global::FineUIPro.TextBox txtDriverSummaryCode;
/// <summary>
/// txtSummary 控件。
@@ -120,15 +120,6 @@ namespace FineUIPro.Web.TestRun.DriverSummary {
/// </remarks>
protected global::FineUIPro.TextArea txtSummary;
/// <summary>
/// txtDriverSummaryCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDriverSummaryCode;
/// <summary>
/// txtSummaryPerson 控件。
/// </summary>