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

20240606 修改组织机构图

This commit is contained in:
毕文静 2024-06-06 15:48:52 +08:00
parent 0c28c16c1d
commit 35c2b0350e
16 changed files with 465 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DataBase/版本日志/SGGLDB_WH_2024-6-6-bwj.sql Normal file
View File

@ -0,0 +1 @@
update ProcessControl_InspectionManagement set IsOnceQualified=1

4
SGGL/BLL/Common/UploadAttachmentService.cs
View File

@ -1,5 +1,6 @@
using NPOI.SS.UserModel;
using System;
using System.Configuration;
using System.IO;
using System.Linq;
using System.Web.UI.WebControls;
@ -74,13 +75,12 @@ namespace BLL
string[] subUrl = url.Split('/');
string fileName = subUrl[subUrl.Count() - 1];
string newFileName = fileName.Substring(fileName.IndexOf("_") + 1);
htmlStr += "<tr><td style=\"width: 60%\" align=\"left\"><span style='cursor:pointer;cursor:pointer;cursor:pointer;TEXT-DECORATION: underline;color:blue' onclick=\"window.open('" + url + "')\">" + newFileName + "</span></td>";
}
}
htmlStr += "</table>";
}
return htmlStr;
}
#endregion

2
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
View File

@ -47,7 +47,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
BP.Class,
P.AcceptanceSite,
P.AcceptanceCheckMan,
(CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified,
(CASE WHEN IsOnceQualified='False' THEN '否' ELSE '是' END)AS IsOnceQualified,
P.InspectionCode,
P.InspectionDate"
+ @" FROM ProcessControl_InspectionManagement AS P "

7
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx
View File

@ -29,7 +29,10 @@
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtAcceptanceSite" Label="验收部位" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
<f:TextBox runat="server" ID="txtAcceptanceCheckMan" Label="检查人" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
<%--<f:TextBox runat="server" ID="txtAcceptanceCheckMan" Label="检查人" LabelAlign="Right" LabelWidth="130px"></f:TextBox>--%>
<f:DropDownList ID="drpAcceptanceCheckMan" runat="server" Label="检查人" EnableCheckBoxSelect="true" LabelWidth="130px"
EnableMultiSelect="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
@ -38,7 +41,7 @@
<f:RadioItem Value="True" Text="是" Selected="true" />
<f:RadioItem Value="False" Text="否" />
</f:RadioButtonList>
<f:DatePicker ID="txtInspectionDate" runat="server" DateFormatString="yyyy-MM-dd HH:mm:ss" ShowTime="true" Label="验收日期" LabelAlign="Right" LabelWidth="130px"></f:DatePicker>
<f:DatePicker ID="txtInspectionDate" runat="server" DateFormatString="yyyy-MM-dd HH:mm:ss" ShowTime="true" Label="验收日期" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>

30
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs
View File

@ -19,6 +19,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
GetButtonPower();
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//专业
UserService.InitUserProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, string.Empty, false);
this.hdInspectionNoticeId.Text = Request.Params["inspectionId"];
if (!string.IsNullOrEmpty(this.hdInspectionNoticeId.Text))
@ -35,7 +36,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl
this.drpCNProfessionalId.SelectedValue = inspectionManagement.CNProfessionalId;
}
this.txtAcceptanceSite.Text = inspectionManagement.AcceptanceSite;
this.txtAcceptanceCheckMan.Text = inspectionManagement.AcceptanceCheckMan;
//this.txtAcceptanceCheckMan.Text = ConvertCheckMan(inspectionManagement.AcceptanceCheckMan);
if (!string.IsNullOrEmpty(inspectionManagement.AcceptanceCheckMan))
{
this.drpAcceptanceCheckMan.SelectedValueArray = inspectionManagement.AcceptanceCheckMan.Split(',');
}
this.txtNoticeCode.Text = inspectionManagement.NoticeCode;
this.hdParentDivisionProjectId.Text = inspectionManagement.ParentDivisionProjectId;
if (inspectionManagement.IsOnceQualified.HasValue)
@ -100,18 +105,29 @@ namespace FineUIPro.Web.CQMS.ProcessControl
}
inspectionManagement.AcceptanceSite = this.txtAcceptanceSite.Text.Trim();
inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim();
//检查人
string CheckManIds = string.Empty;
foreach (var item in this.drpAcceptanceCheckMan.SelectedValueArray)
{
CheckManIds += item + ",";
}
if (!string.IsNullOrEmpty(CheckManIds))
{
CheckManIds = CheckManIds.Substring(0, CheckManIds.LastIndexOf(","));
}
inspectionManagement.AcceptanceCheckMan = CheckManIds;
//inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim();
if (!string.IsNullOrEmpty(this.rblIsOnceQualified.SelectedValue))
{
if (this.rblIsOnceQualified.SelectedValue == "True")
{
inspectionManagement.IsOnceQualified = true;
}
else
if (this.rblIsOnceQualified.SelectedValue == "False")
{
inspectionManagement.IsOnceQualified = false;
inspectionManagement.UnqualifiedReason = this.txtUnqualifiedReason.Text.Trim();
}
else
{
inspectionManagement.IsOnceQualified = true;
}
}
inspectionManagement.InspectionCode = this.txtInspectionCode.Text.Trim();
inspectionManagement.InspectionDate = Funs.GetNewDateTime(this.txtInspectionDate.Text.Trim());

