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

20230710

This commit is contained in:
杨红卫 2023-07-10 18:10:50 +08:00
parent bfa693d306
commit a873d6c064
14 changed files with 175 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/BLL/Common/Funs.cs
View File

@ -1213,15 +1213,15 @@ namespace BLL
{
if (score >= 80)
{
value = "合格";
value = "A级（合格）";
}
else if (score >= 71 && score <= 79)
{
value = "基本合格";
value = "B级（基本合格）";
}
else if (score <= 70)
{
value = "不合格";
value = "C级（不合格）";
}
}
return value;

6
SGGL/BLL/OfficeCheck/Check/CheckNoticeService.cs
View File

@ -26,18 +26,17 @@ namespace BLL
{
Model.ProjectSupervision_CheckNotice newCheckNotice = new Model.ProjectSupervision_CheckNotice();
newCheckNotice.CheckNoticeId = checkNotice.CheckNoticeId;
//newCheckNotice.SubjectUnitId = checkNotice.SubjectUnitId;
newCheckNotice.SubjectUnitAdd = checkNotice.SubjectUnitAdd;
newCheckNotice.SubjectUnitMan = checkNotice.SubjectUnitMan;
newCheckNotice.SubjectUnitTel = checkNotice.SubjectUnitTel;
newCheckNotice.CheckStartTime = checkNotice.CheckStartTime;
newCheckNotice.CheckEndTime = checkNotice.CheckEndTime;
//newCheckNotice.SubjectObject = checkNotice.SubjectObject;
newCheckNotice.CheckTeamLeader = checkNotice.CheckTeamLeader;
newCheckNotice.CompileMan = checkNotice.CompileMan;
newCheckNotice.CompileDate = checkNotice.CompileDate;
newCheckNotice.CheckTeamLeaderName = checkNotice.CheckTeamLeaderName;
newCheckNotice.UnitId = checkNotice.UnitId;
newCheckNotice.DepartId = checkNotice.DepartId;
newCheckNotice.SexName = checkNotice.SexName;
newCheckNotice.SubjectProjectId = checkNotice.SubjectProjectId;
Funs.DB.ProjectSupervision_CheckNotice.InsertOnSubmit(newCheckNotice);
@ -48,7 +47,7 @@ namespace BLL
{
Model.ProjectSupervision_CheckTeam newCheckTeam = new Model.ProjectSupervision_CheckTeam
{
CheckTeamId = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_CheckTeam))
CheckTeamId = SQLHelper.GetNewID()
};
;
newCheckTeam.CheckNoticeId = newCheckNotice.CheckNoticeId;
@ -84,6 +83,7 @@ namespace BLL
newCheckNotice.CompileDate = checkNotice.CompileDate;
newCheckNotice.CheckTeamLeaderName = checkNotice.CheckTeamLeaderName;
newCheckNotice.UnitId = checkNotice.UnitId;
newCheckNotice.DepartId = checkNotice.DepartId;
newCheckNotice.SexName = checkNotice.SexName;
newCheckNotice.SubjectProjectId = checkNotice.SubjectProjectId;
Funs.DB.SubmitChanges();

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

@ -13943,7 +13943,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:4243/</IISUrl>
<IISUrl>http://localhost:6562/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

91
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx
View File

