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

1、关键事项新增时，邮件提醒抄送人； 

2、施工技术交底、培训记录，补充附件上传功能；
This commit is contained in:
夏菊 2025-09-20 16:45:17 +08:00
parent dfa0aefa0a
commit 76668143e5
14 changed files with 361 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4188,7 +4188,7 @@ namespace BLL
public const string MajorPlanApprovalMenuId = "fd116c94-714b-4b92-a3c9-cc83d358e2b3"; public const string MajorPlanApprovalMenuId = "fd116c94-714b-4b92-a3c9-cc83d358e2b3";
/// <summary> /// <summary>
/// 设计交底管理 /// 施工技术交底管理
/// </summary> /// </summary>
public const string ConTechnologyDisclosureMenuId = "A16CFA9D-2783-4573-95F9-EBA2B682B7EA"; public const string ConTechnologyDisclosureMenuId = "A16CFA9D-2783-4573-95F9-EBA2B682B7EA";

21
SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs
View File

@ -24,11 +24,11 @@ namespace BLL
//public static Model.SGGLDB db = Funs.DB; //public static Model.SGGLDB db = Funs.DB;
/// <summary> /// <summary>
/// 关键事项通知提醒责任人 /// 关键事项通知提醒责任人、抄送人
/// </summary> /// </summary>
/// <param name="userId"></param> /// <param name="userIds"></param>
/// <param name="gjsxId"></param> /// <param name="gjsxId"></param>
public static void GJSXNoticeSendEmail(string userId, string gjsxId) public static void GJSXNoticeSendEmail(List<string> userIds, string gjsxId)
{ {
string strSql = $@"select string strSql = $@"select
DATEDIFF(DAY, CompleteDate, isnull(CloseDate,getdate())) AS DateDiffDays DATEDIFF(DAY, CompleteDate, isnull(CloseDate,getdate())) AS DateDiffDays
@ -87,12 +87,23 @@ namespace BLL
}).ToList(); }).ToList();
var gItem = lstOverdue.FirstOrDefault(); var gItem = lstOverdue.FirstOrDefault();
if (gItem != null)
{
foreach (var userId in userIds)
{
var user = UserService.GetUserByUserId(userId); var user = UserService.GetUserByUserId(userId);
if (gItem != null && !string.IsNullOrWhiteSpace(user.Email)) if (!string.IsNullOrWhiteSpace(user.Email))
{ {
MailMessage mail = new MailMessage(); MailMessage mail = new MailMessage();
//邮件主题 //邮件主题
if (userId == gItem.User_AcceptanceUserId)
{
mail.Subject = $"你有新的关键事项了——{gItem.ProjectName}"; mail.Subject = $"你有新的关键事项了——{gItem.ProjectName}";
}
else
{
mail.Subject = $"有新的关键事项抄送你了——{gItem.ProjectName}";
}
mail.To.Add(user.Email); mail.To.Add(user.Email);
//mail.To.Add("test@test.com"); //mail.To.Add("test@test.com");
mail.IsBodyHtml = true;//确保邮件正文被当作HTML解析 mail.IsBodyHtml = true;//确保邮件正文被当作HTML解析
@ -138,6 +149,8 @@ namespace BLL
} }
} }
} }
}
}
/// <summary> /// <summary>

12
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx
View File