4
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.designer.cs generated
View File

@ -85,13 +85,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
protected global::FineUIPro.TextBox txtAcceptanceSite;
/// <summary>
/// txtAcceptanceCheckMan 控件。
/// drpAcceptanceCheckMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAcceptanceCheckMan;
protected global::FineUIPro.DropDownList drpAcceptanceCheckMan;
/// <summary>
/// rblIsOnceQualified 控件。

725
SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx
View File

@ -8,14 +8,14 @@
<title>质量管理组织机构</title>
<style type="text/css">
.auto-style91 {
width: 1304px;
height: 675px;
width: 1300px;
height: 666px;
margin-bottom: 0px;
}
.auto-style92 {
width:1276px;
height:672px;
width: 1330px;
height: 650px;
margin-bottom: 0px;
}
</style>
@ -23,458 +23,365 @@
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" />
<f:ContentPanel ID="ContentPanel1" IsFluid="true" runat="server" BodyPadding="0px"
ShowBorder="true" ShowHeader="true" Title="内容面板">
<f:ContentPanel ID="ContentPanel1" runat="server" BodyPadding="0px"
ShowBorder="true" ShowHeader="true" Title="内容面板" AutoScroll="true">
<div style="text-align: right">
<f:Button ID="btnOut" EnablePostBack="true" runat="server" Text="导出" Icon="Printer" OnClick="btnOut_Click" EnableAjax="false" DisableControlBeforePostBack="false"></f:Button>
</div>
<div id="divOrganizational" runat="server" style="background-image: url('../../res/images/Organizational.png');" class="auto-style91">
<table class="auto-style91">
<tr style="height: 90px; vertical-align: central">
<tr style="height: 15px;">
<td style="width: 15px"></td>
<td style="width: 25px"></td>
<td style="width: 25px"></td>
<td style="width: 170px"></td>
<td style="width: 20px"></td>
<td style="width: 17px"></td>
<td style="width: 160px"></td>
<td style="width: 50px"></td>
<td style="width: 10px"></td>
<td style="width: 150px"></td>
<td style="width: 20px"></td>
<td style="width: 30px"></td>
<td style="width: 140px"></td>
<td style="width: 30px"></td>
<td style="width: 30px"></td>
<td style="width: 170px"></td>
<td style="width: 45px"></td>
<td style="width: 150px"></td>
<td style="width: 20px"></td>
<td style="width: 30px"></td>
<td style="width: 170px"></td>
<td></td>
</tr>
<tr style="height: 45px;">
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td colspan="3">
&nbsp;&nbsp;
<asp:Label ID="Label1" runat="server" Text="项目经理："></asp:Label>
</td>
<td style="width: 20px"></td>
<td style="width: 170px"></td>
<td style="width: 35px"></td>
<td style="width: 150px"></td>
<td style="width: 20px"></td>
<td style="width: 28px"></td>
<td style="width: 170px"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr style="height: 75px">
<td style="width: 25px"></td>
<td style="width: 25px"></td>
<td style="width: 170px"></td>
<td style="width: 20px"></td>
<td style="width: 17px"></td>
<td style="width: 150px"></td>
<td style="width: 20px"></td>
<td style="width: 20px"></td>
<td style="width: 160px"></td>
<td style="width: 20px"></td>
<td style="width: 20px"></td>
<td style="width: 170px"></td>
<td style="width: 35px"></td>
<td style="width: 150px"></td>
<td style="width: 20px"></td>
<td style="width: 28px"></td>
<td style="width: 170px"></td>
<tr style="height: 95px;">
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr style="height: 70px">
<td style="width: 25px"></td>
<td style="width: 25px"></td>
<td style="width: 170px">
<tr style="height: 55px;">
<td></td>
<td></td>
<td>
<asp:Label ID="Label2" runat="server" Text="设计经理："></asp:Label></td>
<td style="width: 20px"></td>
<td style="width: 17px"></td>
<td style="width: 150px">
<td></td>
<td></td>
<td>
<asp:Label ID="Label3" runat="server" Text="采购经理："></asp:Label></td>
<td style="width: 20px"></td>
<td style="width: 20px"></td>
<td style="width: 160px;">
&nbsp;&nbsp;
<td></td>
<td></td>
<td>
<asp:Label ID="Label4" runat="server" Text="施工经理："></asp:Label></td>
<td style="width: 20px"></td>
<td style="width: 20px"></td>
<td style="width: 170px">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<td></td>
<td></td>
<td>
<asp:Label ID="Label5" runat="server" Text="质量经理："></asp:Label></td>
<td style="width: 35px"></td>
<td colspan="2" style="text-align:center">
<td></td>
<td>
<asp:Label ID="Label6" runat="server" Text="HSE经理："></asp:Label></td>
<td style="width: 28px"></td>
<td style="width: 170px;text-align:center">
<asp:Label ID="Label7" runat="server" Text="开车经理："></asp:Label>
</td>
<td></td>
<td></td>
<td>
<asp:Label ID="Label7" runat="server" Text="开车经理："></asp:Label></td>
<td></td>
</tr>
<tr style="height: 82px">
<td style="width: 25px"></td>
<td style="width: 25px"></td>
<td style="width: 170px"></td>
<td style="width: 20px"></td>
<td style="width: 17px"></td>
<td style="width: 150px"></td>
<td style="width: 20px"></td>
<td style="width: 20px"></td>
<td style="width: 160px"></td>
<td style="width: 20px"></td>
<td style="width: 20px"></td>
<td style="width: 170px"></td>
<td style="width: 35px"></td>
<td style="width: 150px"></td>
<td style="width: 20px"></td>
<td style="width: 28px"></td>
<td style="width: 170px"></td>
<tr style="height: 95px;">
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr style="height: 85px">
<td style="width: 25px"></td>
<td style="width: 25px"></td>
<td style="width: 170px"></td>
<td style="width: 20px"></td>
<td style="width: 17px"></td>
<td style="width: 150px; vertical-align: top">
&nbsp;&nbsp;
<tr style="height: 85px; vertical-align: top;">
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td>
<asp:Label ID="Label8" runat="server" Text="仓库管理员："></asp:Label></td>
<td style="width: 20px"></td>
<td style="width: 20px"></td>
<td style="width: 160px"></td>
<td style="width: 20px"></td>
<td style="width: 20px"></td>
<td style="width: 170px; vertical-align: top">
&nbsp;&nbsp;&nbsp;
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td>
<asp:Label ID="Label9" runat="server" Text="文控工程师："></asp:Label></td>
<td style="width: 35px"></td>
<td style="width: 150px; vertical-align: top">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<td></td>
<td>
<asp:Label ID="Label10" runat="server" Text="HSE工程师："></asp:Label></td>
<td style="width: 20px"></td>
<td style="width: 28px"></td>
<td style="width: 170px;vertical-align: top">
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
<td></td>
<td></td>
<td>
<asp:Label ID="Label11" runat="server" Text="开车工程师："></asp:Label></td>
<td></td>
</tr>
<tr style="height: 65px">
<td style="width: 25px"></td>
<td style="width: 25px"></td>
<td style="width: 170px"></td>
<td style="width: 20px"></td>
<td style="width: 17px"></td>
<td style="width: 150px"></td>
<td style="width: 20px"></td>
<td style="width: 20px"></td>
<td style="width: 160px"></td>
<td style="width: 20px"></td>
<td style="width: 20px"></td>
<td style="width: 170px"></td>
<td style="width: 35px"></td>
<td style="width: 150px"></td>
<td style="width: 20px"></td>
<td style="width: 28px"></td>
<td style="width: 170px"></td>
<tr style="height: 70px;">
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr style="height: 100px">
<td style="width: 25px"></td>
<td colspan="2" style="vertical-align: top">
<tr style="height: 100px; vertical-align: top;">
<td></td>
<td colspan="2">
<asp:Label ID="Label12" runat="server" Text="土建工程师："></asp:Label></td>
<td style="width: 20px"></td>
<td colspan="3" style="vertical-align: top">
&nbsp;
<td></td>
<td colspan="3">
<asp:Label ID="Label13" runat="server" Text="设备工程师："></asp:Label></td>
<td style="width: 20px"></td>
<td colspan="2" style="vertical-align: top">
&nbsp;&nbsp;&nbsp;
<td></td>
<td colspan="2">
<asp:Label ID="Label14" runat="server" Text="管道工程师："></asp:Label></td>
<td style="width: 20px"></td>
<td style="width: 170px; vertical-align: top">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<td></td>
<td>
<asp:Label ID="Label15" runat="server" Text="电气工程师："></asp:Label></td>
<td style="width: 35px"></td>
<td colspan="3" style="vertical-align: top">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<td></td>
<td colspan="3">
<asp:Label ID="Label16" runat="server" Text="仪表工程师："></asp:Label></td>
<td style="width: 170px"></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="width: 25px"></td>
<td style="width: 25px"></td>
<td style="width: 170px"></td>
<td style="width: 20px"></td>
<td style="width: 17px"></td>
<td style="width: 150px"></td>
<td style="width: 20px"></td>
<td style="width: 20px"></td>
<td style="width: 160px"></td>
<td style="width: 20px"></td>
<td style="width: 20px"></td>
<td style="width: 170px"></td>
<td style="width: 35px"></td>
<td style="width: 150px"></td>
<td style="width: 20px"></td>
<td style="width: 28px"></td>
<td style="width: 170px"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</table>
</div>
<div id="divSubOrganizational" runat="server" style="background-image: url('../../res/images/SubOrganizational.png');" class="auto-style92" >
<div id="divSubOrganizational" runat="server" style="background-image: url('../../res/images/SubOrganizational.png'); padding: 0px" class="auto-style92">
<table class="auto-style92">
<tr style="height:35px">
<td style="width:30px;">
</td>
<td style="width:150px;">
</td>
<td style="width:30px;">
</td>
<td style="width:60px;">
</td>
<td style="width:60px;">
</td>
<td style="width:120px;">
</td>
<td style="width:50px;">
</td>
<td style="width:190px;">
</td>
<td style="width:40px;">
</td>
<td style="width:100px;">
</td>
<td style="width:85px;">
</td>
<td style="width:50px;">
</td>
<td style="width:30px;">
</td>
<td style="width:155px;">
</td>
<td>
</td>
</tr><tr style="height:45px">
<td style="width:30px;">
</td>
<td style="width:150px;">
</td>
<td style="width:30px;">
</td>
<td style="width:60px;">
</td>
<td style="width:60px;">
</td>
<td style="width:120px;">
</td>
<td style="width:50px;">
</td>
<td style="width:190px;">
&nbsp;&nbsp;&nbsp;
<tr style="height: 15px;">
<td style="width: 10px;"></td>
<td style="width: 150px;"></td>
<td style="width: 40px;"></td>
<td style="width: 160px;"></td>
<td style="width: 30px;"></td>
<td style="width: 2px;"></td>
<td style="width: 130px;"></td>
<td style="width: 25px;"></td>
<td style="width: 30px;"></td>
<td style="width: 153px;"></td>
<td style="width: 20px;"></td>
<td style="width: 120px;"></td>
<td style="width: 30px;"></td>
<td style="width: 30px;"></td>
<td style="width: 130px;"></td>
<td style="width: 20px;"></td>
<td style="width: 40px;"></td>
<td style="width: 150px;"></td>
<td></td>
</tr>
<tr style="height: 50px;">
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td colspan="2">
<asp:Label ID="Label17" runat="server" Text="项目经理："></asp:Label>
</td>
<td style="width:40px;">
</td>
<td style="width:100px;">
</td>
<td style="width:85px;">
</td>
<td style="width:50px;">
</td>
<td style="width:30px;">
</td>
<td style="width:155px;">
</td>
<td>
</td>
</tr><tr style="height:110px">
<td style="width:30px;">
</td>
<td style="width:150px;">
</td>
<td style="width:30px;">
</td>
<td style="width:60px;">
</td>
<td style="width:60px;">
</td>
<td style="width:120px;">
</td>
<td style="width:50px;">
</td>
<td style="width:190px;">
</td>
<td style="width:40px;">
</td>
<td style="width:100px;">
</td>
<td style="width:85px;">
</td>
<td style="width:50px;">
</td>
<td style="width:30px;">
</td>
<td style="width:155px;">
</td>
<td>
</td>
</tr><tr style="height:55px">
<td style="width:30px;">
</td>
<td style="width:150px;">
</td>
<td colspan="3"><asp:Label ID="Label18" runat="server" Text="施工经理："></asp:Label>
</td>
<td style="width:120px;">
</td>
<td style="width:50px;">
</td>
<td style="width:190px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <asp:Label ID="Label19" runat="server" Text="质量经理："></asp:Label>
</td>
<td style="width:40px;">
</td>
<td style="width:100px;">
</td>
<td colspan="3">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <asp:Label ID="Label20" runat="server" Text="HSE经理："></asp:Label>
</td>
<td style="width:155px;">
</td>
<td>
</td>
</tr><tr style="height:60px">
<td style="width:30px;">
</td>
<td style="width:150px;">
</td>
<td style="width:30px;">
</td>
<td style="width:60px;">
</td>
<td style="width:60px;">
</td>
<td style="width:120px;">
</td>
<td style="width:50px;">
</td>
<td style="width:190px;">
</td>
<td style="width:40px;">
</td>
<td style="width:100px;">
</td>
<td style="width:85px;">
</td>
<td style="width:50px;">
</td>
<td style="width:30px;">
</td>
<td style="width:155px;">
</td>
<td>
</td>
</tr><tr style="height:90px">
<td style="width:30px;">
</td>
<td style="width:150px;">
</td>
<td style="width:30px;">
</td>
<td style="width:60px;">
</td>
<td style="width:60px;">
</td>
<td style="width:120px;">
</td>
<td style="width:50px;">
</td>
<td style="width:190px;vertical-align: top">&nbsp;&nbsp;&nbsp;&nbsp; <asp:Label ID="Label21" runat="server" Text="文控工程师："></asp:Label>
</td>
<td style="width:40px;">
</td>
<td style="width:100px;">
</td>
<td colspan="3" style="vertical-align: top">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <asp:Label ID="Label22" runat="server" Text="HSE工程师："></asp:Label>
</td>
<td style="width:155px;">
</td>
<td>
</td>
</tr><tr style="height:90px">
<td style="width:30px;">
</td>
<td style="width:150px;">
</td>
<td style="width:30px;">
</td>
<td style="width:60px;">
</td>
<td style="width:60px;">
</td>
<td style="width:120px;">
</td>
<td style="width:50px;">
</td>
<td style="width:190px;">
</td>
<td style="width:40px;">
</td>
<td style="width:100px;">
</td>
<td style="width:85px;">
</td>
<td style="width:50px;">
</td>
<td style="width:30px;">
</td>
<td style="width:155px;">
</td>
<td>
</td>
</tr><tr style="height:90px">
<td style="width:30px;">
</td>
<td colspan="2" style="vertical-align: top"><asp:Label ID="Label23" runat="server" Text="土建工程师："></asp:Label>
</td>
<td style="width:60px;">
</td>
<td colspan="2" style="vertical-align: top">&nbsp; <asp:Label ID="Label24" runat="server" Text="设备工程师："></asp:Label>
</td>
<td style="width:50px;">
</td>
<td style="width:190px;vertical-align: top">&nbsp;&nbsp;&nbsp;&nbsp; <asp:Label ID="Label25" runat="server" Text="管道工程师："></asp:Label>
</td>
<td style="width:40px;">
</td>
<td colspan="2" style="vertical-align: top">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <asp:Label ID="Label26" runat="server" Text="电气工程师："></asp:Label>
</td>
<td style="width:50px;">
</td>
<td colspan="2" style="vertical-align: top">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <asp:Label ID="Label27" runat="server" Text="仪表工程师："></asp:Label>
</td>
<td>
</td>
</tr><tr>
<td style="width:30px;">
</td>
<td style="width:150px;">
</td>
<td style="width:30px;">
</td>
<td style="width:60px;">
</td>
<td style="width:60px;">
</td>
<td style="width:120px;">
</td>
<td style="width:50px;">
</td>
<td style="width:190px;">
</td>
<td style="width:40px;">
</td>
<td style="width:100px;">
</td>
<td style="width:85px;">
</td>
<td style="width:50px;">
</td>
<td style="width:30px;">
</td>
<td style="width:155px;">
</td>
<td>
</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr style="height: 100px;">
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr style="height: 65px;">
<td></td>
<td></td>
<td></td>
<td colspan="2">
<asp:Label ID="Label18" runat="server" Text="施工经理："></asp:Label>
</td>
<td></td>
<td></td>
<td></td>
<td colspan="3">
<asp:Label ID="Label19" runat="server" Text="质量经理："></asp:Label>
</td>
<td></td>
<td colspan="3">
<asp:Label ID="Label20" runat="server" Text="HSE经理："></asp:Label>
</td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr style="height: 240px;">
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr style="height: 100px;">
<td></td>
<td style="vertical-align: top;">
<asp:Label ID="Label23" runat="server" Text="土建工程师："></asp:Label>
</td>
<td></td>
<td style="vertical-align: top;">
<asp:Label ID="Label24" runat="server" Text="设备工程师："></asp:Label>
</td>
<td></td>
<td style="vertical-align: top;" colspan="2">
<asp:Label ID="Label25" runat="server" Text="管道工程师："></asp:Label>
</td>
<td></td>
<td style="vertical-align: top;">&nbsp;</td>
<td style="vertical-align: top;">
<asp:Label ID="Label26" runat="server" Text="电气工程师："></asp:Label>
</td>
<td></td>
<td style="vertical-align: top;" colspan="2">
<asp:Label ID="Label27" runat="server" Text="仪表工程师："></asp:Label>
</td>
<td></td>
<td style="vertical-align: top" colspan="2">
<asp:Label ID="Label21" runat="server" Text="文控工程师："></asp:Label>
</td>
<td></td>
<td style="vertical-align: top">
<asp:Label ID="Label22" runat="server" Text="HSE工程师："></asp:Label>
</td>
<td></td>
</tr>
<tr style="height: 90px">
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</table>
</div>

