zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

限制单位

This commit is contained in:
李超 2023-04-06 15:58:37 +08:00
parent 04a09dbbc6
commit 787eb249be
21 changed files with 111 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/FineUIPro.Web/CQMS/Check/CheckFineList.aspx
View File

@ -136,6 +136,12 @@
</ItemTemplate>
</f:TemplateField>
<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("CheckFineId")) %>' ToolTip="附件查看"></asp:LinkButton>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

15
SGGL/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Check {
namespace FineUIPro.Web.CQMS.Check
{
public partial class CheckFineList {
public partial class CheckFineList
{
/// <summary>
/// form1 控件。
@ -147,6 +149,15 @@ namespace FineUIPro.Web.CQMS.Check {
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbAuditMan;
/// <summary>
/// lbtnFileUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>

6
SGGL/FineUIPro.Web/CQMS/Check/CheckFinelistEdit.aspx
View File

@ -75,12 +75,12 @@
<f:FormRow Hidden="true">
<f:FormRow >
<Items>
<f:Panel ID="Panel1" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<Items>
<f:Label runat="server" Text="问题图片：" CssStyle="padding-left:25px" Width="110px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="imgBtnFile" Text="问题图片" ToolTip="上传及查看" Icon="TableCell" runat="server"
<f:Label runat="server" Text="附件：" CssStyle="padding-left:25px" Width="110px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="imgBtnFile" Text="附件" ToolTip="上传及查看" Icon="TableCell" runat="server"
OnClick="imgBtnFile_Click">
</f:Button>
</Items>

55
SGGL/FineUIPro.Web/HJGL/DataIn/DataInTable.aspx.cs
View File

@ -655,55 +655,40 @@ namespace FineUIPro.Web.HJGL.DataIn
errInfo += "材质1代号为必填项；";
}
if (!string.IsNullOrEmpty(tempData.Value10))
{
var rate = rates.FirstOrDefault(x => x.DetectionRateCode == tempData.Value10);
if (rate == null)
{
errInfo += "探伤比例[" + tempData.Value10 + "]不存在；";
}
else
{
jointInfo.DetectionRateId = rate.DetectionRateId;
}
}
else
{
errInfo += "探伤比例为必填项；";
}
if (!string.IsNullOrEmpty(tempData.Value41))
{
if (tempData.Value41.Trim() == "是")
{
isoInfo.Is_Standard = true;
jointInfo.Extend_Length = tempData.Value43;
if (!string.IsNullOrEmpty(tempData.Value10))
{
var rate = rates.FirstOrDefault(x => x.DetectionRateCode == tempData.Value10);
if (rate == null)
{
errInfo += "探伤比例[" + tempData.Value10 + "]不存在；";
}
else
{
jointInfo.DetectionRateId = rate.DetectionRateId;
}
}
else
{
errInfo += "探伤比例为必填项；";
}
}
else
{
isoInfo.Is_Standard = false;
if (!string.IsNullOrEmpty(tempData.Value10))
{
var rate = rates.FirstOrDefault(x => x.DetectionRateCode == tempData.Value10);
if (rate == null)
{
errInfo += "探伤比例[" + tempData.Value10 + "]不存在；";
}
else
{
isoInfo.DetectionRateId = rate.DetectionRateId;
}
}
else
{
errInfo += "探伤比例为必填项；";
}
}
}
if (!string.IsNullOrEmpty(tempData.Value41))
if (!string.IsNullOrEmpty(tempData.Value43))
{
isoInfo.ISO_Length = tempData.Value41;
isoInfo.ISO_Length = tempData.Value43;
}
//if (!string.IsNullOrEmpty(tempData.Value15))
//{

2
SGGL/FineUIPro.Web/JDGL/JDJH/Sgzjdjh.aspx.cs
View File

@ -31,7 +31,7 @@ namespace FineUIPro.Web.JDGL.JDJH
U.UserName AS UploadManName
FROM dbo.Common_FileManager AS t
LEFT JOIN dbo.Sys_User AS U ON U.UserId = t.UploadMan
WHERE ToMenu='13' ";
WHERE ToMenu='13' and t.ProjectId ='" + this.CurrUser.LoginProjectId+"'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(txtFileName.Text))

1
SGGL/FineUIPro.Web/JDGL/JDJH/SgzjdjhEdit.aspx.cs
View File

@ -64,6 +64,7 @@ namespace FineUIPro.Web.JDGL.JDJH
temp.UploadMan = this.drpUploadMan.SelectedValue;
}
temp.UploadDate = Funs.GetNewDateTime(this.txtUploadDate.Text.Trim());
temp.ProjectId = this.CurrUser.LoginProjectId;
temp.ToMenu = "13";
temp.Remark = this.txtRemark.Text.Trim();
if (!string.IsNullOrEmpty(fileId))

2
SGGL/FineUIPro.Web/PZHGL/SGCH/Djdzch.aspx.cs
View File

@ -31,7 +31,7 @@ namespace FineUIPro.Web.PZHGL.SGCH
U.UserName AS UploadManName
FROM dbo.Common_FileManager AS t
LEFT JOIN dbo.Sys_User AS U ON U.UserId = t.UploadMan
WHERE ToMenu='3' ";
WHERE ToMenu='3' and t.ProjectId ='" + this.CurrUser.LoginProjectId+"'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(txtFileName.Text))

15
SGGL/FineUIPro.Web/PZHGL/SGCH/Djdzch.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.PZHGL.SGCH {
namespace FineUIPro.Web.PZHGL.SGCH
{
public partial class Djdzch {
public partial class Djdzch
{
/// <summary>
/// form1 控件。
@ -120,15 +122,6 @@ namespace FineUIPro.Web.PZHGL.SGCH {
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// lbtnUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnUrl1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>

1
SGGL/FineUIPro.Web/PZHGL/SGCH/DjdzchEdit.aspx.cs
View File

@ -64,6 +64,7 @@ namespace FineUIPro.Web.PZHGL.SGCH
}
temp.UploadDate = Funs.GetNewDateTime(this.txtUploadDate.Text.Trim());
temp.ToMenu = "3";
temp.ProjectId = this.CurrUser.LoginProjectId;
temp.Remark = this.txtRemark.Text.Trim();
if (!string.IsNullOrEmpty(fileId))
{

2
SGGL/FineUIPro.Web/PZHGL/SGCH/Fbch.aspx.cs
View File

@ -32,7 +32,7 @@ namespace FineUIPro.Web.PZHGL.SGCH
U.UserName AS UploadManName
FROM dbo.Common_FileManager AS t
LEFT JOIN dbo.Sys_User AS U ON U.UserId = t.UploadMan
WHERE ToMenu='5' ";
WHERE ToMenu='5' and t.ProjectId ='" + this.CurrUser.LoginProjectId+"'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(txtFileName.Text))

2
SGGL/FineUIPro.Web/PZHGL/SGCH/FbchEdit.aspx.cs
View File

@ -64,6 +64,8 @@ namespace FineUIPro.Web.PZHGL.SGCH
}
temp.UploadDate = Funs.GetNewDateTime(this.txtUploadDate.Text.Trim());
temp.ToMenu = "5";
temp.ProjectId = this.CurrUser.LoginProjectId;
temp.Remark = this.txtRemark.Text.Trim();
if (!string.IsNullOrEmpty(fileId))
{

2
SGGL/FineUIPro.Web/PZHGL/SGCH/GsBmGlgd.aspx.cs
View File

@ -31,7 +31,7 @@ namespace FineUIPro.Web.PZHGL.SGCH
U.UserName AS UploadManName
FROM dbo.Common_FileManager AS t
LEFT JOIN dbo.Sys_User AS U ON U.UserId = t.UploadMan
WHERE ToMenu='1' ";
WHERE ToMenu='1' and t.ProjectId ='" + this.CurrUser.LoginProjectId+"'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(txtFileName.Text))

2
SGGL/FineUIPro.Web/PZHGL/SGCH/GsBmGlgdEdit.aspx.cs
View File

@ -64,6 +64,8 @@ namespace FineUIPro.Web.PZHGL.SGCH
}
temp.UploadDate = Funs.GetNewDateTime(this.txtUploadDate.Text.Trim());
temp.ToMenu = "1";
temp.ProjectId = this.CurrUser.LoginProjectId;
temp.Remark = this.txtRemark.Text.Trim();
if (!string.IsNullOrEmpty(fileId))
{

2
SGGL/FineUIPro.Web/PZHGL/SGCH/Lsch.aspx.cs
View File

@ -31,7 +31,7 @@ namespace FineUIPro.Web.PZHGL.SGCH
U.UserName AS UploadManName
FROM dbo.Common_FileManager AS t
LEFT JOIN dbo.Sys_User AS U ON U.UserId = t.UploadMan
WHERE ToMenu='2' ";
WHERE ToMenu='2' and t.ProjectId ='" + this.CurrUser.LoginProjectId+"'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(txtFileName.Text))

2
SGGL/FineUIPro.Web/PZHGL/SGCH/LschEdit.aspx.cs
View File

@ -64,6 +64,8 @@ namespace FineUIPro.Web.PZHGL.SGCH
}
temp.UploadDate = Funs.GetNewDateTime(this.txtUploadDate.Text.Trim());
temp.ToMenu = "2";
temp.ProjectId = this.CurrUser.LoginProjectId;
temp.Remark = this.txtRemark.Text.Trim();
if (!string.IsNullOrEmpty(fileId))
{

2
SGGL/FineUIPro.Web/PZHGL/SGCH/Rldych.aspx.cs
View File

@ -31,7 +31,7 @@ namespace FineUIPro.Web.PZHGL.SGCH
U.UserName AS UploadManName
FROM dbo.Common_FileManager AS t
LEFT JOIN dbo.Sys_User AS U ON U.UserId = t.UploadMan
WHERE ToMenu='6' ";
WHERE ToMenu='6' and t.ProjectId ='" + this.CurrUser.LoginProjectId+"'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(txtFileName.Text))

2
SGGL/FineUIPro.Web/PZHGL/SGCH/RldychEdit.aspx.cs
View File

@ -64,6 +64,8 @@ namespace FineUIPro.Web.PZHGL.SGCH
}
temp.UploadDate = Funs.GetNewDateTime(this.txtUploadDate.Text.Trim());
temp.ToMenu = "6";
temp.ProjectId = this.CurrUser.LoginProjectId;
temp.Remark = this.txtRemark.Text.Trim();
if (!string.IsNullOrEmpty(fileId))
{

2
SGGL/FineUIPro.Web/PZHGL/SGCH/SgzdNd.aspx.cs
View File

@ -31,7 +31,7 @@ namespace FineUIPro.Web.PZHGL.SGCH
U.UserName AS UploadManName
FROM dbo.Common_FileManager AS t
LEFT JOIN dbo.Sys_User AS U ON U.UserId = t.UploadMan
WHERE ToMenu='7' ";
WHERE ToMenu='7' and t.ProjectId ='" + this.CurrUser.LoginProjectId+"'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(txtFileName.Text))

1
SGGL/FineUIPro.Web/PZHGL/SGCH/SgzdNdEdit.aspx.cs
View File

@ -63,6 +63,7 @@ namespace FineUIPro.Web.PZHGL.SGCH
temp.UploadMan = this.drpUploadMan.SelectedValue;
}
temp.UploadDate = Funs.GetNewDateTime(this.txtUploadDate.Text.Trim());
temp.ProjectId = this.CurrUser.LoginProjectId;
temp.ToMenu = "7";
temp.Remark = this.txtRemark.Text.Trim();
if (!string.IsNullOrEmpty(fileId))

2
SGGL/FineUIPro.Web/PZHGL/SGCH/XmsgGlgd.aspx.cs
View File

@ -31,7 +31,7 @@ namespace FineUIPro.Web.PZHGL.SGCH
U.UserName AS UploadManName
FROM dbo.Common_FileManager AS t
LEFT JOIN dbo.Sys_User AS U ON U.UserId = t.UploadMan
WHERE ToMenu='4' ";
WHERE ToMenu='4' and t.ProjectId ='" + this.CurrUser.LoginProjectId+"'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(txtFileName.Text))

1
SGGL/FineUIPro.Web/PZHGL/SGCH/XmsgGlgdEdit.aspx.cs
View File

@ -63,6 +63,7 @@ namespace FineUIPro.Web.PZHGL.SGCH
}
temp.UploadDate = Funs.GetNewDateTime(this.txtUploadDate.Text.Trim());
temp.ToMenu = "4";
temp.ProjectId = this.CurrUser.LoginProjectId;
temp.Remark = this.txtRemark.Text.Trim();
if (!string.IsNullOrEmpty(fileId))
{