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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2024-03-11 23:25:20 +08:00
parent 60e1677254 d03c9a0e00
commit f6dee3c033
17 changed files with 573 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2024-02-28.sql
+10
View File
@@ -0,0 +1,10 @@
ALTER TABLE ProjectSupervision_RectifyItem ADD HiddenHazardType NVARCHAR(50) NULL
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'隐患类别（1-一般，2-较大，3-重大）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ProjectSupervision_RectifyItem', @level2type=N'COLUMN',@level2name=N'HiddenHazardType'
GO
ALTER TABLE ProjectSupervision_RectifyItem ALTER COLUMN WrongContent NVARCHAR(500) NULL
GO
ALTER TABLE ProjectSupervision_RectifyItem ALTER COLUMN Requirement NVARCHAR(500) NULL
GO
ALTER TABLE ProjectSupervision_RectifyItem ALTER COLUMN RectifyResults NVARCHAR(500) NULL
GO
SGGL/BLL/API/APIPersonService.cs
+2 -2
View File
@@ -61,7 +61,7 @@ namespace BLL
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.PersonItem person = new Model.PersonItem();
var getProjectPerson = db.SitePerson_Person.FirstOrDefault(x => x.SitePersonId == sitePersonId || (x.ProjectId == projectId && x.IdentityCard == idcard));
var getProjectPerson = db.SitePerson_Person.FirstOrDefault(x => x.SitePersonId == sitePersonId || (x.ProjectId == projectId && x.ProjectId.Length > 1 && x.IdentityCard == idcard));
if (getProjectPerson != null)
{
person.SitePersonId = getProjectPerson.SitePersonId;
@@ -135,7 +135,7 @@ namespace BLL
person.AttachUrl4 = getAttachUrl4(getProjectPerson.PersonId);
person.AttachUrl5 = APIUpLoadFileService.getFileUrl(getProjectPerson.PersonId + "#5", null);
}
var getPerson = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == idcard);
var getPerson = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == idcard && idcard.Length > 1);
if (getPerson != null)
{
person.PersonId = getPerson.PersonId;
SGGL/BLL/BLL.csproj
+5 -10
View File
@@ -70,9 +70,13 @@
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
@@ -846,15 +850,6 @@
<WCFMetadataStorage Include="Service References\OAWebService\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>False</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor>
SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs
+18 -16
View File
@@ -76,24 +76,26 @@ namespace BLL
/// <param name="SpotCheckDetail"></param>
public static void UpdateSpotCheckDetail(Model.Check_SpotCheckDetail SpotCheckDetail)
{
Model.SGGLDB db = Funs.DB;
Model.Check_SpotCheckDetail newSpotCheckDetail = db.Check_SpotCheckDetail.FirstOrDefault(e => e.SpotCheckDetailId == SpotCheckDetail.SpotCheckDetailId);
if (newSpotCheckDetail != null)
using (var db = new Model.SGGLDB(Funs.ConnString))
{
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(null, SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
newSpotCheckDetail.RectifyDescription = SpotCheckDetail.RectifyDescription;
newSpotCheckDetail.IsDataOK = SpotCheckDetail.IsDataOK;
newSpotCheckDetail.DataConfirmDate = SpotCheckDetail.DataConfirmDate;
newSpotCheckDetail.State = SpotCheckDetail.State;
newSpotCheckDetail.HandleMan = SpotCheckDetail.HandleMan;
newSpotCheckDetail.IsShow = SpotCheckDetail.IsShow;
Model.Check_SpotCheckDetail newSpotCheckDetail = db.Check_SpotCheckDetail.FirstOrDefault(e => e.SpotCheckDetailId == SpotCheckDetail.SpotCheckDetailId);
if (newSpotCheckDetail != null)
{
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(null, SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
newSpotCheckDetail.RectifyDescription = SpotCheckDetail.RectifyDescription;
newSpotCheckDetail.IsDataOK = SpotCheckDetail.IsDataOK;
newSpotCheckDetail.DataConfirmDate = SpotCheckDetail.DataConfirmDate;
newSpotCheckDetail.State = SpotCheckDetail.State;
newSpotCheckDetail.HandleMan = SpotCheckDetail.HandleMan;
newSpotCheckDetail.IsShow = SpotCheckDetail.IsShow;
db.SubmitChanges();
db.SubmitChanges();
}
}
}
SGGL/BLL/CQMS/Check/SpotCheckService.cs
+22 -20
View File
@@ -76,27 +76,29 @@ namespace BLL
/// <param name="SpotCheck"></param>
public static void UpdateSpotCheck(Model.Check_SpotCheck SpotCheck)
{
Model.SGGLDB db = Funs.DB;
Model.Check_SpotCheck newSpotCheck = db.Check_SpotCheck.First(e => e.SpotCheckCode == SpotCheck.SpotCheckCode);
newSpotCheck.DocCode = SpotCheck.DocCode;
newSpotCheck.UnitId = SpotCheck.UnitId;
newSpotCheck.CheckDateType = SpotCheck.CheckDateType;
newSpotCheck.SpotCheckDate = SpotCheck.SpotCheckDate;
newSpotCheck.SpotCheckDate2 = SpotCheck.SpotCheckDate2;
newSpotCheck.CheckArea = SpotCheck.CheckArea;
newSpotCheck.IsOK = SpotCheck.IsOK;
newSpotCheck.JointCheckMans = SpotCheck.JointCheckMans;
newSpotCheck.JointCheckMans2 = SpotCheck.JointCheckMans2;
newSpotCheck.JointCheckMans3 = SpotCheck.JointCheckMans3;
newSpotCheck.CNProfessionalCode = SpotCheck.CNProfessionalCode;
newSpotCheck.AttachUrl = SpotCheck.AttachUrl;
newSpotCheck.State = SpotCheck.State;
newSpotCheck.ControlPointType = SpotCheck.ControlPointType;
newSpotCheck.State2 = SpotCheck.State2;
newSpotCheck.IsShow = SpotCheck.IsShow;
newSpotCheck.SaveHandleMan = SpotCheck.SaveHandleMan;
using (var db = new Model.SGGLDB(Funs.ConnString))
{
Model.Check_SpotCheck newSpotCheck = db.Check_SpotCheck.First(e => e.SpotCheckCode == SpotCheck.SpotCheckCode);
newSpotCheck.DocCode = SpotCheck.DocCode;
newSpotCheck.UnitId = SpotCheck.UnitId;
newSpotCheck.CheckDateType = SpotCheck.CheckDateType;
newSpotCheck.SpotCheckDate = SpotCheck.SpotCheckDate;
newSpotCheck.SpotCheckDate2 = SpotCheck.SpotCheckDate2;
newSpotCheck.CheckArea = SpotCheck.CheckArea;
newSpotCheck.IsOK = SpotCheck.IsOK;
newSpotCheck.JointCheckMans = SpotCheck.JointCheckMans;
newSpotCheck.JointCheckMans2 = SpotCheck.JointCheckMans2;
newSpotCheck.JointCheckMans3 = SpotCheck.JointCheckMans3;
newSpotCheck.CNProfessionalCode = SpotCheck.CNProfessionalCode;
newSpotCheck.AttachUrl = SpotCheck.AttachUrl;
newSpotCheck.State = SpotCheck.State;
newSpotCheck.ControlPointType = SpotCheck.ControlPointType;
newSpotCheck.State2 = SpotCheck.State2;
newSpotCheck.IsShow = SpotCheck.IsShow;
newSpotCheck.SaveHandleMan = SpotCheck.SaveHandleMan;
db.SubmitChanges();
db.SubmitChanges();
}
}
/// <summary>
SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs
+55 -51
View File
@@ -43,33 +43,35 @@ namespace BLL
/// <param name="ControlItemAndCycle"></param>
public static void AddControlItemAndCycle(Model.WBS_ControlItemAndCycle ControlItemAndCycle)
{
Model.SGGLDB db = Funs.DB;
Model.WBS_ControlItemAndCycle newControlItemAndCycle = new Model.WBS_ControlItemAndCycle();
//string newKeyID = SQLHelper.GetNewID(typeof(Model.WBS_ControlItemAndCycle));
newControlItemAndCycle.ControlItemAndCycleId = ControlItemAndCycle.ControlItemAndCycleId;
newControlItemAndCycle.ControlItemAndCycleCode = ControlItemAndCycle.ControlItemAndCycleCode;
newControlItemAndCycle.WorkPackageId = ControlItemAndCycle.WorkPackageId;
newControlItemAndCycle.WorkPackageIds = WorkPackageService.getWorkPageIdsByControlItemAndCycle(ControlItemAndCycle.WorkPackageId, ControlItemAndCycle.ControlItemAndCycleId);
newControlItemAndCycle.ProjectId = ControlItemAndCycle.ProjectId;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
newControlItemAndCycle.ControlItemDef = ControlItemAndCycle.ControlItemDef;
newControlItemAndCycle.IsSelected = ControlItemAndCycle.IsSelected;
newControlItemAndCycle.IsApprove = ControlItemAndCycle.IsApprove;
newControlItemAndCycle.AttachUrl = ControlItemAndCycle.AttachUrl;
newControlItemAndCycle.Weights = ControlItemAndCycle.Weights;
newControlItemAndCycle.HGForms = ControlItemAndCycle.HGForms;
newControlItemAndCycle.SHForms = ControlItemAndCycle.SHForms;
newControlItemAndCycle.Standard = ControlItemAndCycle.Standard;
newControlItemAndCycle.ClauseNo = ControlItemAndCycle.ClauseNo;
newControlItemAndCycle.CheckNum = ControlItemAndCycle.CheckNum;
newControlItemAndCycle.InitControlItemCode = ControlItemAndCycle.InitControlItemCode;
newControlItemAndCycle.PlanCompleteDate = ControlItemAndCycle.PlanCompleteDate;
newControlItemAndCycle.Costs = ControlItemAndCycle.Costs;
newControlItemAndCycle.CheckAcceptType = ControlItemAndCycle.CheckAcceptType;
using (var db = new Model.SGGLDB(Funs.ConnString))
{
Model.WBS_ControlItemAndCycle newControlItemAndCycle = new Model.WBS_ControlItemAndCycle();
//string newKeyID = SQLHelper.GetNewID(typeof(Model.WBS_ControlItemAndCycle));
newControlItemAndCycle.ControlItemAndCycleId = ControlItemAndCycle.ControlItemAndCycleId;
newControlItemAndCycle.ControlItemAndCycleCode = ControlItemAndCycle.ControlItemAndCycleCode;
newControlItemAndCycle.WorkPackageId = ControlItemAndCycle.WorkPackageId;
newControlItemAndCycle.WorkPackageIds = WorkPackageService.getWorkPageIdsByControlItemAndCycle(ControlItemAndCycle.WorkPackageId, ControlItemAndCycle.ControlItemAndCycleId);
newControlItemAndCycle.ProjectId = ControlItemAndCycle.ProjectId;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
newControlItemAndCycle.ControlItemDef = ControlItemAndCycle.ControlItemDef;
newControlItemAndCycle.IsSelected = ControlItemAndCycle.IsSelected;
newControlItemAndCycle.IsApprove = ControlItemAndCycle.IsApprove;
newControlItemAndCycle.AttachUrl = ControlItemAndCycle.AttachUrl;
newControlItemAndCycle.Weights = ControlItemAndCycle.Weights;
newControlItemAndCycle.HGForms = ControlItemAndCycle.HGForms;
newControlItemAndCycle.SHForms = ControlItemAndCycle.SHForms;
newControlItemAndCycle.Standard = ControlItemAndCycle.Standard;
newControlItemAndCycle.ClauseNo = ControlItemAndCycle.ClauseNo;
newControlItemAndCycle.CheckNum = ControlItemAndCycle.CheckNum;
newControlItemAndCycle.InitControlItemCode = ControlItemAndCycle.InitControlItemCode;
newControlItemAndCycle.PlanCompleteDate = ControlItemAndCycle.PlanCompleteDate;
newControlItemAndCycle.Costs = ControlItemAndCycle.Costs;
newControlItemAndCycle.CheckAcceptType = ControlItemAndCycle.CheckAcceptType;
db.WBS_ControlItemAndCycle.InsertOnSubmit(newControlItemAndCycle);
db.SubmitChanges();
db.WBS_ControlItemAndCycle.InsertOnSubmit(newControlItemAndCycle);
db.SubmitChanges();
}
}
/// <summary>
@@ -78,32 +80,34 @@ namespace BLL
/// <param name="ControlItemAndCycle"></param>
public static void UpdateControlItemAndCycle(Model.WBS_ControlItemAndCycle ControlItemAndCycle)
{
Model.SGGLDB db = Funs.DB;
Model.WBS_ControlItemAndCycle newControlItemAndCycle = db.WBS_ControlItemAndCycle.First(e => e.ControlItemAndCycleId == ControlItemAndCycle.ControlItemAndCycleId);
newControlItemAndCycle.ControlItemAndCycleCode = ControlItemAndCycle.ControlItemAndCycleCode;
newControlItemAndCycle.WorkPackageId = ControlItemAndCycle.WorkPackageId;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
newControlItemAndCycle.ControlItemDef = ControlItemAndCycle.ControlItemDef;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
newControlItemAndCycle.ControlItemDef = ControlItemAndCycle.ControlItemDef;
newControlItemAndCycle.IsSelected = ControlItemAndCycle.IsSelected;
newControlItemAndCycle.IsApprove = ControlItemAndCycle.IsApprove;
newControlItemAndCycle.AttachUrl = ControlItemAndCycle.AttachUrl;
newControlItemAndCycle.Weights = ControlItemAndCycle.Weights;
newControlItemAndCycle.HGForms = ControlItemAndCycle.HGForms;
newControlItemAndCycle.SHForms = ControlItemAndCycle.SHForms;
newControlItemAndCycle.Standard = ControlItemAndCycle.Standard;
newControlItemAndCycle.ClauseNo = ControlItemAndCycle.ClauseNo;
newControlItemAndCycle.CheckNum = ControlItemAndCycle.CheckNum;
newControlItemAndCycle.PlanCompleteDate = ControlItemAndCycle.PlanCompleteDate;
newControlItemAndCycle.Costs = ControlItemAndCycle.Costs;
newControlItemAndCycle.CheckAcceptType = ControlItemAndCycle.CheckAcceptType;
newControlItemAndCycle.RealEndDate = ControlItemAndCycle.RealEndDate;
newControlItemAndCycle.PlanCost = ControlItemAndCycle.PlanCost;
using (var db = new Model.SGGLDB(Funs.ConnString))
{
Model.WBS_ControlItemAndCycle newControlItemAndCycle = db.WBS_ControlItemAndCycle.First(e => e.ControlItemAndCycleId == ControlItemAndCycle.ControlItemAndCycleId);
newControlItemAndCycle.ControlItemAndCycleCode = ControlItemAndCycle.ControlItemAndCycleCode;
newControlItemAndCycle.WorkPackageId = ControlItemAndCycle.WorkPackageId;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
newControlItemAndCycle.ControlItemDef = ControlItemAndCycle.ControlItemDef;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
newControlItemAndCycle.ControlItemDef = ControlItemAndCycle.ControlItemDef;
newControlItemAndCycle.IsSelected = ControlItemAndCycle.IsSelected;
newControlItemAndCycle.IsApprove = ControlItemAndCycle.IsApprove;
newControlItemAndCycle.AttachUrl = ControlItemAndCycle.AttachUrl;
newControlItemAndCycle.Weights = ControlItemAndCycle.Weights;
newControlItemAndCycle.HGForms = ControlItemAndCycle.HGForms;
newControlItemAndCycle.SHForms = ControlItemAndCycle.SHForms;
newControlItemAndCycle.Standard = ControlItemAndCycle.Standard;
newControlItemAndCycle.ClauseNo = ControlItemAndCycle.ClauseNo;
newControlItemAndCycle.CheckNum = ControlItemAndCycle.CheckNum;
newControlItemAndCycle.PlanCompleteDate = ControlItemAndCycle.PlanCompleteDate;
newControlItemAndCycle.Costs = ControlItemAndCycle.Costs;
newControlItemAndCycle.CheckAcceptType = ControlItemAndCycle.CheckAcceptType;
newControlItemAndCycle.RealEndDate = ControlItemAndCycle.RealEndDate;
newControlItemAndCycle.PlanCost = ControlItemAndCycle.PlanCost;
db.SubmitChanges();
db.SubmitChanges();
}
}
/// <summary>
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+5 -10
View File
@@ -111,6 +111,10 @@
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
@@ -14445,15 +14449,6 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor>
@@ -14474,7 +14469,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:14290/</IISUrl>
<IISUrl>http://localhost:8653/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
SGGL/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx
+44 -15
View File
@@ -5,8 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>总部检查</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<title></title>
<script type="text/javascript" src="../../Controls/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
@@ -23,7 +22,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Left" runat="server">
<Items>
<f:RadioButtonList ID="rbStates" runat="server" Label="状态"
<f:RadioButtonList ID="rbStates" runat="server" Label="状态"
LabelAlign="Right" Width="400px" AutoPostBack="true" OnSelectedIndexChanged="rbStates_SelectedIndexChanged">
<f:RadioItem Text="不合格" Value="0" Selected="true" />
<f:RadioItem Text="合格" Value="1" />
@@ -36,9 +35,9 @@
SortField="RectifyItemId" FieldType="String" HeaderTextAlign="Center" TextAlign="Center"
Hidden="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="StatesName" DataField="StatesName" FieldType="string"
HeaderText="状态">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="StatesName" DataField="StatesName" FieldType="string"
HeaderText="状态">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RectifyCode" DataField="RectifyCode" FieldType="string"
HeaderText="整改单">
</f:RenderField>
@@ -53,11 +52,23 @@
</f:RenderField>
<f:LinkButtonField HeaderText="整改前" ConfirmTarget="Top" Width="80" CommandName="AttachUrl"
TextAlign="Center" ToolTip="整改照片" Text="详细" />
<f:TemplateField ColumnID="tfImageUrl1" Width="120px" HeaderText="整改前" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("RectifyItemId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="RectifyResults" DataField="RectifyResults" FieldType="string"
HeaderText="整改结果">
</f:RenderField>
<f:LinkButtonField ColumnID="ReAttachUrl" HeaderText="整改后" ConfirmTarget="Top" Width="80" CommandName="ReAttachUrl"
TextAlign="Center" ToolTip="整改照片" Text="整改后" />
<f:TemplateField ColumnID="tfImageUrl2" Width="120px" HeaderText="整改后" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertImageUrlByImage2(Eval("RectifyItemId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="dataload" Handler="onGridDataLoad" />
@@ -70,26 +81,44 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<div id="imgID1" style="position: absolute; left: 0; top: 0; width: 300px; height: 300px; z-index: 99999999;">
<img src="" alt="Alternate Text" style="width: 100%; height: auto;" />
</div>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnSubmit" EnablePostBack="true" runat="server"
<f:MenuButton ID="btnSubmit" EnablePostBack="true" runat="server"
Text="提交" Icon="TableEdit" OnClick="btnSubmit_Click">
</f:MenuButton>
</f:MenuButton>
</Items>
</f:Menu>
</form>
<script type="text/javascript">
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
}
function onGridDataLoad(event) {
this.mergeColumns(['RectifyCode'], { depends: true });
}
</script>
function onGridDataLoad(event) {
this.mergeColumns(['RectifyCode'], { depends: true });
}
</script>
<script type="text/javascript">
var imgID = '<%=Grid1.ClientID %>';
F.ready(function () {
var $wrap = $("#" + imgID)
$wrap.find('img').hover(function (e) {
console.log($(this).offset())
var top = $(this).offset().top;
var left = $(this).offset().left - 200;
var src = $(this).attr('src')
console.log('src', src, top, left)
$('#imgID1').css("left", left).css("top", top).show().find('img').attr('src', src)
}, function () {
$('#imgID1').hide()
})
})
</script>
</body>
</html>
SGGL/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
+40
View File
@@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
namespace FineUIPro.Web.HSSE.Check
{
@@ -127,5 +128,44 @@ namespace FineUIPro.Web.HSSE.Check
ShowNotify("数据已提交成功!");
}
}
/// <summary>
/// 获取整改前图片(放于Img中)
/// </summary>
/// <param name="registrationId"></param>
/// <returns></returns>
protected string ConvertImageUrlByImage(object RectifyItemId)
{
string url = string.Empty;
if (RectifyItemId != null)
{
var RectifyNoticesItem = BLL.AttachFileService.GetAttachFileByToKeyId(RectifyItemId.ToString() + "#1");
if (RectifyNoticesItem != null)
{
url = HttpUtility.HtmlDecode(BLL.UploadAttachmentService.ShowImage("../../", RectifyNoticesItem.AttachUrl));
}
}
return url;
}
/// <summary>
/// 获取整改后图片
/// </summary>
/// <param name="registrationId"></param>
/// <returns></returns>
protected string ConvertImageUrlByImage2(object RectifyItemId)
{
string url = string.Empty;
if (RectifyItemId != null)
{
var RectifyNoticesItem = BLL.AttachFileService.GetAttachFileByToKeyId(RectifyItemId.ToString() + "#2");
if (RectifyNoticesItem != null)
{
url = BLL.UploadAttachmentService.ShowImage("../../", RectifyNoticesItem.AttachUrl);
}
}
return url;
}
}
}
SGGL/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.designer.cs
Generated
+18
View File
@@ -68,6 +68,24 @@ namespace FineUIPro.Web.HSSE.Check
/// </remarks>
protected global::FineUIPro.RadioButtonList rbStates;
/// <summary>
/// lbImageUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbImageUrl;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// WindowAtt 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx
+1 -1
View File
@@ -84,7 +84,7 @@
<f:TemplateField ColumnID="tfImageUrl2" Width="110px" HeaderText="整改后" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertImgUrlByImage(Eval("RectifyNoticesItemId")) %>'> %>'></asp:Label>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertImgUrlByImage(Eval("RectifyNoticesItemId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="IsRectify" DataField="IsRectify" FieldType="string"
SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx
+1 -1
View File
@@ -42,7 +42,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtFactoryCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="110px"
<f:TextBox ID="txtFactoryCode" runat="server" Label="出厂编号" LabelAlign="Right" LabelWidth="110px"
MaxLength="50" ShowRedStar="true" Required="true">
</f:TextBox>
<f:TextBox ID="txtCertificateCode" runat="server" Label="合格证编号" LabelAlign="Right"
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx.cs
+4 -3
View File
@@ -1,7 +1,9 @@
using BLL;
using FineUIPro.Web.HSSE.Check;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Policy;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.OfficeCheck.Check
@@ -383,10 +385,9 @@ namespace FineUIPro.Web.OfficeCheck.Check
var getRectify = ProjectSupervision_RectifyService.GetRectifyByCheckNoticeId(this.CheckNoticeId);
if (getRectify != null && getRectify.States != "0" && !string.IsNullOrEmpty(getRectify.States))
{
window = String.Format("RectifyEdit.aspx?CheckNoticeId={0}&type=1", this.CheckNoticeId, "编辑 - ");
PageContext.RegisterStartupScript(Window2.GetShowReference(window));
window = String.Format("RectifyEdit.aspx?CheckNoticeId={0}&type=1", this.CheckNoticeId, "编辑 - ");
}
PageContext.RegisterStartupScript(Window2.GetShowReference(window));
}
SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx
+84 -50
View File
@@ -4,10 +4,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>隐患整改</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../Controls/My97DatePicker/WdatePicker.js"></script>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
<script type="text/javascript" src="../../Controls/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
<form id="form1" runat="server">
@@ -19,58 +18,39 @@
<Rows>
<f:FormRow runat="server">
<Items>
<f:TextBox ID="txtRectifyNoticesCode" runat="server" Label="编号" MaxLength="70" Required="true" ShowRedStar="true">
<f:TextBox ID="txtRectifyNoticesCode" runat="server" Label="编号" MaxLength="70" Required="true" ShowRedStar="true">
</f:TextBox>
<f:DropDownList ID="drpProjectId" runat="server" Label="受检项目"
<f:DropDownList ID="drpProjectId" runat="server" Label="受检项目"
LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:DropDownList ID="drpCheckMan" runat="server" Label="检查人员" LabelAlign="Right"
EnableEdit="true" EnableMultiSelect="true" AutoPostBack="true" OnSelectedIndexChanged="drpCheckMan_SelectedIndexChanged" >
<f:DropDownList ID="drpCheckMan" runat="server" Label="检查人员" LabelAlign="Right"
EnableEdit="true" EnableMultiSelect="true" AutoPostBack="true" OnSelectedIndexChanged="drpCheckMan_SelectedIndexChanged">
</f:DropDownList>
<f:TextBox runat="server" Label="检查人员" ID="txtCheckPerson"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="检查日期" ID="txtCheckedDate"
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="检查日期" ID="txtCheckedDate"
LabelAlign="right" ShowRedStar="true">
</f:DatePicker>
<f:DropDownList ID="drpHiddenHazardType" runat="server" Label="隐患类别" EnableEdit="true" EmptyText="--请选择--">
<f:Label runat="server"></f:Label>
<%-- <f:DropDownList ID="drpHiddenHazardType" runat="server" Label="隐患类别" EnableEdit="true" EmptyText="--请选择--">
<f:ListItem Text="一般" Value="1" />
<f:ListItem Text="较大" Value="2" />
<f:ListItem Text="重大" Value="3" />
</f:DropDownList>
</f:DropDownList>--%>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:HiddenField ID="hdRectifyNoticesId" runat="server"></f:HiddenField>
<f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server"
Text="保存" ValidateForms="SimpleForm1" >
</f:Button>
<f:Button ID="btnSubmit" OnClick="btnSubmit_Click" Icon="SystemSaveNew" runat="server"
Text="签发" ValidateForms="SimpleForm1" >
</f:Button>
<f:Button ID="btnSure" OnClick="btnSure_Click" Icon="Accept" runat="server" Hidden="true"
Text="复查确认" >
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Form ID="Form2" ShowBorder="true" ShowHeader="false" Title="安全隐患及整改要求" AutoScroll="true"
runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" AllowCellEditing="true" ClicksToEdit="1"
ForceFit="true" EnableCollapse="true" EnableColumnLines="true" EnableColumnMove="true" runat="server" BoxFlex="1"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" AllowCellEditing="true" ClicksToEdit="1"
EnableCollapse="true" EnableColumnLines="true" EnableColumnMove="true" runat="server" BoxFlex="1"
DataKeyNames="RectifyItemId,IsRectify" DataIDField="RectifyItemId" AllowSorting="true" SortField="RectifyItemId"
SortDirection="ASC" EnableTextSelection="True" MinHeight="240px" PageSize="500"
EnableRowDoubleClickEvent="true" OnRowCommand="Grid1_RowCommand" OnRowDataBound="Grid1_RowDataBound">
@@ -87,21 +67,31 @@
SortField="RectifyItemId" FieldType="String" HeaderTextAlign="Center" TextAlign="Center"
Hidden="true">
</f:RenderField>
<f:RenderField Width="300px" ColumnID="WrongContent" DataField="WrongContent" FieldType="string"
<f:RenderField Width="550px" ColumnID="WrongContent" DataField="WrongContent" FieldType="string"
HeaderText="具体位置及隐患内容">
<Editor>
<f:TextBox ID="tWrongContent" runat="server" MaxLength="800" ShowRedStar="true" Required="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Requirement" DataField="Requirement" FieldType="string"
<f:TemplateField ColumnID="HiddenHazardType" HeaderText="隐患类别" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
<ItemTemplate>
<asp:DropDownList ID="drpHiddenHazardType" runat="server">
<asp:ListItem Text="一般" Value="1" Selected="True" />
<asp:ListItem Text="较大" Value="2" />
<asp:ListItem Text="重大" Value="3" />
</asp:DropDownList>
<f:HiddenField ID="hdHiddenHazardType" runat="server" Text='<%# Eval("HiddenHazardType") %>'></f:HiddenField>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="220px" ColumnID="Requirement" DataField="Requirement" FieldType="string" HeaderTextAlign="Center"
HeaderText="整改要求">
<Editor>
<f:TextBox ID="tRequirement" runat="server" MaxLength="800" ShowRedStar="true" Required="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:TemplateField ColumnID="LimitTime" Width="100px" HeaderText="整改期限" HeaderTextAlign="Center"
<f:TemplateField ColumnID="LimitTime" Width="120px" HeaderText="整改期限" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:TextBox ID="txtLimitTimes" runat="server" Text='<%# Eval("LimitTime")!=null? ConvertDate(Eval("LimitTime")):"" %>'
@@ -111,17 +101,29 @@
</ItemTemplate>
</f:TemplateField>
<f:LinkButtonField HeaderText="整改前" ConfirmTarget="Top" Width="80" CommandName="AttachUrl"
TextAlign="Center" ToolTip="整改照片" Text="详细" />
<f:RenderField Width="100px" ColumnID="RectifyResults" DataField="RectifyResults" FieldType="string"
TextAlign="Center" ToolTip="整改照片" Text="编辑" />
<f:TemplateField ColumnID="tfImageUrl1" Width="120px" HeaderText="整改前" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("FileUrlId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="200px" ColumnID="RectifyResults" DataField="RectifyResults" FieldType="string" HeaderTextAlign="Center"
HeaderText="整改结果">
<Editor>
<f:TextBox ID="txtRectifyResults" runat="server" MaxLength="800" LabelWidth="160px">
<f:TextBox ID="txtRectifyResults" runat="server" MaxLength="800">
</f:TextBox>
</Editor>
</f:RenderField>
<f:LinkButtonField ColumnID="ReAttachUrl" HeaderText="整改后" ConfirmTarget="Top" Width="80" CommandName="ReAttachUrl"
TextAlign="Center" ToolTip="整改照片" Text="整改后" />
<f:TemplateField ColumnID="IsRectify" HeaderText="合格" HeaderTextAlign="Center" TextAlign="Center" Width="60px">
TextAlign="Center" ToolTip="整改照片" Text="详细" />
<f:TemplateField ColumnID="tfImageUrl2" Width="120px" HeaderText="整改后" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertImageUrlByImage2(Eval("FileUrlId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="IsRectify" HeaderText="合格" HeaderTextAlign="Center" TextAlign="Center" Width="60px">
<ItemTemplate>
<asp:DropDownList ID="drpIsRectify" runat="server">
<asp:ListItem Value="false">否</asp:ListItem>
@@ -130,17 +132,14 @@
<f:HiddenField ID="hdIsRectify" runat="server" Text='<%# Eval("IsRectify") %>'></f:HiddenField>
</ItemTemplate>
</f:TemplateField>
<f:LinkButtonField ID="del" ColumnID="del" HeaderText="删除" Width="60px" CommandName="delete"
<f:LinkButtonField ID="del" ColumnID="del" HeaderText="删除" Width="50px" CommandName="delete"
Icon="Delete" />
<f:RenderField HeaderText="报告明细id" ColumnID="hdCheckReportItemId" DataField="CheckReportItemId" FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow runat="server" ID="next">
<Items>
<f:DropDownList ID="drpSignPerson" runat="server" Label="整改责任人：项目安全经理" LabelWidth="200px"
@@ -149,7 +148,23 @@
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
</Rows>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:HiddenField ID="hdRectifyNoticesId" runat="server"></f:HiddenField>
<f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server"
Text="保存" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnSubmit" OnClick="btnSubmit_Click" Icon="SystemSaveNew" runat="server"
Text="签发" ValidateForms="SimpleForm1">
</f:Button>
<f:Button ID="btnSure" OnClick="btnSure_Click" Icon="Accept" runat="server" Hidden="true"
Text="复查确认">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
</Items>
</f:Panel>
@@ -157,6 +172,25 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
</form>
<div id="imgID1" style="position: absolute; left: 0; top: 0; width: 300px; height: 300px; z-index: 99999999;">
<img src="" alt="Alternate Text" style="width: 100%; height: auto;" />
</div>
</form>
<script type="text/javascript">
var imgID = '<%=Grid1.ClientID %>';
F.ready(function () {
var $wrap = $("#" + imgID)
$wrap.find('img').hover(function (e) {
console.log($(this).offset())
var top = $(this).offset().top;
var left = $(this).offset().left - 200;
var src = $(this).attr('src')
console.log('src', src, top, left)
$('#imgID1').css("left", left).css("top", top).show().find('img').attr('src', src)
}, function () {
$('#imgID1').hide()
})
})
</script>
</body>
</html>
SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs
+104 -23
View File
@@ -1,13 +1,12 @@
using BLL;
using FineUIPro.Web.DataShow;
using Model;
using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
namespace FineUIPro.Web.OfficeCheck.Check
{
@@ -51,7 +50,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.btnSave.Hidden = true;
this.btnAdd.Hidden = true;
this.btnSubmit.Hidden = true;
this.Grid1.Columns[8].Hidden = true;
this.Grid1.Columns[11].Hidden = true;
}
this.CheckNoticeId = Request.Params["CheckNoticeId"];
@@ -71,16 +70,14 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.txtCheckPerson.Text = getRectify.CheckManNames;
this.txtRectifyNoticesCode.Text = getRectify.RectifyCode;
this.txtCheckedDate.Text = getRectify.CheckedDate.ToString();
if (!string.IsNullOrEmpty(getRectify.HiddenHazardType))
{
this.drpHiddenHazardType.SelectedValue = getRectify.HiddenHazardType;
}
//if (!string.IsNullOrEmpty(getRectify.HiddenHazardType))
//{
// this.drpHiddenHazardType.SelectedValue = getRectify.HiddenHazardType;
//}
if (!string.IsNullOrEmpty(getRectify.SignPerson))
{
this.drpSignPerson.SelectedValue = getRectify.SignPerson;
}
BindGrid();
}
if (getRectify.States == Const.State_1 || getRectify.States == Const.State_2)
{
this.btnSure.Hidden = false;
@@ -112,6 +109,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.txtCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
}
BindGrid();
rectifyItemLists.Clear();
}
}
@@ -132,10 +130,26 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </summary>
public void BindGrid()
{
string strSql = @"select RectifyItemId, RectifyId, WrongContent, Requirement, LimitTime, RectifyResults, IsRectify from ProjectSupervision_RectifyItem ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += "where RectifyId = @RectifyId";
listStr.Add(new SqlParameter("@RectifyId", this.hdRectifyNoticesId.Text));
string strSql = string.Empty;
List <SqlParameter> listStr = new List<SqlParameter>();
if (Funs.DB.ProjectSupervision_RectifyItem.FirstOrDefault(x => x.RectifyId == this.hdRectifyNoticesId.Text) != null)
{
strSql = @"select RectifyItemId,WrongContent,Requirement,LimitTime,RectifyResults,IsRectify,HiddenHazardType
,null as CheckReportItemId, RectifyItemId AS FileUrlId
from ProjectSupervision_RectifyItem
where RectifyId = @RectifyId";
listStr.Add(new SqlParameter("@RectifyId", this.hdRectifyNoticesId.Text));
}
else
{
strSql = @"select newid() as RectifyItemId,UnConformItem as WrongContent,null as Requirement,null as LimitTime, null as RectifyResults,0 as IsRectify
,'1' as HiddenHazardType,item.CheckReportItemId,item.CheckReportItemId AS FileUrlId
from ProjectSupervision_CheckReportItem as item
left join ProjectSupervision_CheckReport as Report on item.CheckReportId=Report.CheckReportId
where Report.CheckNoticeId = @CheckNoticeId";
listStr.Add(new SqlParameter("@CheckNoticeId", this.CheckNoticeId));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
var table = this.GetPagedDataTable(Grid1, tb);
@@ -149,7 +163,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
{
addViewTestPlanTrainingList();
Model.ProjectSupervision_RectifyItem notice = new Model.ProjectSupervision_RectifyItem();
notice.RectifyItemId = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_RectifyItem));
notice.RectifyItemId = SQLHelper.GetNewID();
rectifyItemLists.Add(notice);
//将gd数据保存在list中
Grid1.DataSource = rectifyItemLists;
@@ -171,8 +185,9 @@ namespace FineUIPro.Web.OfficeCheck.Check
string rectifyNoticesItemId = values.Value<string>("RectifyItemId");
string requirement = values.Value<string>("Requirement");
string rectifyResults = values.Value<string>("RectifyResults");
System.Web.UI.WebControls.TextBox txtlimitTim = (System.Web.UI.WebControls.TextBox)Grid1.Rows[i].FindControl("txtLimitTimes");
System.Web.UI.WebControls.DropDownList drpIsRect = (System.Web.UI.WebControls.DropDownList)Grid1.Rows[i].FindControl("drpIsRectify");
TextBox txtlimitTim = (TextBox)Grid1.Rows[i].FindControl("txtLimitTimes");
var item = new ProjectSupervision_RectifyItem();
item.RectifyItemId = rectifyNoticesItemId;
item.RectifyId = hdRectifyNoticesId.Text.Trim();
@@ -180,6 +195,10 @@ namespace FineUIPro.Web.OfficeCheck.Check
item.Requirement = requirement;
item.LimitTime = Funs.GetNewDateTime(txtlimitTim.Text);
item.RectifyResults = rectifyResults;
DropDownList drpIsRect = (DropDownList)Grid1.Rows[i].FindControl("drpIsRectify");
item.IsRectify =Convert.ToBoolean( drpIsRect.SelectedValue);
DropDownList drpHiddenHazardType = (DropDownList)Grid1.Rows[i].FindControl("drpHiddenHazardTypeify");
item.HiddenHazardType = drpHiddenHazardType.SelectedValue;
rectifyItemLists.Add(item);
}
}
@@ -242,7 +261,15 @@ namespace FineUIPro.Web.OfficeCheck.Check
string itemId = Grid1.DataKeys[e.RowIndex][0].ToString();
if (e.CommandName == "AttachUrl")
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Rectify&menuId={1}&type=0&strParam=1", itemId, BLL.Const.CheckInfoMenuId)));
if (Funs.DB.ProjectSupervision_RectifyItem.FirstOrDefault(x => x.RectifyItemId == itemId) != null)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Rectify&menuId={1}&type=0&strParam=1", itemId, BLL.Const.CheckInfoMenuId)));
}
else
{
string checkReportItemId= Grid1.Rows[e.RowIndex].Values[12].ToString();
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Rectify&menuId={1}&type=0&strParam=1", checkReportItemId, BLL.Const.CheckInfoMenuId)));
}
}
if (e.CommandName == "delete")
{
@@ -276,6 +303,13 @@ namespace FineUIPro.Web.OfficeCheck.Check
drpIsRectify.SelectedValue = "false";
}
}
System.Web.UI.WebControls.DropDownList drpHiddenHazardType = (System.Web.UI.WebControls.DropDownList)(this.Grid1.Rows[i].FindControl("drpHiddenHazardType"));
HiddenField hdHiddenHazardType = (HiddenField)(this.Grid1.Rows[i].FindControl("hdHiddenHazardType"));
if (!string.IsNullOrEmpty(hdHiddenHazardType.Text))
{
drpHiddenHazardType.SelectedValue = hdHiddenHazardType.Text;
}
}
}
#endregion
@@ -345,10 +379,10 @@ namespace FineUIPro.Web.OfficeCheck.Check
{
Notices.CheckedDate = Convert.ToDateTime(this.txtCheckedDate.Text.Trim());
}
if (this.drpHiddenHazardType.SelectedValue != BLL.Const._Null)
{
Notices.HiddenHazardType = this.drpHiddenHazardType.SelectedValue;
}
//if (this.drpHiddenHazardType.SelectedValue != BLL.Const._Null)
//{
// Notices.HiddenHazardType = this.drpHiddenHazardType.SelectedValue;
//}
if (this.drpSignPerson.SelectedValue != BLL.Const._Null)
{
Notices.SignPerson = this.drpSignPerson.SelectedValue;
@@ -398,6 +432,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
string rectifyResults = values.Value<string>("RectifyResults");
System.Web.UI.WebControls.TextBox txtlimitTim = (System.Web.UI.WebControls.TextBox)Grid1.Rows[i].FindControl("txtLimitTimes");
System.Web.UI.WebControls.DropDownList drpIsRect = (System.Web.UI.WebControls.DropDownList)Grid1.Rows[i].FindControl("drpIsRectify");
System.Web.UI.WebControls.DropDownList drpHiddenHazardType = (System.Web.UI.WebControls.DropDownList)Grid1.Rows[i].FindControl("drpHiddenHazardType");
string limitTime = txtlimitTim.Text.Trim();
Model.ProjectSupervision_RectifyItem rectifyNoticesItem = Funs.DB.ProjectSupervision_RectifyItem.FirstOrDefault(e => e.RectifyItemId == rectifyNoticesItemId);
if (rectifyNoticesItem != null)
@@ -408,6 +443,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
rectifyNoticesItem.Requirement = requirement.Trim();
rectifyNoticesItem.LimitTime = Funs.GetNewDateTime(limitTime);
rectifyNoticesItem.RectifyResults = rectifyResults.Trim();
rectifyNoticesItem.HiddenHazardType = drpHiddenHazardType.SelectedValue;
rectifyNoticesItem.IsRectify = Convert.ToBoolean(drpIsRect.SelectedValue);
Funs.DB.SubmitChanges();
if (rectifyNoticesItem.IsRectify == true)
@@ -417,7 +453,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
}
else
{
var item = new ProjectSupervision_RectifyItem();
item.RectifyItemId = rectifyNoticesItemId;
item.RectifyId = this.hdRectifyNoticesId.Text.Trim();
@@ -425,9 +460,17 @@ namespace FineUIPro.Web.OfficeCheck.Check
item.Requirement = requirement.Trim();
item.LimitTime = Funs.GetNewDateTime(limitTime);
item.RectifyResults = rectifyResults.Trim();
item.HiddenHazardType = drpHiddenHazardType.SelectedValue;
item.IsRectify = Convert.ToBoolean(drpIsRect.SelectedValue);
Funs.DB.ProjectSupervision_RectifyItem.InsertOnSubmit(item);
Funs.DB.SubmitChanges();
string hdCheckReportItemId = values.Value<string>("CheckReportItemId");
var getAtt = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == hdCheckReportItemId + "#1");
if (getAtt != null)
{
UploadFileService.SaveAttachUrl(getAtt.AttachSource, getAtt.AttachUrl, BLL.Const.CheckInfoMenuId, item.RectifyItemId + "#1");
}
}
}
if (j == data.Count)
@@ -488,5 +531,43 @@ namespace FineUIPro.Web.OfficeCheck.Check
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}
/// <summary>
/// 获取整改前图片(放于Img中)
/// </summary>
/// <param name="registrationId"></param>
/// <returns></returns>
protected string ConvertImageUrlByImage(object FileUrlId)
{
string url = string.Empty;
if (FileUrlId != null)
{
var RectifyNoticesItem = BLL.AttachFileService.GetAttachFileByToKeyId(FileUrlId.ToString() + "#1");
if (RectifyNoticesItem != null)
{
url = HttpUtility.HtmlDecode(BLL.UploadAttachmentService.ShowImage("../../", RectifyNoticesItem.AttachUrl));
}
}
return url;
}
/// <summary>
/// 获取整改后图片
/// </summary>
/// <param name="registrationId"></param>
/// <returns></returns>
protected string ConvertImageUrlByImage2(object FileUrlId)
{
string url = string.Empty;
if (FileUrlId != null)
{
var RectifyNoticesItem = BLL.AttachFileService.GetAttachFileByToKeyId(FileUrlId.ToString() + "#2");
if (RectifyNoticesItem != null)
{
url = BLL.UploadAttachmentService.ShowImage("../../", RectifyNoticesItem.AttachUrl);
}
}
return url;
}
}
}
SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.designer.cs
Generated
+136 -127
View File
@@ -95,6 +95,42 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </remarks>
protected global::FineUIPro.DatePicker txtCheckedDate;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// toolAdd 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar toolAdd;
/// <summary>
/// btnAdd 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAdd;
/// <summary>
/// tWrongContent 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tWrongContent;
/// <summary>
/// drpHiddenHazardType 控件。
/// </summary>
@@ -102,7 +138,106 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpHiddenHazardType;
protected global::System.Web.UI.WebControls.DropDownList drpHiddenHazardType;
/// <summary>
/// hdHiddenHazardType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdHiddenHazardType;
/// <summary>
/// tRequirement 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tRequirement;
/// <summary>
/// txtLimitTimes 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtLimitTimes;
/// <summary>
/// lbImageUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbImageUrl;
/// <summary>
/// txtRectifyResults 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRectifyResults;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// drpIsRectify 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList drpIsRectify;
/// <summary>
/// hdIsRectify 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdIsRectify;
/// <summary>
/// del 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.LinkButtonField del;
/// <summary>
/// next 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow next;
/// <summary>
/// drpSignPerson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSignPerson;
/// <summary>
/// Toolbar1 控件。
@@ -149,132 +284,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </remarks>
protected global::FineUIPro.Button btnSure;
/// <summary>
/// Form2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// toolAdd 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar toolAdd;
/// <summary>
/// btnAdd 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAdd;
/// <summary>
/// tWrongContent 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tWrongContent;
/// <summary>
/// tRequirement 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tRequirement;
/// <summary>
/// txtLimitTimes 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtLimitTimes;
/// <summary>
/// txtRectifyResults 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRectifyResults;
/// <summary>
/// drpIsRectify 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList drpIsRectify;
/// <summary>
/// hdIsRectify 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdIsRectify;
/// <summary>
/// del 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.LinkButtonField del;
/// <summary>
/// Form3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form3;
/// <summary>
/// next 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow next;
/// <summary>
/// drpSignPerson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSignPerson;
/// <summary>
/// WindowAtt 控件。
/// </summary>
SGGL/Model/Model.cs
+24
View File
@@ -204995,6 +204995,8 @@ namespace Model
private string _States;
private string _HiddenHazardType;
private EntityRef<ProjectSupervision_Rectify> _ProjectSupervision_Rectify;
#region 可扩展性方法定义
@@ -205017,6 +205019,8 @@ namespace Model
partial void OnIsRectifyChanged();
partial void OnStatesChanging(string value);
partial void OnStatesChanged();
partial void OnHiddenHazardTypeChanging(string value);
partial void OnHiddenHazardTypeChanged();
#endregion
public ProjectSupervision_RectifyItem()
@@ -205189,6 +205193,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiddenHazardType", DbType="NVarChar(50)")]
public string HiddenHazardType
{
get
{
return this._HiddenHazardType;
}
set
{
if ((this._HiddenHazardType != value))
{
this.OnHiddenHazardTypeChanging(value);
this.SendPropertyChanging();
this._HiddenHazardType = value;
this.SendPropertyChanged("HiddenHazardType");
this.OnHiddenHazardTypeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProjectSupervision_RectifyItem_ProjectSupervision_Rectify", Storage="_ProjectSupervision_Rectify", ThisKey="RectifyId", OtherKey="RectifyId", IsForeignKey=true)]
public ProjectSupervision_Rectify ProjectSupervision_Rectify
{