17
SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs
View File

@ -24,6 +24,14 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
string projectId = this.CurrUser.LoginProjectId;
string unitId = this.CurrUser.UnitId;
if (this.CurrUser.UserId == BLL.Const.hfnbdId)
{
unitId = BLL.Const.UnitId_CWCEC;
}
this.divSubOrganizational.Visible = false;
this.divOrganizational.Visible = true;
this.ContentPanel1.Title = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId);
var unit = (from x in Funs.DB.Project_ProjectUnit
@ -305,7 +313,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
name4 = name4.Substring(0, name4.LastIndexOf(','));
}
}
this.Label8.Text = "施工经理：" + name4;
this.Label18.Text = "施工经理：" + name4;
string name5 = string.Empty;
var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理");
@ -320,7 +328,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
name5 = name5.Substring(0, name5.LastIndexOf(','));
}
}
this.Label9.Text = "质量经理：" + name5;
this.Label19.Text = "质量经理：" + name5;
string name6 = string.Empty;
var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理");
@ -465,6 +473,11 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
var pModel = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == projectId);
if(this.CurrUser.UserId==BLL.Const.hfnbdId)
{
unitId = BLL.Const.UnitId_CWCEC;
}
var unit = (from x in Funs.DB.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == projectId

36
SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs generated
View File

@ -246,24 +246,6 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label20;
/// <summary>
/// Label21 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label21;
/// <summary>
/// Label22 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label22;
/// <summary>
/// Label23 控件。
/// </summary>
@ -308,5 +290,23 @@ namespace FineUIPro.Web.CQMS.QualityPlanning {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label27;
/// <summary>
/// Label21 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label21;
/// <summary>
/// Label22 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label22;
}
}

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />

4
SGGL/FineUIPro.Web/Web.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<!--
有关如何配置 ASP.NET 应用程序的详细消息，请访问
@ -77,7 +77,7 @@
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers>
<compilation debug="false" targetFramework="4.6.1"/>
<compilation debug="true" targetFramework="4.6.1"/>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

BIN
SGGL/FineUIPro.Web/res/images/Organizational.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
SGGL/FineUIPro.Web/res/images/SubOrganizational.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />