lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改安全实施计划

This commit is contained in:
高飞 2023-06-27 17:41:09 +08:00
parent c0c275e3df 3137596e47
commit ca2e5715b8
15 changed files with 234 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataBase/版本日志/SGGLDB_V2023-06-27修改明细.txt Normal file
View File

@ -0,0 +1,4 @@
--ADD BY YangHongwei 2023-06-27
1、修改本部检查通知页面。
2、修改赛鼎现场人员更换单位，新项目入场单位下拉框处理。
--END

80
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -1,80 +0,0 @@
错误信息开始=====>
错误类型:HttpCompileException
错误信息:e:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\ZHGL\Plan\ActionPlanListEdit.aspx(78): error CS1061: “ASP.zhgl_plan_actionplanlistedit_aspx”不包含“gvDepart_RowCommand”的定义，并且找不到可接受类型为“ASP.zhgl_plan_actionplanlistedit_aspx”的第一个参数的扩展方法“gvDepart_RowCommand”(是否缺少 using 指令或程序集引用?)
错误堆栈:
在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
出错时间:06/19/2023 16:36:07
出错文件:http://localhost:8667/ZHGL/Plan/ActionPlanListEdit.aspx?actionPlanListId=58122847-39ce-4e36-880d-173df5d1e77e
IP地址:::1
出错时间:06/19/2023 16:36:08
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.ZHGL.Plan.ActionPlanList.EditData() 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\ZHGL\Plan\ActionPlanList.aspx.cs:行号 188
在 FineUIPro.Web.ZHGL.Plan.ActionPlanList.Grid1_RowDoubleClick(Object sender, GridRowClickEventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\ZHGL\Plan\ActionPlanList.aspx.cs:行号 143
在 FineUIPro.Grid.OnRowDoubleClick(GridRowClickEventArgs e)
在 (Grid , GridRowClickEventArgs )
在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:06/20/2023 16:09:03
出错文件:http://localhost:8667/ZHGL/Plan/ActionPlanList.aspx
IP地址:::1
出错时间:06/20/2023 16:09:03
System.ServiceModel.EndpointNotFoundException: 没有终结点在侦听可以接受消息的 https://oa.sedin.com.cn/services/OfsTodoDataWebService。这通常是由于不正确的地址或者 SOAP 操作导致的。如果存在此情况，请参见 InnerException 以了解详细信息。 ---> System.Net.WebException: 远程服务器返回错误: (404) 未找到。
在 System.Net.HttpWebRequest.GetResponse()
在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(TimeSpan timeout)
--- 内部异常堆栈跟踪的结尾 ---
Server stack trace:
在 System.ServiceModel.Channels.HttpChannelUtilities.ProcessGetResponseWebException(WebException webException, HttpWebRequest request, HttpAbortReason abortReason)
在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(TimeSpan timeout)
在 System.ServiceModel.Channels.RequestChannel.Request(Message message, TimeSpan timeout)
在 System.ServiceModel.Dispatcher.RequestChannelBinder.Request(Message message, TimeSpan timeout)
在 System.ServiceModel.Channels.ServiceChannel.Call(String action, Boolean oneway, ProxyOperationRuntime operation, Object[] ins, Object[] outs, TimeSpan timeout)
在 System.ServiceModel.Channels.ServiceChannelProxy.InvokeService(IMethodCallMessage methodCall, ProxyOperationRuntime operation)
在 System.ServiceModel.Channels.ServiceChannelProxy.Invoke(IMessage message)
Exception rethrown at [0]:
在 System.Runtime.Remoting.Proxies.RealProxy.HandleReturnMessage(IMessage reqMsg, IMessage retMsg)
在 System.Runtime.Remoting.Proxies.RealProxy.PrivateInvoke(MessageData& msgData, Int32 type)
在 BLL.OAWebService.OfsTodoDataWebServicePortType.receiveTodoRequestByJson(String in0)
在 BLL.OAWebService.OfsTodoDataWebServicePortTypeClient.receiveTodoRequestByJson(String in0) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\Service References\OAWebService\Reference.cs:行号 478
在 BLL.OAWebSevice.PushoaActionPlan() 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\PHTGL\OAWebSevice.cs:行号 436
System.ServiceModel.EndpointNotFoundException: 没有终结点在侦听可以接受消息的 https://oa.sedin.com.cn/services/OfsTodoDataWebService。这通常是由于不正确的地址或者 SOAP 操作导致的。如果存在此情况，请参见 InnerException 以了解详细信息。 ---> System.Net.WebException: 远程服务器返回错误: (404) 未找到。
在 System.Net.HttpWebRequest.GetResponse()
在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(TimeSpan timeout)
--- 内部异常堆栈跟踪的结尾 ---
Server stack trace:
在 System.ServiceModel.Channels.HttpChannelUtilities.ProcessGetResponseWebException(WebException webException, HttpWebRequest request, HttpAbortReason abortReason)
在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(TimeSpan timeout)
在 System.ServiceModel.Channels.RequestChannel.Request(Message message, TimeSpan timeout)
在 System.ServiceModel.Dispatcher.RequestChannelBinder.Request(Message message, TimeSpan timeout)
在 System.ServiceModel.Channels.ServiceChannel.Call(String action, Boolean oneway, ProxyOperationRuntime operation, Object[] ins, Object[] outs, TimeSpan timeout)
在 System.ServiceModel.Channels.ServiceChannelProxy.InvokeService(IMethodCallMessage methodCall, ProxyOperationRuntime operation)
在 System.ServiceModel.Channels.ServiceChannelProxy.Invoke(IMessage message)
Exception rethrown at [0]:
在 System.Runtime.Remoting.Proxies.RealProxy.HandleReturnMessage(IMessage reqMsg, IMessage retMsg)
在 System.Runtime.Remoting.Proxies.RealProxy.PrivateInvoke(MessageData& msgData, Int32 type)
在 BLL.OAWebService.OfsTodoDataWebServicePortType.receiveTodoRequestByJson(String in0)
在 BLL.OAWebService.OfsTodoDataWebServicePortTypeClient.receiveTodoRequestByJson(String in0) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\Service References\OAWebService\Reference.cs:行号 478
在 BLL.OAWebSevice.PushoaActionPlan() 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\PHTGL\OAWebSevice.cs:行号 436

12
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -1137,7 +1137,7 @@
<Content Include="obj\Debug\Web.csproj.FileListAbsolute.txt" />
<Content Include="obj\Debug\Web.dll" />
<Content Include="obj\Debug\Web.pdb" />
<Content Include="OfficeCheck\Check\CheckContentEdit1.aspx" />
<Content Include="OfficeCheck\Check\CheckContentEdit.aspx" />
<Content Include="OfficeCheck\Check\CheckInfo.aspx" />
<Content Include="OfficeCheck\Check\CheckNotice.aspx" />
<Content Include="OfficeCheck\Check\CheckNoticeEdit.aspx" />
@ -11537,12 +11537,12 @@
<Compile Include="obj\Release\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
<Compile Include="obj\Release\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" />
<Compile Include="obj\Release\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" />
<Compile Include="OfficeCheck\Check\CheckContentEdit1.aspx.cs">
<DependentUpon>CheckContentEdit1.aspx</DependentUpon>
<Compile Include="OfficeCheck\Check\CheckContentEdit.aspx.cs">
<DependentUpon>CheckContentEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="OfficeCheck\Check\CheckContentEdit1.aspx.designer.cs">
<DependentUpon>CheckContentEdit1.aspx</DependentUpon>
<Compile Include="OfficeCheck\Check\CheckContentEdit.aspx.designer.cs">
<DependentUpon>CheckContentEdit.aspx</DependentUpon>
</Compile>
<Compile Include="OfficeCheck\Check\CheckInfo.aspx.cs">
<DependentUpon>CheckInfo.aspx</DependentUpon>
@ -13919,7 +13919,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:1773/</IISUrl>
<IISUrl>http://localhost:8392/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

8
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit1.aspx → SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx
View File

@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckContentEdit1.aspx.cs" Inherits="FineUIPro.Web.OfficeCheck.Check.CheckContentEdit1" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckContentEdit.aspx.cs" Inherits="FineUIPro.Web.OfficeCheck.Check.CheckContentEdit" %>
<!DOCTYPE html>
@ -45,7 +45,7 @@
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="检查标准" EnableCollapse="false" runat="server"
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" EnableColumnLines="true"
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" EnableColumnLines="true" ForceFit="true"
ClicksToEdit="1" DataIDField="ID" AllowSorting="true" SortField="SortIndex" SortDirection="ASC"
OnSort="Grid1_Sort" EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
<Columns>
@ -58,10 +58,10 @@
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="检查标准" ColumnID="CheckStandard" DataField="CheckStandard"
HeaderTextAlign="Center" TextAlign="Left" Width="250px" ExpandUnusedSpace="true">
HeaderTextAlign="Center" TextAlign="Left" Width="400px">
</f:RenderField>
<f:RenderField HeaderText="检查方法" ColumnID="CheckMethod" DataField="CheckMethod"
HeaderTextAlign="Center" TextAlign="Left" Width="130px" >
HeaderTextAlign="Center" TextAlign="Left" Width="150px" >
</f:RenderField>
<f:RenderField HeaderText="检查结果" ColumnID="CheckResult" DataField="CheckResult"
HeaderTextAlign="Center" TextAlign="Left" Width="160px">

8
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit1.aspx.cs → SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.cs
View File

@ -8,7 +8,7 @@ using System.Linq;
namespace FineUIPro.Web.OfficeCheck.Check
{
public partial class CheckContentEdit1 : PageBase
public partial class CheckContentEdit : PageBase
{
#region 定义项
/// <summary>
@ -42,6 +42,12 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.CheckNoticeId = Request.Params["CheckNoticeId"];
if (!string.IsNullOrEmpty(this.CheckNoticeId))
{
var checkInfo = BLL.CheckNoticeService.GetCheckNoticeById(this.CheckNoticeId);
if (checkInfo != null)
{
this.drpSubjectProject.SelectedValue = checkInfo.SubjectProjectId;
}
var table1 = BLL.CheckTable1Service.GetCheckTable1ByCheckNoticeId(this.CheckNoticeId);
if (table1 != null)
{

6
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit1.aspx.designer.cs → SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.OfficeCheck.Check {
namespace FineUIPro.Web.OfficeCheck.Check
{
public partial class CheckContentEdit1 {
public partial class CheckContentEdit
{
/// <summary>
/// form1 控件。

65
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx
View File

@ -25,7 +25,7 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="280px" Title="监督检查" TitleToolTip="监督检查" ShowBorder="true"
EnableCollapse="true" Width="300px" Title="监督检查" TitleToolTip="监督检查" ShowBorder="true"
ShowHeader="false" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="VBox" AutoScroll="true">
<Items>
<f:DatePicker ID="txtCheckStartTimeS" runat="server" Label="开始时间" AutoPostBack="true" OnTextChanged="Tree_TextChanged"
@ -37,8 +37,8 @@
</Items>
<Items>
<f:Tree ID="tvControlItem" EnableCollapse="true" ShowHeader="true" Title="监督检查节点树"
OnNodeCommand="tvControlItem_NodeCommand" AutoLeafIdentification="true"
runat="server" EnableTextSelection="true" AutoScroll="true">
OnNodeCommand="tvControlItem_NodeCommand" AutoLeafIdentification="true" Height="620px"
runat="server" EnableTextSelection="true">
</f:Tree>
</Items>
</f:Panel>
@ -62,42 +62,41 @@
</Toolbars>
<Items>
<f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Left">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="130px">
<Rows>
<f:FormRow ColumnWidths="40% 60%">
<f:FormRow>
<Items>
<f:Label ID="drpSubjectUnit" Label="受检单位" runat="server" LabelWidth="80px">
</f:Label>
<f:Label ID="txtSubjectObject" ShowLabel="false" runat="server" MarginLeft="140px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="40% 60%">
<Items>
<f:Label ID="txtSubjectUnitMan" Label="受检单位负责人" runat="server" LabelWidth="120px">
</f:Label>
<f:Label ID="txtSubjectUnitTel" Label="受检单位负责人电话" runat="server" LabelWidth="150px">
<f:Label ID="drpSubjectUnit" Label="受检单位" runat="server" >
</f:Label>
</Items>
</f:FormRow>
<f:FormRow >
<Items>
<f:Label ID="txtSubjectUnitAdd" Label="受检单位地址" runat="server" LabelWidth="110px">
<f:Label ID="txtSubjectUnitMan" Label="受检单位负责人" runat="server" >
</f:Label>
<f:Label ID="txtSubjectUnitTel" Label="负责人电话" runat="server">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="40% 60%">
<f:FormRow>
<Items>
<f:Label ID="txtCheckStartTime" Label="检查开始日期" runat="server" LabelWidth="110px">
</f:Label>
<f:Label ID="txtCheckEndTime" Label="检查结束日期" runat="server" LabelWidth="110px">
<f:Label ID="txtSubjectUnitAdd" Label="受检单位地址" runat="server" >
</f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="40% 60%">
<f:FormRow >
<Items>
<f:Label ID="txtCompileMan" Label="编制人" runat="server" LabelWidth="100px">
<f:Label ID="txtCheckStartTime" Label="检查开始日期" runat="server" >
</f:Label>
<f:Label ID="txtCompileDate" Label="编制日期" runat="server" LabelWidth="100px">
<f:Label ID="txtCheckEndTime" Label="检查结束日期" runat="server" >
</f:Label>
</Items>
</f:FormRow>
<f:FormRow >
<Items>
<f:Label ID="txtCompileMan" Label="编制人" runat="server" >
</f:Label>
<f:Label ID="txtCompileDate" Label="编制日期" runat="server" >
</f:Label>
</Items>
</f:FormRow>
@ -106,16 +105,16 @@
</Items>
<Items>
<f:Form ID="Form2" ShowBorder="true" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Left">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow ColumnWidths="30% 70%">
<f:FormRow >
<Items>
<f:Label ID="Label1" runat="server" Text="现场安全检查" Label="检查项名称">
</f:Label>
<f:Label ID="lblSubjectUnitId" runat="server" Label="受检对象"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="30% 70%">
<f:FormRow >
<Items>
<f:Label ID="lblCheckDate" runat="server" Label="生效日">
</f:Label>
@ -139,16 +138,16 @@
</Items>
<Items>
<f:Form ID="Form4" ShowBorder="true" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Left">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow ColumnWidths="30% 70%">
<f:FormRow >
<Items>
<f:Label ID="Label9" runat="server" Text="检查报告" Label="检查项名称">
</f:Label>
<f:Label ID="lblCheckObject" runat="server" Label="受检对象"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="30% 70%">
<f:FormRow >
<Items>
<f:Label ID="lblCheckStartTime" runat="server" Label="生效日">
</f:Label>
@ -172,16 +171,16 @@
</Items>
<Items>
<f:Form ID="Form3" ShowBorder="true" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Left">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow ColumnWidths="30% 70%">
<f:FormRow >
<Items>
<f:Label ID="Label5" runat="server" Text="隐患整改" Label="检查项名称">
</f:Label>
<f:Label ID="lblUnitId" runat="server" Label="受检对象"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="30% 70%">
<f:FormRow >
<Items>
<f:Label ID="lblCheckedDate" runat="server" Label="生效日">
</f:Label>
@ -213,7 +212,7 @@
</f:Window>
<f:Window ID="Window2" Title="检查内容项" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1200px" Height="650px">
Width="1200px" Height="650px" Maximized="true">
</f:Window>
</form>
<script type="text/javascript">

5
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx.cs
View File

@ -236,7 +236,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
else
{
this.drpSubjectUnit.Text = string.Empty;
this.txtSubjectObject.Text = string.Empty;
this.txtSubjectUnitMan.Text = string.Empty;
this.txtSubjectUnitTel.Text = string.Empty;
this.txtSubjectUnitAdd.Text = string.Empty;
@ -301,7 +300,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// <param name="e"></param>
protected void btnCheck1_Click(object sender, EventArgs e)
{
string window = String.Format("CheckContentEdit1.aspx?CheckNoticeId={0}", this.CheckNoticeId, "编辑 - ");
string window = String.Format("CheckContentEdit.aspx?CheckNoticeId={0}", this.CheckNoticeId, "编辑 - ");
PageContext.RegisterStartupScript(Window2.GetShowReference(window));
}
@ -312,7 +311,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// <param name="e"></param>
protected void btnView1_Click(object sender, EventArgs e)
{
string window = String.Format("CheckContentEdit1.aspx?CheckNoticeId={0}&type=1", this.CheckNoticeId, "编辑 - ");
string window = String.Format("CheckContentEdit.aspx?CheckNoticeId={0}&type=1", this.CheckNoticeId, "编辑 - ");
PageContext.RegisterStartupScript(Window2.GetShowReference(window));
}
#endregion

15
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx.designer.cs generated
View File

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

63
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx
View File

@ -25,7 +25,7 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="260px" Title="检查通知" TitleToolTip="检查通知" ShowBorder="true"
EnableCollapse="true" Width="300px" Title="检查通知" TitleToolTip="检查通知" ShowBorder="true"
ShowHeader="false" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="VBox" AutoScroll="true">
<Items>
<f:DatePicker ID="txtCheckStartTimeS" runat="server" Label="开始时间" AutoPostBack="true" OnTextChanged="Tree_TextChanged"
@ -38,7 +38,7 @@
<Items>
<f:Tree ID="tvControlItem" EnableCollapse="true" ShowHeader="true" Title="检查通知节点树"
OnNodeCommand="tvControlItem_NodeCommand" AutoLeafIdentification="true"
runat="server" EnableTextSelection="true" AutoScroll="true" Height="580px">
runat="server" EnableTextSelection="true" AutoScroll="true" Height="620px">
</f:Tree>
</Items>
</f:Panel>
@ -64,44 +64,43 @@
</Toolbars>
<Items>
<f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Left">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="130px">
<Rows>
<f:FormRow ColumnWidths="40% 60%">
<f:FormRow>
<Items>
<f:Label ID="drpSubjectUnit" Label="受检单位" runat="server" LabelWidth="80px">
</f:Label>
<f:Label ID="txtSubjectObject" ShowLabel="false" runat="server" MarginLeft="140px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="40% 60%">
<Items>
<f:Label ID="txtSubjectUnitMan" Label="受检单位负责人" runat="server" LabelWidth="120px">
</f:Label>
<f:Label ID="txtSubjectUnitTel" Label="受检单位负责人电话" runat="server" LabelWidth="150px">
<f:Label ID="drpSubjectUnit" Label="受检单位" runat="server">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="40% 60%">
<f:FormRow >
<Items>
<f:Label ID="txtCheckTeamLeader" Label="检查组长" runat="server" LabelWidth="80px">
<f:Label ID="txtSubjectUnitMan" Label="受检单位负责人" runat="server" >
</f:Label>
<f:Label ID="txtSubjectUnitAdd" Label="受检单位地址" runat="server" LabelWidth="120px">
<f:Label ID="txtSubjectUnitTel" Label="负责人电话" runat="server">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="40% 60%">
<f:FormRow >
<Items>
<f:Label ID="txtCheckStartTime" Label="检查开始日期" runat="server" LabelWidth="110px">
<f:Label ID="txtCheckTeamLeader" Label="检查组长" runat="server">
</f:Label>
<f:Label ID="txtCheckEndTime" Label="检查结束日期" runat="server" LabelWidth="110px">
<f:Label ID="txtSubjectUnitAdd" Label="受检地址" runat="server">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="40% 60%">
<f:FormRow >
<Items>
<f:Label ID="txtCompileMan" Label="编制人" runat="server" LabelWidth="100px">
<f:Label ID="txtCheckStartTime" Label="检查开始日期" runat="server" >
</f:Label>
<f:Label ID="txtCompileDate" Label="编制日期" runat="server" LabelWidth="100px">
<f:Label ID="txtCheckEndTime" Label="检查结束日期" runat="server" >
</f:Label>
</Items>
</f:FormRow>
<f:FormRow >
<Items>
<f:Label ID="txtCompileMan" Label="编制人" runat="server" >
</f:Label>
<f:Label ID="txtCompileDate" Label="编制日期" runat="server" >
</f:Label>
</Items>
</f:FormRow>
@ -109,7 +108,7 @@
</f:Form>
</Items>
<Items>
<f:Grid ID="Grid2" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="检查组成员"
<f:Grid ID="Grid2" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="检查组成员" ForceFit="true"
runat="server" BoxFlex="1" DataKeyNames="CheckTeamId" AllowSorting="true" IsDatabasePaging="true" PageSize="10"
OnSort="Grid2_Sort" SortField="SortIndex" SortDirection="ASC" AllowCellEditing="true" Collapsed="false" EnableCollapseEvent="true"
ClicksToEdit="2" EnableColumnLines="true" DataIDField="CheckTeamId" AllowPaging="true" EnableExpandEvent="true"
@ -125,31 +124,31 @@
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="70px" ColumnID="SortIndex" DataField="SortIndex"
<f:RenderField Width="60px" ColumnID="SortIndex" DataField="SortIndex"
SortField="SortIndex" FieldType="Int" HeaderText="序号"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="UserName" DataField="UserName"
<f:RenderField Width="100px" ColumnID="UserName" DataField="UserName"
SortField="UserName" FieldType="String" HeaderText="姓名"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="65px" ColumnID="SexName" DataField="SexName"
<f:RenderField Width="80px" ColumnID="SexName" DataField="SexName"
SortField="SexName" FieldType="String" HeaderText="性别"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UnitName" DataField="UnitName"
SortField="UnitName" FieldType="String" HeaderText="所在单位" ExpandUnusedSpace="true"
<f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName"
SortField="UnitName" FieldType="String" HeaderText="所在单位"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="PostName" DataField="PostName"
<f:RenderField Width="100px" ColumnID="PostName" DataField="PostName"
SortField="PostName" FieldType="String" HeaderText="单位职务"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="WorkTitle" DataField="WorkTitle"
<f:RenderField Width="100px" ColumnID="WorkTitle" DataField="WorkTitle"
SortField="WorkTitle" FieldType="String" HeaderText="职称"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="CheckPostName" DataField="CheckPostName"
<f:RenderField Width="110px" ColumnID="CheckPostName" DataField="CheckPostName"
SortField="CheckPostName" FieldType="String" HeaderText="工作组职务"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>

12
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx.cs
View File

@ -170,7 +170,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
else
{
this.drpSubjectUnit.Text = string.Empty;
this.txtSubjectObject.Text = string.Empty;
this.txtSubjectUnitMan.Text = string.Empty;
this.txtSubjectUnitTel.Text = string.Empty;
this.txtSubjectUnitAdd.Text = string.Empty;
@ -240,11 +239,12 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </summary>
private void BindGrid2()
{
string strSql = @"SELECT CheckTeam.CheckTeamId,CheckTeam.CheckNoticeId,CheckTeam.UserId,CheckTeam.SortIndex,CheckTeam.PostName,CheckTeam.WorkTitle,CheckTeam.CheckPostName,CheckTeam.CheckDate"
+ @" ,CheckTeam.UserName,CheckTeam.SexName,Unit.UnitName,Unit.UnitName "
+ @" FROM dbo.ProjectSupervision_CheckTeam AS CheckTeam "
+ @" LEFT JOIN Base_Unit AS Unit ON CheckTeam.UnitId = Unit.UnitId "
+ @" WHERE 1=1 ";
string strSql = @"SELECT CheckTeam.CheckTeamId,CheckTeam.CheckNoticeId,CheckTeam.UserId
,CheckTeam.SortIndex,CheckTeam.PostName,CheckTeam.WorkTitle,CheckTeam.CheckPostName,CheckTeam.CheckDate
,CheckTeam.UserName,CheckTeam.SexName,Unit.UnitName,Unit.UnitName
FROM dbo.ProjectSupervision_CheckTeam AS CheckTeam
LEFT JOIN Base_Unit AS Unit ON CheckTeam.UnitId = Unit.UnitId
WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND CheckNoticeId = @CheckNoticeId";
listStr.Add(new SqlParameter("@CheckNoticeId", this.CheckNoticeId));

15
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.OfficeCheck.Check {
namespace FineUIPro.Web.OfficeCheck.Check
{
public partial class CheckNotice {
public partial class CheckNotice
{
/// <summary>
/// form1 控件。
@ -156,15 +158,6 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// </remarks>
protected global::FineUIPro.Label drpSubjectUnit;
/// <summary>
/// txtSubjectObject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtSubjectObject;
/// <summary>
/// txtSubjectUnitMan 控件。
/// </summary>

6
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL;
using FineUIPro.Web.BaseInfo;
using System;
namespace FineUIPro.Web.OfficeCheck.Check
@ -161,8 +162,11 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.drpUnit.SelectedValue = sysUser.UnitId;
this.drpUnit.Enabled = false;
}
this.drpSex.SelectedValue = sysUser.Sex == "0" ? "女" : "男";
this.txtPostName.Text = PositionService.GetPositionNameById(sysUser.PositionId);
this.txtWorkTitle.Text = PostTitleService.getPostTitleNameById(sysUser.PostTitleId);
this.hdUserId.Text = sysUser.PersonId;
this.drpSex.SelectedValue = sysUser.Sex;
}
}
#endregion

12
SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
View File

@ -196,14 +196,22 @@ namespace FineUIPro.Web.Person
}
}
#region 基本信息
this.txtPersonName.Text = person.PersonName;
this.drpUnit.SelectedValue = person.UnitId;
if (string.IsNullOrEmpty(this.drpUnit.SelectedValue))
{
string name = UnitService.GetUnitNameByUnitId(person.UnitId);
Alert.ShowInParent("当前人员所属单位【" + name + "】不在该项目单位中，请查证！", MessageBoxIcon.Warning);
var getIsPost = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == person.IdentityCard && x.States != Const.ProjectPersonStates_2 && x.ProjectId != this.drpProject.SelectedValue);
if (getIsPost != null)
{
Alert.ShowInParent("当前人员所属单位【" + name + "】不在该项目单位中且人员在项目" + ProjectService.GetProjectNameByProjectId(getIsPost.ProjectId) + "不是【离岗】状态，请查证！", MessageBoxIcon.Warning);
}
else
{
this.drpUnit.Readonly = false;
Alert.ShowInParent("当前人员所属单位【" + name + "】不在该项目单位中，请重新选择所属单位！", MessageBoxIcon.Warning);
}
}
this.txtAccount.Text = person.Account;
if (person.IsForeign.HasValue)

16
SGGL/Model/Model.cs
View File

@ -98141,7 +98141,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(2000)")]
public string CanWelderCode
{
get
@ -98161,7 +98161,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(3000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(4000)")]
public string CanWelderId
{
get
@ -209184,7 +209184,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RewardAndPunishDecision", DbType="NVarChar(100)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RewardAndPunishDecision", DbType="NVarChar(200)")]
public string RewardAndPunishDecision
{
get
@ -220663,7 +220663,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(2000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string WorkAreaId
{
get
@ -268008,7 +268008,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(2000)")]
public string CanWelderCode
{
get
@ -268024,7 +268024,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(3000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(4000)")]
public string CanWelderId
{
get
@ -282489,7 +282489,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(2000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string WorkAreaId
{
get
@ -283396,7 +283396,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(2000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string WorkAreaId
{
get