This commit is contained in:
parent
ced9c8a416
commit
aa80b143c4
Binary file not shown.
|
|
@ -240,6 +240,7 @@
|
|||
<Content Include="PublicInfo\BaseInfo\PIPClassEdit.aspx" />
|
||||
<Content Include="res\DataInTable.js" />
|
||||
<Content Include="res\ProcessBar.js" />
|
||||
<Content Include="WelderManage\AnalysisEdit.aspx" />
|
||||
<Content Include="WelderManage\QualificationAnalysis.aspx" />
|
||||
<Content Include="WelderManage\QualifiedProject.aspx" />
|
||||
<Content Include="WelderManage\QualifiedProjectEdit.aspx" />
|
||||
|
|
@ -3425,6 +3426,13 @@
|
|||
<Compile Include="PublicInfo\BaseInfo\PIPClassEdit.aspx.designer.cs">
|
||||
<DependentUpon>PIPClassEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="WelderManage\AnalysisEdit.aspx.cs">
|
||||
<DependentUpon>AnalysisEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="WelderManage\AnalysisEdit.aspx.designer.cs">
|
||||
<DependentUpon>AnalysisEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="WelderManage\QualificationAnalysis.aspx.cs">
|
||||
<DependentUpon>QualificationAnalysis.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
|
||||
</configSections>
|
||||
<connectionStrings>
|
||||
<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
|
||||
<add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
|
||||
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
|
||||
providerName="System.Data.SqlClient" />-->
|
||||
</connectionStrings>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,84 @@
|
|||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AnalysisEdit.aspx.cs" Inherits="FineUIPro.Web.WelderManage.AnalysisEdit" %>
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title></title>
|
||||
</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:Label runat="server" ID="lbWedlerName" Label="焊工姓名" LabelWidth="120px"></f:Label>
|
||||
<f:Label runat="server" ID="lbWedlerCode" Label="焊工代号" LabelWidth="120px"></f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:Label ID="txtQualifiedProjectCode" runat="server" Label="合格项目代号" MaxLength="100" ShowRedStar="true" Required="true" LabelWidth="120px">
|
||||
</f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList runat="server" Label="焊接方法" ID="drpWeldingMethod" EnableMultiSelect="true" ShowRedStar="true" Required="true" LabelWidth="120px" EnableEdit="false">
|
||||
</f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtCertificateNo" runat="server" Label="证书编号" MaxLength="50" LabelWidth="120px">
|
||||
</f:TextBox>
|
||||
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="考试日期" ID="txtCheckDate" LabelWidth="120px" EnableEdit="false">
|
||||
</f:DatePicker>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtExamProject" runat="server" Label="考试项目" MaxLength="50" LabelWidth="120px">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList ID="drpIsPass" runat="server" Label="是否合格" LabelWidth="120px">
|
||||
<f:ListItem Value="是" Text="是" Selected="true" />
|
||||
<f:ListItem Value="否" Text="否" />
|
||||
</f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="50" LabelWidth="120px">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
||||
<Items>
|
||||
<f:Label runat="server" ID="lbTemp"></f:Label>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
|
||||
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
|
||||
OnClick="btnSave_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
</f:Form>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,85 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.WelderManage
|
||||
{
|
||||
public partial class AnalysisEdit : PageBase
|
||||
{
|
||||
#region 定义项
|
||||
/// <summary>
|
||||
/// 合格项目id
|
||||
/// </summary>
|
||||
public string WelderQualifiedProjectId
|
||||
{
|
||||
get
|
||||
{
|
||||
return (string)ViewState["WelderQualifiedProjectId"];
|
||||
}
|
||||
set
|
||||
{
|
||||
ViewState["WelderQualifiedProjectId"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 焊工id
|
||||
/// </summary>
|
||||
public string WED_ID
|
||||
{
|
||||
get
|
||||
{
|
||||
return (string)ViewState["WED_ID"];
|
||||
}
|
||||
set
|
||||
{
|
||||
ViewState["WED_ID"] = value;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!IsPostBack)
|
||||
{
|
||||
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
|
||||
this.WelderQualifiedProjectId = Request.Params["WelderQualifiedProjectId"];
|
||||
this.WED_ID = Request.Params["WED_ID"];
|
||||
if (!string.IsNullOrEmpty(this.WelderQualifiedProjectId))
|
||||
{
|
||||
var welderQualifiedProject = BLL.WelderQualifiedService.GetWelderQualifiedProjectById(this.WelderQualifiedProjectId);
|
||||
if (welderQualifiedProject != null)
|
||||
{
|
||||
this.WED_ID = welderQualifiedProject.WelderId;
|
||||
this.txtQualifiedProjectCode.Text = welderQualifiedProject.QualifiedProjectCode;
|
||||
//if (welderQualifiedProject.LimitDate.HasValue)
|
||||
//{
|
||||
// this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", welderQualifiedProject.LimitDate);
|
||||
//}
|
||||
this.txtCertificateNo.Text = welderQualifiedProject.CertificateNo;
|
||||
if (welderQualifiedProject.CheckDate.HasValue)
|
||||
{
|
||||
this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", welderQualifiedProject.CheckDate);
|
||||
}
|
||||
this.txtExamProject.Text = welderQualifiedProject.ExamProject;
|
||||
txtRemark.Text = welderQualifiedProject.Remark;
|
||||
drpIsPass.SelectedValue = welderQualifiedProject.IsPass == true ? "是" : "否";
|
||||
}
|
||||
}
|
||||
Model.Welder_Welder welder = BLL.WelderService.GetWelderById(this.WED_ID);
|
||||
if (welder != null)
|
||||
{
|
||||
this.lbWedlerName.Text = welder.WelderName;
|
||||
this.lbWedlerCode.Text = welder.WelderCode;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void btnSave_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,170 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能导致不正确的行为，如果
|
||||
// 重新生成代码，则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.WelderManage
|
||||
{
|
||||
|
||||
|
||||
public partial class AnalysisEdit
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form SimpleForm1;
|
||||
|
||||
/// <summary>
|
||||
/// lbWedlerName 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbWedlerName;
|
||||
|
||||
/// <summary>
|
||||
/// lbWedlerCode 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbWedlerCode;
|
||||
|
||||
/// <summary>
|
||||
/// txtQualifiedProjectCode 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtQualifiedProjectCode;
|
||||
|
||||
/// <summary>
|
||||
/// drpWeldingMethod 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpWeldingMethod;
|
||||
|
||||
/// <summary>
|
||||
/// txtCertificateNo 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtCertificateNo;
|
||||
|
||||
/// <summary>
|
||||
/// txtCheckDate 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtCheckDate;
|
||||
|
||||
/// <summary>
|
||||
/// txtExamProject 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtExamProject;
|
||||
|
||||
/// <summary>
|
||||
/// drpIsPass 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpIsPass;
|
||||
|
||||
/// <summary>
|
||||
/// txtRemark 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtRemark;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
/// <summary>
|
||||
/// lbTemp 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbTemp;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
/// <summary>
|
||||
/// btnSave 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSave;
|
||||
|
||||
/// <summary>
|
||||
/// btnClose 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnClose;
|
||||
}
|
||||
}
|
||||
|
|
@ -142,10 +142,17 @@
|
|||
Target="top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
|
||||
Width="600px" Height="420px">
|
||||
</f:Window>
|
||||
<f:Window ID="Window2" Title="手动资质分析" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
|
||||
Width="600px" Height="420px">
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
|
||||
runat="server" Text="编辑" Icon="TableEdit">
|
||||
</f:MenuButton>
|
||||
<f:MenuButton ID="btnMenuAnalysis" OnClick="btnMenuAnalysis_Click" EnablePostBack="true"
|
||||
runat="server" Text="手动资质分析" Icon="ApplicationGet">
|
||||
</f:MenuButton>
|
||||
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
|
||||
ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete">
|
||||
</f:MenuButton>
|
||||
|
|
|
|||
|
|
@ -207,6 +207,16 @@ namespace FineUIPro.Web.WelderManage
|
|||
}
|
||||
}
|
||||
|
||||
protected void btnMenuAnalysis_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (Grid1.SelectedRowIndexArray.Length == 0)
|
||||
{
|
||||
Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("AnalysisEdit.aspx?WelderQualifiedProjectId={0}", Grid1.SelectedRowID, "维护 - ")));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 删除
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -7,10 +7,12 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.WelderManage {
|
||||
namespace FineUIPro.Web.WelderManage
|
||||
{
|
||||
|
||||
|
||||
public partial class QualifiedProject {
|
||||
public partial class QualifiedProject
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
|
|
@ -264,6 +266,15 @@ namespace FineUIPro.Web.WelderManage {
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window1;
|
||||
|
||||
/// <summary>
|
||||
/// Window2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window2;
|
||||
|
||||
/// <summary>
|
||||
/// Menu1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -282,6 +293,15 @@ namespace FineUIPro.Web.WelderManage {
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuEdit;
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuAnalysis 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuAnalysis;
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuDelete 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
Loading…
Reference in New Issue