@ -45,7 +45,7 @@
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="检查标准" EnableCollapse="false" runat="server"
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" EnableColumnLines="true" ForceFit="true"
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="1" DataIDField="ID" AllowSorting="true" SortField="SortIndex" SortDirection="ASC"
OnSort="Grid1_Sort" EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
<Columns>
@ -55,13 +55,13 @@
HeaderTextAlign="Center" TextAlign="Center" Width="60px">
</f:RenderField>
<f:RenderField HeaderText="检查项目" ColumnID="CheckItem" DataField="CheckItem"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="检查标准" ColumnID="CheckStandard" DataField="CheckStandard"
HeaderTextAlign="Center" TextAlign="Left" Width="400px">
HeaderTextAlign="Center" TextAlign="Left" Width="400px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField HeaderText="检查方法" ColumnID="CheckMethod" DataField="CheckMethod"
HeaderTextAlign="Center" TextAlign="Left" Width="150px" >
HeaderTextAlign="Center" TextAlign="Left" Width="300px" >
</f:RenderField>
<f:RenderField HeaderText="检查结果" ColumnID="CheckResult" DataField="CheckResult"
HeaderTextAlign="Center" TextAlign="Left" Width="160px">
@ -71,21 +71,21 @@
</Editor>
</f:RenderField>
<f:RenderField HeaderText="基准分" ColumnID="BaseScore" DataField="BaseScore"
HeaderTextAlign="Center" TextAlign="Left" Width="70px" FieldType="Double">
HeaderTextAlign="Center" TextAlign="Left" Width="100px" FieldType="Double">
<Editor>
<f:NumberBox ID="txtBaseScore" runat="server" NoDecimal="false" NoNegative="true" DecimalPrecision="2">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="扣减分" ColumnID="DeletScore" DataField="DeletScore"
HeaderTextAlign="Center" TextAlign="Left" Width="70px" FieldType="Double">
HeaderTextAlign="Center" TextAlign="Left" Width="100px" FieldType="Double">
<Editor>
<f:NumberBox ID="txtDeletScore" runat="server" NoDecimal="false" NoNegative="true" DecimalPrecision="2">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="实得分" ColumnID="GetScore" DataField="GetScore"
HeaderTextAlign="Center" TextAlign="Left" Width="70px" FieldType="Double">
HeaderTextAlign="Center" TextAlign="Left" Width="100px" FieldType="Double">
</f:RenderField>
</Columns>
<Listeners>
@ -96,16 +96,11 @@
</f:Grid>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="lbTotal100Score" runat="server"></f:Label>
<f:HiddenField ID="hdTotalDeletScore6_7" runat="server"></f:HiddenField>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="66% 34%">
<Items>
<f:Label ID="lbTotalLastScore" runat="server"></f:Label>
<f:Label ID="lbEvaluationResult" runat="server" Label="评定结论" LabelWidth="90px" ToolTip="合格（80分以上）；基本合格（71-79分）；不合格（70分以下。"></f:Label>
<f:Label ID="lbTotal100Score" runat="server"></f:Label>
<%-- <f:HiddenField ID="hdTotalDeletScore6_7" runat="server"></f:HiddenField> --%>
<f:Label ID="lbEvaluationResult" runat="server" Label="评定结论" LabelWidth="90px" ToolTip="A级合格（80分以上）；B级基本合格（71-79分）；C级不合格（70分以下。"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
@ -131,6 +126,12 @@
</f:Form>
</form>
<script type="text/javascript">
var grid1ClientID = '<%= Grid1.ClientID %>';
var lbTotal100ScoreClientID = '<%= lbTotal100Score.ClientID %>';
<%-- var hdTotalDeletScore6_7ClientID = '<%= hdTotalDeletScore6_7.ClientID %>';--%>
<%-- var lbTotalLastScoreClientID = '<%= lbTotalLastScore.ClientID %>';--%>
var lbEvaluationResultClientID = '<%= lbEvaluationResult.ClientID %>';
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
@ -144,47 +145,47 @@
function onGridAfterEdit(event, value, params) {
var me = this, columnId = params.columnId, rowId = params.rowId;
if (columnId === 'DeletScore' || columnId === 'BaseScore') {
var baseS = me.getCellValue(rowId, 'BaseScore');
var deleteS = me.getCellValue(rowId, 'DeletScore');
var baseS = me.getCellValue(rowId, 'BaseScore') * 1.0;;
var deleteS = me.getCellValue(rowId, 'DeletScore') * 1.0;;
me.updateCellValue(rowId, 'GetScore', (baseS - deleteS).toFixed(2));
}
//updateSummary();
updateSummary();
}
//function updateSummary() {
// var me = F(grid1ClientID), baseScoreTotal = 0, deletScoreTotal = 0, getScoreTotal = 0;
// me.getRowEls().each(function (index, tr) {
// baseScoreTotal += me.getCellValue(tr, 'BaseScore');
// deletScoreTotal += me.getCellValue(tr, 'DeletScore');
// getScoreTotal += me.getCellValue(tr, 'GetScore');
// });
function updateSummary() {
var me = F(grid1ClientID), baseScoreTotal = 0, deletScoreTotal = 0, getScoreTotal = 0;
me.getRowEls().each(function (index, tr) {
baseScoreTotal += me.getCellValue(tr, 'BaseScore') * 1.0;
deletScoreTotal += me.getCellValue(tr, 'DeletScore') * 1.0;
getScoreTotal += me.getCellValue(tr, 'GetScore') * 1.0;
});
// // 第三个参数 true，强制更新，不显示左上角的更改标识
// me.updateSummaryCellValue('CheckItem', '合计分', true);
// me.updateSummaryCellValue('BaseScore', baseScoreTotal, true);
// me.updateSummaryCellValue('DeletScore', deletScoreTotal, true);
// me.updateSummaryCellValue('GetScore', getScoreTotal, true);
// 第三个参数 true，强制更新，不显示左上角的更改标识
me.updateSummaryCellValue('CheckItem', '合计分', true);
me.updateSummaryCellValue('BaseScore', baseScoreTotal, true);
me.updateSummaryCellValue('DeletScore', deletScoreTotal, true);
me.updateSummaryCellValue('GetScore', getScoreTotal, true);
// var pValue=((getScoreTotal / baseScoreTotal) * 100).toFixed(2);
// var lab100 = "本表百分制得分 = （实查项实得分之和/实查项应得满分之和*100） " + pValue + " 分";
// F(lbTotal100ScoreClientID).setValue(lab100);
var pValue=((getScoreTotal / baseScoreTotal) * 100).toFixed(2);
var lab100 = "本表百分制得分 = （实查项实得分之和/实查项应得满分之和*100） " + pValue + " 分";
F(lbTotal100ScoreClientID).setValue(lab100);
// var lastScore = pValue - F(hdTotalDeletScore6_7ClientID).value;
//var lablast = "综合评定得分 = 本表得分 - 负面清单罚分 = " + lastScore + " 分";
//F(lbTotalLastScoreClientID).setValue(lablast);
// var str= "";
// if (lastScore >= 80) {
// str = "合格";
// }
// else if (lastScore >= 71 && lastScore <= 79) {
// str = "基本合格";
// }
// else if (lastScore <= 70) {
// str = "不合格";
// }
// F(lbEvaluationResultClientID).setValue(str);
//}
var str= "";
if (pValue >= 80) {
str = "A级（合格）";
}
else if (pValue >= 71 && pValue <= 79) {
str = "B级（基本合格）";
}
else if (pValue <= 70) {
str = "C级（不合格）";
}
F(lbEvaluationResultClientID).setValue(str);
}
</script>
</body>
</html>

