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

20240410 开车会议管理

Browse Source
This commit is contained in:
毕文静
2024-04-10 14:37:59 +08:00
parent 00a325ba3a
commit 9bb7f02b83
135 changed files with 5027 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx
+4 -4
View File
@@ -9,9 +9,9 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="1px" BodyPadding="1px" ShowBorder="false"
ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
<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" DataKeyNames="DriverReportId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="DriverReportId" AllowSorting="true" SortField="DriverReportCode"
@@ -60,7 +60,7 @@
FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs
+3 -1
View File
@@ -37,10 +37,12 @@ namespace FineUIPro.Web.TestRun.DriverReport
report.ReportType,
report.Remark,
unitWork.UnitWorkName,
u.UserName AS CompilePersonName"
u.UserName AS CompilePersonName,
RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS AttachUrl"
+ @" FROM Driver_DriverReport AS report "
+ @" LEFT JOIN WBS_UnitWork AS unitWork ON unitWork.UnitWorkId = report.UnitWorkId"
+ @" LEFT JOIN Sys_User AS u ON u.UserId = report.CompilePerson"
+ @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.DriverReportId "
+ @" WHERE report.ProjectId=@projectId AND report.ReportType='6'";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx
+3 -1
View File
@@ -83,6 +83,8 @@
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
<f:Label ID="lbtnAttach" runat="server">
</f:Label>
</Items>
</f:Panel>
</Items>
@@ -96,7 +98,7 @@
</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">
Height="500px" OnClose="WindowAtt_Close">
</f:Window>
</form>
</body>
SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs
+24
View File
@@ -1,5 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
namespace FineUIPro.Web.TestRun.DriverReport
{
@@ -34,6 +35,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
//this.txtNumber.Text = data.Number;
this.txtRemark.Text = data.Remark;
WindowAtt_Close(null, null);
}
}
else
@@ -59,6 +61,28 @@ namespace FineUIPro.Web.TestRun.DriverReport
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/DriverRunComplete&menuId={1}", this.hdId.Text, BLL.Const.DriverRunCompleteMenuId)));
}
protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
{
this.lbtnAttach.Text = string.Empty;
string url = string.Empty;
var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.DriverRunCompleteMenuId);
if (attLists != null)
{
List<string> lists = Funs.GetStrListByStr(attLists.AttachUrl, ',');
if (lists.Count > 0)
{
foreach (var item in lists)
{
url += item.Substring(item.IndexOf('_') + 1) + "\r\n";
}
}
if (!string.IsNullOrEmpty(url))
{
this.lbtnAttach.Text = url;
}
}
}
#endregion
#region 保存
SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs
Generated
+9
View File
@@ -174,6 +174,15 @@ namespace FineUIPro.Web.TestRun.DriverReport {
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// lbtnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbtnAttach;
/// <summary>
/// WindowAtt 控件。
/// </summary>
SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx
+4 -4
View File
@@ -9,9 +9,9 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="1px" BodyPadding="1px" ShowBorder="false"
ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
<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" DataKeyNames="DriverReportId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="DriverReportId" AllowSorting="true" SortField="DriverReportCode"
@@ -60,7 +60,7 @@
FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs
+3 -1
View File
@@ -37,10 +37,12 @@ namespace FineUIPro.Web.TestRun.DriverReport
report.ReportType,
report.Remark,
unitWork.UnitWorkName,
u.UserName AS CompilePersonName"
u.UserName AS CompilePersonName,
RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS AttachUrl"
+ @" FROM Driver_DriverReport AS report "
+ @" LEFT JOIN WBS_UnitWork AS unitWork ON unitWork.UnitWorkId = report.UnitWorkId"
+ @" LEFT JOIN Sys_User AS u ON u.UserId = report.CompilePerson"
+ @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.DriverReportId "
+ @" WHERE report.ProjectId=@projectId AND report.ReportType='4'";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx
+3 -1
View File
@@ -83,6 +83,8 @@
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
<f:Label ID="lbtnAttach" runat="server">
</f:Label>
</Items>
</f:Panel>
</Items>
@@ -96,7 +98,7 @@
</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">
Height="500px" OnClose="WindowAtt_Close">
</f:Window>
</form>
</body>
SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs
+24
View File
@@ -1,5 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
namespace FineUIPro.Web.TestRun.DriverReport
{
@@ -34,6 +35,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
//this.txtNumber.Text = data.Number;
this.txtRemark.Text = data.Remark;
WindowAtt_Close(null, null);
}
}
else
@@ -59,6 +61,28 @@ namespace FineUIPro.Web.TestRun.DriverReport
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/FeedTestRunReport&menuId={1}", this.hdId.Text, BLL.Const.FeedTestRunReportMenuId)));
}
protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
{
this.lbtnAttach.Text = string.Empty;
string url = string.Empty;
var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.FeedTestRunReportMenuId);
if (attLists != null)
{
List<string> lists = Funs.GetStrListByStr(attLists.AttachUrl, ',');
if (lists.Count > 0)
{
foreach (var item in lists)
{
url += item.Substring(item.IndexOf('_') + 1) + "\r\n";
}
}
if (!string.IsNullOrEmpty(url))
{
this.lbtnAttach.Text = url;
}
}
}
#endregion
#region 保存
SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs
Generated
+9
View File
@@ -174,6 +174,15 @@ namespace FineUIPro.Web.TestRun.DriverReport {
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// lbtnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbtnAttach;
/// <summary>
/// WindowAtt 控件。
/// </summary>
SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx
+4 -4
View File
@@ -9,9 +9,9 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="1px" BodyPadding="1px" ShowBorder="false"
ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
<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" DataKeyNames="DriverReportId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="DriverReportId" AllowSorting="true" SortField="DriverReportCode"
@@ -60,7 +60,7 @@
FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs
+3 -1
View File
@@ -37,10 +37,12 @@ namespace FineUIPro.Web.TestRun.DriverReport
report.ReportType,
report.Remark,
unitWork.UnitWorkName,
u.UserName AS CompilePersonName"
u.UserName AS CompilePersonName,
RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS AttachUrl"
+ @" FROM Driver_DriverReport AS report "
+ @" LEFT JOIN WBS_UnitWork AS unitWork ON unitWork.UnitWorkId = report.UnitWorkId"
+ @" LEFT JOIN Sys_User AS u ON u.UserId = report.CompilePerson"
+ @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.DriverReportId "
+ @" WHERE report.ProjectId=@projectId AND report.ReportType='3'";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx
+3 -1
View File
@@ -83,6 +83,8 @@
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
<f:Label ID="lbtnAttach" runat="server">
</f:Label>
</Items>
</f:Panel>
</Items>
@@ -96,7 +98,7 @@
</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">
Height="500px" OnClose="WindowAtt_Close">
</f:Window>
</form>
</body>
SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs
+24
View File
@@ -1,5 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
namespace FineUIPro.Web.TestRun.DriverReport
{
@@ -34,6 +35,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
//this.txtNumber.Text = data.Number;
this.txtRemark.Text = data.Remark;
WindowAtt_Close(null, null);
}
}
else
@@ -59,6 +61,28 @@ namespace FineUIPro.Web.TestRun.DriverReport
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/LinkedTestRunReport&menuId={1}", this.hdId.Text, BLL.Const.LinkedTestRunReportMenuId)));
}
protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
{
this.lbtnAttach.Text = string.Empty;
string url = string.Empty;
var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.LinkedTestRunReportMenuId);
if (attLists != null)
{
List<string> lists = Funs.GetStrListByStr(attLists.AttachUrl, ',');
if (lists.Count > 0)
{
foreach (var item in lists)
{
url += item.Substring(item.IndexOf('_') + 1) + "\r\n";
}
}
if (!string.IsNullOrEmpty(url))
{
this.lbtnAttach.Text = url;
}
}
}
#endregion
#region 保存
SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs
Generated
+9
View File
@@ -174,6 +174,15 @@ namespace FineUIPro.Web.TestRun.DriverReport {
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// lbtnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbtnAttach;
/// <summary>
/// WindowAtt 控件。
/// </summary>
SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx
+5 -5
View File
@@ -9,9 +9,9 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="1px" BodyPadding="1px" ShowBorder="false"
ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
<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" DataKeyNames="MonthReportId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="MonthReportId" AllowSorting="true" SortField="MonthReportDate"
@@ -47,8 +47,8 @@
TextAlign="Center" ToolTip="推送提醒" Icon="CartPut" />
<f:LinkButtonField HeaderText="查看推送内容" ConfirmTarget="Top" Width="120px" CommandName="SeePush" ColumnID="SeePush"
TextAlign="Center" ToolTip="查看推送内容" Icon="Find" />
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="180px" CommandName="AttachUrl" ColumnID="AttachUrl"
TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs
+3 -1
View File
@@ -28,8 +28,10 @@ namespace FineUIPro.Web.TestRun.DriverReport
string strSql = @"SELECT report.MonthReportId,
report.ProjectId,
report.MonthReportCode,
(CONVERT(varchar(10),DATEADD(DAY,1,DATEADD(MONTH,-1,report.MonthReportDate)),120)+'至'+CONVERT(varchar(10),report.MonthReportDate,120)) as MonthReportDate"
(CONVERT(varchar(10),DATEADD(DAY,1,DATEADD(MONTH,-1,report.MonthReportDate)),120)+'至'+CONVERT(varchar(10),report.MonthReportDate,120)) as MonthReportDate,
RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS AttachUrl"
+ @" FROM TestRun_MonthReport AS report "
+ @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.MonthReportId "
+ @" WHERE report.ProjectId=@projectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx
+3 -1
View File
@@ -618,6 +618,8 @@
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
<f:Label ID="lbtnAttach" runat="server">
</f:Label>
</Items>
</f:Panel>
</Items>
@@ -630,7 +632,7 @@
</Rows>
</f:Form>
<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" OnClose="WindowAtt_Close"
Height="500px">
</f:Window>
</form>
SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs
+22
View File
@@ -80,6 +80,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
this.Grid3.DataSource = items3;
this.Grid3.DataBind();
}
WindowAtt_Close(null, null);
}
else
{
@@ -147,6 +148,27 @@ namespace FineUIPro.Web.TestRun.DriverReport
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/MonthReport&menuId={1}", this.hdId.Text, BLL.Const.MonthReportMenuId)));
}
protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
{
this.lbtnAttach.Text = string.Empty;
string url = string.Empty;
var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.MonthReportMenuId);
if (attLists != null)
{
List<string> lists = Funs.GetStrListByStr(attLists.AttachUrl, ',');
if (lists.Count > 0)
{
foreach (var item in lists)
{
url += item.Substring(item.IndexOf('_') + 1) + "\r\n";
}
}
if (!string.IsNullOrEmpty(url))
{
this.lbtnAttach.Text = url;
}
}
}
#endregion
#region 保存
SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs
Generated
+9
View File
@@ -1011,6 +1011,15 @@ namespace FineUIPro.Web.TestRun.DriverReport {
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// lbtnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbtnAttach;
/// <summary>
/// WindowAtt 控件。
/// </summary>
SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx
+4 -4
View File
@@ -9,9 +9,9 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="1px" BodyPadding="1px" ShowBorder="false"
ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
<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" DataKeyNames="DriverReportId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="DriverReportId" AllowSorting="true" SortField="DriverReportCode"
@@ -60,7 +60,7 @@
FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
TextAlign="Center" ToolTip="附件查看" Icon="Find" />
TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs
+3 -1
View File
@@ -37,10 +37,12 @@ namespace FineUIPro.Web.TestRun.DriverReport
report.ReportType,
report.Remark,
unitWork.UnitWorkName,
u.UserName AS CompilePersonName"
u.UserName AS CompilePersonName,
RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS AttachUrl"
+ @" FROM Driver_DriverReport AS report "
+ @" LEFT JOIN WBS_UnitWork AS unitWork ON unitWork.UnitWorkId = report.UnitWorkId"
+ @" LEFT JOIN Sys_User AS u ON u.UserId = report.CompilePerson"
+ @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.DriverReportId "
+ @" WHERE report.ProjectId=@projectId AND report.ReportType='5'";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx
+3 -1
View File
@@ -83,6 +83,8 @@
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
<f:Label ID="lbtnAttach" runat="server">
</f:Label>
</Items>
</f:Panel>
</Items>
@@ -96,7 +98,7 @@
</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">
Height="500px" OnClose="WindowAtt_Close">
</f:Window>
</form>
</body>
SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs
+24
View File
@@ -1,5 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
namespace FineUIPro.Web.TestRun.DriverReport
{
@@ -34,6 +35,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
//this.txtNumber.Text = data.Number;
this.txtRemark.Text = data.Remark;
WindowAtt_Close(null, null);
}
}
else
@@ -59,6 +61,28 @@ namespace FineUIPro.Web.TestRun.DriverReport
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/PropertyReport&menuId={1}", this.hdId.Text, BLL.Const.PropertyReportMenuId)));
}
protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
{
this.lbtnAttach.Text = string.Empty;
string url = string.Empty;
var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.PropertyReportMenuId);
if (attLists != null)
{
List<string> lists = Funs.GetStrListByStr(attLists.AttachUrl, ',');
if (lists.Count > 0)
{
foreach (var item in lists)
{
url += item.Substring(item.IndexOf('_') + 1) + "\r\n";
}
}
if (!string.IsNullOrEmpty(url))
{
this.lbtnAttach.Text = url;
}
}
}
#endregion
#region 保存
SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs
Generated
+9
View File
@@ -174,6 +174,15 @@ namespace FineUIPro.Web.TestRun.DriverReport {
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// lbtnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbtnAttach;
/// <summary>
/// WindowAtt 控件。
/// </summary>