parent
dfa0aefa0a
commit
76668143e5
|
@ -4188,7 +4188,7 @@ namespace BLL
|
|||
public const string MajorPlanApprovalMenuId = "fd116c94-714b-4b92-a3c9-cc83d358e2b3";
|
||||
|
||||
/// <summary>
|
||||
/// 设计交底管理
|
||||
/// 施工技术交底管理
|
||||
/// </summary>
|
||||
public const string ConTechnologyDisclosureMenuId = "A16CFA9D-2783-4573-95F9-EBA2B682B7EA";
|
||||
|
||||
|
|
|
@ -24,11 +24,11 @@ namespace BLL
|
|||
//public static Model.SGGLDB db = Funs.DB;
|
||||
|
||||
/// <summary>
|
||||
/// 关键事项通知提醒责任人
|
||||
/// 关键事项通知提醒责任人、抄送人
|
||||
/// </summary>
|
||||
/// <param name="userId"></param>
|
||||
/// <param name="userIds"></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
|
||||
DATEDIFF(DAY, CompleteDate, isnull(CloseDate,getdate())) AS DateDiffDays
|
||||
|
@ -87,17 +87,28 @@ namespace BLL
|
|||
}).ToList();
|
||||
|
||||
var gItem = lstOverdue.FirstOrDefault();
|
||||
var user = UserService.GetUserByUserId(userId);
|
||||
if (gItem != null && !string.IsNullOrWhiteSpace(user.Email))
|
||||
if (gItem != null)
|
||||
{
|
||||
MailMessage mail = new MailMessage();
|
||||
//邮件主题
|
||||
mail.Subject = $"你有新的关键事项了——{gItem.ProjectName}";
|
||||
mail.To.Add(user.Email);
|
||||
//mail.To.Add("test@test.com");
|
||||
mail.IsBodyHtml = true;//确保邮件正文被当作HTML解析
|
||||
//邮件正文
|
||||
string bodyStr = $@"<html>
|
||||
foreach (var userId in userIds)
|
||||
{
|
||||
var user = UserService.GetUserByUserId(userId);
|
||||
if (!string.IsNullOrWhiteSpace(user.Email))
|
||||
{
|
||||
MailMessage mail = new MailMessage();
|
||||
//邮件主题
|
||||
if (userId == gItem.User_AcceptanceUserId)
|
||||
{
|
||||
mail.Subject = $"你有新的关键事项了——{gItem.ProjectName}";
|
||||
}
|
||||
else
|
||||
{
|
||||
mail.Subject = $"有新的关键事项抄送你了——{gItem.ProjectName}";
|
||||
}
|
||||
mail.To.Add(user.Email);
|
||||
//mail.To.Add("test@test.com");
|
||||
mail.IsBodyHtml = true;//确保邮件正文被当作HTML解析
|
||||
//邮件正文
|
||||
string bodyStr = $@"<html>
|
||||
<head>
|
||||
<style>
|
||||
|
||||
|
@ -125,16 +136,18 @@ namespace BLL
|
|||
|
||||
</body>
|
||||
</html>";
|
||||
//< p > 登录密码:{ user.RawPassword}</ p >
|
||||
mail.Body = bodyStr;
|
||||
//< p > 登录密码:{ user.RawPassword}</ p >
|
||||
mail.Body = bodyStr;
|
||||
|
||||
try
|
||||
{
|
||||
bool send = PushEmail(mail);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
ErrLogInfo.WriteLog($"关键事项通知提醒责任人;项目名称:{gItem.ProjectName},事项编号:{gItem.GJSXID}", ex);
|
||||
try
|
||||
{
|
||||
bool send = PushEmail(mail);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
ErrLogInfo.WriteLog($"关键事项通知提醒责任人;项目名称:{gItem.ProjectName},事项编号:{gItem.GJSXID}", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -76,6 +76,12 @@
|
|||
<f:RenderField ColumnID="AttendMan" DataField="AttendMan" FieldType="String" HeaderText="参加人员" TextAlign="Center"
|
||||
HeaderTextAlign="Center" Width="130px">
|
||||
</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>
|
||||
<Listeners>
|
||||
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
|
||||
|
@ -96,16 +102,16 @@
|
|||
</f:Panel>
|
||||
<f:Window ID="Window1" Title="施工技术交底管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
|
||||
Width="900px" Height="430px">
|
||||
Width="900px" Height="600px">
|
||||
</f:Window>
|
||||
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
|
||||
Width="1200px" Height="660px">
|
||||
</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"
|
||||
IsModal="true" Width="700px" Height="500px">
|
||||
</f:Window>--%>
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<Items>
|
||||
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
|
||||
|
|
|
@ -7,10 +7,12 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Comprehensive {
|
||||
namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
{
|
||||
|
||||
|
||||
public partial class ConTechnologyDisclosure {
|
||||
public partial class ConTechnologyDisclosure
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
|
@ -138,6 +140,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
|
|||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label Label2;
|
||||
|
||||
/// <summary>
|
||||
/// lbtnFileUrl 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarText1 控件。
|
||||
/// </summary>
|
||||
|
@ -174,6 +185,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window2;
|
||||
|
||||
/// <summary>
|
||||
/// WindowAtt 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window WindowAtt;
|
||||
|
||||
/// <summary>
|
||||
/// Menu1 控件。
|
||||
/// </summary>
|
||||
|
|
|
@ -41,26 +41,39 @@
|
|||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:NumberBox ID="txtDisclosurePersonNum" runat="server" Label="交底人数" LabelAlign="Right" LabelWidth="130px" MinValue="0" NoDecimal="true" NoNegative="true"></f:NumberBox>
|
||||
<f:NumberBox ID="txtDisclosurePersonNum" runat="server" Label="交底人数" LabelAlign="Right" LabelWidth="130px" MinValue="0" NoDecimal="true" NoNegative="true"></f:NumberBox>
|
||||
<f:TextBox ID="txtAttendMan" runat="server" Label="参加人员" MaxLength="100" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
|
||||
</Items>
|
||||
</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>
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
||||
<Items>
|
||||
<%--<f:HiddenField ID="hdAttachUrl" runat="server">
|
||||
</f:HiddenField>--%>
|
||||
<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>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
</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"
|
||||
Height="500px">
|
||||
</f:Window>--%>
|
||||
</f:Window>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
using BLL;
|
||||
using FineUIPro.Web.Comprehensive;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
@ -47,6 +48,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
if (con != null)
|
||||
{
|
||||
this.ConTechnologyDisclosureId = con.ConTechnologyDisclosureId;
|
||||
this.hdAttachUrl.Text = this.ConTechnologyDisclosureId;
|
||||
if (!string.IsNullOrEmpty(con.CNProfessionalId))
|
||||
{
|
||||
this.drpCNProfessionalId.SelectedValue = con.CNProfessionalId;
|
||||
|
@ -127,8 +129,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
|
||||
if (string.IsNullOrEmpty(this.ConTechnologyDisclosureId))
|
||||
{
|
||||
newCon.ConTechnologyDisclosureId = SQLHelper.GetNewID(typeof(Model.Comprehensive_ConTechnologyDisclosure));
|
||||
|
||||
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
|
||||
{
|
||||
newCon.ConTechnologyDisclosureId = this.hdAttachUrl.Text;
|
||||
}
|
||||
else
|
||||
{
|
||||
newCon.ConTechnologyDisclosureId = SQLHelper.GetNewID(typeof(Model.Comprehensive_ConTechnologyDisclosure));
|
||||
this.hdAttachUrl.Text = newCon.ConTechnologyDisclosureId;
|
||||
}
|
||||
newCon.CompileMan = this.CurrUser.UserId;
|
||||
newCon.CompileDate = DateTime.Now;
|
||||
BLL.ConTechnologyDisclosureService.AddConTechnologyDisclosure(newCon);
|
||||
|
@ -165,5 +174,22 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
}
|
||||
}
|
||||
#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
|
||||
}
|
||||
}
|
|
@ -131,6 +131,33 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
/// </remarks>
|
||||
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>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
|
@ -140,6 +167,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
/// <summary>
|
||||
/// hdAttachUrl 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.HiddenField hdAttachUrl;
|
||||
|
||||
/// <summary>
|
||||
/// btnSave 控件。
|
||||
/// </summary>
|
||||
|
@ -148,5 +184,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSave;
|
||||
|
||||
/// <summary>
|
||||
/// WindowAtt 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window WindowAtt;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -234,8 +234,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
designDetails.DesignDetailsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails));
|
||||
this.hdAttachUrl.Text = designDetails.DesignDetailsId;
|
||||
}
|
||||
|
||||
|
||||
designDetails.CompileMan = this.CurrUser.UserId;
|
||||
designDetails.CompileDate = DateTime.Now;
|
||||
designDetails.Status = BLL.Const.Comprehensive_Compile;
|
||||
|
|
|
@ -64,6 +64,12 @@
|
|||
<f:RenderField ColumnID="Remark" DataField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
|
||||
HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
|
||||
</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>
|
||||
<Listeners>
|
||||
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
|
||||
|
@ -84,11 +90,15 @@
|
|||
</f:Panel>
|
||||
<f:Window ID="Window1" Title="培训记录" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
|
||||
Width="800px" Height="500px">
|
||||
Width="800px" Height="600px">
|
||||
</f:Window>
|
||||
<f:Window ID="Window2" Title="培训记录导入" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
|
||||
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:Menu ID="Menu1" runat="server">
|
||||
<Items>
|
||||
|
|
|
@ -7,10 +7,12 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Comprehensive {
|
||||
namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
{
|
||||
|
||||
|
||||
public partial class TrainingRecords {
|
||||
public partial class TrainingRecords
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
|
@ -120,6 +122,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
|
|||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label lblPageIndex;
|
||||
|
||||
/// <summary>
|
||||
/// lbtnFileUrl 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarText1 控件。
|
||||
/// </summary>
|
||||
|
@ -156,6 +167,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window2;
|
||||
|
||||
/// <summary>
|
||||
/// WindowAtt 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window WindowAtt;
|
||||
|
||||
/// <summary>
|
||||
/// Menu1 控件。
|
||||
/// </summary>
|
||||
|
|
|
@ -52,16 +52,35 @@
|
|||
<f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="50" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
|
||||
</Items>
|
||||
</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>
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
||||
<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>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
</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>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
using BLL;
|
||||
using FineUIPro.Web.Comprehensive;
|
||||
using System;
|
||||
using System.Linq;
|
||||
|
||||
|
@ -40,6 +41,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
if (trainingRecords != null)
|
||||
{
|
||||
this.TrainingRecordsId = trainingRecords.TrainingRecordsId;
|
||||
this.hdAttachUrl.Text = this.TrainingRecordsId;
|
||||
this.txtTrainingContents.Text = trainingRecords.TrainingContents;
|
||||
if (!string.IsNullOrEmpty(trainingRecords.CNProfessionalId))
|
||||
{
|
||||
|
@ -91,7 +93,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
}
|
||||
else
|
||||
{
|
||||
trainingRecords.TrainingRecordsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_TrainingRecords));
|
||||
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
|
||||
{
|
||||
trainingRecords.TrainingRecordsId = this.hdAttachUrl.Text;
|
||||
}
|
||||
else
|
||||
{
|
||||
trainingRecords.TrainingRecordsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_TrainingRecords));
|
||||
this.hdAttachUrl.Text = trainingRecords.TrainingRecordsId;
|
||||
}
|
||||
trainingRecords.ProjectId = this.CurrUser.LoginProjectId;
|
||||
BLL.TrainingRecordsService.AddTrainingRecords(trainingRecords);
|
||||
}
|
||||
|
@ -122,5 +132,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
|||
}
|
||||
}
|
||||
#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
|
||||
}
|
||||
}
|
|
@ -7,10 +7,12 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Comprehensive {
|
||||
namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
{
|
||||
|
||||
|
||||
public partial class TrainingRecordsEdit {
|
||||
public partial class TrainingRecordsEdit
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
|
@ -111,6 +113,33 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
|
|||
/// </remarks>
|
||||
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>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
|
@ -120,6 +149,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
/// <summary>
|
||||
/// hdAttachUrl 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.HiddenField hdAttachUrl;
|
||||
|
||||
/// <summary>
|
||||
/// btnSave 控件。
|
||||
/// </summary>
|
||||
|
@ -128,5 +166,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
|
|||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSave;
|
||||
|
||||
/// <summary>
|
||||
/// WindowAtt 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window WindowAtt;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -758,8 +758,10 @@ namespace FineUIPro.Web.PZHGL.GJSX
|
|||
|
||||
#endregion
|
||||
|
||||
List<string> userIds = new List<string>();
|
||||
userIds.Add(DropUser_AcceptanceId);
|
||||
userIds.AddRange(drpCsUsers.Values);
|
||||
string EditType = Request.Params["EditType"];
|
||||
|
||||
string ID = Request.Params["ID"];
|
||||
if (string.IsNullOrEmpty(ID))
|
||||
{
|
||||
|
@ -767,10 +769,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
|
|||
//勾选邮件即时通知责任人,邮箱通知提醒关键事项
|
||||
if (rNotice == "1")
|
||||
{
|
||||
if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
|
||||
{
|
||||
GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
|
||||
}
|
||||
GJSXMonitorService.GJSXNoticeSendEmail(userIds, this.txtGJSXID.Text.Trim());
|
||||
//if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
|
||||
//{
|
||||
// GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
|
||||
//}
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -783,10 +786,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
|
|||
//勾选邮件即时通知责任人,邮箱通知提醒关键事项
|
||||
if (rNotice == "1")
|
||||
{
|
||||
if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
|
||||
{
|
||||
GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
|
||||
}
|
||||
GJSXMonitorService.GJSXNoticeSendEmail(userIds, this.txtGJSXID.Text.Trim());
|
||||
//if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
|
||||
//{
|
||||
// GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
|
||||
//}
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue