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

岗位合并清理、班前会数据同步、

Browse Source
This commit is contained in:
夏菊
2026-02-27 11:05:35 +08:00
parent d5fe6816ce
commit 73511d2e03
28 changed files with 1911 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx
+19
View File
@@ -18,6 +18,21 @@
SortField="PostType,WorkPostCode" SortDirection="ASC"
OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" Label="名称" ID="txtKey" EmptyText="输入查询条件" AutoPostBack="true" Width="200px" LabelWidth="50px">
</f:TextBox>
<f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<%--<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出" EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>--%>
<f:Button ID="btnDataBase" Text="岗位合并" ToolTip="数据清理" Icon="DatabaseWrench" runat="server" Hidden="true" OnClick="btnDataBase_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
@@ -134,6 +149,10 @@
</f:SimpleForm>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="单位合并" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="false"
CloseAction="HidePostBack" Width="1200px" Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
Hidden="true" runat="server" Text="编辑" Icon="Pencil">
SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx.cs
+23
View File
@@ -42,6 +42,10 @@ namespace FineUIPro.Web.BaseInfo
case wp.IsHsse when 1 then '是' else '否' end as IsHsseStr,const.ConstText as PostTypeName
FROM dbo.Base_WorkPost AS wp
LEFT JOIN Sys_Const AS const ON const.ConstValue = wp.PostType and const.GroupId = '" + ConstValue.Group_PostType + "' ";
if (!string.IsNullOrEmpty(this.txtKey.Text.Trim()))
{
strSql += "where wp.WorkPostName like '%" + this.txtKey.Text.Trim() + "%' ";
}
List<SqlParameter> listStr = new List<SqlParameter>();
//strSql += " AND HazardList.ProjectId = @ProjectId";
//listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
@@ -256,6 +260,10 @@ namespace FineUIPro.Web.BaseInfo
{
this.btnSave.Hidden = false;
}
if (this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.fuweiId || this.CurrUser.UserId == Const.shenyinhangId)
{//系统管理员、合肥诺必达、付伟、申银行
this.btnDataBase.Hidden = false;
}
}
}
#endregion
@@ -333,5 +341,20 @@ namespace FineUIPro.Web.BaseInfo
}
}
#endregion
#region 数据清理
/// <summary>
/// 数据清理
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnDataBase_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference($"WorkPostCleanupMerge.aspx", "岗位清理合并"));
}
#endregion
}
}
SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx.designer.cs
Generated
+81 -34
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo {
public partial class WorkPost {
namespace FineUIPro.Web.BaseInfo
{
public partial class WorkPost
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,43 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtKey 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtKey;
/// <summary>
/// btnQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// btnDataBase 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDataBase;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label4 控件。
/// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label4;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.SimpleForm SimpleForm1;
/// <summary>
/// hfFormID 控件。
/// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hfFormID;
/// <summary>
/// drpWorkPostCode 控件。
/// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkPostCode;
/// <summary>
/// txtWorkPostName 控件。
/// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkPostName;
/// <summary>
/// drpPostType 控件。
/// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPostType;
/// <summary>
/// ckbIsHsse 控件。
/// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsHsse;
/// <summary>
/// ckbIsCQMS 控件。
/// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsCQMS;
/// <summary>
/// txtCNCodes 控件。
/// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownBox txtCNCodes;
/// <summary>
/// gvCNCodes 控件。
/// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvCNCodes;
/// <summary>
/// txtRemark 控件。
/// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// lb1 控件。
/// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lb1;
/// <summary>
/// Label2 控件。
/// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
/// <summary>
/// Label3 控件。
/// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -218,7 +256,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -227,7 +265,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnDelete 控件。
/// </summary>
@@ -236,7 +274,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -245,7 +283,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -254,7 +292,16 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -263,7 +310,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@@ -272,7 +319,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
SGGL/FineUIPro.Web/BaseInfo/WorkPostCleanupMerge.aspx
+161
View File
@@ -0,0 +1,161 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WorkPostCleanupMerge.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.WorkPostCleanupMerge" %>
<!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">
.customlabel span {
margin-left: 140px;
color: red;
font-weight: bold;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" LabelWidth="140px"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpWorkPostBox" AutoPostBack="true" OnTextChanged="MergeTextBox_TextChanged" Label="合并后的岗位" EmptyText="请从下拉表格中选择合并后的岗位" DataControlID="Grid1"
EnableMultiSelect="false" MatchFieldWidth="false" Required="true" ShowRedStar="true">
<PopPanel>
<f:Panel ID="Panel1" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Form ID="Form2" ShowBorder="False" ShowHeader="False" runat="server">
<Rows>
<f:FormRow>
<Items>
<f:TwinTriggerBox Width="200px" runat="server" EmptyText="按岗位代码、名称查找" ShowLabel="false" ID="ttbWorkPostNameCodeSearch"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" ShowTrigger1="false" OnTrigger1Click="ttbWorkPostNameCodeSearch_Trigger1Click" OnTrigger2Click="ttbWorkPostNameCodeSearch_Trigger2Click" Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Grid ID="Grid1" BoxFlex="1" DataKeyNames="WorkPostId"
DataIDField="WorkPostId" DataTextField="WorkPostName" EnableMultiSelect="false"
PageSize="50" ShowBorder="true" ShowHeader="false"
AllowPaging="true" IsDatabasePaging="true" OnPageIndexChange="Grid1_PageIndexChange" runat="server" EnableCheckBoxSelect="true"
AllowSorting="false" SortField="WorkPostName" SortDirection="ASC"
OnSort="Grid1_Sort">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="true">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:BoundField ExpandUnusedSpace="true" Width="200px" DataField="WorkPostCode" HeaderText="编号" />
<f:BoundField ExpandUnusedSpace="true" Width="260px" DataField="WorkPostName" HeaderText="岗位名称" />
<f:BoundField ExpandUnusedSpace="true" Width="120px" DataField="PostTypeName" HeaderText="类型" />
<f:BoundField ExpandUnusedSpace="true" Width="80px" DataField="IsHsseStr" HeaderText="安管人员" />
<f:BoundField ExpandUnusedSpace="true" Width="80px" DataField="IsCQMSStr" HeaderText="质量管理" />
<f:BoundField ExpandUnusedSpace="true" Width="80px" DataField="IsCQMSCheckStr" HeaderText="质量报验" />
<%--<f:RenderField ExpandUnusedSpace="true" Width="80px" DataField="IsHsse" FieldType="Boolean" HeaderText="安管人员" />
<f:RenderField ExpandUnusedSpace="true" Width="80px" DataField="IsCQMS" FieldType="Boolean" HeaderText="质量管理" />
<f:RenderField ExpandUnusedSpace="true" Width="80px" DataField="IsCQMSCheck" FieldType="Boolean" HeaderText="质量报验" />--%>
</Columns>
</f:Grid>
</Items>
</f:Panel>
</PopPanel>
</f:DropDownBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpMergeWorkPostBox" Label="需要合并的岗位" EmptyText="请从下拉表格中选择需要合并的岗位" DataControlID="Grid2"
EnableMultiSelect="true" MatchFieldWidth="false" Required="true" ShowRedStar="true">
<PopPanel>
<f:Panel ID="Panel2" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Form ID="Form3" ShowBorder="False" ShowHeader="False" runat="server">
<Rows>
<f:FormRow>
<Items>
<f:TwinTriggerBox Width="200px" runat="server" EmptyText="按编号、名称查找" ShowLabel="false" ID="ttbMergeWorkPostNameCodeSearch"
AutoPostBack="true" OnTextChanged="MergeTextBox_TextChanged" ShowTrigger1="false" OnTrigger1Click="ttbMergeWorkPostNameCodeSearch_Trigger1Click" OnTrigger2Click="ttbMergeWorkPostNameCodeSearch_Trigger2Click" Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Grid ID="Grid2" BoxFlex="1" DataKeyNames="WorkPostId"
DataIDField="WorkPostId" DataTextField="WorkPostName" EnableMultiSelect="true"
PageSize="50" ShowBorder="true" ShowHeader="false"
AllowPaging="true" IsDatabasePaging="true" OnPageIndexChange="Grid2_PageIndexChange" runat="server" EnableCheckBoxSelect="true"
AllowSorting="false" SortField="WorkPostName" SortDirection="ASC"
OnSort="Grid2_Sort">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="true">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid2.PageIndex * Grid2.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:BoundField ExpandUnusedSpace="true" Width="200px" DataField="WorkPostCode" HeaderText="编号" />
<f:BoundField ExpandUnusedSpace="true" Width="260px" DataField="WorkPostName" HeaderText="岗位名称" />
<f:BoundField ExpandUnusedSpace="true" Width="120px" DataField="PostTypeName" HeaderText="类型" />
<f:BoundField ExpandUnusedSpace="true" Width="80px" DataField="IsHsseStr" HeaderText="安管人员" />
<f:BoundField ExpandUnusedSpace="true" Width="80px" DataField="IsCQMSStr" HeaderText="质量管理" />
<f:BoundField ExpandUnusedSpace="true" Width="80px" DataField="IsCQMSCheckStr" HeaderText="质量报验" />
<%--<f:RenderField ExpandUnusedSpace="true" Width="80px" DataField="IsHsse" FieldType="Boolean" HeaderText="安管人员" />
<f:RenderField ExpandUnusedSpace="true" Width="80px" DataField="IsCQMS" FieldType="Boolean" HeaderText="质量管理" />
<f:RenderField ExpandUnusedSpace="true" Width="80px" DataField="IsCQMSCheck" FieldType="Boolean" HeaderText="质量报验" />--%>
</Columns>
</f:Grid>
</Items>
</f:Panel>
</PopPanel>
</f:DropDownBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtRemark" runat="server" Label="备注说明" Height="120px" EmptyText="100字内">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label2" runat="server" Text="注：" CssClass="customlabel"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label3" runat="server" Text="1、请谨慎操作，合并后数据无法恢复；" CssClass="customlabel"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label4" runat="server" Text="2、建议在系统使用低峰时期合并项目岗位数据；" CssClass="customlabel"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label5" runat="server" Text="3、数据合并过程缓慢，请勿关闭此界面，请耐心等待。" CssClass="customlabel"></f:Label>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1" Hidden="true"
OnClick="btnSave_Click" ToolTip="开始清理">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
</form>
</body>
</html>
SGGL/FineUIPro.Web/BaseInfo/WorkPostCleanupMerge.aspx.cs
+280
View File
@@ -0,0 +1,280 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.BaseInfo
{
public partial class WorkPostCleanupMerge : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
////权限按钮方法
this.GetButtonPower();
BindGrid();
BindGrid2();
}
}
#region 加载合并后的岗位
/// <summary>
/// 加载合并后的岗位
/// </summary>
private void BindGrid()
{
var pType = (from x in Funs.DB.Sys_Const where x.GroupId == ConstValue.Group_PostType select x);
var list = (from x in Funs.DB.Base_WorkPost
join y in pType on x.PostType equals y.ConstValue into yGroup
from y in yGroup.DefaultIfEmpty()
orderby x.WorkPostName descending
select new
{
x.WorkPostId,
x.WorkPostName,
x.WorkPostCode,
x.IsHsse,
x.IsCQMS,
x.IsCQMSCheck,
x.PostType,
IsHsseStr = x.IsHsse == true ? "是" : "否",
IsCQMSStr = x.IsHsse == true ? "是" : "否",
IsCQMSCheckStr = x.IsHsse == true ? "是" : "否",
PostTypeName = y.ConstText,
x.Remark
}).ToList();
string codeName = ttbWorkPostNameCodeSearch.Text.Trim();
if (!string.IsNullOrWhiteSpace(codeName))
{
list = list.Where(x => (!string.IsNullOrWhiteSpace(x.WorkPostName) && x.WorkPostName.Contains(codeName)) || (!string.IsNullOrWhiteSpace(x.WorkPostCode) && x.WorkPostCode.Contains(codeName))).ToList();
}
// 1.设置总项数（特别注意：数据库分页一定要设置总记录数RecordCount）
Grid1.RecordCount = list.Count();
// 2.获取当前分页数据
DataTable table = Funs.LINQToDataTable(list);
// 3.绑定到Grid
//Grid1.DataSource = table;
Grid1.DataSource = this.GetPagedDataTable(Grid1, table);
Grid1.DataBind();
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
protected void ttbWorkPostNameCodeSearch_Trigger1Click(object sender, EventArgs e)
{
ttbWorkPostNameCodeSearch.Text = string.Empty;
ttbWorkPostNameCodeSearch.ShowTrigger1 = false;
BindGrid();
}
protected void ttbWorkPostNameCodeSearch_Trigger2Click(object sender, EventArgs e)
{
ttbWorkPostNameCodeSearch.ShowTrigger1 = true;
BindGrid();
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e)
{
BindGrid();
}
#endregion
#region 加载需要合并的岗位
/// <summary>
/// 加载需要合并的岗位
/// </summary>
private void BindGrid2()
{
var pType = (from x in Funs.DB.Sys_Const where x.GroupId == ConstValue.Group_PostType select x);
var list = (from x in Funs.DB.Base_WorkPost
join y in pType on x.PostType equals y.ConstValue into yGroup
from y in yGroup.DefaultIfEmpty()
orderby x.WorkPostName descending
select new
{
x.WorkPostId,
x.WorkPostName,
x.WorkPostCode,
x.IsHsse,
x.IsCQMS,
x.IsCQMSCheck,
x.PostType,
IsHsseStr = x.IsHsse == true ? "是" : "否",
IsCQMSStr = x.IsHsse == true ? "是" : "否",
IsCQMSCheckStr = x.IsHsse == true ? "是" : "否",
PostTypeName = y.ConstText,
x.Remark
}).ToList();
string workPostId = this.drpWorkPostBox.Value;
if (!string.IsNullOrWhiteSpace(workPostId))
{
list = list.Where(x => x.WorkPostId != workPostId).ToList();
}
string codeName = ttbMergeWorkPostNameCodeSearch.Text.Trim();
if (!string.IsNullOrWhiteSpace(codeName))
{
list = list.Where(x => (!string.IsNullOrWhiteSpace(x.WorkPostName) && x.WorkPostName.Contains(codeName)) || (!string.IsNullOrWhiteSpace(x.WorkPostCode) && x.WorkPostCode.Contains(codeName))).ToList();
}
// 1.设置总项数（特别注意：数据库分页一定要设置总记录数RecordCount）
Grid2.RecordCount = list.Count();
// 2.获取当前分页数据
DataTable table = Funs.LINQToDataTable(list);
// 3.绑定到Grid
//Grid2.DataSource = table;
Grid2.DataSource = this.GetPagedDataTable(Grid2, table);
Grid2.DataBind();
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid2();
}
protected void Grid2_Sort(object sender, GridSortEventArgs e)
{
BindGrid2();
}
protected void ttbMergeWorkPostNameCodeSearch_Trigger1Click(object sender, EventArgs e)
{
ttbMergeWorkPostNameCodeSearch.Text = string.Empty;
ttbMergeWorkPostNameCodeSearch.ShowTrigger1 = false;
BindGrid2();
}
protected void ttbMergeWorkPostNameCodeSearch_Trigger2Click(object sender, EventArgs e)
{
ttbMergeWorkPostNameCodeSearch.ShowTrigger1 = true;
BindGrid2();
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void MergeTextBox_TextChanged(object sender, EventArgs e)
{
BindGrid2();
}
#endregion
/// <summary>
/// 保存按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
string workPostId = string.Empty;
string workPostMergeId = string.Empty;
string workPostName = string.Empty;
string workPostMergeName = string.Empty;
if (!string.IsNullOrWhiteSpace(this.drpWorkPostBox.Text))
{
workPostId = this.drpWorkPostBox.Value.Trim();
workPostName = this.drpWorkPostBox.Text;
}
else
{
Alert.ShowInParent("请选择合并后岗位！", MessageBoxIcon.Warning);
return;
}
if (!string.IsNullOrWhiteSpace(this.drpMergeWorkPostBox.Text))
{
workPostMergeId = this.drpMergeWorkPostBox.Value.Trim();
workPostMergeName = this.drpMergeWorkPostBox.Text;
if (workPostMergeId == workPostId)
{
Alert.ShowInParent("两个岗位为同一个岗位，无需合并！", MessageBoxIcon.Warning);
return;
}
}
else
{
Alert.ShowInParent("请选择需要合并的岗位！", MessageBoxIcon.Warning);
return;
}
List<string> workPostMergeIds = workPostMergeId.Split(',').ToList();
workPostMergeIds = workPostMergeIds.Where(x => x != workPostId).ToList();
string msg = string.Empty;
bool merge = DataCleanupMergeHelper.DataCleanupMerge("Base_WorkPost", "PostId", workPostMergeIds, workPostId, ref msg);
if (merge)
{
string txtRemark = this.txtRemark.Text.Trim();
//其他数据表岗位数据合并后，删除岗位表冗余岗位
foreach (var mergeId in workPostMergeIds)
{
string wId = mergeId.Trim();
var workPost = BLL.WorkPostService.GetWorkPostById(wId);
if (workPost != null)
{
WorkPostService.DeleteWorkPostById(wId);
string op = $"岗位合并清理后，{Const.BtnDelete}；备注：{txtRemark}";
LogService.AddSys_Log(this.CurrUser, workPost.WorkPostCode, workPost.WorkPostId, Const.WorkPostMenuId, op);
}
}
}
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
#region 获取按钮权限
/// <summary>
/// 获取按钮权限
/// </summary>
/// <param name="button"></param>
/// <returns></returns>
private void GetButtonPower()
{
if (this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.fuweiId || this.CurrUser.UserId == Const.shenyinhangId)
{//系统管理员、合肥诺必达、付伟、申银行
this.btnSave.Hidden = false;
}
}
#endregion
}
}
SGGL/FineUIPro.Web/BaseInfo/WorkPostCleanupMerge.aspx.designer.cs
Generated
+224
View File
@@ -0,0 +1,224 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo
{
public partial class WorkPostCleanupMerge
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpWorkPostBox 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownBox drpWorkPostBox;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Form2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// ttbWorkPostNameCodeSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TwinTriggerBox ttbWorkPostNameCodeSearch;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// drpMergeWorkPostBox 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownBox drpMergeWorkPostBox;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Form3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form3;
/// <summary>
/// ttbMergeWorkPostNameCodeSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TwinTriggerBox ttbMergeWorkPostNameCodeSearch;
/// <summary>
/// Grid2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// txtRemark 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// Label4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label4;
/// <summary>
/// Label5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label5;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
}
}
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+8
View File
@@ -280,6 +280,7 @@
<Content Include="BaseInfo\TransferMajor.aspx" />
<Content Include="BaseInfo\UnitType.aspx" />
<Content Include="BaseInfo\WorkPost.aspx" />
<Content Include="BaseInfo\WorkPostCleanupMerge.aspx" />
<Content Include="BaseInfo\WorkStage.aspx" />
<Content Include="BoSheng\BoExam.aspx" />
<Content Include="BoSheng\BoPersonEdit.aspx" />
@@ -6948,6 +6949,13 @@
<Compile Include="BaseInfo\WorkPost.aspx.designer.cs">
<DependentUpon>WorkPost.aspx</DependentUpon>
</Compile>
<Compile Include="BaseInfo\WorkPostCleanupMerge.aspx.cs">
<DependentUpon>WorkPostCleanupMerge.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="BaseInfo\WorkPostCleanupMerge.aspx.designer.cs">
<DependentUpon>WorkPostCleanupMerge.aspx</DependentUpon>
</Compile>
<Compile Include="BaseInfo\WorkStage.aspx.cs">
<DependentUpon>WorkStage.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx
+104 -99
View File
@@ -8,105 +8,110 @@
</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" ShowHeader="false" Title="班前会" EnableCollapse="true"
runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ClassMeetingId"
DataIDField="ClassMeetingId" AllowSorting="true" ForceFit="true"
SortField="ClassMeetingCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" Label="编号" ID="txtClassMeetingCode" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
LabelAlign="right">
</f:TextBox>
<f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px">
</f:DropDownList>
<f:TextBox runat="server" Label="名称" ID="txtClassMeetingName" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
LabelAlign="right">
</f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true"
runat="server">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="140px" ColumnID="ClassMeetingCode" DataField="ClassMeetingCode"
SortField="ClassMeetingCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ClassMeetingName" DataField="ClassMeetingName"
SortField="ClassMeetingName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
SortField="UnitName" FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ClassMeetingDate" DataField="ClassMeetingDate"
SortField="ClassMeetingDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="会议日期" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="tfCompileMan" Width="120px" HeaderText="整理人" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lblCompileMan" runat="server" Text='<%# ConvertCompileMan(Eval("CompileMan")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
SortField="FlowOperateName" FieldType="String" 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" OnClose="Window1_Close" IsModal="true"
Width="1024px" Height="630px">
</f:Window>
<f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
Hidden="true" runat="server" Text="编辑">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
Text="删除">
</f:MenuButton>
</f:Menu>
<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" ShowHeader="false" Title="班前会" EnableCollapse="true"
runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ClassMeetingId"
DataIDField="ClassMeetingId" AllowSorting="true" ForceFit="true"
SortField="ClassMeetingCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" Label="编号" ID="txtClassMeetingCode" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
LabelAlign="right">
</f:TextBox>
<f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px">
</f:DropDownList>
<f:TextBox runat="server" Label="名称" ID="txtClassMeetingName" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
LabelAlign="right">
</f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true"
runat="server">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
<f:Button ID="btnPush" ToolTip="推送至总包单位" Icon="ApplicationGo" runat="server" Hidden="true" Text="批量推送" OnClick="btnPush_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="140px" ColumnID="ClassMeetingCode" DataField="ClassMeetingCode"
SortField="ClassMeetingCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ClassMeetingName" DataField="ClassMeetingName"
SortField="ClassMeetingName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
SortField="UnitName" FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ClassMeetingDate" DataField="ClassMeetingDate"
SortField="ClassMeetingDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="会议日期" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="tfCompileMan" Width="120px" HeaderText="整理人" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lblCompileMan" runat="server" Text='<%# ConvertCompileMan(Eval("CompileMan")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="140px" ColumnID="Remark" DataField="Remark" FieldType="String" 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" OnClose="Window1_Close" IsModal="true"
Width="1024px" Height="630px">
</f:Window>
<f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
Hidden="true" runat="server" Text="编辑">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
Text="删除">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs
+50 -15
View File
@@ -1,4 +1,5 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
@@ -65,37 +66,39 @@ namespace FineUIPro.Web.HSSE.Meeting
/// </summary>
private void BindGrid()
{
string strSql = "SELECT ClassMeeting.ClassMeetingId,ClassMeeting.ProjectId,CodeRecords.Code AS ClassMeetingCode,Unit.UnitId,Unit.UnitName,ClassMeeting.ClassMeetingName,ClassMeeting.ClassMeetingDate,ClassMeeting.CompileMan,ClassMeeting.ClassMeetingContents,ClassMeeting.CompileDate,ClassMeeting.States "
+ @" ,(CASE WHEN ClassMeeting.States = " + BLL.Const.State_0 + " OR ClassMeeting.States IS NULL THEN '待['+ISNULL(OperateUser.UserName,Users.UserName)+']提交' WHEN ClassMeeting.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS FlowOperateName"
+ @" FROM Meeting_ClassMeeting AS ClassMeeting "
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON ClassMeeting.ClassMeetingId = CodeRecords.DataId "
+ @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ClassMeeting.ClassMeetingId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+ @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
+ @" LEFT JOIN Sys_User AS Users ON ClassMeeting.CompileMan = Users.UserId"
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId WHERE 1=1 ";
StringBuilder sb = new StringBuilder();//CodeRecords.Code AS ClassMeetingCode,
sb.AppendFormat("SELECT ClassMeeting.ClassMeetingId,ClassMeeting.ProjectId,ClassMeeting.ClassMeetingCode,Unit.UnitId,Unit.UnitName,ClassMeeting.ClassMeetingName,ClassMeeting.ClassMeetingDate,ClassMeeting.CompileMan,ClassMeeting.ClassMeetingContents,ClassMeeting.CompileDate,ClassMeeting.States,(CASE WHEN ClassMeeting.States ='{0}' OR ClassMeeting.States IS NULL THEN '待['+ISNULL(OperateUser.UserName,Users.UserName)+']提交' WHEN ClassMeeting.States = '{1}' THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS FlowOperateName,ClassMeeting.Remark ", BLL.Const.State_0, BLL.Const.State_2);
sb.Append("FROM Meeting_ClassMeeting AS ClassMeeting ");
//sb.Append("LEFT JOIN Sys_CodeRecords AS CodeRecords ON ClassMeeting.ClassMeetingId = CodeRecords.DataId ");
sb.Append("LEFT JOIN Sys_FlowOperate AS FlowOperate ON ClassMeeting.ClassMeetingId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1 ");
sb.Append("LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId ");
sb.Append("LEFT JOIN Sys_User AS Users ON ClassMeeting.CompileMan = Users.UserId ");
sb.Append("LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=ClassMeeting.UnitId ");//Users.UnitId
sb.Append("WHERE 1=1 ");
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
strSql += " AND ClassMeeting.ProjectId = @ProjectId";
sb.Append("AND ClassMeeting.ProjectId = @ProjectId ");
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
}
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
strSql += " AND Unit.UnitId = @UnitId";
sb.Append("AND Unit.UnitId = @UnitId ");
listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
}
if (!string.IsNullOrEmpty(this.txtClassMeetingCode.Text.Trim()))
{
strSql += " AND ClassMeetingCode LIKE @ClassMeetingCode";
sb.Append("AND ClassMeetingCode LIKE @ClassMeetingCode ");
listStr.Add(new SqlParameter("@ClassMeetingCode", "%" + this.txtClassMeetingCode.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtClassMeetingName.Text.Trim()))
{
strSql += " AND ClassMeetingName LIKE @ClassMeetingName";
sb.Append("AND ClassMeetingName LIKE @ClassMeetingName ");
listStr.Add(new SqlParameter("@ClassMeetingName", "%" + this.txtClassMeetingName.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
@@ -201,7 +204,7 @@ namespace FineUIPro.Web.HSSE.Meeting
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ClassMeetingEdit.aspx?ClassMeetingId={0}", id, "编辑 - ")));
}
}
}
}
#endregion
@@ -272,6 +275,11 @@ namespace FineUIPro.Web.HSSE.Meeting
if (buttonList.Contains(BLL.Const.BtnAdd))
{
this.btnNew.Hidden = false;
var porject = BLL.ProjectService.GetProjectByProjectId(this.ProjectId);
if (!string.IsNullOrWhiteSpace(porject.SubjectUnit) && !string.IsNullOrWhiteSpace(porject.SubjectProject))
{//项目关联了总包单位项目，显示推送操作按钮
this.btnPush.Hidden = false;
}
}
if (buttonList.Contains(BLL.Const.BtnModify))
{
@@ -297,11 +305,38 @@ namespace FineUIPro.Web.HSSE.Meeting
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("班前会" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = this.Grid1.RecordCount;
this.Grid1.PageSize = this.Grid1.RecordCount;
this.BindGrid();
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
#endregion
#region 分包会议数据推送至总包单位
/// <summary>
/// 分包会议数据推送至总包单位
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnPush_Click(object sender, EventArgs e)
{
ReturnData responeData = APIMeetingSyncService.PushClassMeetingLists(this.ProjectId, string.Empty);
//if (responeData.code == 0)
//{
// Alert.ShowInTop(responeData.message, MessageBoxIcon.Warning);
//}
//else
//{
// ShowNotify(responeData.message, MessageBoxIcon.Success);
//}
//PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
ShowNotify(responeData.message, responeData.code == 0 ? MessageBoxIcon.Warning : MessageBoxIcon.Success);
return;
}
#endregion
}
}
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.designer.cs
Generated
+36 -25
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Meeting {
public partial class ClassMeeting {
namespace FineUIPro.Web.HSSE.Meeting
{
public partial class ClassMeeting
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtClassMeetingCode 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtClassMeetingCode;
/// <summary>
/// drpUnitId 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// txtClassMeetingName 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtClassMeetingName;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -110,7 +112,16 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// btnPush 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPush;
/// <summary>
/// labNumber 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// lblCompileMan 控件。
/// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCompileMan;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// WindowAtt 控件。
/// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Meeting {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingEdit.aspx.cs
+2 -1
View File
@@ -65,7 +65,8 @@ namespace FineUIPro.Web.HSSE.Meeting
{
this.InitDropDownList();
}
this.txtClassMeetingCode.Text = BLL.CodeRecordsService.ReturnCodeByDataId(this.ClassMeetingId);
this.txtClassMeetingCode.Text = classMeeting.ClassMeetingCode;
//this.txtClassMeetingCode.Text = BLL.CodeRecordsService.ReturnCodeByDataId(this.ClassMeetingId);
this.txtClassMeetingName.Text = classMeeting.ClassMeetingName;
this.txtClassMeetingDate.Text = string.Format("{0:yyyy-MM-dd}", classMeeting.ClassMeetingDate);
if (!string.IsNullOrEmpty(classMeeting.CompileMan))
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs
+2 -1
View File
@@ -41,7 +41,8 @@ namespace FineUIPro.Web.HSSE.Meeting
Model.Meeting_ClassMeeting classMeeting = BLL.ClassMeetingService.GetClassMeetingById(this.ClassMeetingId);
if (classMeeting != null)
{
this.txtClassMeetingCode.Text = BLL.CodeRecordsService.ReturnCodeByDataId(this.ClassMeetingId);
this.txtClassMeetingCode.Text = classMeeting.ClassMeetingCode;
//this.txtClassMeetingCode.Text = BLL.CodeRecordsService.ReturnCodeByDataId(this.ClassMeetingId);
this.txtClassMeetingName.Text = classMeeting.ClassMeetingName;
if (classMeeting.ClassMeetingDate != null)
{
SGGL/FineUIPro.Web/SysManage/UnitCleanupMerge.aspx.cs
+36 -31
View File
@@ -1,13 +1,14 @@
using System;
using System.Linq;
using System.Web.UI.WebControls;
using BLL;
using BLL;
using FineUIPro.Web.BaseInfo;
using FineUIPro.Web.DataShow;
using NPOI.Util;
using System;
using System.Collections.Generic;
using System.Data;
using FineUIPro.Web.DataShow;
using System.Data.SqlClient;
using System.Linq;
using System.Threading;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.SysManage
{
@@ -225,24 +226,26 @@ namespace FineUIPro.Web.SysManage
List<string> unitMergeIds = unitMergeId.Split(',').ToList();
unitMergeIds = unitMergeIds.Where(x => x != unitId).ToList();
//db.DataIdMove.DeleteAllOnSubmit();
Model.SGGLDB db = Funs.DB;
var clist = db.DataIdMove.Where(x => x.ColumType == "Unit" && x.NewIds == unitId).ToList();
db.DataIdMove.DeleteAllOnSubmit(clist);
db.SubmitChanges();
List<Model.DataIdMove> list = new List<Model.DataIdMove>();
foreach (var mergeId in unitMergeIds)
{
list.Add(new Model.DataIdMove { OldId = mergeId.Trim(), NewIds = unitId.Trim(), ColumType = "Unit" });
}
string msg = string.Empty;
bool merge = DataCleanupMergeHelper.DataCleanupMerge("Base_Unit", "Unit", unitMergeIds, unitId, ref msg);
db.DataIdMove.InsertAllOnSubmit(list);
db.SubmitChanges();
//Model.SUBQHSEDB db = Funs.DB;
//var clist = db.DataIdMove.Where(x => x.ColumType == "Unit" && x.NewIds == unitId).ToList();
//db.DataIdMove.DeleteAllOnSubmit(clist);
//db.SubmitChanges();
//List<Model.DataIdMove> list = new List<Model.DataIdMove>();
//foreach (var mergeId in unitMergeIds)
//{
// list.Add(new Model.DataIdMove { OldId = mergeId.Trim(), NewIds = unitId.Trim(), ColumType = "Unit" });
//}
//db.DataIdMove.InsertAllOnSubmit(list);
//db.SubmitChanges();
string strSql = $"exec SP_DataIdMove 'Unit','{unitId}'";
BLL.SQLHelper.ExecutSql(strSql);
//string strSql = $"exec SP_DataIdMove 'Unit','{unitId}'";
//BLL.SQLHelper.ExecutSql(strSql);
//SqlParameter[] parameters = {
// new SqlParameter("@colums", "Unit"),
@@ -252,22 +255,24 @@ namespace FineUIPro.Web.SysManage
//int succ = BLL.SQLHelper.ExecuteProcedure("SP_DataIdMove", parameters);
//Thread.Sleep(30000); // 等待30秒，30000毫秒等于30秒
string txtRemark = this.txtRemark.Text.Trim();
//其他数据表单位数据合并后，删除单位表冗余单位
foreach (var mergeId in unitMergeIds)
if (merge)
{
string uId = mergeId.Trim();
var unit = BLL.UnitService.GetUnitByUnitId(uId);
if (unit != null)
string txtRemark = this.txtRemark.Text.Trim();
//其他数据表单位数据合并后，删除单位表冗余单位
foreach (var mergeId in unitMergeIds)
{
UnitService.DeleteUnitById(uId);
string op = $"单位合并清理后，{Const.BtnDelete}；备注：{txtRemark}";
LogService.AddSys_Log(this.CurrUser, unit.UnitCode, unit.UnitId, Const.UnitMenuId, op);
string uId = mergeId.Trim();
var unit = BLL.UnitService.GetUnitByUnitId(uId);
if (unit != null)
{
UnitService.DeleteUnitById(uId);
string op = $"单位合并清理后，{Const.BtnDelete}；备注：{txtRemark}";
LogService.AddSys_Log(this.CurrUser, unit.UnitCode, unit.UnitId, Const.UnitMenuId, op);
}
}
}
db.DataIdMove.DeleteAllOnSubmit(list);
db.SubmitChanges();
//db.DataIdMove.DeleteAllOnSubmit(list);
//db.SubmitChanges();
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}