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

修改施工方案和关键事项

Browse Source
This commit is contained in:
潘鸿锋
2024-10-12 15:27:37 +08:00
parent a360cb9448
commit d35d9efdcb
54 changed files with 10572 additions and 2051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx
+14 -14
View File
@@ -92,8 +92,8 @@
<f:DropDownList ID="drpSolutionType" runat="server" Width="350px" Label="方案类别" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpState" runat="server" Label="审批状态" LabelAlign="Right" EnableEdit="true" >
<f:ListItem Text="已闭合" Value="1" />
<f:ListItem Text="未闭合" Value="0" />
<f:ListItem Text="已完成" Value="1" />
<f:ListItem Text="未完成" Value="0" />
</f:DropDownList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
@@ -108,56 +108,56 @@
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
<f:TemplateField ColumnID="tfPageIndex" minWidth="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField ColumnID="code" DataField="code" Width="50px"
<f:RenderField ColumnID="code" DataField="code" minWidth="50px"
SortField="code" FieldType="String" HeaderText="编号" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SolutionName" DataField="SolutionName" Width="130px"
<f:RenderField ColumnID="SolutionName" DataField="SolutionName" minWidth="130px"
SortField="SolutionName" FieldType="String" HeaderText="方案名称" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="UnitName" DataField="UnitName" Width="160px"
<f:RenderField ColumnID="UnitName" DataField="UnitName" minWidth="160px"
SortField="UnitName" FieldType="String" HeaderText="施工单位" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="UnitWorkIds" Width="120px" DataField="UnitWorkIds"
<f:RenderField ColumnID="UnitWorkIds" minWidth="120px" DataField="UnitWorkIds"
SortField="UnitWorkIds" FieldType="String" HeaderText="单位工程" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="CNProfessionalCodes" DataField="CNProfessionalCodes" SortField="CNProfessionalCodes"
<f:RenderField minWidth="120px" ColumnID="CNProfessionalCodes" DataField="CNProfessionalCodes" SortField="CNProfessionalCodes"
FieldType="String" HeaderText="专业" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="SolutionTempleteTypeName" DataField="SolutionTempleteTypeName" SortField="SolutionTempleteTypeName"
<f:RenderField minWidth="120px" ColumnID="SolutionTempleteTypeName" DataField="SolutionTempleteTypeName" SortField="SolutionTempleteTypeName"
FieldType="String" HeaderText="方案类别" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="CompileManName" Width="70px" DataField="CompileManName"
<f:RenderField ColumnID="CompileManName" minWidth="70px" DataField="CompileManName"
SortField="CompileManName" FieldType="String" HeaderText="编制人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
<f:RenderField minWidth="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="State" Width="60px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
<f:TemplateField ColumnID="State" minWidth="60px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMSConstructSolutionService.ConvertState(Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="ApprovaMan" Width="60px" HeaderText="当前审批人" HeaderTextAlign="Center" TextAlign="Center"
<f:TemplateField ColumnID="ApprovaMan" minWidth="120px" HeaderText="当前审批人" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# BLL.CQMSConstructSolutionApproveService.GetThisApproveNameByConstructSolutionId(Eval("ConstructSolutionId")) %>'></asp:Label>
<asp:Label ID="Label2" runat="server" Text='<%# BLL.CQMSConstructSolutionApproveService.GetThisApproveNameByConstructSolutionId(Eval("ConstructSolutionId"),Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs
+15 -9
View File
@@ -128,12 +128,12 @@ namespace FineUIPro.Web.CQMS.Solution
if (drpState.SelectedValue == "1") //已闭合
{
strSql += " AND State=@State";
listStr.Add(new SqlParameter("@State", "3"));
listStr.Add(new SqlParameter("@State", "4"));
}
else //未闭合
{
strSql += " AND State!=@State";
listStr.Add(new SqlParameter("@State", "3"));
listStr.Add(new SqlParameter("@State", "4"));
}
}
strSql += " order by chec.code desc ";
@@ -253,16 +253,21 @@ namespace FineUIPro.Web.CQMS.Solution
return;
}
}
else if (constructSolution.State == Const.CQMSConstructSolution_Audit || constructSolution.State == Const.CQMSConstructSolution_ReCompile)
//一级审核、二级审批、重报
else if (constructSolution.State == Const.CQMSConstructSolution_Audit
|| constructSolution.State == Const.CQMSConstructSolution_Audit1
|| constructSolution.State == Const.CQMSConstructSolution_ReCompile)
{
var approve = CQMSConstructSolutionApproveService.GetThisApproveByConstructSolutionId(id);
if (approve!=null && approve.ApproveMan==this.CurrUser.UserId)
//审批列表中是否包含当前用户
var approve = CQMSConstructSolutionApproveService.GetThisApproveByConstructSolutionId(id, constructSolution.State);
//if (approve!=null && approve.ApproveMan==this.CurrUser.UserId)
if (approve.Any(x=>x.ApproveMan.IndexOf(CurrUser.UserId)>-1))
{
PageContext.RegisterStartupScript(window_tt.GetShowReference(String.Format("EditConstructSolution.aspx?constructSolutionId={0}", id)));
}
else
{
Alert.ShowInTop("您不是办理用户，无法操作！请右键查看", MessageBoxIcon.Warning);
Alert.ShowInTop("您不是审核人员，无法操作！请右键查看", MessageBoxIcon.Warning);
return;
}
//Model.Solution_CQMSConstructSolutionApprove approve = CQMSConstructSolutionApproveService.GetConstructSolutionApproveByApproveMan(id, CurrUser.UserId);
@@ -285,6 +290,7 @@ namespace FineUIPro.Web.CQMS.Solution
//}
}
}
@@ -324,7 +330,7 @@ namespace FineUIPro.Web.CQMS.Solution
}
else
{
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Success);
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
else
@@ -339,14 +345,14 @@ namespace FineUIPro.Web.CQMS.Solution
Alert.ShowInTop("删除成功！", MessageBoxIcon.Success);
return;
}
Alert.ShowInTop("删除失败，方案正在审批中！", MessageBoxIcon.Success);
Alert.ShowInTop("删除失败，只能删除未上报的数据！", MessageBoxIcon.Warning);
}
}
else
{
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Success);
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx
+74 -2
View File
@@ -144,6 +144,78 @@
</f:DropDownBox>--%>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox Readonly="true" runat="server" ID="txtzyUserIds" Label="一级审核人员" LabelWidth="120px" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox Readonly="true" runat="server" ID="txtaqUserIds" Label="二级审批人员" LabelWidth="120px" ></f:TextBox>
</Items>
</f:FormRow>
<%-- <f:FormRow>
<Items>
<f:TextBox Readonly="true" runat="server" ID="txtsgUserIds" Label="总包会签施工经理" LabelWidth="160px" ></f:TextBox>
</Items>
</f:FormRow>--%>
<f:FormRow>
<Items>
<f:TextBox Readonly="true" runat="server" ID="txtCsUsers" Label="抄送人员" LabelWidth="120px" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ID="options1" Hidden="true">
<Items>
<f:Grid ID="gvOperateComplianceObligations" ShowBorder="true" ShowHeader="false" Title="" runat="server"
AllowCellEditing="true" DataIDField="Id" DataKeyNames="Id"
EnableMultiSelect="false" ShowGridHeader="true" Height="220px" EnableColumnLines="true">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="250px" ColumnID="Chapter" DataField="Chapter" FieldType="String"
HeaderText="章节" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Amendment" DataField="Amendment" FieldType="String"
HeaderText="修改意见" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProposerName" DataField="ProposerName" FieldType="String"
HeaderText="提出人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Modification" DataField="Modification" FieldType="String"
HeaderText="修改情况" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="ReviewerOpinion" DataField="ReviewerOpinion" FieldType="String"
HeaderText="审核人意见" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="IsAccept" DataField="IsAccept" FieldType="String"
HeaderText="是否接受" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
</f:Grid>
<%-- <f:TextArea ID="txtOptions" ShowRedStar="true" Required="true" runat="server" Label="办理意见" MaxLength="3000">
</f:TextArea>--%>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:TabStrip ID="TabStrip1" IsFluid="true" Height="500px" ShowBorder="true" TabPosition="Top"
@@ -188,7 +260,7 @@
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow Hidden="true">
<Items>
<f:Panel ID="Panel2" IsFluid="true" CssClass="mytable blockpanel" runat="server" ShowBorder="true"
Layout="Table" TableConfigColumns="3" ShowHeader="true" Title="总包会签">
@@ -278,7 +350,7 @@
</ItemTemplate>
</f:TemplateField>
<f:BoundField Width="100px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="办理时间" />
<f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" />
<%--<f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" />--%>
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
</Columns>
</f:Grid>
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs
+65 -7
View File
@@ -29,12 +29,35 @@ namespace FineUIPro.Web.CQMS.Solution
String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}",
-1, ConstructSolutionId, Const.CQMSConstructSolutionMenuId)));
}
private string GetUserNames(string Ids)
{
string[] arr = Ids.Split(',');
var data = Funs.DB.Sys_User.Where(t => arr.Contains(t.UserId)).Select(t => t.UserName).ToList();
if (data.Count > 0)
return string.Join(",", data);
return null;
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
ConstructSolutionId = Request.Params["constructSolutionId"];
if (Funs.DB.Solution_CQMSConstructSolutionApprove_Item.Where(x => x.ConstructSolutionId == ConstructSolutionId).OrderBy(x => x.SortId).ToList().Count > 0)
{
//有重报的情况，显示options1
options1.Hidden = false;
var complianceObligationsCs = Funs.DB.Solution_CQMSConstructSolutionApprove_Item.Where(x => x.ConstructSolutionId == ConstructSolutionId)
.OrderBy(x => x.Proposer).OrderBy(x => x.SortId).ToList();
if (complianceObligationsCs.Count > 0)
{
gvOperateComplianceObligations.DataSource = complianceObligationsCs;
gvOperateComplianceObligations.DataBind();
}
}
if (!string.IsNullOrWhiteSpace(ConstructSolutionId))
{
txtProjectName.Text = ProjectService.GetProjectByProjectId(CurrUser.LoginProjectId).ProjectName;
@@ -79,21 +102,49 @@ namespace FineUIPro.Web.CQMS.Solution
BindKZRole();
BindSGRole();
BindXMRole();
var zyUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "ZY");
var zyUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "Yi");
if (zyUserIds.Count > 0)
{
var zyUserIdsStr = string.Join(",", zyUserIds);
txtzyUserIds.Text = GetUserNames(zyUserIdsStr);
SetCheck(trOne, zyUserIds);
}
var zlUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "ZL");
if (zlUserIds.Count > 0)
{
SetCheck(trTwo, zlUserIds);
else {
zyUserIds =
CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignTypeNew(ConstructSolutionId, "Yi");
if (zyUserIds.Count > 0)
{
var zyUserIdsStr = string.Join(",", zyUserIds);
txtzyUserIds.Text = GetUserNames(zyUserIdsStr);
SetCheck(trOne, zyUserIds);
}
}
var aqUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "AQ");
//var zlUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "Er");
//if (zlUserIds.Count > 0)
//{
// SetCheck(trTwo, zlUserIds);
//}
var aqUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "Er");
if (aqUserIds.Count > 0)
{
var zyUserIdsStr = string.Join(",", aqUserIds);
txtaqUserIds.Text = GetUserNames(zyUserIdsStr);
SetCheck(trThree, aqUserIds);
}
else {
aqUserIds =
CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignTypeNew(ConstructSolutionId, "Er");
if (aqUserIds.Count > 0)
{
var zyUserIdsStr = string.Join(",", aqUserIds);
txtaqUserIds.Text = GetUserNames(zyUserIdsStr);
SetCheck(trThree, aqUserIds);
}
}
var kzUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "KZ");
if (kzUserIds.Count > 0)
{
@@ -102,6 +153,9 @@ namespace FineUIPro.Web.CQMS.Solution
var sgUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "SG");
if (sgUserIds.Count > 0)
{
var zyUserIdsStr = string.Join(",", sgUserIds);
//txtsgUserIds.Text = GetUserNames(zyUserIdsStr);
SetCheck(trFive, sgUserIds);
}
var xmUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "XM");
@@ -118,6 +172,10 @@ namespace FineUIPro.Web.CQMS.Solution
BLL.CQMSConstructSolutionApproveService.UpdateConstructSolutionApprove(approve);
}
}
if (!string.IsNullOrEmpty(constructSolution.CsUsers))
{
txtCsUsers.Text= GetUserNames(constructSolution.CsUsers);
}
AddAttachTab();
}
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.designer.cs
Generated
+45
View File
@@ -149,6 +149,51 @@ namespace FineUIPro.Web.CQMS.Solution
/// </remarks>
protected global::FineUIPro.TextBox txtUnitWork;
/// <summary>
/// txtzyUserIds 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtzyUserIds;
/// <summary>
/// txtaqUserIds 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtaqUserIds;
/// <summary>
/// txtCsUsers 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCsUsers;
/// <summary>
/// options1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow options1;
/// <summary>
/// gvOperateComplianceObligations 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvOperateComplianceObligations;
/// <summary>
/// TabStrip1 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx
+248 -93
View File
@@ -111,6 +111,247 @@
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpzyUserIds" MultiSelectSeparator="," AutoPostBack="true" LabelWidth="120px"
Label="一级审核人员" Required="true" ShowRedStar="true" EmptyText="请从下拉表格中选择" EnableMultiSelect="true" MatchFieldWidth="false">
<PopPanel>
<f:Grid ID="Grid1" Width="800px" Height="300px" Hidden="true"
DataIDField="UserId" DataTextField="UserName" EnableMultiSelect="true" KeepCurrentSelection="true"
PageSize="100" ShowBorder="true" ShowHeader="false"
AllowPaging="true" IsDatabasePaging="true" runat="server" EnableCheckBoxSelect="true"
DataKeyNames="UserId" OnPageIndexChange="Grid1_PageIndexChange"
AllowSorting="true" SortField="UserName" SortDirection="ASC"
OnSort="Grid1_Sort">
<Columns>
<f:RowNumberField />
<f:BoundField Width="200px" DataField="UserName" SortField="UserName" DataFormatString="{0}"
HeaderText="姓名" />
</Columns>
<Toolbars>
<f:Toolbar runat="server" Position="Top">
<Items>
<f:TwinTriggerBox Width="300px" runat="server" EmptyText="在姓名中查找" ShowLabel="false" ID="ttbSearch1"
ShowTrigger1="false" OnTrigger1Click="ttbSearch_Trigger1Click1" OnTrigger2Click="ttbSearch_Trigger2Click1"
Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
</Items>
</f:Toolbar>
</Toolbars>
</f:Grid>
</PopPanel>
</f:DropDownBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label runat="server" Text="一级审核人员必须选择施工工程师和HSE工程师" LabelWidth="120px" CssStyle="color:red"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpaqUserIds" MultiSelectSeparator="," AutoPostBack="true" LabelWidth="120px"
Label="二级审批人员" Required="true" ShowRedStar="true" EmptyText="请从下拉表格中选择" EnableMultiSelect="true" MatchFieldWidth="false">
<PopPanel>
<f:Grid ID="Grid2" Width="800px" Height="300px" Hidden="true"
DataIDField="UserId" DataTextField="UserName" EnableMultiSelect="true" KeepCurrentSelection="true"
PageSize="100" ShowBorder="true" ShowHeader="false"
AllowPaging="true" IsDatabasePaging="true" runat="server" EnableCheckBoxSelect="true"
DataKeyNames="UserId" OnPageIndexChange="Grid2_PageIndexChange"
AllowSorting="true" SortField="UserName" SortDirection="ASC"
OnSort="Grid2_Sort">
<Columns>
<f:RowNumberField />
<f:BoundField Width="200px" DataField="UserName" SortField="UserName" DataFormatString="{0}"
HeaderText="姓名" />
</Columns>
<Toolbars>
<f:Toolbar runat="server" Position="Top">
<Items>
<f:TwinTriggerBox Width="300px" runat="server" EmptyText="在姓名中查找" ShowLabel="false" ID="ttbSearch2"
ShowTrigger1="false" OnTrigger1Click="ttbSearch_Trigger1Click2" OnTrigger2Click="ttbSearch_Trigger2Click2"
Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
</Items>
</f:Toolbar>
</Toolbars>
</f:Grid>
</PopPanel>
</f:DropDownBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label runat="server" Text="二级审批人员必须选择施工经理、HSE经理、质量经理" LabelWidth="120px" CssStyle="color:red"></f:Label>
</Items>
</f:FormRow>
<%-- <f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpsgUserIds" MultiSelectSeparator="," AutoPostBack="true" LabelWidth="160px"
Label="总包会签施工经理" Required="true" ShowRedStar="true" EmptyText="请从下拉表格中选择" EnableMultiSelect="true" MatchFieldWidth="false">
<PopPanel>
<f:Grid ID="Grid3" Width="800px" Height="300px" Hidden="true"
DataIDField="UserId" DataTextField="UserName" EnableMultiSelect="true" KeepCurrentSelection="true"
PageSize="100" ShowBorder="true" ShowHeader="false"
AllowPaging="true" IsDatabasePaging="true" runat="server" EnableCheckBoxSelect="true"
DataKeyNames="UserId" OnPageIndexChange="Grid3_PageIndexChange"
AllowSorting="true" SortField="UserName" SortDirection="ASC"
OnSort="Grid3_Sort">
<Columns>
<f:RowNumberField />
<f:BoundField Width="200px" DataField="UserName" SortField="UserName" DataFormatString="{0}"
HeaderText="姓名" />
</Columns>
<Toolbars>
<f:Toolbar runat="server" Position="Top">
<Items>
<f:TwinTriggerBox Width="300px" runat="server" EmptyText="在姓名中查找" ShowLabel="false" ID="ttbSearch3"
ShowTrigger1="false" OnTrigger1Click="ttbSearch_Trigger1Click3" OnTrigger2Click="ttbSearch_Trigger2Click3"
Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
</Items>
</f:Toolbar>
</Toolbars>
</f:Grid>
</PopPanel>
</f:DropDownBox>
</Items>
</f:FormRow>--%>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpCsUsers" MultiSelectSeparator="," AutoPostBack="true" LabelWidth="120px"
Label="抄送人员" EmptyText="请从下拉表格中选择" EnableMultiSelect="true" MatchFieldWidth="false">
<PopPanel>
<f:Grid ID="Grid4" Width="800px" Height="300px" Hidden="true"
DataIDField="UserId" DataTextField="UserName" EnableMultiSelect="true" KeepCurrentSelection="true"
PageSize="100" ShowBorder="true" ShowHeader="false"
AllowPaging="true" IsDatabasePaging="true" runat="server" EnableCheckBoxSelect="true"
DataKeyNames="UserId" OnPageIndexChange="Grid4_PageIndexChange"
AllowSorting="true" SortField="UserName" SortDirection="ASC"
OnSort="Grid4_Sort">
<Columns>
<f:RowNumberField />
<f:BoundField Width="200px" DataField="UserName" SortField="UserName" DataFormatString="{0}"
HeaderText="姓名" />
</Columns>
<Toolbars>
<f:Toolbar runat="server" Position="Top">
<Items>
<f:TwinTriggerBox Width="300px" runat="server" EmptyText="在姓名中查找" ShowLabel="false" ID="ttbSearch4"
ShowTrigger1="false" OnTrigger1Click="ttbSearch_Trigger1Click4" OnTrigger2Click="ttbSearch_Trigger2Click4"
Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
</Items>
</f:Toolbar>
</Toolbars>
</f:Grid>
</PopPanel>
</f:DropDownBox>
</Items>
</f:FormRow>
<f:FormRow ID="agree">
<Items>
<f:RadioButtonList runat="server" ID="rblIsAgree" Label="是否同意" ShowRedStar="true" AutoPostBack="true"
OnSelectedIndexChanged="radChange">
<f:RadioItem Text="同意" Value="true" Selected="true" />
<f:RadioItem Text="不同意" Value="false" />
</f:RadioButtonList>
<f:Label runat="server" CssStyle="display:none"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ID="options" Hidden="true">
<Items>
<f:Button ID="btnNew" Text="新增" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click">
</f:Button>
</Items>
</f:FormRow>
<f:FormRow ID="options1" Hidden="true">
<Items>
<f:Grid ID="gvOperateComplianceObligations" ShowBorder="true" ShowHeader="false" Title="" runat="server"
AllowCellEditing="true" ClicksToEdit="1" DataIDField="Id" DataKeyNames="Id"
EnableMultiSelect="false" ShowGridHeader="true" Height="220px" EnableColumnLines="true"
OnRowCommand="gvOperateComplianceObligations_RowCommand">
<Columns>
<f:LinkButtonField Width="40px" ConfirmText="删除选中行？" ConfirmTarget="Parent" CommandName="Delete"
ToolTip="删除" Icon="Delete" TextAlign="Center" />
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="150px" ColumnID="Chapter" DataField="Chapter" FieldType="String"
HeaderText="章节" HeaderTextAlign="Center" TextAlign="Left">
<Editor>
<f:TextBox runat="server" ID="TextBox7">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Amendment" DataField="Amendment" FieldType="String"
HeaderText="修改意见" HeaderTextAlign="Center" TextAlign="Left">
<Editor>
<f:TextBox runat="server" ID="TextBox1">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProposerName" DataField="ProposerName" FieldType="String"
HeaderText="提出人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Modification" DataField="Modification" FieldType="String"
HeaderText="修改情况" HeaderTextAlign="Center" TextAlign="Left">
<Editor>
<f:TextBox runat="server" ID="TextBox2">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="ReviewerOpinion" DataField="ReviewerOpinion" FieldType="String"
HeaderText="审核人意见" HeaderTextAlign="Center" TextAlign="Left">
<Editor>
<f:TextBox runat="server" ID="TextBox3">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="IsAccept" DataField="IsAccept" FieldType="String"
HeaderText="是否接受" HeaderTextAlign="Center" TextAlign="Left">
<Editor>
<f:DropDownList runat="server" ID="drpIsAccept">
<f:ListItem Value="接受AE" Text="接受AE" Selected="true"/>
<f:ListItem Value="带意见接受AC" Text="带意见接受AC"/>
<f:ListItem Value="拒绝AJ" Text="拒绝AJ"/>
</f:DropDownList>
</Editor>
</f:RenderField>
</Columns>
</f:Grid>
<%-- <f:TextArea ID="txtOptions" ShowRedStar="true" Required="true" runat="server" Label="办理意见" MaxLength="3000">
</f:TextArea>--%>
</Items>
</f:FormRow>
<f:FormRow ID="optio">
<Items>
<f:Panel ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<Items>
<f:Label runat="server" Text="附件：" ShowRedStar="true" CssStyle="padding-left:53px" Width="100px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="btnapprove" Text="附件" ToolTip="上传及查看" Icon="TableCell" OnClick="btnapprove_Click" runat="server">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:TabStrip ID="TabStrip1" IsFluid="true" Height="500px" ShowBorder="true" TabPosition="Top"
@@ -133,6 +374,8 @@
</f:TabStrip>
</Items>
</f:FormRow>
<%-- <f:FormRow Hidden="True">
<Items>
<f:Panel ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
@@ -149,102 +392,14 @@
</f:ContentPanel>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<%--<f:FormRow runat="server">
<Items>
<f:TextBox runat="server" ID="txtCopyMan" Label="总包会签人员" Readonly="True" Enabled="False"/>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Panel ID="Panel2" IsFluid="true" CssClass="mytable blockpanel" runat="server" AutoScroll="true" ShowBorder="true"
Layout="Table" TableConfigColumns="3" ShowHeader="true" Title="总包会签">
<Items>
<f:Panel ID="Panel1" Title="Panel1" Width="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false" Height="200px">
<Items>
<f:Tree runat="server" ID="trOne" ShowHeader="false" AutoScroll="true" ShowBorder="false" OnNodeCheck="trOne_NodeCheck" EnableArrows="true">
</f:Tree>
</Items>
</f:Panel>
<%--<f:Panel ID="Panel3" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false" Hidden="True">
<Items>
<f:Tree runat="server" ID="trTwo" ShowHeader="false" ShowBorder="false" OnNodeCheck="trTwo_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>--%>
<f:Panel ID="Panel4" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trThree" ShowHeader="false" ShowBorder="false" OnNodeCheck="trThree_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>
<%--<f:Panel ID="Panel5" Title="Panel1" Width="200px" AutoScroll="true" Height="200px" Hidden="True"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trFour" ShowHeader="false" ShowBorder="false" OnNodeCheck="trFour_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>--%>
<f:Panel ID="Panel6" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trFive" ShowHeader="false" ShowBorder="false" OnNodeCheck="trFive_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>
<%--<f:Panel ID="Panel7" Title="Panel1" Width="200px" AutoScroll="true" Height="200px" Hidden="True"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trSixe" ShowHeader="false" ShowBorder="false" OnNodeCheck="trSixe_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>--%>
</Items>
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow ID="agree">
<Items>
<f:RadioButtonList runat="server" ID="rblIsAgree" Label="是否同意" ShowRedStar="true" AutoPostBack="true">
<f:RadioItem Text="同意" Value="true" Selected="true" />
<f:RadioItem Text="不同意" Value="false" />
</f:RadioButtonList>
<f:Label runat="server" CssStyle="display:none"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ID="options">
<Items>
<f:TextArea ID="txtOptions" ShowRedStar="true" Required="true" runat="server" Label="办理意见" MaxLength="3000">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ID="optio">
<Items>
<f:Panel ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<Items>
<f:Label runat="server" Text="附件：" ShowRedStar="true" CssStyle="padding-left:53px" Width="100px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="btnapprove" Text="附件" ToolTip="上传及查看" Icon="TableCell" OnClick="btnapprove_Click" runat="server">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
</f:FormRow>--%>
<f:FormRow ID="plApprove2">
<Items>
@@ -274,7 +429,7 @@
</ItemTemplate>
</f:TemplateField>
<f:BoundField Width="100px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="办理时间" />
<f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" />
<%-- <f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="办理意见" />--%>
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
</Columns>
</f:Grid>
SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs
+1027 -168
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.designer.cs
Generated
+110 -38
View File
@@ -168,103 +168,85 @@ namespace FineUIPro.Web.CQMS.Solution
protected global::FineUIPro.DatePicker txtCompileDate;
/// <summary>
/// TabStrip1 控件。
/// drpzyUserIds 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
protected global::FineUIPro.DropDownBox drpzyUserIds;
/// <summary>
/// SimpleForm2 控件。
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.SimpleForm SimpleForm2;
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// txtDocContent 控件。
/// ttbSearch1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HtmlEditor txtDocContent;
protected global::FineUIPro.TwinTriggerBox ttbSearch1;
/// <summary>
/// txtCopyMan 控件。
/// drpaqUserIds 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCopyMan;
protected global::FineUIPro.DropDownBox drpaqUserIds;
/// <summary>
/// Panel2 控件。
/// Grid2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// Panel1 控件。
/// ttbSearch2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
protected global::FineUIPro.TwinTriggerBox ttbSearch2;
/// <summary>
/// trOne 控件。
/// drpCsUsers 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trOne;
protected global::FineUIPro.DropDownBox drpCsUsers;
/// <summary>
/// Panel4 控件。
/// Grid4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel4;
protected global::FineUIPro.Grid Grid4;
/// <summary>
/// trThree 控件。
/// ttbSearch4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trThree;
/// <summary>
/// Panel6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel6;
/// <summary>
/// trFive 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trFive;
protected global::FineUIPro.TwinTriggerBox ttbSearch4;
/// <summary>
/// agree 控件。
@@ -294,13 +276,76 @@ namespace FineUIPro.Web.CQMS.Solution
protected global::FineUIPro.FormRow options;
/// <summary>
/// txtOptions 控件。
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtOptions;
protected global::FineUIPro.Button btnNew;
/// <summary>
/// options1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow options1;
/// <summary>
/// gvOperateComplianceObligations 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvOperateComplianceObligations;
/// <summary>
/// TextBox7 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox7;
/// <summary>
/// TextBox1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox1;
/// <summary>
/// TextBox2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox2;
/// <summary>
/// TextBox3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox3;
/// <summary>
/// drpIsAccept 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsAccept;
/// <summary>
/// optio 控件。
@@ -320,6 +365,33 @@ namespace FineUIPro.Web.CQMS.Solution
/// </remarks>
protected global::FineUIPro.Button btnapprove;
/// <summary>
/// TabStrip1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// SimpleForm2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.SimpleForm SimpleForm2;
/// <summary>
/// txtDocContent 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HtmlEditor txtDocContent;
/// <summary>
/// plApprove2 控件。
/// </summary>