@ -76,6 +76,12 @@
<f:RenderField ColumnID="AttendMan" DataField="AttendMan" FieldType="String" HeaderText="参加人员" TextAlign="Center" <f:RenderField ColumnID="AttendMan" DataField="AttendMan" FieldType="String" HeaderText="参加人员" TextAlign="Center"
HeaderTextAlign="Center" Width="130px"> HeaderTextAlign="Center" Width="130px">
</f:RenderField> </f:RenderField>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("ConTechnologyDisclosureId")) %>' ToolTip="附件查看"></asp:LinkButton>
</ItemTemplate>
</f:TemplateField>
</Columns> </Columns>
<Listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -96,16 +102,16 @@
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="施工技术交底管理" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="施工技术交底管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="900px" Height="430px"> Width="900px" Height="600px">
</f:Window> </f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true" Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1200px" Height="660px"> Width="1200px" Height="660px">
</f:Window> </f:Window>
<%--<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Parent" EnableResize="false" runat="server" EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
IsModal="true" Width="700px" Height="500px"> IsModal="true" Width="700px" Height="500px">
</f:Window>--%> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<Items> <Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true"> <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive { namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class ConTechnologyDisclosure { public partial class ConTechnologyDisclosure
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -138,6 +140,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label Label2; protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// lbtnFileUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
/// <summary> /// <summary>
/// ToolbarText1 控件。 /// ToolbarText1 控件。
/// </summary> /// </summary>
@ -174,6 +185,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks> /// </remarks>
protected global::FineUIPro.Window Window2; protected global::FineUIPro.Window Window2;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary> /// <summary>
/// Menu1 控件。 /// Menu1 控件。
/// </summary> /// </summary>

21
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx
View File

@ -45,22 +45,35 @@
<f:TextBox ID="txtAttendMan" runat="server" Label="参加人员" MaxLength="100" LabelAlign="Right" LabelWidth="130px"></f:TextBox> <f:TextBox ID="txtAttendMan" runat="server" Label="参加人员" MaxLength="100" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow>
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="140px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
</Rows> </Rows>
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server"> <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items> <Items>
<%--<f:HiddenField ID="hdAttachUrl" runat="server"> <f:HiddenField ID="hdAttachUrl" runat="server">
</f:HiddenField>--%> </f:HiddenField>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true"> <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
</f:Button> </f:Button>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
</f:Form> </f:Form>
<%--<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px"> Height="500px">
</f:Window>--%> </f:Window>
</form> </form>
</body> </body>
</html> </html>

28
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL; using BLL;
using FineUIPro.Web.Comprehensive;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -47,6 +48,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
if (con != null) if (con != null)
{ {
this.ConTechnologyDisclosureId = con.ConTechnologyDisclosureId; this.ConTechnologyDisclosureId = con.ConTechnologyDisclosureId;
this.hdAttachUrl.Text = this.ConTechnologyDisclosureId;
if (!string.IsNullOrEmpty(con.CNProfessionalId)) if (!string.IsNullOrEmpty(con.CNProfessionalId))
{ {
this.drpCNProfessionalId.SelectedValue = con.CNProfessionalId; this.drpCNProfessionalId.SelectedValue = con.CNProfessionalId;
@ -126,9 +128,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
newCon.DisclosurePersonNum = Funs.GetNewInt(this.txtDisclosurePersonNum.Text.Trim()); newCon.DisclosurePersonNum = Funs.GetNewInt(this.txtDisclosurePersonNum.Text.Trim());
if (string.IsNullOrEmpty(this.ConTechnologyDisclosureId)) if (string.IsNullOrEmpty(this.ConTechnologyDisclosureId))
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
{
newCon.ConTechnologyDisclosureId = this.hdAttachUrl.Text;
}
else
{ {
newCon.ConTechnologyDisclosureId = SQLHelper.GetNewID(typeof(Model.Comprehensive_ConTechnologyDisclosure)); newCon.ConTechnologyDisclosureId = SQLHelper.GetNewID(typeof(Model.Comprehensive_ConTechnologyDisclosure));
this.hdAttachUrl.Text = newCon.ConTechnologyDisclosureId;
}
newCon.CompileMan = this.CurrUser.UserId; newCon.CompileMan = this.CurrUser.UserId;
newCon.CompileDate = DateTime.Now; newCon.CompileDate = DateTime.Now;
BLL.ConTechnologyDisclosureService.AddConTechnologyDisclosure(newCon); BLL.ConTechnologyDisclosureService.AddConTechnologyDisclosure(newCon);
@ -165,5 +174,22 @@ namespace FineUIPro.Web.CQMS.Comprehensive
} }
} }
#endregion #endregion
#region 附件上传
/// <summary>
/// 附件上传
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAttach_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录
{
this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails));
}
Model.Comprehensive_ConTechnologyDisclosure con = BLL.ConTechnologyDisclosureService.GetConTechnologyDisclosureById(this.ConTechnologyDisclosureId);
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/ConTechnologyDisclosure&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ConTechnologyDisclosureMenuId)));
}
#endregion
} }
} }