38
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.cs
View File

@ -46,7 +46,12 @@ namespace FineUIPro.Web.OfficeCheck.Check
if (checkInfo != null)
{
this.drpSubjectProject.SelectedValue = checkInfo.SubjectProjectId;
this.txtCheckLeader.Text = Person_PersonsService.GetPersonsNameById(checkInfo.CheckTeamLeader);
this. txtSubjectUnitMan.Text= Person_PersonsService.GetPersonsNameById(checkInfo.SubjectUnitMan);
}
this.txtCheckMan.Text = this.CurrUser.PersonName;
this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtSubjectUnitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
var table1 = BLL.CheckTable1Service.GetCheckTable1ByCheckNoticeId(this.CheckNoticeId);
if (table1 != null)
@ -55,18 +60,12 @@ namespace FineUIPro.Web.OfficeCheck.Check
{
this.drpSubjectProject.SelectedValue = table1.SubjectProjectId;
}
if (!string.IsNullOrEmpty(table1.CheckMan))
{
this.txtCheckMan.Text = table1.CheckMan;
}
else
{
this.txtCheckMan.Text = this.CurrUser.PersonName;
}
this.txtCheckLeader.Text = table1.CheckLeader;
this.txtSubjectUnitMan.Text = table1.SubjectUnitMan;
this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", table1.CheckDate);
this.txtSubjectUnitDate.Text = string.Format("{0:yyyy-MM-dd}", table1.SubjectUnitDate);
if (table1.Total100Score.HasValue)
{
this.lbTotal100Score.Text = "本表百分制得分 = （实查项实得分之和/实查项应得满分之和*100） " + table1.Total100Score + " 分";
@ -76,14 +75,14 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.lbTotal100Score.Text = "本表百分制得分 = （实查项实得分之和/实查项应得满分之和*100） 分";
}
if (table1.TotalLastScore.HasValue)
{
this.lbTotalLastScore.Text = "综合评定得分 = 本表得分 - 负面清单罚分 = " + table1.TotalLastScore + " 分";
}
else
{
this.lbTotalLastScore.Text = "综合评定得分 = 本表得分 - 负面清单罚分 = 分";
}
//if (table1.TotalLastScore.HasValue)
//{
// this.lbTotalLastScore.Text = "综合评定得分 = 本表得分 - 负面清单罚分 = " + table1.TotalLastScore + " 分";
//}
//else
//{
// this.lbTotalLastScore.Text = "综合评定得分 = 本表得分 - 负面清单罚分 = 分";
//}
this.lbEvaluationResult.Text = table1.EvaluationResult;
}
@ -142,6 +141,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
}
this.Grid1.DataBind();
}
/// <summary>
/// 合计值
/// </summary>
@ -229,7 +229,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
if (checks == null)
{
Model.ProjectSupervision_Check1 newCheck = new Model.ProjectSupervision_Check1();
newCheck.ID = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_Check1));
newCheck.ID = SQLHelper.GetNewID();
newCheck.SortIndex = Funs.GetNewInt(values.Value<string>("SortIndex"));
newCheck.CheckItem = values.Value<string>("CheckItem");
newCheck.CheckStandard = values.Value<string>("CheckStandard");
@ -245,7 +245,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
else
{
Model.ProjectSupervision_Check1 newCheck = new Model.ProjectSupervision_Check1();
newCheck.ID = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_Check1));
newCheck.ID = SQLHelper.GetNewID();
newCheck.SortIndex = checks.SortIndex;
newCheck.CheckItem = checks.CheckItem;
newCheck.CheckStandard = values.Value<string>("CheckStandard");
@ -286,7 +286,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
totalGetScore = totalBaseScore - totalDeletScore;
decimal sS = (totalGetScore / totalBaseScore) * 100;
total100Score = Math.Round(sS, 2);
totalLastScore = (total100Score - Funs.GetNewDecimalOrZero(this.hdTotalDeletScore6_7.Text));
totalLastScore = total100Score; //total100Score - Funs.GetNewDecimalOrZero(this.hdTotalDeletScore6_7.Text));
}
}
@ -309,7 +309,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
table1.TotalLastScore = totalLastScore;
table1.EvaluationResult = Funs.ReturnEvaluationResultByScore(table1.TotalLastScore);
table1.CheckNoticeId = this.CheckNoticeId;
table1.CheckItemId = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_CheckTable1));
table1.CheckItemId = SQLHelper.GetNewID();
BLL.CheckTable1Service.AddCheckTable1(table1);
ShowNotify("保存成功！", MessageBoxIcon.Success);

