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

修改待办

This commit is contained in:
高飞 2023-07-24 21:06:07 +08:00
parent 9db016519d
commit 346bba826e
12 changed files with 398 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/BLL/Common/Const.cs
View File

@ -746,6 +746,10 @@ namespace BLL
/// 文档管理 /// 文档管理
/// </summary> /// </summary>
public const string Menu_Doc = "Menu_Doc"; public const string Menu_Doc = "Menu_Doc";
/// <summary>
/// 待办
/// </summary>
public const string Menu_ToDo = "Menu_ToDo";
#endregion #endregion
#endregion #endregion

9
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -313,6 +313,7 @@
</Content> </Content>
<Content Include="common\Menu_TestRun.xml" /> <Content Include="common\Menu_TestRun.xml" />
<Content Include="common\Menu_CLGL.xml" /> <Content Include="common\Menu_CLGL.xml" />
<Content Include="common\Menu_ToDo.xml" />
<Content Include="common\Menu_ZHGL.xml" /> <Content Include="common\Menu_ZHGL.xml" />
<Content Include="common\themes.aspx" /> <Content Include="common\themes.aspx" />
<Content Include="Controls\FlowOperateControl.ascx" /> <Content Include="Controls\FlowOperateControl.ascx" />
@ -1589,6 +1590,7 @@
<Content Include="res\liveplayer\liveplayer.swf" /> <Content Include="res\liveplayer\liveplayer.swf" />
<Content Include="SHIYE\InformationProject\SafetyBriefing.aspx" /> <Content Include="SHIYE\InformationProject\SafetyBriefing.aspx" />
<Content Include="SHIYE\InformationProject\SafetyBriefingEdit.aspx" /> <Content Include="SHIYE\InformationProject\SafetyBriefingEdit.aspx" />
<Content Include="SysManage\ProjectToDo.aspx" />
<Content Include="TestRun\BeforeTestRun\BeforeTestRun.aspx" /> <Content Include="TestRun\BeforeTestRun\BeforeTestRun.aspx" />
<Content Include="TestRun\BeforeTestRun\BeforeTestRunEdit.aspx" /> <Content Include="TestRun\BeforeTestRun\BeforeTestRunEdit.aspx" />
<Content Include="TestRun\BeforeTestRun\DeviceRun.aspx" /> <Content Include="TestRun\BeforeTestRun\DeviceRun.aspx" />
@ -14638,6 +14640,13 @@
<Compile Include="SysManage\ParticipateProject.aspx.designer.cs"> <Compile Include="SysManage\ParticipateProject.aspx.designer.cs">
<DependentUpon>ParticipateProject.aspx</DependentUpon> <DependentUpon>ParticipateProject.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="SysManage\ProjectToDo.aspx.cs">
<DependentUpon>ProjectToDo.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SysManage\ProjectToDo.aspx.designer.cs">
<DependentUpon>ProjectToDo.aspx</DependentUpon>
</Compile>
<Compile Include="SysManage\RoleItem.aspx.cs"> <Compile Include="SysManage\RoleItem.aspx.cs">
<DependentUpon>RoleItem.aspx</DependentUpon> <DependentUpon>RoleItem.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>

3
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx.cs
View File

@ -166,7 +166,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
if (isClosed) if (isClosed)
{ {
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); string scripts = String.Format("F.getActiveWindow().window.reloadGrid('{0}');", "");
PageContext.RegisterStartupScript(scripts + ActiveWindow.GetHidePostBackReference());
} }
} }
#endregion #endregion

3
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationRectify.aspx.cs
View File

@ -150,7 +150,8 @@ namespace FineUIPro.Web.HiddenInspection
BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnModify); BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnModify);
if (isClosed) if (isClosed)
{ {
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); string scripts = String.Format("F.getActiveWindow().window.reloadGrid('{0}');", "");
PageContext.RegisterStartupScript(scripts + ActiveWindow.GetHidePostBackReference());
} }
} }
} }