45
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.designer.cs generated
View File

@ -131,6 +131,33 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtAttendMan; protected global::FineUIPro.TextBox txtAttendMan;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// btnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary> /// <summary>
/// Toolbar1 控件。 /// Toolbar1 控件。
/// </summary> /// </summary>
@ -140,6 +167,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// </remarks> /// </remarks>
protected global::FineUIPro.Toolbar Toolbar1; protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
/// <summary> /// <summary>
/// btnSave 控件。 /// btnSave 控件。
/// </summary> /// </summary>
@ -148,5 +184,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnSave; protected global::FineUIPro.Button btnSave;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
} }
} }

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
View File

@ -234,8 +234,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
designDetails.DesignDetailsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails)); designDetails.DesignDetailsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails));
this.hdAttachUrl.Text = designDetails.DesignDetailsId; this.hdAttachUrl.Text = designDetails.DesignDetailsId;
} }
designDetails.CompileMan = this.CurrUser.UserId; designDetails.CompileMan = this.CurrUser.UserId;
designDetails.CompileDate = DateTime.Now; designDetails.CompileDate = DateTime.Now;
designDetails.Status = BLL.Const.Comprehensive_Compile; designDetails.Status = BLL.Const.Comprehensive_Compile;

12
SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx
View File

@ -64,6 +64,12 @@
<f:RenderField ColumnID="Remark" DataField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center" <f:RenderField ColumnID="Remark" DataField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true"> HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
</f:RenderField> </f:RenderField>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("TrainingRecordsId")) %>' ToolTip="附件查看"></asp:LinkButton>
</ItemTemplate>
</f:TemplateField>
</Columns> </Columns>
<Listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -84,11 +90,15 @@
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="培训记录" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="培训记录" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="800px" Height="500px"> Width="800px" Height="600px">
</f:Window> </f:Window>
<f:Window ID="Window2" Title="培训记录导入" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window2" Title="培训记录导入" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1200px" Height="650px"> Width="1200px" Height="650px">
</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:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<Items> <Items>

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive { namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class TrainingRecords { public partial class TrainingRecords
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -120,6 +122,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex; protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// lbtnFileUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
/// <summary> /// <summary>
/// ToolbarText1 控件。 /// ToolbarText1 控件。
/// </summary> /// </summary>
@ -156,6 +167,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks> /// </remarks>
protected global::FineUIPro.Window Window2; protected global::FineUIPro.Window Window2;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary> /// <summary>
/// Menu1 控件。 /// Menu1 控件。
/// </summary> /// </summary>

19
SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx
View File

@ -52,16 +52,35 @@
<f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="50" LabelAlign="Right" LabelWidth="130px"></f:TextArea> <f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="50" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow>
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="140px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
</Rows> </Rows>
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server"> <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items> <Items>
<f:HiddenField ID="hdAttachUrl" runat="server">
</f:HiddenField>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true"> <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
</f:Button> </f:Button>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
</f:Form> </f:Form>
<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>
</form> </form>
</body> </body>
</html> </html>

28
SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL; using BLL;
using FineUIPro.Web.Comprehensive;
using System; using System;
using System.Linq; using System.Linq;
@ -40,6 +41,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
if (trainingRecords != null) if (trainingRecords != null)
{ {
this.TrainingRecordsId = trainingRecords.TrainingRecordsId; this.TrainingRecordsId = trainingRecords.TrainingRecordsId;
this.hdAttachUrl.Text = this.TrainingRecordsId;
this.txtTrainingContents.Text = trainingRecords.TrainingContents; this.txtTrainingContents.Text = trainingRecords.TrainingContents;
if (!string.IsNullOrEmpty(trainingRecords.CNProfessionalId)) if (!string.IsNullOrEmpty(trainingRecords.CNProfessionalId))
{ {
@ -90,8 +92,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
BLL.TrainingRecordsService.UpdateTrainingRecords(trainingRecords); BLL.TrainingRecordsService.UpdateTrainingRecords(trainingRecords);
} }
else else
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
{
trainingRecords.TrainingRecordsId = this.hdAttachUrl.Text;
}
else
{ {
trainingRecords.TrainingRecordsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_TrainingRecords)); trainingRecords.TrainingRecordsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_TrainingRecords));
this.hdAttachUrl.Text = trainingRecords.TrainingRecordsId;
}
trainingRecords.ProjectId = this.CurrUser.LoginProjectId; trainingRecords.ProjectId = this.CurrUser.LoginProjectId;
BLL.TrainingRecordsService.AddTrainingRecords(trainingRecords); BLL.TrainingRecordsService.AddTrainingRecords(trainingRecords);
} }
@ -122,5 +132,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive
} }
} }
#endregion #endregion
#region 附件上传
/// <summary>
/// 附件上传
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAttach_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录
{
this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails));
}
Model.Comprehensive_TrainingRecords trainingRecords = BLL.TrainingRecordsService.GetTrainingRecordsById(this.TrainingRecordsId);
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/TrainingRecords&menuId={1}", this.hdAttachUrl.Text, BLL.Const.TrainingRecordsMenuId)));
}
#endregion
} }
} }

