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-04 16:10:53 +08:00
parent 9730da1465 e58662ebcd
commit a1fb7d11e6
39 changed files with 1199 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BLL.csproj
-9
View File
@@ -844,15 +844,6 @@
<WCFMetadataStorage Include="Service References\OAWebService\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="Microsoft.Office.Core">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
SGGL/BLL/OfficeCheck/Check/CheckNoticeService.cs
+59 -39
View File
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using NPOI.SS.Formula;
using System.Collections.Generic;
using System.Linq;
namespace BLL
@@ -58,6 +59,7 @@ namespace BLL
newCheckTeam.UserName = newCheckNotice.CheckTeamLeaderName;
newCheckTeam.UnitId = newCheckNotice.UnitId;
newCheckTeam.SexName = newCheckNotice.SexName;
newCheckTeam.DepartId = newCheckNotice.DepartId;
BLL.CheckTeamService.AddCheckTeam(newCheckTeam);
}
}
@@ -96,19 +98,34 @@ namespace BLL
/// <param name="checkNoticeId"></param>
public static void DeleteCheckNoticeByCheckNoticeId(string checkNoticeId)
{
Model.ProjectSupervision_CheckNotice checkNotice = Funs.DB.ProjectSupervision_CheckNotice.FirstOrDefault(e => e.CheckNoticeId == checkNoticeId);
if (checkNotice != null)
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var checkTeams = from x in Funs.DB.ProjectSupervision_CheckTeam where x.CheckNoticeId == checkNoticeId select x;
if (checkTeams.Count() > 0)
var checkNotice = db.ProjectSupervision_CheckNotice.FirstOrDefault(e => e.CheckNoticeId == checkNoticeId);
if (checkNotice != null)
{
foreach (var item in checkTeams)
var checkTeams = from x in db.ProjectSupervision_CheckTeam where x.CheckNoticeId == checkNoticeId select x;
if (checkTeams.Count() > 0)
{
BLL.CheckTeamService.DeleteCheckTeamByCheckTeamId(item.CheckTeamId);
db.ProjectSupervision_CheckTeam.DeleteAllOnSubmit(checkTeams);
}
var getCheck1 = from x in db.ProjectSupervision_Check1 where x.CheckNoticeId == checkNoticeId select x;
if (getCheck1.Count() > 0)
{
db.ProjectSupervision_Check1.DeleteAllOnSubmit(getCheck1);
}
var getCheckTable1 = from x in db.ProjectSupervision_CheckTable1 where x.CheckNoticeId == checkNoticeId select x;
if (getCheckTable1.Count() > 0)
{
db.ProjectSupervision_CheckTable1.DeleteAllOnSubmit(getCheckTable1);
}
CheckReportService.DeleteCheckReportByCheckNoticeId(checkNoticeId);
ProjectSupervision_RectifyService.DeleteRectifyByCheckNoticeId(checkNoticeId);
db.ProjectSupervision_CheckNotice.DeleteOnSubmit(checkNotice);
db.SubmitChanges();
}
Funs.DB.ProjectSupervision_CheckNotice.DeleteOnSubmit(checkNotice);
Funs.DB.SubmitChanges();
}
}
@@ -119,44 +136,47 @@ namespace BLL
/// <returns></returns>
public static List<Model.ProjectSupervision_CheckNotice> GetCheckInfoList(string unitId, string userId, string roleId)
{
List<Model.ProjectSupervision_CheckNotice> checkInfoLists = new List<Model.ProjectSupervision_CheckNotice>();
var role = BLL.RoleService.GetRoleByRoleId(roleId);
if (userId == BLL.Const.sysglyId || (BLL.CommonService.IsMainUnitOrAdmin(unitId) && role != null))
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
checkInfoLists = (from x in Funs.DB.ProjectSupervision_CheckNotice orderby x.CheckStartTime select x).ToList();
}
else
{
var checkInfoIdList = (from x in Funs.DB.ProjectSupervision_CheckTeam
where x.UserId == userId && x.UnitId == unitId
select x.CheckNoticeId).Distinct().ToList();
if (checkInfoIdList.Count() > 0)
List<Model.ProjectSupervision_CheckNotice> checkInfoLists = new List<Model.ProjectSupervision_CheckNotice>();
var role = BLL.RoleService.GetRoleByRoleId(roleId);
if (userId == BLL.Const.sysglyId || (BLL.CommonService.IsMainUnitOrAdmin(unitId) && role != null))
{
checkInfoLists = (from x in Funs.DB.ProjectSupervision_CheckNotice
where checkInfoIdList.Contains(x.CheckNoticeId)
orderby x.CheckStartTime
select x).ToList();
checkInfoLists = (from x in db.ProjectSupervision_CheckNotice orderby x.CheckStartTime select x).ToList();
}
var checkInfoIdList1 = (from x in Funs.DB.ProjectSupervision_CheckNotice
where x.CompileMan == userId
orderby x.CheckStartTime
select x).ToList();
if (checkInfoIdList1.Count() > 0)
else
{
if (checkInfoLists.Count() > 0)
var checkInfoIdList = (from x in db.ProjectSupervision_CheckTeam
where x.UserId == userId && x.UnitId == unitId
select x.CheckNoticeId).Distinct().ToList();
if (checkInfoIdList.Count() > 0)
{
checkInfoLists.AddRange(checkInfoIdList1);
checkInfoLists = (from x in db.ProjectSupervision_CheckNotice
where checkInfoIdList.Contains(x.CheckNoticeId)
orderby x.CheckStartTime
select x).ToList();
}
else
{
checkInfoLists = checkInfoIdList1;
}
}
checkInfoLists = checkInfoLists.Distinct().ToList();
var checkInfoIdList1 = (from x in db.ProjectSupervision_CheckNotice
where x.CompileMan == userId
orderby x.CheckStartTime
select x).ToList();
if (checkInfoIdList1.Count() > 0)
{
if (checkInfoLists.Count() > 0)
{
checkInfoLists.AddRange(checkInfoIdList1);
}
else
{
checkInfoLists = checkInfoIdList1;
}
}
checkInfoLists = checkInfoLists.Distinct().ToList();
}
return checkInfoLists;
}
return checkInfoLists;
}
#region 根据检查ID得到检查内容项
SGGL/BLL/OfficeCheck/Check/CheckReportItemService.cs
+7 -4
View File
@@ -28,11 +28,14 @@ namespace BLL
/// <param name="checkReportId"></param>
public static void DeleteCheckReportItemByCheckReportId(string checkReportId)
{
var q = (from x in Funs.DB.ProjectSupervision_CheckReportItem where x.CheckReportId == checkReportId select x).ToList();
if (q != null)
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Funs.DB.ProjectSupervision_CheckReportItem.DeleteAllOnSubmit(q);
Funs.DB.SubmitChanges();
var q = (from x in db.ProjectSupervision_CheckReportItem where x.CheckReportId == checkReportId select x).ToList();
if (q != null)
{
db.ProjectSupervision_CheckReportItem.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/OfficeCheck/Check/CheckReportService.cs
+8 -4
View File
@@ -61,11 +61,15 @@ namespace BLL
/// <param name="checkNoticeId"></param>
public static void DeleteCheckReportByCheckNoticeId(string checkNoticeId)
{
Model.ProjectSupervision_CheckReport checkReport = Funs.DB.ProjectSupervision_CheckReport.FirstOrDefault(e => e.CheckNoticeId == checkNoticeId);
if (checkReport != null)
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Funs.DB.ProjectSupervision_CheckReport.DeleteOnSubmit(checkReport);
Funs.DB.SubmitChanges();
Model.ProjectSupervision_CheckReport checkReport = db.ProjectSupervision_CheckReport.FirstOrDefault(e => e.CheckNoticeId == checkNoticeId);
if (checkReport != null)
{
CheckReportItemService.DeleteCheckReportItemByCheckReportId(checkReport.CheckReportId);
db.ProjectSupervision_CheckReport.DeleteOnSubmit(checkReport);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/OfficeCheck/Check/CheckTeamService.cs
+2
View File
@@ -48,6 +48,7 @@ namespace BLL
UserName = CheckTeam.UserName,
UnitId = CheckTeam.UnitId,
SexName = CheckTeam.SexName,
DepartId=CheckTeam.DepartId,
};
Funs.DB.ProjectSupervision_CheckTeam.InsertOnSubmit(newCheckTeam);
Funs.DB.SubmitChanges();
@@ -71,6 +72,7 @@ namespace BLL
newCheckTeam.UserName = CheckTeam.UserName;
newCheckTeam.UnitId = CheckTeam.UnitId;
newCheckTeam.SexName = CheckTeam.SexName;
newCheckTeam.DepartId = CheckTeam.DepartId;
Funs.DB.SubmitChanges();
}
}
SGGL/BLL/OfficeCheck/Check/ProjectSupervision_RectifyItemService.cs
+7 -4
View File
@@ -36,11 +36,14 @@ namespace BLL
public static void DeleteRectifyItemByRectifyId(string rectifyId)
{
var q = (from x in Funs.DB.ProjectSupervision_RectifyItem where x.RectifyId == rectifyId select x).ToList();
if (q != null)
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Funs.DB.ProjectSupervision_RectifyItem.DeleteAllOnSubmit(q);
Funs.DB.SubmitChanges();
var q = (from x in db.ProjectSupervision_RectifyItem where x.RectifyId == rectifyId select x).ToList();
if (q != null)
{
db.ProjectSupervision_RectifyItem.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
}
SGGL/BLL/OfficeCheck/Check/ProjectSupervision_RectifyService.cs
+8 -5
View File
@@ -75,13 +75,16 @@ namespace BLL
/// <param name="checkNoticeId"></param>
public static void DeleteRectifyByCheckNoticeId(string checkNoticeId)
{
Model.ProjectSupervision_Rectify newRectify = Funs.DB.ProjectSupervision_Rectify.FirstOrDefault(e => e.CheckNoticeId == checkNoticeId);
if (newRectify != null)
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Funs.DB.ProjectSupervision_Rectify.DeleteOnSubmit(newRectify);
Funs.DB.SubmitChanges();
var newRectify = db.ProjectSupervision_Rectify.FirstOrDefault(e => e.CheckNoticeId == checkNoticeId);
if (newRectify != null)
{
ProjectSupervision_RectifyItemService.DeleteRectifyItemByRectifyId(newRectify.RectifyId);
db.ProjectSupervision_Rectify.DeleteOnSubmit(newRectify);
db.SubmitChanges();
}
}
}
}
}
SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs
+19 -19
View File
@@ -29,25 +29,25 @@ namespace BLL
get;
set;
}
public static List<Model.InterFaceLog> GetInterFaceLogByModle(Model.InterFaceLog table)
{
var q= from x in db.InterFaceLog
where
( string.IsNullOrEmpty(table.InterFaceLogId)||x.InterFaceLogId.Contains(table.InterFaceLogId)) &&
( string.IsNullOrEmpty(table.UserId)||x.UserId.Contains(table.UserId)) &&
( string.IsNullOrEmpty(table.UnitId)||x.UnitId.Contains(table.UnitId)) &&
( string.IsNullOrEmpty(table.InterFaceName)||x.InterFaceName.Contains(table.InterFaceName)) &&
( string.IsNullOrEmpty(table.InterFaceUrl)||x.InterFaceUrl.Contains(table.InterFaceUrl)) &&
( string.IsNullOrEmpty(table.InterFaceMehtod)||x.InterFaceMehtod.Contains(table.InterFaceMehtod)) &&
( string.IsNullOrEmpty(table.InterFaceBody)||x.InterFaceBody.Contains(table.InterFaceBody)) &&
( string.IsNullOrEmpty(table.InterFaceReturnData)||x.InterFaceReturnData.Contains(table.InterFaceReturnData)) &&
( string.IsNullOrEmpty(table.InterFaceType)||x.InterFaceType.Contains(table.InterFaceType)) &&
( string.IsNullOrEmpty(table.IP)||x.IP.Contains(table.IP))
orderby x.InterFaceLogDate descending
select x
;
return q.ToList();
public static List<Model.InterFaceLog> GetInterFaceLogByModle(Model.InterFaceLog table)
{
var q = from x in db.InterFaceLog
where
(string.IsNullOrEmpty(table.InterFaceLogId) || x.InterFaceLogId.Contains(table.InterFaceLogId)) &&
(string.IsNullOrEmpty(table.UserId) || x.UserId.Contains(table.UserId)) &&
(string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) &&
(string.IsNullOrEmpty(table.InterFaceName) || x.InterFaceName.Contains(table.InterFaceName)) &&
(string.IsNullOrEmpty(table.InterFaceUrl) || x.InterFaceUrl.Contains(table.InterFaceUrl)) &&
(string.IsNullOrEmpty(table.InterFaceMehtod) || x.InterFaceMehtod.Contains(table.InterFaceMehtod)) &&
(string.IsNullOrEmpty(table.InterFaceBody) || x.InterFaceBody.Contains(table.InterFaceBody)) &&
(string.IsNullOrEmpty(table.InterFaceReturnData) || x.InterFaceReturnData.Contains(table.InterFaceReturnData)) &&
(string.IsNullOrEmpty(table.InterFaceType) || x.InterFaceType.Contains(table.InterFaceType)) &&
(string.IsNullOrEmpty(table.IP) || x.IP.Contains(table.IP))
orderby x.InterFaceLogDate descending
select x
;
return q.ToList();
}
/// 获取分页列表
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
+8 -4
View File
@@ -1355,7 +1355,8 @@ namespace BLL
{
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
where x.ProjectId == projectid && y.RiskLevel == 2
join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId
where z.ProjectId == projectid && y.RiskLevel == 2 && z.CompileDate.Value.Year >= 2023
select x).Count();
return result;
}
@@ -1368,7 +1369,8 @@ namespace BLL
{
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
where x.ProjectId == projectid && y.RiskLevel == 1
join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId
where z.ProjectId == projectid && y.RiskLevel == 1 && z.CompileDate.Value.Year >= 2023
select x).Count();
return result;
}
@@ -1381,7 +1383,8 @@ namespace BLL
{
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
where x.ProjectId == projectid && y.RiskLevel == 3
join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId
where z.ProjectId == projectid && y.RiskLevel == 3 && z.CompileDate.Value.Year >= 2023
select x).Count();
return result;
}
@@ -1394,7 +1397,8 @@ namespace BLL
{
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
where x.ProjectId == projectid && y.RiskLevel == 4
join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId
where z.ProjectId == projectid && y.RiskLevel == 4 && z.CompileDate.Value.Year >= 2023
select x).Count();
return result;
}
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
+2 -1
View File
@@ -235,7 +235,7 @@ namespace FineUIPro.Web.DataShow
count = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId
where y.ProjectId == projectId && (x.HazardLevel == getlevel.RiskLevelId || x.HazardLevel == level.ToString()) && y.States == Const.State_2
&& y.CompileDate.Value.Year >= 2023
select x).Count();
}
else
@@ -243,6 +243,7 @@ namespace FineUIPro.Web.DataShow
count = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId
where y.ProjectId == projectId && x.HazardLevel == level.ToString() && y.States == Const.State_2
&& y.CompileDate.Value.Year >= 2023
select x).Count();
}
return count;
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+1 -10
View File
@@ -14397,15 +14397,6 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="Microsoft.Office.Core">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
@@ -14435,7 +14426,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:2828/</IISUrl>
<IISUrl>http://localhost:14290/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+8 -9
View File
@@ -308,19 +308,18 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
//private static bool canSave; //是否可以保存
public string ConvertPipeArea(object PipeArea)
{
string StateName = string.Empty;
if (!string.IsNullOrEmpty(PipeArea.ToString()))
string stateName = string.Empty;
if (PipeArea != null && !string.IsNullOrEmpty(PipeArea.ToString()))
{
if (PipeArea != null)
{
string txt = PipelineService.GetPipeArea().FirstOrDefault(x => x.Value == PipeArea.ToString()).Text;
string txt = PipelineService.GetPipeArea().FirstOrDefault(x => x.Value == PipeArea.ToString())?.Text;
return txt;
}
return "";
}
return StateName;
return stateName;
}
#region 焊接日报 提交事件
// 检查用户权限
SGGL/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx
+36 -5
View File
@@ -17,15 +17,16 @@
<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"
DataKeyNames="RectifyItemId,IsRectify" DataIDField="RectifyItemId" AllowSorting="true" SortField="RectifyItemId"
SortDirection="ASC" EnableTextSelection="True" MinHeight="240px" PageSize="500"
DataKeyNames="RectifyItemId" DataIDField="RectifyItemId" AllowSorting="true" SortField="RectifyCode"
SortDirection="DESC" EnableTextSelection="True" MinHeight="240px" PageSize="500"
EnableRowDoubleClickEvent="true" OnRowCommand="Grid1_RowCommand">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Left" runat="server">
<Items>
<f:RadioButtonList ID="rbStates" runat="server" Label="状态" LabelAlign="Right" Width="400px" AutoPostBack="true" OnSelectedIndexChanged="rbStates_SelectedIndexChanged">
<f:RadioItem Text="待整改" Value="1" Selected="true" />
<f:RadioItem Text="已完成" Value="3" />
<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" />
</f:RadioButtonList>
</Items>
</f:Toolbar>
@@ -34,6 +35,12 @@
<f:RenderField HeaderText="主键" ColumnID="RectifyItemId" DataField="RectifyItemId"
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="RectifyCode" DataField="RectifyCode" FieldType="string"
HeaderText="整改单">
</f:RenderField>
<f:RenderField Width="300px" ColumnID="WrongContent" DataField="WrongContent" FieldType="string"
HeaderText="具体位置及隐患内容">
@@ -52,6 +59,10 @@
<f:LinkButtonField ColumnID="ReAttachUrl" HeaderText="整改后" ConfirmTarget="Top" Width="80" CommandName="ReAttachUrl"
TextAlign="Center" ToolTip="整改照片" Text="整改后" />
</Columns>
<Listeners>
<f:Listener Event="dataload" Handler="onGridDataLoad" />
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
</f:Grid>
</Items>
</f:Panel>
@@ -59,6 +70,26 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnSubmit" EnablePostBack="true" runat="server"
Text="提交" Icon="TableEdit" OnClick="btnSubmit_Click">
</f:MenuButton>
</Items>
</f:Menu>
</form>
<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>
</body>
</html>
SGGL/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
+46 -14
View File
@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.HSSE.Check
{
@@ -21,22 +22,16 @@ namespace FineUIPro.Web.HSSE.Check
/// </summary>
public void BindGrid()
{
string strSql = @"SELECT Item.RectifyItemId,
Item.RectifyId,
Item.WrongContent,
Item.Requirement,
Item.LimitTime,
Item.RectifyResults,
Item.IsRectify,
Rectify.States,
Rectify.ProjectId "
+ @" FROM ProjectSupervision_RectifyItem AS Item "
+ @" LEFT JOIN ProjectSupervision_Rectify AS Rectify ON Rectify.RectifyId=Item.RectifyId";
string strSql = @"SELECT (CASE WHEN Rectify.States=1 THEN '待整改' WHEN Rectify.States=2 THEN '待确认' WHEN Rectify.States=3 THEN '已完成' ELSE '待签发' END) AS StatesName,
Rectify.RectifyCode,Item.RectifyItemId,Item.RectifyId,Item.WrongContent,Item.Requirement,Item.LimitTime,Item.RectifyResults,Item.IsRectify,Rectify.States,Rectify.ProjectId
FROM ProjectSupervision_RectifyItem AS Item
LEFT JOIN ProjectSupervision_Rectify AS Rectify ON Rectify.RectifyId=Item.RectifyId
WHERE Rectify.States !='0' AND Rectify.States IS NOT NULL ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " WHERE Rectify.ProjectId = @ProjectId";
strSql += " AND Rectify.States = @States";
strSql += " AND Rectify.ProjectId = @ProjectId";
strSql += " AND Item.IsRectify = @IsRectify";
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@States", this.rbStates.SelectedValue));
listStr.Add(new SqlParameter("@IsRectify", this.rbStates.SelectedValue));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
var table = this.GetPagedDataTable(Grid1, tb);
@@ -52,6 +47,14 @@ namespace FineUIPro.Web.HSSE.Check
protected void rbStates_SelectedIndexChanged(object sender, EventArgs e)
{
BindGrid();
if (this.rbStates.SelectedValue == "1")
{
this.btnSubmit.Hidden = true;
}
else
{
this.btnSubmit.Hidden = false;
}
}
/// <summary>
@@ -95,5 +98,34 @@ namespace FineUIPro.Web.HSSE.Check
}
}
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSubmit_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length > 0)
{
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString().Split(',')[0];
var getV = Funs.DB.ProjectSupervision_RectifyItem.FirstOrDefault(x => x.RectifyItemId == rowID);
if (getV != null)
{
var getR = Funs.DB.ProjectSupervision_Rectify.FirstOrDefault(x => x.RectifyId == getV.RectifyId);
if (getR != null && getR.States != Const.State_3)
{
getR.States = BLL.Const.State_2;
Funs.DB.SubmitChanges();
}
}
}
BindGrid();
ShowNotify("数据已提交成功!");
}
}
}
}
SGGL/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.designer.cs
Generated
+31 -11
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Check {
public partial class OfficeCheck {
namespace FineUIPro.Web.HSSE.Check
{
public partial class OfficeCheck
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// rbStates 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbStates;
/// <summary>
/// WindowAtt 控件。
/// </summary>
@@ -74,5 +76,23 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnSubmit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnSubmit;
}
}
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/CheckContentEdit.aspx
+1 -1
View File
@@ -142,7 +142,7 @@
//合并列
function onGridDataLoad(event) {
this.mergeColumns(['SortIndex', 'CheckItem', 'CheckMethod', 'CheckResult', 'BaseScore', 'DeletScore', 'GetScore'], {
this.mergeColumns(['SortIndex', 'CheckItem', 'CheckMethod'], {
dependsFirst: true
});
}
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx.cs
+46 -16
View File
@@ -187,6 +187,18 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </summary>
private void PageInfoLoad()
{
this.drpSubjectUnit.Text = string.Empty;
this.txtSubjectUnitMan.Text = string.Empty;
this.txtSubjectUnitTel.Text = string.Empty;
this.txtSubjectUnitAdd.Text = string.Empty;
this.txtCheckStartTime.Text = string.Empty;
this.txtCheckEndTime.Text = string.Empty;
this.txtCompileMan.Text = string.Empty;
this.txtCompileDate.Text = string.Empty;
this.lblResult.Text = string.Empty;
this.lblCheckReportResult.Text = string.Empty;
this.lblCheckResult.Text = string.Empty;
var checkInfo = BLL.CheckNoticeService.GetCheckNoticeById(this.CheckNoticeId);
if (checkInfo != null)
{
@@ -208,41 +220,50 @@ namespace FineUIPro.Web.OfficeCheck.Check
var checkTable = BLL.CheckTable1Service.GetCheckTable1ByCheckNoticeId(this.CheckNoticeId);
if (checkTable != null)
{
// this.lblSubjectUnitId.Text = BLL.ProjectService.GetProjectNameByProjectId(checkTable.SubjectProjectId);
// this.lblCheckDate.Text = string.Format("{0:yyyy-MM-dd}", checkTable.CheckDate);
// this.lblSubjectUnitId.Text = BLL.ProjectService.GetProjectNameByProjectId(checkTable.SubjectProjectId);
// this.lblCheckDate.Text = string.Format("{0:yyyy-MM-dd}", checkTable.CheckDate);
this.lblResult.Text = "评定得分：" + checkTable.TotalLastScore + "；评定结果：" + checkTable.EvaluationResult;
}
//检查报告
var checkReport = BLL.CheckReportService.GetCheckReportByCheckNoticeId(this.CheckNoticeId);
if (checkReport != null)
{
// this.lblCheckObject.Text = BLL.ProjectService.GetProjectNameByProjectId(checkInfo.SubjectProjectId);
// this.lblCheckStartTime.Text = string.Format("{0:yyyy-MM-dd}", checkInfo.CheckStartTime);
// this.lblCheckObject.Text = BLL.ProjectService.GetProjectNameByProjectId(checkInfo.SubjectProjectId);
// this.lblCheckStartTime.Text = string.Format("{0:yyyy-MM-dd}", checkInfo.CheckStartTime);
this.lblCheckReportResult.Text = checkReport.CheckResult;
}
//隐患整改
var rectify = BLL.ProjectSupervision_RectifyService.GetRectifyByCheckNoticeId(this.CheckNoticeId);
if (rectify != null)
{
// this.lblUnitId.Text = BLL.ProjectService.GetProjectNameByProjectId(rectify.ProjectId);
// this.lblCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", rectify.CheckedDate);
string stateText = "【待提交】";
if (rectify.States == Const.State_2)
{
stateText = "【待复查确认】";
}
else if (rectify.States == Const.State_1)
{
stateText = "【待项目整改】";
}
else if (rectify.States == Const.State_0)
{
stateText = "【待签发】";
}
else if (rectify.States == Const.State_3)
{
stateText = "【整改完成】";
}
// this.lblUnitId.Text = BLL.ProjectService.GetProjectNameByProjectId(rectify.ProjectId);
// this.lblCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", rectify.CheckedDate);
var item = BLL.ProjectSupervision_RectifyItemService.GetRectifyItemByRectifyId(rectify.RectifyId);
if (item != null)
{
this.lblCheckResult.Text = "隐患：" + item.Count() + "条";
this.lblCheckResult.Text = "隐患：" + item.Count() + "条。单据状态：" + stateText;
}
}
}
else
{
this.drpSubjectUnit.Text = string.Empty;
this.txtSubjectUnitMan.Text = string.Empty;
this.txtSubjectUnitTel.Text = string.Empty;
this.txtSubjectUnitAdd.Text = string.Empty;
this.txtCheckStartTime.Text = string.Empty;
this.txtCheckEndTime.Text = string.Empty;
this.txtCompileMan.Text = string.Empty;
this.txtCompileDate.Text = string.Empty;
this.CheckNoticeId = string.Empty;
}
}
@@ -323,7 +344,8 @@ namespace FineUIPro.Web.OfficeCheck.Check
BaseScore = item.BaseScore,
DeletScore = 0,
GetScore = item.BaseScore,
Type = item.Type
Type = item.Type,
IsSelect = true,
};
Funs.DB.ProjectSupervision_Check1.InsertOnSubmit(check1);
Funs.DB.SubmitChanges();
@@ -357,6 +379,14 @@ namespace FineUIPro.Web.OfficeCheck.Check
protected void btnCheck2_Click(object sender, EventArgs e)
{
string window = String.Format("RectifyEdit.aspx?CheckNoticeId={0}", this.CheckNoticeId, "编辑 - ");
var getCheckNotice = CheckNoticeService.GetCheckNoticeById(this.CheckNoticeId);
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));
}
PageContext.RegisterStartupScript(Window2.GetShowReference(window));
}
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx
+7 -3
View File
@@ -132,7 +132,7 @@
SortField="UserName" FieldType="String" HeaderText="姓名"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="SexName" DataField="SexName"
<f:RenderField Width="70px" ColumnID="SexName" DataField="SexName"
SortField="SexName" FieldType="String" HeaderText="性别"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
@@ -140,6 +140,10 @@
SortField="UnitName" FieldType="String" HeaderText="所在单位"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="DepartName" DataField="DepartName"
FieldType="String" HeaderText="部门"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PostName" DataField="PostName"
SortField="PostName" FieldType="String" HeaderText="单位职务"
HeaderTextAlign="Center" TextAlign="Left">
@@ -162,11 +166,11 @@
</Items>
</f:Panel>
<f:Window ID="Window1" Title="检查通知维护" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="900px" Height="500px">
</f:Window>
<f:Window ID="WindowTeam" Title="维护检查工作组" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="true" runat="server" OnClose="WindowTeam_Close" IsModal="true"
Target="Parent" EnableResize="true" runat="server" OnClose="WindowTeam_Close" IsModal="true"
Width="900px" Height="500px">
</f:Window>
<%--<f:Window ID="Window3" Title="查看" ShowHeader="false" Hidden="true" EnableIFrame="true" EnableMaximize="true"
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx.cs
+2 -1
View File
@@ -241,9 +241,10 @@ namespace FineUIPro.Web.OfficeCheck.Check
{
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
,CheckTeam.UserName,CheckTeam.SexName,Unit.UnitName,Unit.UnitName,Depart.DepartName
FROM dbo.ProjectSupervision_CheckTeam AS CheckTeam
LEFT JOIN Base_Unit AS Unit ON CheckTeam.UnitId = Unit.UnitId
LEFT JOIN Base_Depart AS Depart ON CheckTeam.DepartId = Depart.DepartId
WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND CheckNoticeId = @CheckNoticeId";
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckReport.aspx
+12 -8
View File
@@ -41,7 +41,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label1" Text="二、依据" CssClass="title" runat="server"></f:Label>
<f:Label ID="Label1" Text="二、检查依据" CssClass="title" runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
@@ -51,7 +51,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label2" Text="三、安全环保管理" CssClass="title" runat="server"></f:Label>
<f:Label ID="Label2" Text="三、受检项目基本情况" CssClass="title" runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
@@ -84,21 +84,21 @@
SortField="CheckReportItemId" FieldType="String" HeaderTextAlign="Center" TextAlign="Center"
Hidden="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CheckReportCode" DataField="CheckReportCode" FieldType="string"
<f:RenderField Width="80px" ColumnID="CheckReportCode" DataField="CheckReportCode" FieldType="string"
HeaderText="序号" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="txtCheckReportCode" runat="server" MaxLength="50">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="300px" ColumnID="UnConformItem" DataField="UnConformItem" FieldType="string"
<f:RenderField Width="500px" ColumnID="UnConformItem" DataField="UnConformItem" FieldType="string"
HeaderText="不符合项" HeaderTextAlign="Center" ExpandUnusedSpace="true">
<Editor>
<f:TextBox ID="txtUnConformItem" runat="server" MaxLength="500">
</f:TextBox>
</Editor>
</f:RenderField>
<f:LinkButtonField HeaderText="整改前" ConfirmTarget="Top" Width="80" CommandName="AttachUrl"
<f:LinkButtonField HeaderText="整改前" ConfirmTarget="Top" Width="150" CommandName="AttachUrl"
TextAlign="Center" ToolTip="整改照片" Text="详细" HeaderTextAlign="Center" />
<f:LinkButtonField ID="del" ColumnID="del" HeaderText="删除" Width="60px" CommandName="delete"
Icon="Delete" TextAlign="Center" HeaderTextAlign="Center" />
@@ -157,8 +157,12 @@
SortField="UnitName" FieldType="String" HeaderText="所在单位" ExpandUnusedSpace="true"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="220px" ColumnID="PostName" DataField="PostName"
SortField="PostName" FieldType="String" HeaderText="所在单位职务"
<f:RenderField Width="110px" ColumnID="DepartName" DataField="DepartName"
FieldType="String" HeaderText="部门"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PostName" DataField="PostName"
SortField="PostName" FieldType="String" HeaderText="单位职务"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="WorkTitle" DataField="WorkTitle"
@@ -166,7 +170,7 @@
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="CheckPostName" DataField="CheckPostName"
SortField="CheckPostName" FieldType="String" HeaderText="检查工作组职务"
SortField="CheckPostName" FieldType="String" HeaderText="工作组职务"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<%--<f:RenderField Width="120px" ColumnID="CheckDate" DataField="CheckDate"
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckReport.aspx.cs
+26 -20
View File
@@ -63,9 +63,9 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.txtValues3.Text = checkReport.BasicInfo;
//this.txtValues4.Text = checkReport.ConformItem;
this.txtValues6.Text = checkReport.Opinion;
this.txtValues7.Text = checkReport.CheckResult;
this.BindGrid2();
this.txtValues7.Text = checkReport.CheckResult;
}
this.BindGrid2();
this.BindGrid();
}
checkReportItems.Clear();
@@ -79,20 +79,12 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </summary>
private void BindGrid()
{
string strSql = @"select checkTeam.CheckTeamId,
checkTeam.CheckNoticeId,
checkTeam.UserId,
checkTeam.SortIndex,
checkTeam.PostName,
checkTeam.WorkTitle,
checkTeam.CheckPostName,
checkTeam.CheckDate,
checkTeam.UserName,
checkTeam.UnitId,
checkTeam.SexName,
unit.UnitName"
+ @" from ProjectSupervision_CheckTeam as checkTeam "
+ @" left join Base_Unit as unit on unit.UnitId = checkTeam.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.UnitId, checkTeam.SexName,unit.UnitName,Depart.DepartName
from ProjectSupervision_CheckTeam as checkTeam
left join Base_Unit as unit on unit.UnitId = checkTeam.UnitId
LEFT JOIN Base_Depart AS Depart ON CheckTeam.DepartId = Depart.DepartId where 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND checkTeam.CheckNoticeId = @CheckNoticeId";
listStr.Add(new SqlParameter("@CheckNoticeId", this.CheckNoticeId));
@@ -125,10 +117,24 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </summary>
private void BindGrid2()
{
string strSql = @"select CheckReportItemId, CheckReportId, CheckReportCode, UnConformItem from ProjectSupervision_CheckReportItem ";
string strSql = string.Empty;
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += "where CheckReportId = @CheckReportId";
listStr.Add(new SqlParameter("@CheckReportId", this.hdCheckReportId.Text));
if (Funs.DB.ProjectSupervision_CheckReportItem.FirstOrDefault(x => x.CheckReportId == this.hdCheckReportId.Text) != null)
{
strSql = @"select CheckReportItemId, CheckReportCode, UnConformItem from ProjectSupervision_CheckReportItem
where CheckReportId = @CheckReportId";
listStr.Add(new SqlParameter("@CheckReportId", this.hdCheckReportId.Text));
}
else
{
strSql = @"select NEWID() AS CheckReportItemId,ROW_NUMBER() over(order by SortIndex) AS CheckReportCode,
('检查项目:'+CheckItem+',检查标准:'+CheckStandard+',检查结果:'+CheckStandard) AS UnConformItem
from ProjectSupervision_Check1
where IsSelect=1 and DeletScore >0
and CheckNoticeId =@CheckNoticeId";
listStr.Add(new SqlParameter("@CheckNoticeId", this.CheckNoticeId));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
var table = this.GetPagedDataTable(Grid2, tb);
@@ -173,7 +179,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
else
{
newCheckReport.CheckNoticeId = this.CheckNoticeId;
newCheckReport.CheckReportId = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_CheckReport));
newCheckReport.CheckReportId = SQLHelper.GetNewID();
BLL.CheckReportService.AddCheckReport(newCheckReport);
this.hdCheckReportId.Text = newCheckReport.CheckReportId;
}
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx
+67 -61
View File
@@ -4,13 +4,12 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<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 src="../res/js/jquery-3.3.1.min.js" type="text/javascript"></script>
<style type="text/css">
.f-grid-row .f-grid-cell-inner
{
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
@@ -18,64 +17,71 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:NumberBox ID="txtSortIndex" runat="server" Label="序号" LabelWidth="120px"
MinValue="1" NoDecimal="true" NoNegative="true">
</f:NumberBox>
<f:TextBox ID="txtUserName" runat="server" Label="组成员" LabelWidth="100px" FocusOnPageLoad="true"
ShowRedStar="true" Required="true" AutoPostBack="true" OnTextChanged="txtUserName_TextChanged">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpUnit" runat="server" Label="所在单位"
EnableEdit="true" Required="true" ShowRedStar="true" LabelWidth="120px" >
</f:DropDownList>
<f:DropDownList ID="drpSex" runat="server" Label="性别" LabelWidth="100px" >
<f:ListItem Value="男" Text="男" Selected="true"/>
<f:ListItem Value="女" Text="女"/>
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtPostName" runat="server" Label="所在单位职务" LabelWidth="120px" MaxLength="200">
</f:TextBox>
<f:TextBox ID="txtWorkTitle" runat="server" Label="职称" LabelWidth="100px" MaxLength="200">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckPostName" runat="server" Label="检查小组职务" LabelWidth="120px" MaxLength="200">
</f:TextBox>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="检查日期" ID="txtCheckDate"
EmptyText="请选择检查日期">
</f:DatePicker>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:HiddenField runat="server" ID="hdUserId"></f:HiddenField>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存数据" ValidateForms="SimpleForm1"
OnClick="btnSave_Click" >
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:NumberBox ID="txtSortIndex" runat="server" Label="序号" LabelWidth="120px"
MinValue="1" NoDecimal="true" NoNegative="true">
</f:NumberBox>
<f:TextBox ID="txtUserName" runat="server" Label="组成员" LabelWidth="100px" FocusOnPageLoad="true"
ShowRedStar="true" Required="true" AutoPostBack="true" OnTextChanged="txtUserName_TextChanged">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpUnit" runat="server" Label="所在单位"
EnableEdit="true" Required="true" ShowRedStar="true" LabelWidth="120px">
</f:DropDownList>
<f:DropDownList ID="drpDepart" runat="server" Label="部门"
EnableEdit="true" LabelWidth="120px">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtPostName" runat="server" Label="所在单位职务" LabelWidth="120px" MaxLength="200">
</f:TextBox>
<f:TextBox ID="txtWorkTitle" runat="server" Label="职称" LabelWidth="100px" MaxLength="200">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpSex" runat="server" Label="性别" LabelWidth="100px">
<f:ListItem Value="男" Text="男" Selected="true" />
<f:ListItem Value="女" Text="女" />
</f:DropDownList>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="检查日期" ID="txtCheckDate"
EmptyText="请选择检查日期">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckPostName" runat="server" Label="检查小组职务" LabelWidth="120px" MaxLength="200">
</f:TextBox>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:HiddenField runat="server" ID="hdUserId"></f:HiddenField>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存数据" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
</form>
<%--<script src="../res/js/hook.js" type="text/javascript"></script>--%>
<%--<script src="../res/js/hook.js" type="text/javascript"></script>--%>
</body>
</html>
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.cs
+9 -1
View File
@@ -53,6 +53,8 @@ namespace FineUIPro.Web.OfficeCheck.Check
BLL.UnitService.InitUnitDropDownList(this.drpUnit, null, true);
DepartService.InitDepartDropDownList(this.drpDepart, true);
if (!string.IsNullOrEmpty(this.CheckTeamId))
{
var checkTeam = BLL.CheckTeamService.GetCheckTeamByCheckTeamId(this.CheckTeamId);
@@ -78,6 +80,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.drpUnit.Enabled = false;
}
this.drpSex.SelectedValue = checkTeam.SexName;
this.drpDepart.SelectedValue = checkTeam.DepartId;
}
}
else
@@ -125,6 +128,10 @@ namespace FineUIPro.Web.OfficeCheck.Check
{
newCheckTeam.UnitId = this.drpUnit.SelectedValue;
}
if (this.drpDepart.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpDepart.SelectedValue))
{
newCheckTeam.DepartId = this.drpDepart.SelectedValue;
}
if (!string.IsNullOrEmpty(this.hdUserId.Text))
{
newCheckTeam.UserId = this.hdUserId.Text;
@@ -132,7 +139,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
newCheckTeam.UserName = this.txtUserName.Text.Trim();
if (string.IsNullOrEmpty(this.CheckTeamId))
{
newCheckTeam.CheckTeamId = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_CheckTeam));
newCheckTeam.CheckTeamId = SQLHelper.GetNewID();
BLL.CheckTeamService.AddCheckTeam(newCheckTeam);
}
else
@@ -167,6 +174,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.txtPostName.Text = PositionService.GetPositionNameById(sysUser.PositionId);
this.txtWorkTitle.Text = PostTitleService.getPostTitleNameById(sysUser.PostTitleId);
this.hdUserId.Text = sysUser.PersonId;
this.drpDepart.SelectedValue = sysUser.DepartId;
}
}
#endregion
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.designer.cs
Generated
+34 -23
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.OfficeCheck.Check {
public partial class CheckTeamEdit {
namespace FineUIPro.Web.OfficeCheck.Check
{
public partial class CheckTeamEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtSortIndex 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtSortIndex;
/// <summary>
/// txtUserName 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUserName;
/// <summary>
/// drpUnit 控件。
/// </summary>
@@ -65,16 +67,16 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpSex 控件。
/// drpDepart 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSex;
protected global::FineUIPro.DropDownList drpDepart;
/// <summary>
/// txtPostName 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPostName;
/// <summary>
/// txtWorkTitle 控件。
/// </summary>
@@ -92,16 +94,16 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkTitle;
/// <summary>
/// txtCheckPostName 控件。
/// drpSex 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckPostName;
protected global::FineUIPro.DropDownList drpSex;
/// <summary>
/// txtCheckDate 控件。
/// </summary>
@@ -110,7 +112,16 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCheckDate;
/// <summary>
/// txtCheckPostName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckPostName;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdUserId 控件。
/// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdUserId;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx
+38 -19
View File
@@ -4,9 +4,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>隐患整改</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../Controls/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
@@ -19,31 +19,33 @@
<Rows>
<f:FormRow runat="server">
<Items>
<f:TextBox ID="txtRectifyNoticesCode" runat="server" Label="编号" MaxLength="70" >
<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>
@@ -51,9 +53,14 @@
<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" ToolTip="保存" ValidateForms="SimpleForm1" >
<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" ToolTip="签发" ValidateForms="SimpleForm1" >
<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>
@@ -61,10 +68,10 @@
</f:Form>
<f:Form ID="Form2" ShowBorder="true" ShowHeader="false" Title="安全隐患及整改要求" AutoScroll="true"
runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<Rows>
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" AllowCellEditing="true" ClicksToEdit="1"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" AllowCellEditing="true" ClicksToEdit="1"
ForceFit="true" 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"
@@ -82,14 +89,24 @@
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="300px" 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="60px">
<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="100px" ColumnID="Requirement" DataField="Requirement" FieldType="string" HeaderTextAlign="Center"
HeaderText="整改要求">
<Editor>
<f:TextBox ID="tRequirement" runat="server" MaxLength="800" ShowRedStar="true" Required="true">
@@ -116,7 +133,7 @@
</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">
<f:TemplateField ColumnID="IsRectify" HeaderText="合格" HeaderTextAlign="Center" TextAlign="Center" Width="60px">
<ItemTemplate>
<asp:DropDownList ID="drpIsRectify" runat="server">
<asp:ListItem Value="false">否</asp:ListItem>
@@ -127,6 +144,8 @@
</f:TemplateField>
<f:LinkButtonField ID="del" ColumnID="del" HeaderText="删除" Width="60px" CommandName="delete"
Icon="Delete" />
<f:RenderField HeaderText="报告明细id" ColumnID="hdCheckReportItemId" DataField="CheckReportItemId" FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@@ -138,13 +157,13 @@
<Rows>
<f:FormRow runat="server" ID="next">
<Items>
<f:DropDownList ID="drpSignPerson" runat="server" Label="项目安全经理" LabelWidth="110px"
<f:DropDownList ID="drpSignPerson" runat="server" Label="整改责任人：项目安全经理" LabelWidth="200px"
LabelAlign="Right" EnableEdit="true" ShowRedStar="true">
</f:DropDownList>
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
</Rows>
</Rows>
</f:Form>
</Items>
</f:Panel>
@@ -152,6 +171,6 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
</form>
</form>
</body>
</html>
SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs
+134 -49
View File
@@ -42,66 +42,111 @@ namespace FineUIPro.Web.OfficeCheck.Check
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
//受检项目
BLL.ProjectService.InitAllProjectDropDownList(this.drpProjectId, true);
///安全经理
BLL.Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, true);
///检察人员
BLL.Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpCheckMan, this.CurrUser.LoginProjectId, null, true);
{
string type = Request.Params["type"];
if (type == "1")
{
this.btnSave.Hidden = true;
this.btnAdd.Hidden = true;
this.Grid1.Columns[8].Hidden = true;
this.btnSubmit.Hidden = true;
this.Grid1.Columns[9].Hidden = true;
}
this.CheckNoticeId = Request.Params["CheckNoticeId"];
if (!string.IsNullOrEmpty(this.CheckNoticeId))
var getRectify = ProjectSupervision_RectifyService.GetRectifyByCheckNoticeId(this.CheckNoticeId);
if (getRectify != null)
{
Model.ProjectSupervision_Rectify RectifyNotices = ProjectSupervision_RectifyService.GetRectifyByCheckNoticeId(this.CheckNoticeId);
if (RectifyNotices != null)
SetDrop(getRectify.ProjectId);
this.hdRectifyNoticesId.Text = getRectify.RectifyId;
if (!string.IsNullOrEmpty(getRectify.ProjectId))
{
this.hdRectifyNoticesId.Text = RectifyNotices.RectifyId;
if (!string.IsNullOrEmpty(RectifyNotices.ProjectId))
{
this.drpProjectId.SelectedValue = RectifyNotices.ProjectId;
}
if (!string.IsNullOrEmpty(RectifyNotices.CheckManIds))
{
this.drpCheckMan.SelectedValueArray = RectifyNotices.CheckManIds.Split(',');
}
this.txtCheckPerson.Text = RectifyNotices.CheckManNames;
this.txtRectifyNoticesCode.Text = RectifyNotices.RectifyCode;
this.txtCheckedDate.Text = RectifyNotices.CheckedDate.ToString();
if (!string.IsNullOrEmpty(RectifyNotices.HiddenHazardType))
{
this.drpHiddenHazardType.SelectedValue = RectifyNotices.HiddenHazardType;
}
if (!string.IsNullOrEmpty(RectifyNotices.SignPerson))
{
this.drpSignPerson.SelectedValue = RectifyNotices.SignPerson;
}
BindGrid();
this.drpProjectId.SelectedValue = getRectify.ProjectId;
}
else
if (!string.IsNullOrEmpty(getRectify.CheckManIds))
{
this.txtCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.drpCheckMan.SelectedValueArray = getRectify.CheckManIds.Split(',');
}
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.SignPerson))
{
this.drpSignPerson.SelectedValue = getRectify.SignPerson;
}
if (getRectify.States == Const.State_1 || getRectify.States == Const.State_2)
{
this.btnSure.Hidden = false;
}
rectifyItemLists.Clear();
}
else
{
var getCheckNotice = CheckNoticeService.GetCheckNoticeById(this.CheckNoticeId);
if (getCheckNotice != null)
{
SetDrop(getCheckNotice.SubjectProjectId);
if (!string.IsNullOrEmpty(getCheckNotice.SubjectProjectId))
{
this.drpProjectId.SelectedValue = getCheckNotice.SubjectProjectId;
}
if (!string.IsNullOrEmpty(getCheckNotice.CheckTeamLeader))
{
this.drpCheckMan.SelectedValueArray = getCheckNotice.CheckTeamLeader.Split(',');
}
var getTeam = CheckTeamService.GetCheckTeamListByCheckNoticeId(this.CheckNoticeId);
foreach (var item in getTeam)
{
this.txtCheckPerson.Text += item.UserName + "、";
}
string perfix = DateTime.Now.Year.ToString()+ DateTime.Now.Month.ToString() + DateTime.Now.Day.ToString() + "-";
this.txtRectifyNoticesCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode3", "dbo.ProjectSupervision_Rectify", "RectifyCode", perfix);
}
this.txtCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
}
BindGrid();
rectifyItemLists.Clear();
}
}
private void SetDrop(string projectId)
{
//受检项目
BLL.ProjectService.InitAllProjectDropDownList(this.drpProjectId, true);
this.drpProjectId.SelectedValue = projectId;
///安全经理
BLL.Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, projectId, Const.UnitId_SEDIN, true);
///检察人员
BLL.Person_PersonsService.InitUserUnitIdDepartIdDropDownList(this.drpCheckMan, Const.UnitId_SEDIN, string.Empty, true);
}
/// <summary>
/// 绑定明细
/// </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
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
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);
@@ -115,7 +160,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;
@@ -137,8 +182,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();
@@ -146,6 +192,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);
}
}
@@ -208,7 +258,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[10].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")
{
@@ -242,6 +300,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
@@ -311,10 +376,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;
@@ -364,6 +429,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)
@@ -374,6 +440,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)
@@ -383,7 +450,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
}
else
{
var item = new ProjectSupervision_RectifyItem();
item.RectifyItemId = rectifyNoticesItemId;
item.RectifyId = this.hdRectifyNoticesId.Text.Trim();
@@ -391,9 +457,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)
@@ -442,6 +516,17 @@ namespace FineUIPro.Web.OfficeCheck.Check
}
this.drpCheckMan.SelectedValueArray = str.ToArray();
}
#endregion
#endregion
protected void btnSure_Click(object sender, EventArgs e)
{
var getRectify = ProjectSupervision_RectifyService.GetRectifyByCheckNoticeId(this.CheckNoticeId);
if (getRectify != null)
{
saveNoticesItemDetail();//增加明细
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}
}
}
SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.designer.cs
Generated
+61 -41
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.OfficeCheck.Check {
public partial class RectifyEdit {
namespace FineUIPro.Web.OfficeCheck.Check
{
public partial class RectifyEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel4 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel4;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtRectifyNoticesCode 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRectifyNoticesCode;
/// <summary>
/// drpProjectId 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectId;
/// <summary>
/// drpCheckMan 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCheckMan;
/// <summary>
/// txtCheckPerson 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckPerson;
/// <summary>
/// txtCheckedDate 控件。
/// </summary>
@@ -92,16 +94,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCheckedDate;
/// <summary>
/// drpHiddenHazardType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpHiddenHazardType;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -110,7 +103,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdRectifyNoticesId 控件。
/// </summary>
@@ -119,7 +112,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdRectifyNoticesId;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -128,7 +121,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
@@ -137,7 +130,16 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// btnSure 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSure;
/// <summary>
/// Form2 控件。
/// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// toolAdd 控件。
/// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar toolAdd;
/// <summary>
/// btnAdd 控件。
/// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAdd;
/// <summary>
/// tWrongContent 控件。
/// </summary>
@@ -182,7 +184,25 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tWrongContent;
/// <summary>
/// drpHiddenHazardType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList drpHiddenHazardType;
/// <summary>
/// hdHiddenHazardType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdHiddenHazardType;
/// <summary>
/// tRequirement 控件。
/// </summary>
@@ -191,7 +211,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tRequirement;
/// <summary>
/// txtLimitTimes 控件。
/// </summary>
@@ -200,7 +220,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtLimitTimes;
/// <summary>
/// txtRectifyResults 控件。
/// </summary>
@@ -209,7 +229,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRectifyResults;
/// <summary>
/// drpIsRectify 控件。
/// </summary>
@@ -218,7 +238,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList drpIsRectify;
/// <summary>
/// hdIsRectify 控件。
/// </summary>
@@ -227,7 +247,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdIsRectify;
/// <summary>
/// del 控件。
/// </summary>
@@ -236,7 +256,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.LinkButtonField del;
/// <summary>
/// Form3 控件。
/// </summary>
@@ -245,7 +265,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form3;
/// <summary>
/// next 控件。
/// </summary>
@@ -254,7 +274,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow next;
/// <summary>
/// drpSignPerson 控件。
/// </summary>
@@ -263,7 +283,7 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSignPerson;
/// <summary>
/// WindowAtt 控件。
/// </summary>
SGGL/FineUIPro.Web/PHTGL/Filing/ContractStandingBook.aspx.cs
+16 -4
View File
@@ -40,20 +40,26 @@ namespace FineUIPro.Web.PHTGL.Filing
var model = new Model.PHTGL_ContractStandingBook();
var RoleIds = this.CurrUser.RoleIds;
if (RoleIds.Contains(Const.SedinHTGLManager))
if (this.CurrUser.PersonId == Const.hfnbdId || this.CurrUser.PersonId == Const.sysglyId)
{
}
else if (RoleIds.Contains(Const.SedinHTGLManager) && !string.IsNullOrEmpty(RoleIds))
{
//model.UnitId=this.CurrUser.UnitId;
}
else if (RoleIds.Contains(Const.OtherHTGLManager))
else if (RoleIds.Contains(Const.OtherHTGLManager) && !string.IsNullOrEmpty(RoleIds))
{
model.UnitId = this.CurrUser.UnitId;
}
else if (RoleIds.Contains(Const.SedinHTGLDepartManager))
else if (RoleIds.Contains(Const.SedinHTGLDepartManager) && !string.IsNullOrEmpty(RoleIds))
{
model.UnitId = this.CurrUser.UnitId;
model.DepartId= this.CurrUser.DepartId;
}
else
{
model.UnitId = "normal";
@@ -176,7 +182,13 @@ namespace FineUIPro.Web.PHTGL.Filing
dropState.SelectedValue = Const._Null;
//txtSubConstruction.Text = string.Empty;
}
/// <summary>
/// 状态
/// </summary>
/// <param name="State"></param>
/// <returns></returns>
public string ConvertState(object State)
{
string StateName = string.Empty;
SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx
+15 -13
View File
@@ -24,10 +24,10 @@
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox ID="txtUserName" runat="server" Label="接口名称" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="50px"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px"
LabelAlign="Right">
</f:TextBox>
<%-- <f:DropDownList ID="drpDataType" runat="server" Label="操作类型" EnableEdit="false" ForceSelection="false"
<%-- <f:DropDownList ID="drpDataType" runat="server" Label="操作类型" EnableEdit="false" ForceSelection="false"
Required="true" ShowRedStar="true">
</f:DropDownList>--%>
<%--<f:TextBox ID="txtUnitName" runat="server" Label="单位" EmptyText="输入查询条件"
@@ -43,40 +43,42 @@
<f:DatePicker ID="txtEndDate" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="150px" EmptyText="结束时间">
</f:DatePicker>--%>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:TemplateField Width="250px" HeaderText="单位" ColumnID="UnitId" HeaderTextAlign="Center" ExpandUnusedSpace="true"
<f:TemplateField Width="200px" HeaderText="单位" ColumnID="UnitId" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# GetUnitName(Eval("UnitId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="InterFaceName" DataField="InterFaceName" SortField="InterFaceName"
<f:RenderField Width="120px" ColumnID="InterFaceName" DataField="InterFaceName" SortField="InterFaceName"
FieldType="String" HeaderText="接口名称" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="InterFaceType" DataField="InterFaceType" SortField="InterFaceType" HeaderTextAlign="Center" TextAlign="Left"
<f:RenderField Width="100px" ColumnID="InterFaceType" DataField="InterFaceType" SortField="InterFaceType" HeaderTextAlign="Center" TextAlign="Left"
FieldType="String" HeaderText="接口类型">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="InterFaceUrl" DataField="InterFaceUrl" SortField="InterFaceUrl" HeaderTextAlign="Center" TextAlign="Left"
<f:RenderField Width="200px" ColumnID="InterFaceUrl" DataField="InterFaceUrl" SortField="InterFaceUrl" HeaderTextAlign="Center" TextAlign="Left"
FieldType="String" HeaderText="接口地址">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="LogSateInterFaceBodyName" DataField="InterFaceBody" SortField="InterFaceBody" HeaderTextAlign="Center" TextAlign="Left"
FieldType="String" HeaderText="接口参数">
</f:RenderField>
<f:TemplateField Width="250px" HeaderText="操作日志" ColumnID="InterFaceReturnData" HeaderTextAlign="Center" ExpandUnusedSpace="true"
<f:TemplateField Width="500px" HeaderText="接口参数" ColumnID="LogSateInterFaceBodyName" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Bind("InterFaceBody") %>' ToolTip='<%# Bind("InterFaceBody") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField Width="500px" HeaderText="操作日志" ColumnID="InterFaceReturnData" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# Bind("InterFaceReturnData") %>' ToolTip='<%# Bind("InterFaceReturnData") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="LogSateName" DataField="LogSateName" SortField="LogSateName" HeaderTextAlign="Center" TextAlign="Left"
<f:RenderField Width="100px" ColumnID="LogSateName" DataField="LogSateName" SortField="LogSateName" HeaderTextAlign="Center" TextAlign="Left"
FieldType="String" HeaderText="状态">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="InterFaceLogDate" DataField="InterFaceLogDate" SortField="InterFaceLogDate"
<f:RenderField Width="100px" ColumnID="InterFaceLogDate" DataField="InterFaceLogDate" SortField="InterFaceLogDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="操作时间" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx.designer.cs
Generated
+9
View File
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.InterFace
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label4 控件。
/// </summary>
SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx
+1 -1
View File
@@ -120,7 +120,7 @@
</f:Panel>
<f:Window ID="Window1" Title="编辑接口配置信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="800px" Height="380px">
Width="1024px" Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceTask.aspx
+1 -1
View File
@@ -85,7 +85,7 @@
</f:Panel>
<f:Window ID="Window1" Title="编辑信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="800px" Height="380px">
Width="1024px" Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
SGGL/Model/Model.cs
+48
View File
@@ -201635,6 +201635,8 @@ namespace Model
private string _SexName;
private string _DepartId;
private EntityRef<Base_Unit> _Base_Unit;
private EntityRef<Person_Persons> _Person_Persons;
@@ -201667,6 +201669,8 @@ namespace Model
partial void OnUnitIdChanged();
partial void OnSexNameChanging(string value);
partial void OnSexNameChanged();
partial void OnDepartIdChanging(string value);
partial void OnDepartIdChanged();
#endregion
public ProjectSupervision_CheckTeam()
@@ -201909,6 +201913,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartId", DbType="NVarChar(50)")]
public string DepartId
{
get
{
return this._DepartId;
}
set
{
if ((this._DepartId != value))
{
this.OnDepartIdChanging(value);
this.SendPropertyChanging();
this._DepartId = value;
this.SendPropertyChanged("DepartId");
this.OnDepartIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProjectSupervision_CheckTeam_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
public Base_Unit Base_Unit
{
@@ -204129,6 +204153,8 @@ namespace Model
private string _States;
private string _HiddenHazardType;
private EntityRef<ProjectSupervision_Rectify> _ProjectSupervision_Rectify;
#region 可扩展性方法定义
@@ -204151,6 +204177,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()
@@ -204323,6 +204351,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
{
SGGL/WebAPI/Controllers/PersonController.cs
+1 -1
View File
@@ -747,7 +747,7 @@ namespace WebAPI.Controllers
TrainRecord = APIPersonService.getStrTrainRecordByPersonId(x.PersonId),
x.ExchangeTime,
x.ExchangeTime2,
persons.PhotoUrl,
PhotoUrl=persons.PhotoUrl.Replace('\\', '/'),
}).Take(200);
}
catch (Exception ex)