18
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx.designer.cs generated
View File

@ -140,24 +140,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </remarks>
protected global::FineUIPro.Label lbTotal100Score;
/// <summary>
/// hdTotalDeletScore6_7 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdTotalDeletScore6_7;
/// <summary>
/// lbTotalLastScore 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbTotalLastScore;
/// <summary>
/// lbEvaluationResult 控件。
/// </summary>

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

@ -52,9 +52,9 @@
</f:Button>--%>
<f:HiddenField runat="server" ID="hdCheckNoticeId"></f:HiddenField>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnEdit" ToolTip="修改检查信息" Icon="TableEdit" runat="server" OnClick="btnEdit_Click" Hidden="true">
<f:Button ID="btnEdit" Text="编辑" Icon="TableEdit" runat="server" OnClick="btnEdit_Click" Hidden="true">
</f:Button>
<f:Button ID="btnDelete" ToolTip="删除检查" ConfirmText="确认删除此检查?" ConfirmTarget="Top" Hidden="true"
<f:Button ID="btnDelete" Text="删除" ConfirmText="确认删除此检查?" ConfirmTarget="Top" Hidden="true"
Icon="Delete" runat="server" OnClick="btnDelete_Click">
</f:Button>
</Items>
@ -109,15 +109,15 @@
<Rows>
<f:FormRow >
<Items>
<f:Label ID="Label1" runat="server" Text="现场安全检查" Label="检查项名称">
<f:Label ID="Label1" runat="server" Text="现场安全检查" >
</f:Label>
<f:Label ID="lblSubjectUnitId" runat="server" Label="受检对象"></f:Label>
<%-- <f:Label ID="lblSubjectUnitId" runat="server" Label="受检对象"></f:Label>--%>
</Items>
</f:FormRow>
<f:FormRow >
<Items>
<f:Label ID="lblCheckDate" runat="server" Label="生效日">
</f:Label>
<%-- <f:Label ID="lblCheckDate" runat="server" Label="生效日">
</f:Label>--%>
<f:Label ID="lblResult" runat="server" Label="检查结果">
</f:Label>
</Items>
@ -127,9 +127,9 @@
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:ToolbarFill ID="ToolbarFill2" runat="server"></f:ToolbarFill>
<f:Button ID="btnCheck1" ToolTip="编辑现场安全检查" Icon="TableEdit" runat="server" OnClick="btnCheck1_Click" Hidden="true">
<f:Button ID="btnCheck1" Text="编辑" Icon="TableEdit" runat="server" OnClick="btnCheck1_Click" Hidden="true">
</f:Button>
<f:Button ID="btnView1" ToolTip="查看现场安全检查" Icon="Find" runat="server" OnClick="btnView1_Click" Hidden="true">
<f:Button ID="btnView1" Text="查看" Icon="Find" runat="server" OnClick="btnView1_Click" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
@ -142,16 +142,16 @@
<Rows>
<f:FormRow >
<Items>
<f:Label ID="Label9" runat="server" Text="检查报告" Label="检查项名称">
<f:Label ID="Label9" runat="server" Text="检查报告" >
</f:Label>
<f:Label ID="lblCheckObject" runat="server" Label="受检对象"></f:Label>
<%--<f:Label ID="lblCheckObject" runat="server" Label="受检对象"></f:Label>--%>
</Items>
</f:FormRow>
<f:FormRow >
<Items>
<f:Label ID="lblCheckStartTime" runat="server" Label="生效日">
</f:Label>
<f:Label ID="lblCheckReportResult" runat="server" Label="检查结果">
<%-- <f:Label ID="lblCheckStartTime" runat="server" Label="生效日">
</f:Label>--%>
<f:Label ID="lblCheckReportResult" runat="server" Label="检查结论">
</f:Label>
</Items>
</f:FormRow>
@ -160,9 +160,9 @@
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:ToolbarFill ID="ToolbarFill4" runat="server"></f:ToolbarFill>
<f:Button ID="btnCheck3" ToolTip="编辑检查报告" Icon="TableEdit" runat="server" OnClick="btnCheck3_Click" Hidden="true">
<f:Button ID="btnCheck3" Text="编辑" Icon="TableEdit" runat="server" OnClick="btnCheck3_Click" Hidden="true">
</f:Button>
<f:Button ID="btnView3" ToolTip="查看检查报告" Icon="Find" runat="server" OnClick="btnView3_Click" Hidden="true">
<f:Button ID="btnView3" Text="查看" Icon="Find" runat="server" OnClick="btnView3_Click" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
@ -175,16 +175,16 @@
<Rows>
<f:FormRow >
<Items>
<f:Label ID="Label5" runat="server" Text="隐患整改" Label="检查项名称">
<f:Label ID="Label5" runat="server" Text="隐患整改" >
</f:Label>
<f:Label ID="lblUnitId" runat="server" Label="受检对象"></f:Label>
<%-- <f:Label ID="lblUnitId" runat="server" Label="受检对象"></f:Label>--%>
</Items>
</f:FormRow>
<f:FormRow >
<Items>
<f:Label ID="lblCheckedDate" runat="server" Label="生效日">
</f:Label>
<f:Label ID="lblCheckResult" runat="server" Label="检查结果">
<%-- <f:Label ID="lblCheckedDate" runat="server" Label="生效日">
</f:Label>--%>
<f:Label ID="lblCheckResult" runat="server" Label="整改内容">
</f:Label>
</Items>
</f:FormRow>

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