51
SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive { namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class TrainingRecordsEdit { public partial class TrainingRecordsEdit
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -111,6 +113,33 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks> /// </remarks>
protected global::FineUIPro.TextArea txtRemark; protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// btnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary> /// <summary>
/// Toolbar1 控件。 /// Toolbar1 控件。
/// </summary> /// </summary>
@ -120,6 +149,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks> /// </remarks>
protected global::FineUIPro.Toolbar Toolbar1; protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
/// <summary> /// <summary>
/// btnSave 控件。 /// btnSave 控件。
/// </summary> /// </summary>
@ -128,5 +166,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnSave; protected global::FineUIPro.Button btnSave;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
} }
} }

22
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
View File

@ -758,8 +758,10 @@ namespace FineUIPro.Web.PZHGL.GJSX
#endregion #endregion
List<string> userIds = new List<string>();
userIds.Add(DropUser_AcceptanceId);
userIds.AddRange(drpCsUsers.Values);
string EditType = Request.Params["EditType"]; string EditType = Request.Params["EditType"];
string ID = Request.Params["ID"]; string ID = Request.Params["ID"];
if (string.IsNullOrEmpty(ID)) if (string.IsNullOrEmpty(ID))
{ {
@ -767,10 +769,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
//勾选邮件即时通知责任人，邮箱通知提醒关键事项 //勾选邮件即时通知责任人，邮箱通知提醒关键事项
if (rNotice == "1") if (rNotice == "1")
{ {
if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId)) GJSXMonitorService.GJSXNoticeSendEmail(userIds, this.txtGJSXID.Text.Trim());
{ //if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim()); //{
} // GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
//}
} }
} }
else else
@ -783,10 +786,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
//勾选邮件即时通知责任人，邮箱通知提醒关键事项 //勾选邮件即时通知责任人，邮箱通知提醒关键事项
if (rNotice == "1") if (rNotice == "1")
{ {
if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId)) GJSXMonitorService.GJSXNoticeSendEmail(userIds, this.txtGJSXID.Text.Trim());
{ //if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim()); //{
} // GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
//}
} }
} }
else else