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

2023-04-26

This commit is contained in:
李超 2023-04-26 15:31:09 +08:00
parent 787eb249be
commit f2ab2d5b73
10 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx
View File

@ -150,8 +150,8 @@
<f:RenderField HeaderText="问题描述<font color='red'>(*)</font>" ColumnID="QuestionDef" DataField="QuestionDef" <f:RenderField HeaderText="问题描述<font color='red'>(*)</font>" ColumnID="QuestionDef" DataField="QuestionDef"
HeaderTextAlign="Center" TextAlign="Center" Width="150px" FieldType="String" > HeaderTextAlign="Center" TextAlign="Center" Width="150px" FieldType="String" >
<Editor> <Editor >
<f:TextArea runat="server" AutoGrowHeight="true" AutoGrowHeightMin="60" AutoGrowHeightMax="300" ID="txtQuestion_Def" Text='<%# Bind("QuestionDef") %>'> <f:TextArea runat="server" AutoGrowHeight="true" AutoGrowHeightMin="60" AutoGrowHeightMax="300" ID="txtQuestion_Def" Text='<%# Bind("QuestionDef") %>'>
</f:TextArea> </f:TextArea>
</Editor> </Editor>
</f:RenderField> </f:RenderField>

2
SGGL/FineUIPro.Web/Controls/FlowOperateControl.ascx.cs
View File

@ -280,6 +280,8 @@ namespace FineUIPro.Web.Controls
BLL.UserService.InitUserProjectIdRoleIdDropDownList(this.drpPerson, this.geProjectId, nextMenuFlowOperate.RoleId, true); BLL.UserService.InitUserProjectIdRoleIdDropDownList(this.drpPerson, this.geProjectId, nextMenuFlowOperate.RoleId, true);
this.drpPerson.Hidden = false; this.drpPerson.Hidden = false;
} else if (this.txtAuditFlowName.Text == "编制单据"){
this.drpPerson.Hidden = false;
} }
else else
{ {

2
SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx
View File

@ -90,7 +90,7 @@
TextAlign="Left"> TextAlign="Left">
</f:RenderField> </f:RenderField>
<f:WindowField TextAlign="Center" Width="90px" WindowID="WindowAtt" HeaderText="证书扫描件" <f:WindowField TextAlign="Center" Width="90px" WindowID="WindowAtt" HeaderText="证书扫描件"
Text="查看" ToolTip="附件上传查看" DataIFrameUrlFields="SafePersonQualityId" DataIFrameUrlFormatString="../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SafePersonQualityAttachUrl&menuId=750F5074-45B9-470E-AE1E-6204957421E6&type=-1" Text="查看" ToolTip="附件上传查看" DataIFrameUrlFields="SafePersonQualityId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SafePersonQualityAttachUrl&menuId=750F5074-45B9-470E-AE1E-6204957421E6&type=-1"
HeaderTextAlign="Center" ColumnID="attWindow" /> HeaderTextAlign="Center" ColumnID="attWindow" />
</Columns> </Columns>
<Listeners> <Listeners>

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

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

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

@ -49,6 +49,7 @@ namespace FineUIPro.Web.JDGL.JDJH
{ {
string fileId = Request.Params["fileId"]; string fileId = Request.Params["fileId"];
Model.Common_FileManager temp = new Model.Common_FileManager(); Model.Common_FileManager temp = new Model.Common_FileManager();
temp.ProjectId = this.CurrUser.LoginProjectId;
if (txtFileName.Text == string.Empty) if (txtFileName.Text == string.Empty)
{ {
ShowNotify("名称不能为空!", MessageBoxIcon.Warning); ShowNotify("名称不能为空!", MessageBoxIcon.Warning);

2
SGGL/FineUIPro.Web/JDGL/SGBG/Sgyb.aspx.cs
View File

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

1
SGGL/FineUIPro.Web/JDGL/SGBG/SgybEdit.aspx.cs
View File

@ -49,6 +49,7 @@ namespace FineUIPro.Web.JDGL.SGBG
{ {
string fileId = Request.Params["fileId"]; string fileId = Request.Params["fileId"];
Model.Common_FileManager temp = new Model.Common_FileManager(); Model.Common_FileManager temp = new Model.Common_FileManager();
temp.ProjectId = this.CurrUser.LoginProjectId;
if (txtFileName.Text == string.Empty) if (txtFileName.Text == string.Empty)
{ {
ShowNotify("名称不能为空!", MessageBoxIcon.Warning); ShowNotify("名称不能为空!", MessageBoxIcon.Warning);

2
SGGL/FineUIPro.Web/common/Menu_CQMS.xml
View File

@ -6,7 +6,7 @@
<TreeNode id="AC145EE1-4E5C-4CEF-A85A-AAC331A041DB" Text="质量管理实施计划" NavigateUrl="CQMS/ZLCH/Zlssjh.aspx"></TreeNode> <TreeNode id="AC145EE1-4E5C-4CEF-A85A-AAC331A041DB" Text="质量管理实施计划" NavigateUrl="CQMS/ZLCH/Zlssjh.aspx"></TreeNode>
<TreeNode id="098307DA-C53D-4EDB-8587-339CD782031F" Text="质量管理规定/程序文件" NavigateUrl="CQMS/ZLCH/Zlglgd.aspx"></TreeNode> <TreeNode id="098307DA-C53D-4EDB-8587-339CD782031F" Text="质量管理规定/程序文件" NavigateUrl="CQMS/ZLCH/Zlglgd.aspx"></TreeNode>
</TreeNode> </TreeNode>
<TreeNode id="BBBF69F1-9520-4E0A-B0C0-9F4D3FBF4C10" Text="施工组织设计/施工方案" NavigateUrl=""><TreeNode id="91C4BFDB-0A51-4992-99CC-EB4EC185593D" Text="施工组织设计及施工方案" NavigateUrl="CQMS/WBS/ProjectControlPoint.aspx"></TreeNode> <TreeNode id="BBBF69F1-9520-4E0A-B0C0-9F4D3FBF4C10" Text="施工组织设计/施工方案" NavigateUrl=""><TreeNode id="91C4BFDB-0A51-4992-99CC-EB4EC185593D" Text="施工组织设计及施工方案" NavigateUrl="CQMS/Solution/ConstructSolution.aspx"></TreeNode>
<TreeNode id="fd116c94-714b-4b92-a3c9-cc83d358e2b3" Text="超过一定规模危大施工方案" NavigateUrl="CQMS/Comprehensive/MajorPlanApproval.aspx"></TreeNode> <TreeNode id="fd116c94-714b-4b92-a3c9-cc83d358e2b3" Text="超过一定规模危大施工方案" NavigateUrl="CQMS/Comprehensive/MajorPlanApproval.aspx"></TreeNode>
<TreeNode id="B068DA9C-FDB8-42CF-82FB-377F63840431" Text="施工方案定稿文件" NavigateUrl="CQMS/Solution/ConstructSolutionFinal.aspx"></TreeNode> <TreeNode id="B068DA9C-FDB8-42CF-82FB-377F63840431" Text="施工方案定稿文件" NavigateUrl="CQMS/Solution/ConstructSolutionFinal.aspx"></TreeNode>
<TreeNode id="D5F6DFAA-4051-4E0E-818B-2A45F985C5A4" Text="HSE方案模板" NavigateUrl="HSSE/Solution/SolutionTemplate.aspx"></TreeNode> <TreeNode id="D5F6DFAA-4051-4E0E-818B-2A45F985C5A4" Text="HSE方案模板" NavigateUrl="HSSE/Solution/SolutionTemplate.aspx"></TreeNode>