@ -198,7 +198,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
{
this.drpSubjectUnit.Text = projectName;
}
this.txtSubjectUnitMan.Text = checkInfo.SubjectUnitMan;
this.txtSubjectUnitMan.Text = Person_PersonsService.GetPersonsNameById(checkInfo.SubjectUnitMan);
this.txtSubjectUnitAdd.Text = checkInfo.SubjectUnitAdd;
this.txtSubjectUnitTel.Text = checkInfo.SubjectUnitTel;
this.txtCompileMan.Text = BLL.Person_PersonsService.GetPersonsNameById(checkInfo.CompileMan);
@ -208,24 +208,24 @@ 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);
// 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)
{

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

@ -230,24 +230,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// lblSubjectUnitId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblSubjectUnitId;
/// <summary>
/// lblCheckDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblCheckDate;
/// <summary>
/// lblResult 控件。
/// </summary>
@ -311,24 +293,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </remarks>
protected global::FineUIPro.Label Label9;
/// <summary>
/// lblCheckObject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblCheckObject;
/// <summary>
/// lblCheckStartTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblCheckStartTime;
/// <summary>
/// lblCheckReportResult 控件。
/// </summary>
@ -392,24 +356,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </remarks>
protected global::FineUIPro.Label Label5;
/// <summary>
/// lblUnitId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblUnitId;
/// <summary>
/// lblCheckedDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblCheckedDate;
/// <summary>
/// lblCheckResult 控件。
/// </summary>

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

@ -159,7 +159,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.txtCheckStartTime.Text = string.Format("{0:yyyy-MM-dd}", checkInfo.CheckStartTime);
this.txtCheckEndTime.Text = string.Format("{0:yyyy-MM-dd}", checkInfo.CheckEndTime);
this.drpSubjectUnit.Text = BLL.ProjectService.GetProjectNameByProjectId(checkInfo.SubjectProjectId);
this.txtSubjectUnitMan.Text = checkInfo.SubjectUnitMan;
this.txtSubjectUnitMan.Text = Person_PersonsService.GetPersonsNameById(checkInfo.SubjectUnitMan);
this.txtSubjectUnitAdd.Text = checkInfo.SubjectUnitAdd;
this.txtSubjectUnitTel.Text = checkInfo.SubjectUnitTel;
//this.txtSubjectObject.Text = checkInfo.SubjectObject;

33
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx.cs
View File

@ -51,19 +51,15 @@ namespace FineUIPro.Web.OfficeCheck.Check
if (!string.IsNullOrEmpty(checkNotice.SubjectProjectId))
{
this.drpSubjectProject.SelectedValue = checkNotice.SubjectProjectId;
SitePerson_PersonService.InitSitePersonDropDownList(this.drpSubjectUnitMan, checkNotice.SubjectProjectId, Const.UnitId_SEDIN, null, null, true);
this.drpSubjectUnitMan.SelectedValue = checkNotice.SubjectUnitMan;
}
SitePerson_PersonService.InitSitePersonDropDownList(this.drpSubjectUnitMan, this.drpSubjectProject.SelectedValue, Const.sedinId, null, null, true);
// this.txtSubjectUnitMan.Text = checkNotice.SubjectUnitMan;
this.drpUnit.SelectedValue = checkNotice.UnitId;
this.drpDepart.SelectedValue = checkNotice.DepartId;
this.drpCheckTeamLeader.SelectedValue = checkNotice.SubjectUnitMan;
this.txtSubjectUnitAdd.Text = checkNotice.SubjectUnitAdd;
this.txtSubjectUnitTel.Text = checkNotice.SubjectUnitTel;
//this.txtSubjectObject.Text = checkNotice.SubjectObject;
// this.txtCheckTeamLeaderName.Text = checkNotice.CheckTeamLeaderName;
if (!string.IsNullOrEmpty(checkNotice.UnitId))
{
this.drpUnit.SelectedValue = checkNotice.UnitId;
this.drpUnit.Enabled = false;
}
this.drpSex.SelectedValue = checkNotice.SexName;
this.hdUserId.Text = checkNotice.CheckTeamLeader;
}
@ -85,19 +81,26 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpCheckTeamLeader.SelectedValue != Const._Null)
if (this.drpCheckTeamLeader.SelectedValue == Const._Null)
{
ShowNotify("请先填写检查组长!", MessageBoxIcon.Warning);
return;
}
Model.ProjectSupervision_CheckNotice newCheckNotice = new Model.ProjectSupervision_CheckNotice();
newCheckNotice.SubjectUnitAdd = this.txtSubjectUnitAdd.Text.Trim();
// newCheckNotice.SubjectUnitMan = this.txtSubjectUnitMan.Text.Trim();
if (this.drpSubjectUnitMan.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpSubjectUnitMan.SelectedValue))
{
newCheckNotice.SubjectUnitMan = this.drpSubjectUnitMan.SelectedValue;
}
newCheckNotice.SubjectUnitTel = this.txtSubjectUnitTel.Text.Trim();
newCheckNotice.CheckStartTime = Funs.GetNewDateTime(this.txtCheckStartTime.Text).Value;
newCheckNotice.CheckEndTime = Funs.GetNewDateTime(this.txtCheckEndTime.Text).Value;
newCheckNotice.CompileMan = this.CurrUser.PersonId;
newCheckNotice.CompileDate = DateTime.Now;
if (this.drpCheckTeamLeader.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpCheckTeamLeader.SelectedValue))
{
newCheckNotice.CheckTeamLeader = this.drpCheckTeamLeader.SelectedValue;
}
newCheckNotice.CheckTeamLeaderName = this.drpCheckTeamLeader.SelectedText;
if (this.drpSubjectProject.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpSubjectProject.SelectedValue))
{
@ -111,9 +114,9 @@ namespace FineUIPro.Web.OfficeCheck.Check
{
newCheckNotice.UnitId = this.drpUnit.SelectedValue;
}
if (!string.IsNullOrEmpty(this.hdUserId.Text))
if (this.drpDepart.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpDepart.SelectedValue))
{
newCheckNotice.CheckTeamLeader = this.hdUserId.Text;
newCheckNotice.DepartId = this.drpDepart.SelectedValue;
}
if (string.IsNullOrEmpty(this.CheckNoticeId))
@ -172,7 +175,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
BLL.Person_PersonsService.InitUserUnitIdDepartIdDropDownList(this.drpCheckTeamLeader, this.drpUnit.SelectedValue, string.Empty, true);
}
/// <summary>

