111
This commit is contained in:
@@ -139,8 +139,8 @@
|
||||
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Center" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="<%$ Resources:Lan,TrustDate %>" ColumnID="CreatedTime"
|
||||
DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
|
||||
<f:RenderField HeaderText="<%$ Resources:Lan,TrustDate %>" ColumnID="DelegationDate"
|
||||
DataField="DelegationDate" SortField="DelegationDate" FieldType="Date" Renderer="Date"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="<%$ Resources:Lan,QualityNo %>" ColumnID="QualityNo" DataField="QualityNo"
|
||||
|
||||
@@ -350,7 +350,8 @@ namespace FineUIPro.Web.WeldingProcess.PMI
|
||||
newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString();
|
||||
newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString();
|
||||
newTrustItem.Status = 0;
|
||||
newTrustItem.CreatedTime = DateTime.Now;
|
||||
newTrustItem.CheckTime = DateTime.Now;
|
||||
newTrustItem.ReportTime = DateTime.Now;
|
||||
newTrustItem.PMIId = this.PMIDelegationId;
|
||||
listData.Add(newTrustItem);
|
||||
}
|
||||
|
||||
@@ -95,9 +95,9 @@
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:Label ID="txtTabler" Label="<%$ Resources:Lan,Lister %>" runat="server" LabelAlign="Right"
|
||||
LabelWidth="170px">
|
||||
</f:Label>
|
||||
<f:Label ID="txtTabler" Label="<%$ Resources:Lan,Lister %>" runat="server" LabelAlign="Right"
|
||||
LabelWidth="170px">
|
||||
</f:Label>
|
||||
<f:Label ID="txtRemark" Label="<%$ Resources:Lan,Remark %>" runat="server" LabelAlign="Right"
|
||||
LabelWidth="170px">
|
||||
</f:Label>
|
||||
@@ -152,20 +152,20 @@
|
||||
DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px">
|
||||
</f:RenderField>
|
||||
<%-- 检测日期 --%>
|
||||
<f:RenderField HeaderText="<%$ Resources:Lan,FilmDate %>" ColumnID="DelegationDate"
|
||||
DataField="DelegationDate" SortField="DelegationDate" FieldType="Date" Renderer="Date"
|
||||
<f:RenderField HeaderText="<%$ Resources:Lan,FilmDate %>" ColumnID="checkTime"
|
||||
DataField="checkTime" RendererArgument="yyyy-MM-dd" SortField="checkTime" FieldType="Date" Renderer="Date"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
|
||||
<Editor>
|
||||
<f:DatePicker ID="tbxTrustDate" DateFormatString="yyyy-MM-dd" Required="true" runat="server">
|
||||
<f:DatePicker ID="tbxTrustDate" Required="true" runat="server">
|
||||
</f:DatePicker>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<%-- 报告日期 --%>
|
||||
<f:RenderField HeaderText="<%$ Resources:Lan,ReportDate %>" ColumnID="CreatedTime"
|
||||
DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
|
||||
<f:RenderField HeaderText="<%$ Resources:Lan,ReportDate %>" ColumnID="reportTime"
|
||||
DataField="reportTime" RendererArgument="yyyy-MM-dd" SortField="reportTime" FieldType="Date" Renderer="Date"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
|
||||
<Editor>
|
||||
<f:DatePicker ID="tbxCreatedTime" DateFormatString="yyyy-MM-dd" Required="true" runat="server">
|
||||
<f:DatePicker ID="tbxreportTime" Required="true" runat="server">
|
||||
</f:DatePicker>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
@@ -183,9 +183,9 @@
|
||||
DataField="StatusText" SortField="StatusText" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="100px">
|
||||
<Editor>
|
||||
<f:DropDownList ID="drpstatus" runat="server" ShowRedStar="true" Required="true" >
|
||||
<f:DropDownList ID="drpstatus" runat="server" ShowRedStar="true" Required="true">
|
||||
<f:ListItem Value="合格" Text="合格" />
|
||||
<f:ListItem Value="不合格" Text="不合格" />
|
||||
<f:ListItem Value="不合格" Text="不合格" />
|
||||
</f:DropDownList>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
|
||||
@@ -197,12 +197,13 @@ namespace FineUIPro.Web.WeldingProcess.PMI
|
||||
private void PageInfoLoad()
|
||||
{
|
||||
this.SimpleForm1.Reset(); ///重置所有字段
|
||||
|
||||
var pageInfo = (from x in Funs.DB.PMI_Delegation
|
||||
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
|
||||
join n in Funs.DB.Project_Installation on x.InstallationId equals n.InstallationId
|
||||
join u in Funs.DB.Sys_User on x.DetectionStandard equals u.UserId into u1 //左连接查询
|
||||
from u in u1.DefaultIfEmpty()
|
||||
where x.Id == hdPMIId.Text
|
||||
where x.Id == this.PMIID
|
||||
select new
|
||||
{
|
||||
DelegationNo = x.DelegationNo,
|
||||
@@ -221,7 +222,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
|
||||
this.txtInstallationName.Text = pageInfo[0].InstallationName;
|
||||
this.txtUnitName.Text = pageInfo[0].UnitName;
|
||||
this.txtDetectionMethod.Text = pageInfo[0].DetectionMethod;
|
||||
this.txtTabler.Text = pageInfo[0].Tabler;
|
||||
this.txtTabler.Text = BLL.Sys_UserService.GetUserNameByUserId(pageInfo[0].Tabler);
|
||||
this.txtRemark.Text = pageInfo[0].Remark;
|
||||
this.txtDetectionStandard.Text = pageInfo[0].DetectionStandard;
|
||||
}
|
||||
@@ -349,17 +350,17 @@ namespace FineUIPro.Web.WeldingProcess.PMI
|
||||
if (onePMIDelegationDetails == null)
|
||||
continue;
|
||||
//检测日期(缺失)
|
||||
string DelegationDate = values.Value<string>("DelegationDate");
|
||||
if (string.IsNullOrWhiteSpace(DelegationDate))
|
||||
;
|
||||
string checkTime = values.Value<string>("checkTime");
|
||||
if (string.IsNullOrWhiteSpace(checkTime))
|
||||
onePMIDelegationDetails.CheckTime = null;
|
||||
else
|
||||
;
|
||||
onePMIDelegationDetails.CheckTime = Convert.ToDateTime(checkTime);
|
||||
//报告日期
|
||||
string createdTime = values.Value<string>("CreatedTime");
|
||||
if (string.IsNullOrWhiteSpace(createdTime))
|
||||
onePMIDelegationDetails.CreatedTime=null;
|
||||
string reportTime = values.Value<string>("reportTime");
|
||||
if (string.IsNullOrWhiteSpace(reportTime))
|
||||
onePMIDelegationDetails.ReportTime = null;
|
||||
else
|
||||
onePMIDelegationDetails.CreatedTime=Convert.ToDateTime(createdTime);
|
||||
onePMIDelegationDetails.ReportTime = Convert.ToDateTime(reportTime);
|
||||
//报告编号
|
||||
onePMIDelegationDetails.ReportNo = values.Value<string>("reportNo").ToString();
|
||||
//是否合格 0合格 1不合格
|
||||
|
||||
@@ -267,13 +267,13 @@ namespace FineUIPro.Web.WeldingProcess.PMI
|
||||
protected global::FineUIPro.DatePicker tbxTrustDate;
|
||||
|
||||
/// <summary>
|
||||
/// tbxCreatedTime 控件。
|
||||
/// tbxreportTime 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker tbxCreatedTime;
|
||||
protected global::FineUIPro.DatePicker tbxreportTime;
|
||||
|
||||
/// <summary>
|
||||
/// tbxreportNo 控件。
|
||||
|
||||
Reference in New Issue
Block a user