zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交集团数据穿透修改

Browse Source
This commit is contained in:
高飞
2023-06-19 09:04:34 +08:00
parent efed3c7f6f
commit 1e709abb1a
184 changed files with 10777 additions and 3631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/License/LicenseManager.aspx
+10 -13
View File
@@ -39,17 +39,12 @@
<f:DatePicker ID="txtEndDate" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="150px" EmptyText="结束时间" LabelWidth="80px">
</f:DatePicker>
</Items>
</f:Toolbar>
<f:Toolbar runat="server">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true"
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
runat="server">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
@@ -78,7 +73,10 @@
</f:RenderField>
<f:RenderField Width="140px" ColumnID="WorkAreaName" DataField="WorkAreaName" SortField="WorkAreaName"
FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</f:RenderField>
<f:CheckBoxField Width="100px" SortField="IsHighRisk" RenderAsStaticField="true" DataField="IsHighRisk"
HeaderText="高风险作业" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
<f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="申请日期"
HeaderTextAlign="Center" TextAlign="Center">
@@ -91,10 +89,9 @@
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="结束时间"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="140px" ColumnID="FlowOperateName" DataField="FlowOperateName"
SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="WorkStatesStr" DataField="WorkStatesStr" SortField="WorkStatesStr"
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<%-- <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" HeaderText="附件"
Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="LicenseManagerId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LicenseManagerAttachUrl&menuId=0E9B7084-D021-4CA3-B9D2-9CBAA27A571B"
HeaderTextAlign="Center" />--%>
SGGL/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs
+3 -3
View File
@@ -69,7 +69,7 @@ namespace FineUIPro.Web.HSSE.License
/// </summary>
private void BindGrid()
{
string strSql = "SELECT LicenseManager.LicenseManagerId,LicenseManager.ProjectId,LicenseManager.LicenseTypeId,CodeRecords.Code AS LicenseManagerCode,LicenseManager.LicenseManageName,LicenseManager.UnitId,LicenseManager.LicenseManageContents,LicenseManager.CompileMan,LicenseManager.CompileDate,LicenseManager.States,LicenseManager.ProjectCode,LicenseManager.ProjectName,LicenseManager.LicenseTypeName,LicenseManager.UnitName,LicenseManager.UnitTypeName,LicenseManager.UserName,LicenseManager.WorkAreaName,LicenseManager.StartDate,LicenseManager.EndDate"
string strSql = "SELECT LicenseManager.LicenseManagerId,LicenseManager.ProjectId,LicenseManager.WorkStatesStr,LicenseManager.LicenseTypeId,CodeRecords.Code AS LicenseManagerCode,LicenseManager.IsHighRisk,LicenseManager.LicenseManageName,LicenseManager.UnitId,LicenseManager.LicenseManageContents,LicenseManager.CompileMan,LicenseManager.CompileDate,LicenseManager.States,LicenseManager.ProjectCode,LicenseManager.ProjectName,LicenseManager.LicenseTypeName,LicenseManager.UnitName,LicenseManager.UnitTypeName,LicenseManager.UserName,LicenseManager.WorkAreaName,LicenseManager.StartDate,LicenseManager.EndDate"
+ @" ,(CASE WHEN LicenseManager.States = " + BLL.Const.State_0 + " OR LicenseManager.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN LicenseManager.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS FlowOperateName"
+ @" FROM View_License_LicenseManager AS LicenseManager "
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON LicenseManager.LicenseManagerId=CodeRecords.DataId "
@@ -226,7 +226,7 @@ namespace FineUIPro.Web.HSSE.License
var licenseManager = BLL.LicenseManagerService.GetLicenseManagerById(id);
if (licenseManager != null)
{
if (this.btnMenuEdit.Hidden || licenseManager.States == BLL.Const.State_2) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
if (this.btnMenuEdit.Hidden) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("LicenseManagerView.aspx?LicenseManagerId={0}", id, "查看 - ")));
}
@@ -258,7 +258,7 @@ namespace FineUIPro.Web.HSSE.License
BLL.LicenseManagerService.DeleteLicenseManagerById(rowID);
}
}
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.WorkPermit);
this.BindGrid();
ShowNotify("删除数据成功!", MessageBoxIcon.Success);
}
SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx
+4 -16
View File
@@ -1,8 +1,6 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LicenseManagerEdit.aspx.cs"
Inherits="FineUIPro.Web.HSSE.License.LicenseManagerEdit" ValidateRequest="false" %>
<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl"
TagPrefix="uc1" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
@@ -16,7 +14,7 @@
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow ColumnWidths="34% 66%">
<f:FormRow ColumnWidths="34% 33% 33%">
<Items>
<f:TextBox ID="txtLicenseManagerCode" runat="server" Label="许可证编号" LabelAlign="Right"
MaxLength="50" Readonly="true">
@@ -24,6 +22,7 @@
<f:DropDownList ID="drpUnitId" runat="server" Label="申请单位" LabelAlign="Right" Required="true"
ShowRedStar="true" ForceSelection="false" EnableEdit="true" FocusOnPageLoad="true">
</f:DropDownList>
<f:CheckBox runat="server" ID="cbIsHighRisk" Label="高风险作业"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="34% 33% 33%">
@@ -62,14 +61,6 @@
</f:HtmlEditor>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
BodyPadding="0px">
<uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
@@ -81,13 +72,10 @@
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" ToolTip="提交" ValidateForms="SimpleForm1"
OnClick="btnSubmit_Click">
</f:Button>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1" Text="保存"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose" Text="关闭">
</f:Button>
</Items>
</f:Toolbar>
SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx.cs
+9 -36
View File
@@ -81,6 +81,10 @@ namespace FineUIPro.Web.HSSE.License
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", licenseManager.StartDate);
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", licenseManager.EndDate);
this.drpStates.SelectedValue = licenseManager.WorkStates;
if (licenseManager.IsHighRisk == true)
{
this.cbIsHighRisk.Checked = true;
}
}
}
else
@@ -98,12 +102,6 @@ namespace FineUIPro.Web.HSSE.License
////自动生成编码
this.txtLicenseManagerCode.Text = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.ProjectLicenseManagerMenuId, this.ProjectId, this.CurrUser.UnitId);
}
///初始化审核菜单
this.ctlAuditFlow.MenuId = BLL.Const.ProjectLicenseManagerMenuId;
this.ctlAuditFlow.DataId = this.LicenseManagerId;
this.ctlAuditFlow.ProjectId = this.ProjectId;
this.ctlAuditFlow.UnitId = this.CurrUser.UnitId;
}
}
#endregion
@@ -125,27 +123,11 @@ namespace FineUIPro.Web.HSSE.License
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
{
this.SaveData(BLL.Const.BtnSave);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
/// <summary>
/// 提交按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSubmit_Click(object sender, EventArgs e)
{
if (this.ctlAuditFlow.NextStep == BLL.Const.State_1 && this.ctlAuditFlow.NextPerson == BLL.Const._Null)
{
ShowNotify("请选择下一步办理人！", MessageBoxIcon.Warning);
return;
}
this.SaveData(BLL.Const.BtnSubmit);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
/// <summary>
/// 保存数据
/// </summary>
@@ -177,7 +159,7 @@ namespace FineUIPro.Web.HSSE.License
{
licenseManager.UnitId = this.drpUnitId.SelectedValue;
}
licenseManager.IsHighRisk = Convert.ToBoolean(this.cbIsHighRisk.Checked);
licenseManager.ApplicantMan = this.txtApplicantMan.Text.Trim();
if (!string.IsNullOrEmpty(this.drpWorkAreaId.SelectedValue))
{
@@ -193,22 +175,14 @@ namespace FineUIPro.Web.HSSE.License
licenseManager.EndDate = Funs.GetNewDateTime(this.txtEndDate.Text);
licenseManager.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
licenseManager.LicenseManageContents = HttpUtility.HtmlEncode(this.txtLicenseManageContents.Text);
licenseManager.States = BLL.Const.State_0;
licenseManager.States = BLL.Const.State_2;
if (!string.IsNullOrEmpty(this.drpStates.SelectedValue))
{
licenseManager.WorkStates = this.drpStates.SelectedValue;
}
else
{
licenseManager.WorkStates =null;
}
if (type == BLL.Const.BtnSubmit)
{
licenseManager.States = this.ctlAuditFlow.NextStep;
if (licenseManager.States == Const.State_2 && licenseManager.WorkStates != Const.State_R)
{
licenseManager.WorkStates = Const.State_3;
}
licenseManager.WorkStates = null;
}
if (!string.IsNullOrEmpty(this.LicenseManagerId))
{
@@ -224,8 +198,7 @@ namespace FineUIPro.Web.HSSE.License
BLL.LicenseManagerService.AddLicenseManager(licenseManager);
BLL.LogService.AddSys_Log(this.CurrUser, licenseManager.LicenseManagerCode, licenseManager.LicenseManagerId, BLL.Const.ProjectLicenseManagerMenuId, BLL.Const.BtnAdd);
}
////保存流程审核数据
this.ctlAuditFlow.btnSaveData(this.ProjectId, BLL.Const.ProjectLicenseManagerMenuId, this.LicenseManagerId, (type == BLL.Const.BtnSubmit ? true : false), licenseManager.LicenseManageName, "../License/LicenseManagerView.aspx?LicenseManagerId={0}");
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.WorkPermit);
}
#endregion
SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx.designer.cs
Generated
+9 -27
View File
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.HSSE.License {
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// cbIsHighRisk 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsHighRisk;
/// <summary>
/// drpLicenseTypeId 控件。
/// </summary>
@@ -129,24 +138,6 @@ namespace FineUIPro.Web.HSSE.License {
/// </remarks>
protected global::FineUIPro.HtmlEditor txtLicenseManageContents;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ctlAuditFlow 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -183,15 +174,6 @@ namespace FineUIPro.Web.HSSE.License {
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSubmit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// btnSave 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/License/LicenseManagerView.aspx
+3 -2
View File
@@ -16,13 +16,14 @@
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow ColumnWidths="33% 66%">
<f:FormRow ColumnWidths="34% 33% 33%">
<Items>
<f:TextBox ID="txtLicenseManagerCode" runat="server" Label="许可证编号" LabelAlign="Right"
Readonly="true">
</f:TextBox>
<f:TextBox ID="txtUnitName" runat="server" Label="申请单位" LabelAlign="Right" Readonly="true">
</f:TextBox>
<f:CheckBox runat="server" ID="cbIsHighRisk" Label="高风险作业" Readonly="true"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="34% 33% 33%">
@@ -72,7 +73,7 @@
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose" Text="关闭">
</f:Button>
</Items>
</f:Toolbar>
SGGL/FineUIPro.Web/HSSE/License/LicenseManagerView.aspx.cs
+4
View File
@@ -48,6 +48,10 @@ namespace FineUIPro.Web.HSSE.License
this.txtUnitName.Text = unit.UnitName;
}
}
if (licenseManager.IsHighRisk == true)
{
this.cbIsHighRisk.Checked = true;
}
if (!string.IsNullOrEmpty(licenseManager.LicenseTypeId))
{
var licenseType = BLL.LicenseTypeService.GetLicenseTypeById(licenseManager.LicenseTypeId);
SGGL/FineUIPro.Web/HSSE/License/LicenseManagerView.aspx.designer.cs
Generated
+9
View File
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.HSSE.License {
/// </remarks>
protected global::FineUIPro.TextBox txtUnitName;
/// <summary>
/// cbIsHighRisk 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsHighRisk;
/// <summary>
/// txtLicenseTypeName 控件。
/// </summary>