24
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckReport.aspx
View File

@ -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>
@ -61,17 +61,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label3" Text="四、符合项" CssClass="title" runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtValues4" runat="server" Height="50px"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label4" Text="五、不符合项" CssClass="title" runat="server"></f:Label>
<f:Label ID="Label4" Text="四、主要不符合项" CssClass="title" runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
@ -118,7 +108,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label5" Text="六、改进意见" CssClass="title" runat="server"></f:Label>
<f:Label ID="Label5" Text="五、改进建议" CssClass="title" runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
@ -128,7 +118,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label6" Text="七、检查结论" CssClass="title" runat="server"></f:Label>
<f:Label ID="Label6" Text="六、检查结论" CssClass="title" runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
@ -143,7 +133,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar5" runat="server" ToolbarAlign="Right">
<Items>
<f:Label ID="Label8" runat="server" Text="八、检查工作组人员" CssClass="title"></f:Label>
<f:Label ID="Label8" runat="server" Text="七、检查工作组成员" CssClass="title"></f:Label>
<f:ToolbarFill ID="ToolbarFill2" runat="server"></f:ToolbarFill>
<f:Button ID="btnRefresh" ToolTip="刷新工作组人员信息" Icon="ArrowRefresh" runat="server" OnClick="btnRefresh_Click">
</f:Button>
@ -179,10 +169,10 @@
SortField="CheckPostName" FieldType="String" HeaderText="检查工作组职务"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="CheckDate" DataField="CheckDate"
<%--<f:RenderField Width="120px" ColumnID="CheckDate" DataField="CheckDate"
SortField="CheckDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="检查日期" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</f:RenderField>--%>
</Columns>
</f:Grid>
</Items>

