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

20210520

Browse Source
This commit is contained in:
杨红卫
2021-05-20 17:16:01 +08:00
parent f901e87a6e
commit e7cb804684
219 changed files with 17315 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx
+9 -7
View File
@@ -69,8 +69,14 @@
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="100px" ColumnID="GJSXID" DataField="GJSXID" SortField="GJSXID"
<f:RenderField Width="100px" ColumnID="GJSXID" DataField="GJSXID" SortField="GJSXID" Hidden="true"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Detail" DataField="Detail" SortField="Detail"
FieldType="String" HeaderText="事项描述" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="QuestionTypeName" DataField="QuestionTypeName" SortField="QuestionTypeName"
FieldType="String" HeaderText="问题类别" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
<f:RenderField Width="80px" ColumnID="State" DataField="State" SortField="State"
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
@@ -84,15 +90,11 @@
<f:RenderField Width="150px" ColumnID="CloseDate" DataField="CloseDate" SortField="CloseDate"
FieldType="String" HeaderText="关闭日期" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="QuestionTypeName" DataField="QuestionTypeName" SortField="QuestionTypeName"
FieldType="String" HeaderText="问题类别" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="User_ReceiveID" DataField="User_ReceiveID" SortField="User_ReceiveID"
FieldType="String" HeaderText="接受人" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Detail" DataField="Detail" SortField="Detail"
FieldType="String" HeaderText="事项描述" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="User_Acceptance" DataField="User_Acceptance"
FieldType="String" HeaderText="验收人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx
+5
View File
@@ -84,6 +84,11 @@
<f:RenderField Width="150px" ColumnID="CNProfessionalID" DataField="CNProfessionalID"
FieldType="String" HeaderText="专业" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField ColumnID="Certificate" Width="150px" HeaderText="事项进展情况" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertProgressDetail(Eval("GJSXID")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="State" DataField="State" SortField="State"
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs
+14
View File
@@ -279,5 +279,19 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
BindGrid();
}
protected string ConvertProgressDetail(object GJSXID)
{
string detailStr = string.Empty;
if (!string.IsNullOrEmpty(GJSXID.ToString()))
{
Model.GJSX_detail detail = (from x in Funs.DB.GJSX_detail where x.GJSXID == GJSXID.ToString() && x.Progress_detail != null && x.Progress_detail != "" orderby x.Date descending select x).FirstOrDefault();
if (detail != null)
{
detailStr = detail.Progress_detail;
}
}
return detailStr;
}
}
}
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.designer.cs
Generated
+9
View File
@@ -66,6 +66,15 @@ namespace FineUIPro.Web.PZHGL.GJSX {
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
+1 -1
View File
@@ -440,7 +440,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
gjsx.ProjectId = this.CurrUser.LoginProjectId;
gjsx.UnitId = this.DropUnitId.SelectedValue;
gjsx.State = state;
gjsx.QuestionTypeID = this.DropQuestionTypeID.SelectedValue;
//gjsx.QuestionTypeID = this.DropQuestionTypeID.SelectedValue;
gjsx.IsManypeople = lblIsManyPeople.SelectedValue;
gjsx.CompleteDate = DateTime.Parse(Date_CompleteDate.Text);
gjsx.AttachUrl = "";