gaofei/SGGL_HBAZ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

专项检查

Browse Source
This commit is contained in:
杨家亮
2025-04-15 20:48:53 +08:00
parent 80ea8ec450
commit 1c6dca4612
36 changed files with 29955 additions and 932 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx
+61 -71
View File
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script src="../../Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
<title>质量巡检</title>
@@ -35,11 +35,12 @@
background-color: #79FF79;
}*/
.Green {
.Green {
background-color: Green;
color:white;
color: white;
}
.Yellow {
.Yellow {
background-color: #FFFF93;
}
@@ -50,6 +51,7 @@
.LightGreen {
background-color: LightGreen
}
.f-grid-colheader-text {
white-space: normal;
word-break: break-all;
@@ -74,39 +76,39 @@
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpSponsorUnit" runat="server" Label="施工单位" EnableEdit="true" EmptyText="请选择查询条件"
LabelAlign="right">
LabelAlign="right">
</f:DropDownList>
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpQuestionType" runat="server" Label="问题类别" Width="210px" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpQuestionType" runat="server" Label="问题类别" Width="210px" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="dpHandelStatus" runat="server" Label="整改状态" LabelAlign="Right" EnableEdit="true">
<f:ListItem Text="待整改" Value="4" />
<f:ListItem Text="已整改-待复查验收" Value="1" />
<f:ListItem Text="超期未整改" Value="3" />
<f:ListItem Text="已闭环" Value="2" />
<f:DropDownList ID="dpHandelStatus" runat="server" Label="整改状态" LabelAlign="Right" EnableEdit="true">
<f:ListItem Text="待整改" Value="4" />
<f:ListItem Text="已整改-待复查验收" Value="1" />
<f:ListItem Text="超期未整改" Value="3" />
<f:ListItem Text="已闭环" Value="2" />
</f:DropDownList>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
LabelAlign="right" >
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
LabelAlign="right">
</f:DatePicker>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
LabelAlign="right" >
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
LabelAlign="right">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server" >
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
</f:Button>
<f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server" >
<f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
</f:Button>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
Hidden="true">
@@ -118,7 +120,7 @@
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
@@ -126,27 +128,45 @@
<ItemTemplate>
<asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="DocCode" DataField="DocCode"
SortField="DocCode" FieldType="String" HeaderText="质量巡检编号" TextAlign="Center"
</f:TemplateField>
<f:RenderField ColumnID="DocCode" DataField="DocCode"
SortField="DocCode" FieldType="String" HeaderText="编号" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UnitWorkName" DataField="UnitWorkName"
SortField="UnitWorkName" FieldType="String" HeaderText="单位工程名称" TextAlign="Center"
<f:RenderField Width="100px" ColumnID="CheckSite" DataField="CheckSite"
SortField="CheckSite" FieldType="String" HeaderText="部位" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UnitName" DataField="UnitName"
SortField="UnitName" FieldType="String" HeaderText="施工单位" TextAlign="Left"
<f:RenderField ColumnID="CNProfessionalCodeName" DataField="CNProfessionalCodeName"
SortField="CNProfessionalCodeName" FieldType="String" HeaderText="专业" TextAlign="center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="ProfessionalName" DataField="ProfessionalName" SortField="ProfessionalName"
FieldType="String" HeaderText="专业" TextAlign="Center" HeaderTextAlign="Center">
<f:RenderField ColumnID="QuestionTypeName" DataField="QuestionTypeName" SortField="QuestionTypeName"
FieldType="String" HeaderText="问题类型" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="QuestionType" DataField="QuestionType" SortField="QuestionType"
FieldType="String" HeaderText="问题类别" TextAlign="Center" HeaderTextAlign="Center">
<f:RenderField ColumnID="QuestionDef" DataField="QuestionDef" SortField="QuestionDef"
FieldType="String" HeaderText="问题描述" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="tfImageUrl1" Width="120px" HeaderText="整改前" HeaderTextAlign="Center"
<f:RenderField ColumnID="RectifyOpinion" Width="400px" DataField="RectifyOpinion" SortField="RectifyOpinion"
FieldType="String" HeaderText="整改要求" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName" SortField="UnitWorkName"
FieldType="String" HeaderText="受检区域" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="CheckManName" DataField="CheckManName" SortField="CheckManName"
FieldType="String" HeaderText="检查人" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate"
FieldType="String" HeaderText="检查日期" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="PrincipalManName" DataField="PrincipalManName" SortField="PrincipalManName"
FieldType="String" HeaderText="责任人" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="LimitDate" DataField="LimitDate" SortField="LimitDate"
FieldType="String" HeaderText="整改期限" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="AttachUrl" Width="120px" HeaderText="整改前" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("CheckControlCode")) %>'></asp:Label>
@@ -158,33 +178,13 @@
<asp:Label ID="lbImageUrl2" runat="server" Text='<%# ConvertImgUrlByImage(Eval("CheckControlCode")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="70px" ColumnID="CheckSite" DataField="CheckSite" SortField="CheckSite"
FieldType="String" HeaderText="部位" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="95px" ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="巡检日期" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="95px" ColumnID="userName" DataField="userName" SortField="userName"
FieldType="String" HeaderText="检查人" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="State" Width="100px" HeaderText="审批状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="labState" runat="server" Text='<%# ConvertState(Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="AuditMan" Width="80px" HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lbAuditMan" runat="server" Text='<%# ConvertMan(Eval("CheckControlCode")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="State2" Width="80px" HeaderText="整改状态" HeaderTextAlign="Center" TextAlign="Center"
<f:TemplateField ColumnID="State2" Width="80px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lbState2" runat="server" Text='<%# Convertstatus(Eval("CheckControlCode")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -213,28 +213,18 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1300px" Height="660px">
</f:Window>
<f:Window ID="Window2" Title="质量罚款单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window2" Title="质量罚款单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1000px" Height="450px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
OnClick="btnMenuModify_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看" Icon="ApplicationViewIcons"
OnClick="btnMenuView_Click">
</f:MenuButton>
<f:MenuButton ID="MenuButton1" EnablePostBack="true" EnableAjax="false" runat="server" DisableControlBeforePostBack="false" Text="质量通知单打印" Icon="ApplicationViewIcons"
OnClick="btnMenuNotice_Click">
</f:MenuButton>
<f:MenuButton ID="MenuButton2" EnablePostBack="true" EnableAjax="false" runat="server" DisableControlBeforePostBack="false" Text="质量整改回复单" Icon="ApplicationViewIcons"
OnClick="btnMenuReNotice_Click">
</f:MenuButton>
<f:MenuButton ID="MenuButton3" EnablePostBack="true" EnableAjax="false" runat="server" DisableControlBeforePostBack="false" Text="生成质量罚款单" Icon="ApplicationViewIcons"
OnClick="btnMenuFine_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
OnClick="btnMenuDel_Click">
</f:MenuButton>
SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
+174 -132
View File
@@ -3,11 +3,13 @@ using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Reflection.Emit;
using System.Text;
using System.Threading.Tasks;
using AspNet = System.Web.UI.WebControls;
@@ -129,65 +131,100 @@ namespace FineUIPro.Web.CQMS.Check
}
protected DataTable ChecklistData()
{
string strSql = @"SELECT chec.CheckControlCode,chec.CheckSite,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName,"
+ @" QualityQuestionType.QualityQuestionType as QuestionType,"
+ @" chec.checkman,chec.CheckDate,chec.DocCode,chec.submitman,chec.state,chec.CNProfessionalCode,"
+ @" unit.UnitName,unitWork.UnitWorkName,u.userName "
+ @" FROM Check_CheckControl chec"
+ @" left join Base_Unit unit on unit.unitId=chec.unitId"
+ @" left join Base_CNProfessional cNProfessional on cNProfessional.CNProfessionalId=chec.CNProfessionalCode"
+ @" left join WBS_UnitWork unitWork on unitWork.UnitWorkId = chec.UnitWorkId"
+ @" left join Base_QualityQuestionType QualityQuestionType on QualityQuestionType.QualityQuestionTypeId = chec.QuestionType"
+ @" left join sys_User u on u.userId = chec.CheckMan"
+ @" where chec.ProjectId=@ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
strSql += " AND (chec.CheckDate>=@startTime or @startTime='') and (chec.CheckDate<=@endTime or @endTime='') ";
listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : ""));
listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + " 23:59:59" : ""));
if (drpSponsorUnit.SelectedValue != BLL.Const._Null)
{
strSql += " AND chec.unitId=@unitId";
listStr.Add(new SqlParameter("@unitId", drpSponsorUnit.SelectedValue));
}
if (drpUnitWork.SelectedValue != Const._Null)
{
strSql += " AND chec.unitworkId=@unitworkId";
listStr.Add(new SqlParameter("@unitworkId", drpUnitWork.SelectedValue));
}
if (drpCNProfessional.SelectedValue != Const._Null)
{
strSql += " AND chec.CNProfessionalCode=@CNProfessionalCode";
listStr.Add(new SqlParameter("@CNProfessionalCode", drpCNProfessional.SelectedValue));
}
if (drpQuestionType.SelectedValue != Const._Null)
{
strSql += " AND chec.QuestionType=@QuestionType";
listStr.Add(new SqlParameter("@QuestionType", drpQuestionType.SelectedValue));
}
if (dpHandelStatus.SelectedValue != Const._Null)
{
if (dpHandelStatus.SelectedValue.Equals("1"))
{
strSql += " AND (chec.state='5' or chec.state='6')";
}
else if (dpHandelStatus.SelectedValue.Equals("2"))
{
strSql += " AND chec.state='7'";
}
else if (dpHandelStatus.SelectedValue.Equals("3"))
{
strSql += " AND DATEADD(day,1,chec.LimitDate)< GETDATE() and chec.state<>5 and chec.state<>6 and chec.state<>7";
}
else if (dpHandelStatus.SelectedValue.Equals("4"))
{
strSql += " AND DATEADD(day,1,chec.LimitDate)> GETDATE() and chec.state<>5 and chec.state<>6 and chec.state<>7";
}
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
return tb;
//string strSql = @"SELECT chec.CheckControlCode,chec.CheckSite,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName,"
// + @" QualityQuestionType.QualityQuestionType as QuestionType,"
// + @" chec.checkman,chec.CheckDate,chec.DocCode,chec.submitman,chec.state,chec.CNProfessionalCode,"
// + @" unit.UnitName,unitWork.UnitWorkName,u.userName "
// + @" FROM Check_CheckControl chec"
// + @" left join Base_Unit unit on unit.unitId=chec.unitId"
// + @" left join Base_CNProfessional cNProfessional on cNProfessional.CNProfessionalId=chec.CNProfessionalCode"
// + @" left join WBS_UnitWork unitWork on unitWork.UnitWorkId = chec.UnitWorkId"
// + @" left join Base_QualityQuestionType QualityQuestionType on QualityQuestionType.QualityQuestionTypeId = chec.QuestionType"
// + @" left join sys_User u on u.userId = chec.CheckMan"
// + @" where chec.ProjectId=@ProjectId";
//List<SqlParameter> listStr = new List<SqlParameter>();
//listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
//strSql += " AND (chec.CheckDate>=@startTime or @startTime='') and (chec.CheckDate<=@endTime or @endTime='') ";
//listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : ""));
//listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + " 23:59:59" : ""));
//if (drpSponsorUnit.SelectedValue != BLL.Const._Null)
//{
// strSql += " AND chec.unitId=@unitId";
// listStr.Add(new SqlParameter("@unitId", drpSponsorUnit.SelectedValue));
//}
//if (drpUnitWork.SelectedValue != Const._Null)
//{
// strSql += " AND chec.unitworkId=@unitworkId";
// listStr.Add(new SqlParameter("@unitworkId", drpUnitWork.SelectedValue));
//}
//if (drpCNProfessional.SelectedValue != Const._Null)
//{
// strSql += " AND chec.CNProfessionalCode=@CNProfessionalCode";
// listStr.Add(new SqlParameter("@CNProfessionalCode", drpCNProfessional.SelectedValue));
//}
//if (drpQuestionType.SelectedValue != Const._Null)
//{
// strSql += " AND chec.QuestionType=@QuestionType";
// listStr.Add(new SqlParameter("@QuestionType", drpQuestionType.SelectedValue));
//}
//if (dpHandelStatus.SelectedValue != Const._Null)
//{
// if (dpHandelStatus.SelectedValue.Equals("1"))
// {
// strSql += " AND (chec.state='5' or chec.state='6')";
// }
// else if (dpHandelStatus.SelectedValue.Equals("2"))
// {
// strSql += " AND chec.state='7'";
// }
// else if (dpHandelStatus.SelectedValue.Equals("3"))
// {
// strSql += " AND DATEADD(day,1,chec.LimitDate)< GETDATE() and chec.state<>5 and chec.state<>6 and chec.state<>7";
// }
// else if (dpHandelStatus.SelectedValue.Equals("4"))
// {
// strSql += " AND DATEADD(day,1,chec.LimitDate)> GETDATE() and chec.state<>5 and chec.state<>6 and chec.state<>7";
// }
//}
//SqlParameter[] parameter = listStr.ToArray();
//DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
var query = (from x in Funs.DB.Check_CheckControl
select new
{
CheckControlCode = x.CheckControlCode,
ProjectId = x.ProjectId,
ProjectName = Funs.DB.Base_Project.FirstOrDefault(p => p.ProjectId == x.ProjectId).ProjectName,
DocCode = x.DocCode,
States = x.State,
CheckSite = x.CheckSite,
QuestionDef = x.QuestionDef,
CheckDate = String.Format("{0:yyyy-MM-dd}", x.CheckDate),
LimitDate = String.Format("{0:yyyy-MM-dd}", x.LimitDate),
RectifyOpinion = x.RectifyOpinion,
CheckMan = x.CheckMan,
UnitWorkId = x.UnitWorkId,
AttachUrl = x.AttachUrl,
HandleWay = x.HandleWay,
RectifyDate = String.Format("{0:yyyy-MM-dd}", x.RectifyDate),
ReAttachUrl = x.ReAttachUrl,
IsOk = x.IsOK,
OKDescr = x.OKDescr,
UnitWorkName = (from y in Funs.DB.WBS_UnitWork where y.UnitWorkId == x.UnitWorkId select y.UnitWorkName).First(),
CheckManName = (from y in Funs.DB.Sys_User where y.UserId == x.CheckMan select y.UserName).First(),
PrincipalMan = x.DutyMan,
PrincipalManName = Funs.DB.Sys_User.FirstOrDefault(e => e.UserId == x.DutyMan).UserName,
CNProfessionalCode = x.CNProfessionalCode,
CNProfessionalCodeName = Funs.DB.Base_CNProfessional.FirstOrDefault(e => e.CNProfessionalId == x.CNProfessionalCode).ProfessionalName,
QuestionType = x.QuestionType,
QuestionTypeName = Funs.DB.Base_QualityQuestionType.FirstOrDefault(e => e.QualityQuestionTypeId == x.QuestionType).QualityQuestionType,
}).ToList();
DataTable td = ToDataTable(query);
return td;
}
protected void btnOut_Click(object sender, EventArgs e)
{
@@ -272,42 +309,26 @@ namespace FineUIPro.Web.CQMS.Check
return sb.ToString();
}
#region 检查照片
protected string ConvertImageUrlByImage(object registrationId)
{
string url = string.Empty;
if (registrationId != null)
{
IList<Model.AttachFile> sourlist = AttachFileService.GetBeforeFileList(registrationId.ToString(), BLL.Const.CheckListMenuId);
if (sourlist != null&& sourlist.Count>0)
{
string AttachUrl = "";
foreach(var item in sourlist)
{ if(!string.IsNullOrEmpty(item.AttachUrl)&& item.AttachUrl.ToLower().EndsWith(".jpg")|| item.AttachUrl.ToLower().EndsWith(".jpeg")|| item.AttachUrl.ToLower().EndsWith(".png"))
AttachUrl += item.AttachUrl.TrimEnd(',')+",";
}
url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["CEMS_IMG_URL"], AttachUrl.TrimEnd(','));
}
Model.Check_CheckControl m = Funs.DB.Check_CheckControl.FirstOrDefault(e => e.CheckControlCode == registrationId.ToString());
url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["CEMS_IMG_URL"], m.AttachUrl.TrimEnd(','));
}
return url;
}
#endregion
protected string ConvertImgUrlByImage(object registrationId)
{
string url = string.Empty;
if (registrationId != null)
{
IList<Model.AttachFile> sourlist = AttachFileService.Getfilelist(registrationId.ToString()+"r", BLL.Const.CheckListMenuId);
if (sourlist != null && sourlist.Count > 0)
{
string AttachUrl = "";
foreach (var item in sourlist)
{
if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png"))
AttachUrl += item.AttachUrl.TrimEnd(',') + ",";
}
url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["CEMS_IMG_URL"], AttachUrl.TrimEnd(','));
}
Model.Check_CheckControl m = Funs.DB.Check_CheckControl.FirstOrDefault(e => e.CheckControlCode == registrationId.ToString());
url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["CEMS_IMG_URL"], m.ReAttachUrl.TrimEnd(','));
}
return url;
}
@@ -315,25 +336,25 @@ namespace FineUIPro.Web.CQMS.Check
public string Convertstatus(Object code)
{
Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(code.ToString());
if (checkControl.State.Equals("5") || checkControl.State.Equals("6"))
if (checkControl.State.Equals("1") )
{
return "未确认";
return "待整改";
}
else if (checkControl.State == Const.CheckControl_Complete)
else if (checkControl.State.Equals("2"))
{ //闭环
return "已闭环";
return "待确认";
}
//else if( checkControl.LimitDate> )
else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now) //延期未整改
else if (checkControl.State.Equals("3")) //延期未整改
{
return "超期未整改";
return "已闭环";
}
else //期内未整改
else
{
return "未整改";
return "";
}
}
@@ -355,31 +376,31 @@ namespace FineUIPro.Web.CQMS.Check
Grid1.DataSource = table;
Grid1.DataBind();
for (int i = 0; i < Grid1.Rows.Count; i++)
{
string rowID = Grid1.Rows[i].DataKeys[0].ToString();
if (rowID.Count() > 0)
{
Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(rowID);
if (checkControl.State.Equals("5") || checkControl.State.Equals("6"))
{
Grid1.Rows[i].CellCssClasses[11] = "LightGreen";//未确认
}
else if (checkControl.State == Const.CheckControl_Complete)
{ //闭环
Grid1.Rows[i].CellCssClasses[11] = "Green";
//for (int i = 0; i < Grid1.Rows.Count; i++)
//{
// string rowID = Grid1.Rows[i].DataKeys[0].ToString();
// if (rowID.Count() > 0)
// {
// Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(rowID);
// if (checkControl.State.Equals("5") || checkControl.State.Equals("6"))
// {
// Grid1.Rows[i].CellCssClasses[11] = "LightGreen";//未确认
// }
// else if (checkControl.State == Const.CheckControl_Complete)
// { //闭环
// Grid1.Rows[i].CellCssClasses[11] = "Green";
}
else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now) //延期未整改
{
Grid1.Rows[i].CellCssClasses[11] = "Red";
}
else //期内未整改
{
Grid1.Rows[i].CellCssClasses[11] = " Yellow ";
}
}
}
// }
// else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now) //延期未整改
// {
// Grid1.Rows[i].CellCssClasses[11] = "Red";
// }
// else //期内未整改
// {
// Grid1.Rows[i].CellCssClasses[11] = " Yellow ";
// }
// }
//}
}
@@ -507,16 +528,16 @@ namespace FineUIPro.Web.CQMS.Check
}
}
if (this.btnMenuModify.Hidden || checks.State == BLL.Const.State_2) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckListView.aspx?CheckControlCode={0}", codes, "查看 - ")));
return;
}
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckListEdit.aspx?CheckControlCode={0}", codes, "编辑 - ")));
return;
}
//if (this.btnMenuModify.Hidden || checks.State == BLL.Const.State_2) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckListView.aspx?CheckControlCode={0}", codes, "查看 - ")));
// return;
//}
//else
//{
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckListEdit.aspx?CheckControlCode={0}", codes, "编辑 - ")));
// return;
//}
}
else
@@ -574,15 +595,12 @@ namespace FineUIPro.Web.CQMS.Check
var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.CheckListMenuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
{
this.btnNew.Hidden = false;
//if (buttonList.Contains(BLL.Const.BtnAdd))
//{
// this.btnNew.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnModify))
{
this.btnMenuModify.Hidden = false;
}
//}
if (buttonList.Contains(BLL.Const.BtnDelete))
{
this.btnMenuDel.Hidden = false;
@@ -1498,5 +1516,29 @@ namespace FineUIPro.Web.CQMS.Check
txtEndTime.Text = "";
BindGrid();
}
#region Linq获取列表转换焊材DateTable类型
public DataTable ToDataTable<T>(IEnumerable<T> data)
{
PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(typeof(T));
DataTable table = new DataTable();
foreach (PropertyDescriptor prop in properties)
{
table.Columns.Add(prop.Name, Nullable.GetUnderlyingType(prop.PropertyType) ?? prop.PropertyType);
}
foreach (T item in data)
{
DataRow row = table.NewRow();
foreach (PropertyDescriptor prop in properties)
{
row[prop.Name] = prop.GetValue(item) ?? DBNull.Value;
}
table.Rows.Add(row);
}
return table;
}
#endregion
}
}
SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.designer.cs
Generated
-54
View File
@@ -194,24 +194,6 @@ namespace FineUIPro.Web.CQMS.Check
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbImageUrl2;
/// <summary>
/// labState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labState;
/// <summary>
/// lbAuditMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbAuditMan;
/// <summary>
/// lbState2 控件。
/// </summary>
@@ -275,15 +257,6 @@ namespace FineUIPro.Web.CQMS.Check
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnMenuView 控件。
/// </summary>
@@ -293,33 +266,6 @@ namespace FineUIPro.Web.CQMS.Check
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuView;
/// <summary>
/// MenuButton1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton MenuButton1;
/// <summary>
/// MenuButton2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton MenuButton2;
/// <summary>
/// MenuButton3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton MenuButton3;
/// <summary>
/// btnMenuDel 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx.cs
+5 -5
View File
@@ -318,9 +318,9 @@ namespace FineUIPro.Web.CQMS.Check
}
Model.Check_CheckControl checkControl1 = CheckControlService.GetCheckControl(CheckControlCode);
if (checkControl1 != null && !string.IsNullOrEmpty(checkControl1.SaveHandleMan))
if (checkControl1 != null && !string.IsNullOrEmpty(checkControl1.DutyMan))
{
this.drpHandleMan.SelectedValue = checkControl1.SaveHandleMan;
this.drpHandleMan.SelectedValue = checkControl1.DutyMan;
}
}
}
@@ -476,7 +476,7 @@ namespace FineUIPro.Web.CQMS.Check
}
if (saveType == "submit")
{
checkControl.SaveHandleMan = null;
checkControl.DutyMan = null;
Model.Check_CheckControlApprove approve = new Model.Check_CheckControlApprove();
approve.CheckControlCode = CheckControlCode;
if (this.drpHandleMan.SelectedValue != BLL.Const._Null)
@@ -496,7 +496,7 @@ namespace FineUIPro.Web.CQMS.Check
}
if (saveType == "save")
{
checkControl.SaveHandleMan = this.drpHandleMan.SelectedValue;
checkControl.DutyMan = this.drpHandleMan.SelectedValue;
}
checkControl.CheckControlCode = CheckControlCode;
BLL.CheckControlService.UpdateCheckControl(checkControl);
@@ -506,7 +506,7 @@ namespace FineUIPro.Web.CQMS.Check
checkControl.CheckMan = this.CurrUser.UserId;
if (saveType == "save")
{
checkControl.SaveHandleMan = this.drpHandleMan.SelectedValue;
checkControl.DutyMan = this.drpHandleMan.SelectedValue;
}
if (!string.IsNullOrEmpty(this.hdCheckControlCode.Text))
{