89
SGGL/FineUIPro.Web/SysManage/ProjectToDo.aspx Normal file
View File

@ -0,0 +1,89 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectToDo.aspx.cs" Inherits="FineUIPro.Web.SysManage.ProjectToDo" %>
<!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">
<title>代办事项</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" EnableCollapse="true" ShowHeader="false"
runat="server" BoxFlex="1" DataKeyNames="DataId" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="DataId" AllowSorting="true" SortField="DataTime"
SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="110px" ColumnID="MenuName" DataField="MenuName"
FieldType="String" HeaderText="菜单" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="240px" ColumnID="Content" DataField="Content" TextAlign="Left"
FieldType="String" HeaderText="内容" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="DataTime" DataField="DataTime"
HeaderText="单据时间" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="办理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true"
Width="1200px" Height="650px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
runat="server" Text="办理" Icon="Pencil">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/jscript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
function reloadGrid(param) {
__doPostBack(null, 'ReloadGrid$' + param);
}
</script>
</body>
</html>

125
SGGL/FineUIPro.Web/SysManage/ProjectToDo.aspx.cs Normal file
View File

@ -0,0 +1,125 @@
using BLL;
using FineUIPro.Web.DataShow;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.SysManage
{
public partial class ProjectToDo : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack && this.CurrUser != null)
{
Funs.DropDownPageSize(this.ddlPageSize);
// 绑定表格
this.BindGrid();
}
else
{
string requestArg = GetRequestEventArgument(); // 此函数所在文件：PageBase.cs
if (requestArg.StartsWith("ReloadGrid$"))
{
BindGrid();
//PageContext.RegisterStartupScript("parent.__doPostBack('','Test3WindowClose');"
// + ActiveWindow.GetHidePostBackReference());
}
}
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
var getDataList = Funs.DB.Sp_Project_GetToDoItems(this.CurrUser.LoginProjectId, this.CurrUser.UserId).ToList();
Grid1.RecordCount = getDataList.Count();
Grid1.DataSource = getDataList;
Grid1.DataBind();
}
#region 查询
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e)
{
this.BindGrid();
}
#endregion
/// <summary>
/// 分页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页显示条数下拉框
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid();
}
/// <summary>
/// Grid行双击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
this.EditData();
}
/// <summary>
/// 右键编辑事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuEdit_Click(object sender, EventArgs e)
{
this.EditData();
}
/// <summary>
/// 编辑数据方法
/// </summary>
private void EditData()
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
var getData = Funs.DB.Sp_Project_GetToDoItems(this.CurrUser.LoginProjectId, this.CurrUser.UserId).FirstOrDefault(x => x.DataId == Grid1.SelectedRowID);
if (getData != null) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("{0}", getData.PCUrl, "编辑 - ")));
}
}
}
}

125
SGGL/FineUIPro.Web/SysManage/ProjectToDo.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,125 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.SysManage
{
public partial class ProjectToDo
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
}
}

4
SGGL/FineUIPro.Web/common/Menu_ToDo.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
</Tree>

7
SGGL/FineUIPro.Web/indexProject.aspx
View File

@ -287,6 +287,11 @@
<f:Button runat="server" CssClass="bgbtntop" IconFont="StarO" ToolTip="收藏夹" Hidden="true" <f:Button runat="server" CssClass="bgbtntop" IconFont="StarO" ToolTip="收藏夹" Hidden="true"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="Button19"> EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="Button19">
</f:Button> </f:Button>
</li>
<li class="layui-nav-item">
<f:Button runat="server" CssClass="bgbtntop" IconFont="Bell" OnClick="btnTodo_Click" ToolTip="消息"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnMessage" OnClientClick="parent.removeActiveTab();">
</f:Button>
</li> </li>
<li class="layui-nav-item"> <li class="layui-nav-item">
<f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnPersonal_Click" ToolTip="我的" <f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnPersonal_Click" ToolTip="我的"
@ -391,7 +396,7 @@
<Tabs> <Tabs>
<%--.f-tabstrip-noheader>.f-panel-header--%> <%--.f-tabstrip-noheader>.f-panel-header--%>
<f:Tab ID="Tab1" Title="首页" IconFont="Home" CssClass=".bgbtn" <f:Tab ID="Tab1" Title="首页" IconFont="Home" CssClass=".bgbtn"
EnableIFrame="true" IFrameUrl="~/common/mainProject.aspx" runat="server"> EnableIFrame="true" IFrameUrl="~/SysManage/ProjectToDo.aspx" runat="server">
</f:Tab> </f:Tab>
</Tabs> </Tabs>
<Tools> <Tools>

