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

20240331 质量月报

Browse Source
This commit is contained in:
毕文静
2024-03-31 01:12:53 +08:00
parent 1791d28bde
commit 4aa229ef1f
54 changed files with 6959 additions and 1709 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs
+10
View File
@@ -84,8 +84,18 @@ namespace FineUIPro.Web.TestRun.DriverReport
else
{
this.txtMonthReportDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
//新增月报时填充上一条月报的项目概况内容
var report = BLL.TestRun_MonthReportService.GetReportByMaxDate(this.CurrUser.LoginProjectId);
if (report != null)
{
this.txtProjectOverview.Text = report.ProjectOverview;
this.txtProjectBaseInfo.Text = report.ProjectBaseInfo;
this.txtEngineeringPlant.Text = report.EngineeringPlant;
this.txtProjectContract.Text = report.ProjectContract;
}
#region 开车绩效测量数据
monthReportItems2.Clear();
Model.TestRun_MonthReportItem2 newItem = new Model.TestRun_MonthReportItem2();
newItem.MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2));
newItem.TypeName = "设计";
SGGL/FineUIPro.Web/TestRun/Meeting/Feedback.aspx.cs
+8 -8
View File
@@ -17,15 +17,15 @@ namespace FineUIPro.Web.TestRun.Meeting
if (data != null)
{
this.hdId.Text = id;
this.txtMeetingCode.Text = data.MeetingCode;
this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
//this.txtMeetingCode.Text = data.MeetingCode;
//this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
this.txtMeetingAddress.Text = data.MeetingAddress;
this.txtMeetingUrl.Text = data.AttachUrl;
if (!string.IsNullOrEmpty(data.CompileMan))
{
this.drpCompileMan.SelectedValue = data.CompileMan;
}
this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
//this.txtMeetingUrl.Text = data.AttachUrl;
//if (!string.IsNullOrEmpty(data.CompileMan))
//{
// this.drpCompileMan.SelectedValue = data.CompileMan;
//}
//this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
}
}
}
SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx
+16
View File
@@ -0,0 +1,16 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MeetingInitiate.aspx.cs" Inherits="FineUIPro.Web.TestRun.Meeting.MeetingInitiate" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>会议发起</title>
</head>
<body>
<form id="form1" runat="server">
<div>
</div>
</form>
</body>
</html>
SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.TestRun.Meeting
{
public partial class MeetingInitiate : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx.designer.cs
Generated
+24
View File
@@ -0,0 +1,24 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun.Meeting {
public partial class MeetingInitiate {
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
}
}
SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx
+84
View File
@@ -0,0 +1,84 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MeetingInitiateEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.Meeting.MeetingInitiateEdit" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>编辑会议发起</title>
</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"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1">
</f:Button>
<f:HiddenField ID="hdId" runat="server"></f:HiddenField>
</Items>
</f:Toolbar>
</Toolbars>
<Rows>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel2" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="false" AutoScroll="true"
runat="server">
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow ColumnWidths="50% 31% 1% 18%">
<Items>
<f:TextBox ID="txtMeetingName" runat="server" Label="会议名称" LabelAlign="Right" LabelWidth="100px" MaxLength="50" Required="true" ShowRedStar="true">
</f:TextBox>
<f:DatePicker runat="server" Required="true" DateFormatString="yyyy-MM-dd HH:mm" Label="起止时间" ID="txtStartTime" ShowRedStar="true" ShowTime="true" ShowSecond="false"></f:DatePicker>
<f:Label ID="Label1" runat="server" Text="-"></f:Label>
<f:DatePicker runat="server" Required="true" DateFormatString="yyyy-MM-dd HH:mm" ID="txtEndTime" ShowRedStar="true" ShowTime="true" ShowSecond="false"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:RadioButtonList ID="rblMeetingType" runat="server" Label="会议类别" LabelAlign="Right" LabelWidth="100px" Required="true" ShowRedStar="true">
<f:RadioItem Value="1" Text="开车专题会" Selected="true" />
<f:RadioItem Value="2" Text="生产调度会" />
<f:RadioItem Value="3" Text="开车周例会" />
</f:RadioButtonList>
<f:TextBox ID="txtMeetingAddress" runat="server" Label="地点" LabelAlign="Right" LabelWidth="100px" MaxLength="100">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtMeetingUrl" runat="server" Label="链接" LabelAlign="Right" LabelWidth="100px" MaxLength="1000">
</f:TextBox>
<f:DatePicker ID="txtInitiationDate" runat="server" Label="发起日期" LabelAlign="Right" LabelWidth="100px" Required="true" ShowRedStar="true"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtMeetingContent" runat="server" Label="会议内容" LabelAlign="Right" LabelWidth="100px"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Tree ID="tvAttendMeetingsPerson" EnableCollapse="true" ShowHeader="true" Title="参会人员" EnableCheckBox="true"
AutoLeafIdentification="true" runat="server" EnableIcons="true" AutoScroll="true"
EnableSingleClickExpand="true" OnNodeCheck="tvAttendMeetingsPerson_NodeCheck">
</f:Tree>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</form>
</body>
</html>
SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx.cs
+233
View File
@@ -0,0 +1,233 @@
using BLL;
using System;
namespace FineUIPro.Web.TestRun.Meeting
{
public partial class MeetingInitiateEdit : PageBase
{
#region 加载
/// <summary>
/// 页面加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
string id = Request.Params["id"];
if (!string.IsNullOrEmpty(id))
{
Model.Driver_Meeting data = BLL.MeetingService.GetMeetingById(id);
if (data != null)
{
this.hdId.Text = id;
this.txtMeetingName.Text = data.MeetingName;
this.txtStartTime.Text = data.StartTime.HasValue ? string.Format("{0:yyyy-MM-dd hh:mm:ss}", data.StartTime) : "";
this.txtEndTime.Text = data.EndTime.HasValue ? string.Format("{0:yyyy-MM-dd hh:mm:ss}", data.EndTime) : "";
this.txtMeetingAddress.Text = data.MeetingAddress;
this.txtMeetingUrl.Text = data.MeetingUrl;
this.txtInitiationDate.Text = data.InitiationDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.InitiationDate) : "";
this.txtMeetingContent.Text = data.MeetingContent;
this.rblMeetingType.SelectedValue = data.MeetingType;
}
}
else
{
this.txtStartTime.Text = string.Format("{0:yyyy-MM-dd hh:mm:ss}", DateTime.Now);
this.txtEndTime.Text = string.Format("{0:yyyy-MM-dd hh:mm:ss}", DateTime.Now);
this.txtInitiationDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
}
InitMenuTree();
}
}
#endregion
#region 保存
/// <summary>
/// 保存按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
SaveData(BLL.Const.BtnSave);
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
/// <summary>
/// 保存数据
/// </summary>
/// <param name="type"></param>
private void SaveData(string type)
{
string id = Request.Params["id"];
Model.Driver_Meeting newData = new Model.Driver_Meeting();
newData.MeetingName = this.txtMeetingName.Text.Trim();
newData.StartTime = Funs.GetNewDateTime(this.txtStartTime.Text.Trim());
newData.EndTime = Funs.GetNewDateTime(this.txtEndTime.Text.Trim());
newData.MeetingAddress = this.txtMeetingAddress.Text.Trim();
newData.MeetingUrl = this.txtMeetingUrl.Text.Trim();
newData.InitiationDate = Funs.GetNewDateTime(this.txtInitiationDate.Text.Trim());
newData.MeetingContent = this.txtMeetingContent.Text.Trim();
newData.MeetingType = this.rblMeetingType.SelectedValue;
newData.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(id))
{
newData.MeetingId = id;
BLL.MeetingService.UpdateMeeting(newData);
}
else
{
if (!string.IsNullOrEmpty(this.hdId.Text))
{
newData.MeetingId = this.hdId.Text.Trim();
}
else
{
newData.MeetingId = SQLHelper.GetNewID(typeof(Model.Driver_Meeting));
this.hdId.Text = newData.MeetingId;
}
BLL.MeetingService.AddMeeting(newData);
}
#region 保存参会人员
BLL.MeetingItemService.DeleteMeetingItemByMeetingId(this.hdId.Text);
TreeNode[] nodes = this.tvAttendMeetingsPerson.GetCheckedNodes();
if (nodes.Length > 0)
{
foreach (TreeNode tn in nodes)
{
if (tn.NodeID != "0")
{
Model.Driver_MeetingItem newItem = new Model.Driver_MeetingItem
{
MeetingItemId = SQLHelper.GetNewID(typeof(Model.Driver_MeetingItem)),
MeetingId = this.hdId.Text,
UserId = tn.NodeID,
};
BLL.MeetingItemService.AddMeetingItem(newItem);
}
}
}
#endregion
}
#endregion
#region 初始化树
/// <summary>
/// 初始化树
/// </summary>
/// <param name="menuList">单位集合</param>
private void InitMenuTree()
{
this.tvAttendMeetingsPerson.Nodes.Clear();
var units = BLL.UnitService.GetUnitByProjectIdList(this.CurrUser.LoginProjectId);
foreach (var item in units)
{
TreeNode rootNode = new TreeNode
{
Text = item.UnitName,
NodeID = item.UnitId,
EnableCheckBox = true,
EnableCheckEvent = true,
Expanded = true
};
this.tvAttendMeetingsPerson.Nodes.Add(rootNode);
this.BoundTree(rootNode.Nodes, rootNode.NodeID);
}
}
/// <summary>
/// 遍历增加子节点
/// </summary>
/// <param name="nodes"></param>
/// <param name="menuId"></param>
private void BoundTree(TreeNodeCollection nodes, string superMenuId)
{
var menus = BLL.UserService.GetUserByUnitId(this.CurrUser.LoginProjectId, superMenuId);
foreach (var item in menus)
{
TreeNode chidNode = new TreeNode
{
Text = item.Text,
NodeID = item.Value,
EnableCheckBox = true,
EnableCheckEvent = true
};
var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(this.hdId.Text.Trim());
if (items.Count > 0)
{
foreach (var i in items)
{
if (i.UserId == item.Value)
{
chidNode.Checked = true;
chidNode.Expanded = true;
chidNode.Selectable = true;
//var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
//if (meeting != null)
//{
// if (meeting.States == "2")
// {
// if (i.IsMeeting == true)
// {
// chidNode.Text = item.Text + "（可按时参加）";
// }
// else if (i.IsMeeting == false)
// {
// chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
// }
// else
// {
// chidNode.Text = item.Text + "（暂未反馈）";
// }
// }
//}
}
}
}
nodes.Add(chidNode);
}
}
#endregion
#region 全选、全不选
/// <summary>
/// 全选、全不选
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void tvAttendMeetingsPerson_NodeCheck(object sender, FineUIPro.TreeCheckEventArgs e)
{
if (e.Checked)
{
this.tvAttendMeetingsPerson.CheckAllNodes(e.Node.Nodes);
SetCheckParentNode(e.Node);
}
else
{
this.tvAttendMeetingsPerson.UncheckAllNodes(e.Node.Nodes);
}
}
/// <summary>
/// 选中父节点
/// </summary>
/// <param name="node"></param>
private void SetCheckParentNode(TreeNode node)
{
if (node.ParentNode != null && node.ParentNode.NodeID != "0")
{
node.ParentNode.Checked = true;
if (node.ParentNode.ParentNode.NodeID != "0")
{
SetCheckParentNode(node.ParentNode);
}
}
}
#endregion
}
}
SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx.designer.cs
Generated
+186
View File
@@ -0,0 +1,186 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun.Meeting {
public partial class MeetingInitiateEdit {
/// <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>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// hdId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdId;
/// <summary>
/// ContentPanel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel2;
/// <summary>
/// Form2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// txtMeetingName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMeetingName;
/// <summary>
/// txtStartTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartTime;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// rblMeetingType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblMeetingType;
/// <summary>
/// txtMeetingAddress 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMeetingAddress;
/// <summary>
/// txtMeetingUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMeetingUrl;
/// <summary>
/// txtInitiationDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtInitiationDate;
/// <summary>
/// txtMeetingContent 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtMeetingContent;
/// <summary>
/// tvAttendMeetingsPerson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvAttendMeetingsPerson;
}
}
SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx
+16
View File
@@ -0,0 +1,16 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MeetingSummary.aspx.cs" Inherits="FineUIPro.Web.TestRun.Meeting.MeetingSummary" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>会议纪要</title>
</head>
<body>
<form id="form1" runat="server">
<div>
</div>
</form>
</body>
</html>
SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.TestRun.Meeting
{
public partial class MeetingSummary : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx.designer.cs
Generated
+24
View File
@@ -0,0 +1,24 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun.Meeting {
public partial class MeetingSummary {
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
}
}
SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeeting.aspx.cs
+28 -28
View File
@@ -260,34 +260,34 @@ namespace FineUIPro.Web.TestRun.Meeting
Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
return;
}
var meeting = BLL.MeetingService.GetMeetingById(Grid1.SelectedRowID);
if (meeting.States == "2")
{
var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(Grid1.SelectedRowID);
if (items.Count > 0)
{
var user = items.Where(x => x.UserId == this.CurrUser.UserId);
if (user.Count() > 0)
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Feedback.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
}
else
{
Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning);
return;
}
}
else
{
Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning);
return;
}
}
else
{
Alert.ShowInTop("审核未完成，无需反馈！", MessageBoxIcon.Warning);
return;
}
//var meeting = BLL.MeetingService.GetMeetingById(Grid1.SelectedRowID);
//if (meeting.States == "2")
//{
// var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(Grid1.SelectedRowID);
// if (items.Count > 0)
// {
// var user = items.Where(x => x.UserId == this.CurrUser.UserId);
// if (user.Count() > 0)
// {
// PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Feedback.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
// }
// else
// {
// Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning);
// return;
// }
// }
// else
// {
// Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning);
// return;
// }
//}
//else
//{
// Alert.ShowInTop("审核未完成，无需反馈！", MessageBoxIcon.Warning);
// return;
//}
}
#endregion
}
SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeetingEdit.aspx.cs
+41 -41
View File
@@ -23,15 +23,15 @@ namespace FineUIPro.Web.TestRun.Meeting
if (data != null)
{
this.hdId.Text = id;
this.txtMeetingCode.Text = data.MeetingCode;
this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
//this.txtMeetingCode.Text = data.MeetingCode;
//this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
this.txtMeetingAddress.Text = data.MeetingAddress;
this.txtMeetingUrl.Text = data.AttachUrl;
if (!string.IsNullOrEmpty(data.CompileMan))
{
this.drpCompileMan.SelectedValue = data.CompileMan;
}
this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
//this.txtMeetingUrl.Text = data.AttachUrl;
//if (!string.IsNullOrEmpty(data.CompileMan))
//{
// this.drpCompileMan.SelectedValue = data.CompileMan;
//}
//this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
}
}
else
@@ -121,22 +121,22 @@ namespace FineUIPro.Web.TestRun.Meeting
{
string id = Request.Params["id"];
Model.Driver_Meeting newData = new Model.Driver_Meeting();
newData.MeetingCode = this.txtMeetingCode.Text.Trim();
newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim());
//newData.MeetingCode = this.txtMeetingCode.Text.Trim();
//newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim());
newData.MeetingAddress = this.txtMeetingAddress.Text.Trim();
newData.AttachUrl = this.txtMeetingUrl.Text.Trim();
if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
{
newData.CompileMan = this.drpCompileMan.SelectedValue;
}
newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
//newData.AttachUrl = this.txtMeetingUrl.Text.Trim();
//if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
//{
// newData.CompileMan = this.drpCompileMan.SelectedValue;
//}
//newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
newData.ProjectId = this.CurrUser.LoginProjectId;
////单据状态
newData.States = BLL.Const.State_0;
if (type == BLL.Const.BtnSubmit)
{
newData.States = this.ctlAuditFlow.NextStep;
}
//newData.States = BLL.Const.State_0;
//if (type == BLL.Const.BtnSubmit)
//{
// newData.States = this.ctlAuditFlow.NextStep;
//}
if (!string.IsNullOrEmpty(id))
{
newData.MeetingId = id;
@@ -179,7 +179,7 @@ namespace FineUIPro.Web.TestRun.Meeting
#endregion
////保存流程审核数据
this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.ScheduleMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null);
//this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.ScheduleMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null);
}
#endregion
@@ -234,25 +234,25 @@ namespace FineUIPro.Web.TestRun.Meeting
chidNode.Checked = true;
chidNode.Expanded = true;
chidNode.Selectable = true;
var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
if (meeting != null)
{
if (meeting.States == "2")
{
if (i.IsMeeting == true)
{
chidNode.Text = item.Text + "（可按时参加）";
}
else if (i.IsMeeting == false)
{
chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
}
else
{
chidNode.Text = item.Text + "（暂未反馈）";
}
}
}
//var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
//if (meeting != null)
//{
// if (meeting.States == "2")
// {
// if (i.IsMeeting == true)
// {
// chidNode.Text = item.Text + "（可按时参加）";
// }
// else if (i.IsMeeting == false)
// {
// chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
// }
// else
// {
// chidNode.Text = item.Text + "（暂未反馈）";
// }
// }
//}
}
}
}
SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeetingView.aspx.cs
+27 -27
View File
@@ -22,15 +22,15 @@ namespace FineUIPro.Web.TestRun.Meeting
if (data != null)
{
this.hdId.Text = id;
this.txtMeetingCode.Text = data.MeetingCode;
this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
//this.txtMeetingCode.Text = data.MeetingCode;
//this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
this.txtMeetingAddress.Text = data.MeetingAddress;
this.txtMeetingUrl.Text = data.AttachUrl;
if (!string.IsNullOrEmpty(data.CompileMan))
{
this.drpCompileMan.SelectedValue = data.CompileMan;
}
this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
//this.txtMeetingUrl.Text = data.AttachUrl;
//if (!string.IsNullOrEmpty(data.CompileMan))
//{
// this.drpCompileMan.SelectedValue = data.CompileMan;
//}
//this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
}
}
InitMenuTree();
@@ -120,25 +120,25 @@ namespace FineUIPro.Web.TestRun.Meeting
chidNode.Checked = true;
chidNode.Expanded = true;
chidNode.Selectable = true;
var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
if (meeting != null)
{
if (meeting.States == "2")
{
if (i.IsMeeting == true)
{
chidNode.Text = item.Text + "（可按时参加）";
}
else if (i.IsMeeting == false)
{
chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
}
else
{
chidNode.Text = item.Text + "（暂未反馈）";
}
}
}
//var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
//if (meeting != null)
//{
// if (meeting.States == "2")
// {
// if (i.IsMeeting == true)
// {
// chidNode.Text = item.Text + "（可按时参加）";
// }
// else if (i.IsMeeting == false)
// {
// chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
// }
// else
// {
// chidNode.Text = item.Text + "（暂未反馈）";
// }
// }
//}
}
}
}
SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeeting.aspx.cs
+28 -28
View File
@@ -267,34 +267,34 @@ namespace FineUIPro.Web.TestRun.Meeting
Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
return;
}
var meeting = BLL.MeetingService.GetMeetingById(Grid1.SelectedRowID);
if (meeting.States == "2")
{
var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(Grid1.SelectedRowID);
if (items.Count > 0)
{
var user = items.Where(x => x.UserId == this.CurrUser.UserId);
if (user.Count() > 0)
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Feedback.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
}
else
{
Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning);
return;
}
}
else
{
Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning);
return;
}
}
else
{
Alert.ShowInTop("审核未完成，无需反馈！", MessageBoxIcon.Warning);
return;
}
//var meeting = BLL.MeetingService.GetMeetingById(Grid1.SelectedRowID);
//if (meeting.States == "2")
//{
// var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(Grid1.SelectedRowID);
// if (items.Count > 0)
// {
// var user = items.Where(x => x.UserId == this.CurrUser.UserId);
// if (user.Count() > 0)
// {
// PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Feedback.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
// }
// else
// {
// Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning);
// return;
// }
// }
// else
// {
// Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning);
// return;
// }
//}
//else
//{
// Alert.ShowInTop("审核未完成，无需反馈！", MessageBoxIcon.Warning);
// return;
//}
}
#endregion
}
SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeetingEdit.aspx.cs
+41 -41
View File
@@ -23,15 +23,15 @@ namespace FineUIPro.Web.TestRun.Meeting
if (data != null)
{
this.hdId.Text = id;
this.txtMeetingCode.Text = data.MeetingCode;
this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
//this.txtMeetingCode.Text = data.MeetingCode;
//this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
this.txtMeetingAddress.Text = data.MeetingAddress;
this.txtMeetingUrl.Text = data.AttachUrl;
if (!string.IsNullOrEmpty(data.CompileMan))
{
this.drpCompileMan.SelectedValue = data.CompileMan;
}
this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
//this.txtMeetingUrl.Text = data.AttachUrl;
//if (!string.IsNullOrEmpty(data.CompileMan))
//{
// this.drpCompileMan.SelectedValue = data.CompileMan;
//}
//this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
}
}
else
@@ -121,22 +121,22 @@ namespace FineUIPro.Web.TestRun.Meeting
{
string id = Request.Params["id"];
Model.Driver_Meeting newData = new Model.Driver_Meeting();
newData.MeetingCode = this.txtMeetingCode.Text.Trim();
newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim());
//newData.MeetingCode = this.txtMeetingCode.Text.Trim();
//newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim());
newData.MeetingAddress = this.txtMeetingAddress.Text.Trim();
newData.AttachUrl = this.txtMeetingUrl.Text.Trim();
if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
{
newData.CompileMan = this.drpCompileMan.SelectedValue;
}
newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
//newData.AttachUrl = this.txtMeetingUrl.Text.Trim();
//if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
//{
// newData.CompileMan = this.drpCompileMan.SelectedValue;
//}
//newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
newData.ProjectId = this.CurrUser.LoginProjectId;
////单据状态
newData.States = BLL.Const.State_0;
if (type == BLL.Const.BtnSubmit)
{
newData.States = this.ctlAuditFlow.NextStep;
}
//newData.States = BLL.Const.State_0;
//if (type == BLL.Const.BtnSubmit)
//{
// newData.States = this.ctlAuditFlow.NextStep;
//}
if (!string.IsNullOrEmpty(id))
{
newData.MeetingId = id;
@@ -179,7 +179,7 @@ namespace FineUIPro.Web.TestRun.Meeting
#endregion
////保存流程审核数据
this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.SpecialMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null);
//this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.SpecialMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null);
}
#endregion
@@ -234,25 +234,25 @@ namespace FineUIPro.Web.TestRun.Meeting
chidNode.Checked = true;
chidNode.Expanded = true;
chidNode.Selectable = true;
var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
if (meeting != null)
{
if (meeting.States == "2")
{
if (i.IsMeeting == true)
{
chidNode.Text = item.Text + "（可按时参加）";
}
else if (i.IsMeeting == false)
{
chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
}
else
{
chidNode.Text = item.Text + "（暂未反馈）";
}
}
}
//var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
//if (meeting != null)
//{
// if (meeting.States == "2")
// {
// if (i.IsMeeting == true)
// {
// chidNode.Text = item.Text + "（可按时参加）";
// }
// else if (i.IsMeeting == false)
// {
// chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
// }
// else
// {
// chidNode.Text = item.Text + "（暂未反馈）";
// }
// }
//}
}
}
}
SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeetingView.aspx.cs
+27 -27
View File
@@ -22,15 +22,15 @@ namespace FineUIPro.Web.TestRun.Meeting
if (data != null)
{
this.hdId.Text = id;
this.txtMeetingCode.Text = data.MeetingCode;
this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
//this.txtMeetingCode.Text = data.MeetingCode;
//this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
this.txtMeetingAddress.Text = data.MeetingAddress;
this.txtMeetingUrl.Text = data.AttachUrl;
if (!string.IsNullOrEmpty(data.CompileMan))
{
this.drpCompileMan.SelectedValue = data.CompileMan;
}
this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
//this.txtMeetingUrl.Text = data.AttachUrl;
//if (!string.IsNullOrEmpty(data.CompileMan))
//{
// this.drpCompileMan.SelectedValue = data.CompileMan;
//}
//this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
}
}
InitMenuTree();
@@ -120,25 +120,25 @@ namespace FineUIPro.Web.TestRun.Meeting
chidNode.Checked = true;
chidNode.Expanded = true;
chidNode.Selectable = true;
var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
if (meeting != null)
{
if (meeting.States == "2")
{
if (i.IsMeeting == true)
{
chidNode.Text = item.Text + "（可按时参加）";
}
else if (i.IsMeeting == false)
{
chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
}
else
{
chidNode.Text = item.Text + "（暂未反馈）";
}
}
}
//var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
//if (meeting != null)
//{
// if (meeting.States == "2")
// {
// if (i.IsMeeting == true)
// {
// chidNode.Text = item.Text + "（可按时参加）";
// }
// else if (i.IsMeeting == false)
// {
// chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
// }
// else
// {
// chidNode.Text = item.Text + "（暂未反馈）";
// }
// }
//}
}
}
}
SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeeting.aspx.cs
+28 -28
View File
@@ -267,34 +267,34 @@ namespace FineUIPro.Web.TestRun.Meeting
Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
return;
}
var meeting = BLL.MeetingService.GetMeetingById(Grid1.SelectedRowID);
if (meeting.States == "2")
{
var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(Grid1.SelectedRowID);
if (items.Count > 0)
{
var user = items.Where(x => x.UserId == this.CurrUser.UserId);
if (user.Count() > 0)
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Feedback.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
}
else
{
Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning);
return;
}
}
else
{
Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning);
return;
}
}
else
{
Alert.ShowInTop("审核未完成，无需反馈！", MessageBoxIcon.Warning);
return;
}
//var meeting = BLL.MeetingService.GetMeetingById(Grid1.SelectedRowID);
//if (meeting.States == "2")
//{
// var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(Grid1.SelectedRowID);
// if (items.Count > 0)
// {
// var user = items.Where(x => x.UserId == this.CurrUser.UserId);
// if (user.Count() > 0)
// {
// PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Feedback.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
// }
// else
// {
// Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning);
// return;
// }
// }
// else
// {
// Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning);
// return;
// }
//}
//else
//{
// Alert.ShowInTop("审核未完成，无需反馈！", MessageBoxIcon.Warning);
// return;
//}
}
#endregion
}
SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeetingEdit.aspx.cs
+41 -41
View File
@@ -23,15 +23,15 @@ namespace FineUIPro.Web.TestRun.Meeting
if (data != null)
{
this.hdId.Text = id;
this.txtMeetingCode.Text = data.MeetingCode;
this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
//this.txtMeetingCode.Text = data.MeetingCode;
//this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
this.txtMeetingAddress.Text = data.MeetingAddress;
this.txtMeetingUrl.Text = data.AttachUrl;
if (!string.IsNullOrEmpty(data.CompileMan))
{
this.drpCompileMan.SelectedValue = data.CompileMan;
}
this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
//this.txtMeetingUrl.Text = data.AttachUrl;
//if (!string.IsNullOrEmpty(data.CompileMan))
//{
// this.drpCompileMan.SelectedValue = data.CompileMan;
//}
//this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
}
}
else
@@ -121,22 +121,22 @@ namespace FineUIPro.Web.TestRun.Meeting
{
string id = Request.Params["id"];
Model.Driver_Meeting newData = new Model.Driver_Meeting();
newData.MeetingCode = this.txtMeetingCode.Text.Trim();
newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim());
//newData.MeetingCode = this.txtMeetingCode.Text.Trim();
//newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim());
newData.MeetingAddress = this.txtMeetingAddress.Text.Trim();
newData.AttachUrl = this.txtMeetingUrl.Text.Trim();
if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
{
newData.CompileMan = this.drpCompileMan.SelectedValue;
}
newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
//newData.AttachUrl = this.txtMeetingUrl.Text.Trim();
//if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
//{
// newData.CompileMan = this.drpCompileMan.SelectedValue;
//}
//newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
newData.ProjectId = this.CurrUser.LoginProjectId;
////单据状态
newData.States = BLL.Const.State_0;
if (type == BLL.Const.BtnSubmit)
{
newData.States = this.ctlAuditFlow.NextStep;
}
//newData.States = BLL.Const.State_0;
//if (type == BLL.Const.BtnSubmit)
//{
// newData.States = this.ctlAuditFlow.NextStep;
//}
if (!string.IsNullOrEmpty(id))
{
newData.MeetingId = id;
@@ -179,7 +179,7 @@ namespace FineUIPro.Web.TestRun.Meeting
#endregion
////保存流程审核数据
this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.WeekMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null);
//this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.WeekMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null);
}
#endregion
@@ -235,25 +235,25 @@ namespace FineUIPro.Web.TestRun.Meeting
chidNode.Expanded = true;
chidNode.Selectable = true;
var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
if (meeting != null)
{
if (meeting.States == "2")
{
if (i.IsMeeting == true)
{
chidNode.Text = item.Text + "（可按时参加）";
}
else if (i.IsMeeting == false)
{
chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
}
else
{
chidNode.Text = item.Text + "（暂未反馈）";
}
}
}
//var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
//if (meeting != null)
//{
// if (meeting.States == "2")
// {
// if (i.IsMeeting == true)
// {
// chidNode.Text = item.Text + "（可按时参加）";
// }
// else if (i.IsMeeting == false)
// {
// chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
// }
// else
// {
// chidNode.Text = item.Text + "（暂未反馈）";
// }
// }
//}
}
}
}
SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeetingView.aspx.cs
+27 -27
View File
@@ -22,15 +22,15 @@ namespace FineUIPro.Web.TestRun.Meeting
if (data != null)
{
this.hdId.Text = id;
this.txtMeetingCode.Text = data.MeetingCode;
this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
//this.txtMeetingCode.Text = data.MeetingCode;
//this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
this.txtMeetingAddress.Text = data.MeetingAddress;
this.txtMeetingUrl.Text = data.AttachUrl;
if (!string.IsNullOrEmpty(data.CompileMan))
{
this.drpCompileMan.SelectedValue = data.CompileMan;
}
this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
//this.txtMeetingUrl.Text = data.AttachUrl;
//if (!string.IsNullOrEmpty(data.CompileMan))
//{
// this.drpCompileMan.SelectedValue = data.CompileMan;
//}
//this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
}
}
InitMenuTree();
@@ -120,25 +120,25 @@ namespace FineUIPro.Web.TestRun.Meeting
chidNode.Checked = true;
chidNode.Expanded = true;
chidNode.Selectable = true;
var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
if (meeting != null)
{
if (meeting.States == "2")
{
if (i.IsMeeting == true)
{
chidNode.Text = item.Text + "（可按时参加）";
}
else if (i.IsMeeting == false)
{
chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
}
else
{
chidNode.Text = item.Text + "（暂未反馈）";
}
}
}
//var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
//if (meeting != null)
//{
// if (meeting.States == "2")
// {
// if (i.IsMeeting == true)
// {
// chidNode.Text = item.Text + "（可按时参加）";
// }
// else if (i.IsMeeting == false)
// {
// chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
// }
// else
// {
// chidNode.Text = item.Text + "（暂未反馈）";
// }
// }
//}
}
}
}