2023-10-25
This commit is contained in:
@@ -51,8 +51,8 @@
|
||||
<Items>
|
||||
<f:TextBox ID="txtWeldingDailyCode" Label="焊接日报编号"
|
||||
ShowRedStar="true" Required="true" runat="server" LabelWidth="120px" LabelAlign="Right" FocusOnPageLoad="true">
|
||||
</f:TextBox>
|
||||
<f:DropDownList ID="drpUnit" Label="单位名称" runat="server"
|
||||
</f:TextBox>
|
||||
<f:DropDownList ID="drpUnit" Label="单位名称" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJointAttribute_SelectedIndexChanged"
|
||||
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px" LabelAlign="Right">
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程编号" Readonly="true"
|
||||
|
||||
@@ -216,6 +216,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
||||
{
|
||||
task = task.Where(x=>x.JointAttribute== drpJointAttribute.SelectedValue).ToList();
|
||||
}
|
||||
|
||||
if (drpUnit.SelectedValue != Const._Null)
|
||||
{
|
||||
task = task.Where(x => x.UnitId == drpUnit.SelectedValue).ToList();
|
||||
}
|
||||
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
|
||||
{
|
||||
task = task.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
|
||||
@@ -238,6 +243,10 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
||||
{
|
||||
task = task.Where(x => x.JointAttribute == drpJointAttribute.SelectedValue).ToList();
|
||||
}
|
||||
if (drpUnit.SelectedValue != Const._Null)
|
||||
{
|
||||
task = task.Where(x => x.UnitId == drpUnit.SelectedValue).ToList();
|
||||
}
|
||||
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
|
||||
{
|
||||
task = task.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
|
||||
|
||||
@@ -890,6 +890,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
Alert.ShowInTop("请选择任务单", MessageBoxIcon.Warning);
|
||||
}
|
||||
}
|
||||
protected void Window1_Close(object sender, WindowCloseEventArgs e)
|
||||
{
|
||||
string str1 = hdItemsString.Text;
|
||||
string str2 = hdTaskWeldJoint.Text;
|
||||
this.InitTreeMenu();
|
||||
var unit = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
|
||||
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
|
||||
if (unit == null)
|
||||
{
|
||||
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
|
||||
}
|
||||
else
|
||||
{
|
||||
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
|
||||
|
||||
}
|
||||
this.BindGrid(GetWeldingTaskList);
|
||||
|
||||
}
|
||||
|
||||
#region 删除
|
||||
protected void btnMenuDelete_Click(object sender, EventArgs e)
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
<head runat="server">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title>施工基础信息录入</title>
|
||||
<style type="text/css">
|
||||
<style type="text/css">
|
||||
.f-grid-row.color1,
|
||||
.f-grid-row.color1 .f-icon,
|
||||
.f-grid-row.color1 a {
|
||||
background-color: green;
|
||||
background-color: green;
|
||||
color: #fff;
|
||||
}
|
||||
</style>
|
||||
@@ -29,14 +29,14 @@
|
||||
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线号"
|
||||
EmptyText="输入查询条件" Width="180px" LabelWidth="65px">
|
||||
</f:TextBox>
|
||||
<f:CheckBox ID="ckNOEdit" ShowLabel="false" runat="server" Text="未录入" Label="未录入" DisplayType="Switch" Checked="true">
|
||||
EmptyText="输入查询条件" Width="180px" LabelWidth="65px">
|
||||
</f:TextBox>
|
||||
<f:CheckBox ID="ckNOEdit" ShowLabel="false" runat="server" Text="未录入" Label="未录入" DisplayType="Switch" Checked="true">
|
||||
</f:CheckBox>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
<f:Toolbar runat="server" ToolbarAlign="Left" >
|
||||
<Items>
|
||||
<f:Toolbar runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
<f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>
|
||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||
<f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
|
||||
@@ -66,17 +66,21 @@
|
||||
</f:TextBox>
|
||||
<f:RadioButtonList ID="rbInput" runat="server" Width="220px"
|
||||
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
|
||||
<f:RadioItem Value="0" Text="全部" Selected="true"/>
|
||||
<f:RadioItem Value="1" Text="未录入"/>
|
||||
<f:RadioItem Value="2" Text="已录入"/>
|
||||
<f:RadioItem Value="0" Text="全部" Selected="true" />
|
||||
<f:RadioItem Value="1" Text="未录入" />
|
||||
<f:RadioItem Value="2" Text="已录入" />
|
||||
</f:RadioButtonList>
|
||||
|
||||
|
||||
<f:DropDownList ID="drpUnit" runat="server" Required="true" ShowRedStar="true"
|
||||
Label="工艺规程编制单位" LabelAlign="Right" LabelWidth="180px">
|
||||
Label="工艺规程编制单位" LabelAlign="Right" LabelWidth="180px">
|
||||
</f:DropDownList>
|
||||
|
||||
<f:DropDownList ID="drpJointAttribute" Label="焊口属性" AutoPostBack="true"
|
||||
runat="server" ShowRedStar="true" Required="true" LabelWidth="100px" OnSelectedIndexChanged="TextBox_TextChanged"
|
||||
Width="180px" LabelAlign="Right">
|
||||
</f:DropDownList>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
|
||||
<f:Button ID="btnAutoInput" Text="自动录入" Icon="Add" runat="server" OnClick="btnAutoInput_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnEdit" Text="编辑" Icon="DateEdit" runat="server" OnClick="btnEdit_Click">
|
||||
@@ -91,7 +95,7 @@
|
||||
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="WeldJointId"
|
||||
AllowSorting="true" SortField="WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort"
|
||||
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
|
||||
EnableTextSelection="True" EnableRowDoubleClickEvent="true"
|
||||
EnableTextSelection="True" EnableRowDoubleClickEvent="true"
|
||||
OnRowDoubleClick="Grid1_RowDoubleClick" OnRowDataBound="Grid1_RowDataBound">
|
||||
<Columns>
|
||||
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
|
||||
@@ -117,7 +121,7 @@
|
||||
Width="90px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="公称直径" ColumnID="DNDia"
|
||||
DataField="DNDia" SortField="DNDia" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
|
||||
DataField="DNDia" SortField="DNDia" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
|
||||
Width="90px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="壁厚" ColumnID="Thickness"
|
||||
@@ -212,7 +216,7 @@
|
||||
EnableMaximize="true" Target="Top" EnableResize="false" runat="server" IsModal="true"
|
||||
Width="1200px" Height="620px">
|
||||
</f:Window>
|
||||
|
||||
|
||||
<f:Menu ID="Menu" runat="server">
|
||||
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
|
||||
runat="server" Text="编辑" Icon="TableEdit">
|
||||
@@ -224,13 +228,13 @@
|
||||
</form>
|
||||
<script type="text/javascript">
|
||||
var menuID = '<%= Menu.ClientID %>';
|
||||
|
||||
|
||||
// 返回false，来阻止浏览器右键菜单
|
||||
function onRowContextMenu(event, rowId) {
|
||||
F(menuID).show(); //showAt(event.pageX, event.pageY);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
function reloadGrid() {
|
||||
__doPostBack(null, 'reloadGrid');
|
||||
}
|
||||
|
||||
@@ -17,7 +17,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
if (!IsPostBack)
|
||||
{
|
||||
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
|
||||
|
||||
///焊接属性
|
||||
this.drpJointAttribute.DataTextField = "Text";
|
||||
this.drpJointAttribute.DataValueField = "Value";
|
||||
this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute();
|
||||
this.drpJointAttribute.DataBind();
|
||||
this.InitTreeMenu();
|
||||
}
|
||||
}
|
||||
@@ -262,6 +266,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
strSql += " AND WPQId IS NOT NULL";
|
||||
}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(drpJointAttribute.SelectedValue))
|
||||
{
|
||||
strSql += " AND JointAttribute =@JointAttribute";
|
||||
|
||||
listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue));
|
||||
}
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
|
||||
@@ -364,7 +375,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
|
||||
{
|
||||
var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID && x.WPQId == null select x;
|
||||
var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID &&x.JointAttribute==drpJointAttribute.SelectedValue && x.WPQId == null select x;
|
||||
if (jotList.Count() > 0)
|
||||
{
|
||||
foreach (var jot in jotList)
|
||||
|
||||
@@ -149,6 +149,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpUnit;
|
||||
|
||||
/// <summary>
|
||||
/// drpJointAttribute 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpJointAttribute;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user