4
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckReport.aspx.cs
View File

@ -61,7 +61,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.txtValues1.Text = checkReport.CheckPurpose;
this.txtValues2.Text = checkReport.Basis;
this.txtValues3.Text = checkReport.BasicInfo;
this.txtValues4.Text = checkReport.ConformItem;
//this.txtValues4.Text = checkReport.ConformItem;
this.txtValues6.Text = checkReport.Opinion;
this.txtValues7.Text = checkReport.CheckResult;
this.BindGrid2();
@ -162,7 +162,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
newCheckReport.CheckPurpose = this.txtValues1.Text.Trim();
newCheckReport.Basis = this.txtValues2.Text.Trim();
newCheckReport.BasicInfo = this.txtValues3.Text.Trim();
newCheckReport.ConformItem = this.txtValues4.Text.Trim();
//newCheckReport.ConformItem = this.txtValues4.Text.Trim();
newCheckReport.Opinion = this.txtValues6.Text.Trim();
newCheckReport.CheckResult = this.txtValues7.Text.Trim();
if (!string.IsNullOrEmpty(hdCheckReportId.Text.Trim()))

24
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckReport.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.OfficeCheck.Check {
namespace FineUIPro.Web.OfficeCheck.Check
{
public partial class CheckReport {
public partial class CheckReport
{
/// <summary>
/// form1 控件。
@ -138,24 +140,6 @@ namespace FineUIPro.Web.OfficeCheck.Check {
/// </remarks>
protected global::FineUIPro.TextArea txtValues3;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// txtValues4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtValues4;
/// <summary>
/// Label4 控件。
/// </summary>