11
SGGL/FineUIPro.Web/indexProject.aspx.cs
View File

@ -642,7 +642,7 @@ namespace FineUIPro.Web
if (!string.IsNullOrEmpty(type)) if (!string.IsNullOrEmpty(type))
{ {
this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId; this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;
if (CommonService.IsHaveSystemPower(this.CurrUser.UserId, type, this.CurrUser.LoginProjectId) || type == Const.Menu_Personal) if (CommonService.IsHaveSystemPower(this.CurrUser.UserId, type, this.CurrUser.LoginProjectId) || type == Const.Menu_Personal || type == Const.Menu_ToDo)
{ {
this.XmlDataSource1.DataFile = "common/" + type + ".xml"; this.XmlDataSource1.DataFile = "common/" + type + ".xml";
this.leftPanel.Hidden = false; this.leftPanel.Hidden = false;
@ -682,6 +682,10 @@ namespace FineUIPro.Web
this.Tab1.IFrameUrl = "~/DocManage/DocManage.aspx"; this.Tab1.IFrameUrl = "~/DocManage/DocManage.aspx";
this.Tab1.Title = "协调与沟通"; this.Tab1.Title = "协调与沟通";
} }
else if (type==Const.Menu_ToDo)
{
this.Tab1.IFrameUrl = "~/SysManage/ProjectToDo.aspx";
}
else else
{ {
this.Tab1.Title = "首页"; this.Tab1.Title = "首页";
@ -794,5 +798,10 @@ namespace FineUIPro.Web
{ {
this.MenuSwitchMethod(Const.Menu_Opinion); this.MenuSwitchMethod(Const.Menu_Opinion);
} }
protected void btnTodo_Click(object sender, EventArgs e)
{
this.MenuSwitchMethod(Const.Menu_ToDo);
}
} }
} }

9
SGGL/FineUIPro.Web/indexProject.aspx.designer.cs generated
View File

@ -203,6 +203,15 @@ namespace FineUIPro.Web
/// </remarks> /// </remarks>
protected global::FineUIPro.Button Button19; protected global::FineUIPro.Button Button19;
/// <summary>
/// btnMessage 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnMessage;
/// <summary> /// <summary>
/// btnPersonal 控件。 /// btnPersonal 控件。
/// </summary> /// </summary>

13
SGGL/Model/ModelProc.cs
View File

@ -93,5 +93,18 @@ namespace Model
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), projectId, unitId, workPostId, day); IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), projectId, unitId, workPostId, day);
return (ISingleResult<AbsenceDutyItem>)result.ReturnValue; return (ISingleResult<AbsenceDutyItem>)result.ReturnValue;
} }
/// <summary>
/// 获取当前用户在项目待办事项
/// </summary>
/// <param name="unitcode"></param>
/// <param name="isono"></param>
/// <returns></returns>
[Function(Name = "[dbo].[Sp_Project_GetToDoItems]")]
public IEnumerable<ToDoItem> Sp_Project_GetToDoItems([Parameter(DbType = "nvarchar(50)")] string projectId, [Parameter(DbType = "nvarchar(50)")] string userId)
{
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), projectId, userId);
return (ISingleResult<ToDoItem>)result.ReturnValue;
}
} }
} }