shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/shecs/Basf_TCC7

This commit is contained in:
汪青 2024-06-01 22:39:48 +08:00
parent 8943fa432d 5ba3757185
commit 6b3b02da10
7 changed files with 416 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

88
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx
View File

@ -1,4 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TestPackageManageAudit.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.TestPackageManage.TestPackageManageAudit" %> <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TestPackageManageAudit.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.TestPackageManage.TestPackageManageAudit" %>
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server"> <head id="Head1" runat="server">
@ -7,29 +8,32 @@
.Cyan span { .Cyan span {
background-color: Cyan; background-color: Cyan;
} }
.Yellow span { .Yellow span {
background-color: Yellow; background-color: Yellow;
} }
.Green span { .Green span {
background-color: Green; background-color: Green;
} }
.Purple span { .Purple span {
background-color: Purple; background-color: Purple;
} }
.f-grid-row.Cyan
{ .f-grid-row.Cyan {
background-color: Cyan; background-color: Cyan;
} }
.f-grid-row.Yellow
{ .f-grid-row.Yellow {
background-color: Yellow; background-color: Yellow;
} }
.f-grid-row.Green
{ .f-grid-row.Green {
background-color: Green; background-color: Green;
} }
.f-grid-row.Purple
{ .f-grid-row.Purple {
background-color: Purple; background-color: Purple;
} }
</style> </style>
@ -65,9 +69,37 @@
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items> <Items>
<f:HiddenField runat="server" ID="hdPTP_ID"></f:HiddenField> <f:HiddenField runat="server" ID="hdPTP_ID"></f:HiddenField>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> </f:ToolbarFill> <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:DropDownList ID="drpPrintTypeList" Width="500" EnableMultiSelect="true" <f:DropDownBox ID="drpSelect" Width="500" DataControlID="drpPrintTypeList" EnableMultiSelect="true" Values="" runat="server" Label="打印报表" LabelAlign="Right">
AutoSelectFirstItem="false" EnableCheckBoxSelect="true" runat="server" Label="打印报表" LabelAlign="Right"></f:DropDownList>
<PopPanel>
<f:SimpleForm ID="SimpleForm2" BodyPadding="10px" runat="server" AutoScroll="true"
ShowBorder="true" ShowHeader="false" Hidden="true">
<Items>
<f:CheckBoxList ID="drpPrintTypeList" ColumnNumber="1" runat="server"></f:CheckBoxList>
</Items>
<toolbars>
<f:Toolbar runat="server" Position="Top">
<items>
<f:Button runat="server" ID="btnSelectAll" EnablePostBack="false" Text="全选">
<listeners>
<f:Listener Event="click" Handler="onSelectAllClick" />
</listeners>
</f:Button>
<f:Button runat="server" ID="btnClearAll" EnablePostBack="false" Text="清空">
<listeners>
<f:Listener Event="click" Handler="onClearAllClick" />
</listeners>
</f:Button>
</items>
</f:Toolbar>
</toolbars>
</f:SimpleForm>
</PopPanel>
</f:DropDownBox>
<f:Button ID="btnPrint" Text="打印" Icon="Printer" EnableAjax="false" runat="server" DisableControlBeforePostBack="false" EnablePostBack="true" OnClick="btnPrint_Click"> <f:Button ID="btnPrint" Text="打印" Icon="Printer" EnableAjax="false" runat="server" DisableControlBeforePostBack="false" EnablePostBack="true" OnClick="btnPrint_Click">
</f:Button> </f:Button>
<f:Button ID="btnAudit" Text="审核" ToolTip="审核检测单" AjaxLoadingType="Mask" ShowAjaxLoadingMaskText="true" <f:Button ID="btnAudit" Text="审核" ToolTip="审核检测单" AjaxLoadingType="Mask" ShowAjaxLoadingMaskText="true"
@ -167,7 +199,7 @@
<f:DropDownList ID="drpAuditMan" Label="审核人" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px"> <f:DropDownList ID="drpAuditMan" Label="审核人" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="120px">
</f:DropDownList> </f:DropDownList>
<f:DatePicker ID="txtAuditDate" Label="审核日期" runat="server" DateFormatString="yyyy-MM-dd" <f:DatePicker ID="txtAuditDate" Label="审核日期" runat="server" DateFormatString="yyyy-MM-dd"
ShowRedStar="true" Required="true" LabelWidth="120px" > ShowRedStar="true" Required="true" LabelWidth="120px">
</f:DatePicker> </f:DatePicker>
</Items> </Items>
</f:FormRow> </f:FormRow>
@ -195,7 +227,7 @@
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
<Columns> <Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center"/> <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="工作区" ColumnID="WorkAreaCode" DataField="WorkAreaCode" SortField="WorkAreaCode" <f:RenderField HeaderText="工作区" ColumnID="WorkAreaCode" DataField="WorkAreaCode" SortField="WorkAreaCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField> </f:RenderField>
@ -222,9 +254,11 @@
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="应检测比例值" ColumnID="NDTR_Rate" DataField="NDTR_Rate" <f:RenderField HeaderText="应检测比例值" ColumnID="NDTR_Rate" DataField="NDTR_Rate"
FieldType="String" Hidden="true"></f:RenderField> FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="实际检测比例值" ColumnID="RatioC" DataField="RatioC" <f:RenderField HeaderText="实际检测比例值" ColumnID="RatioC" DataField="RatioC"
FieldType="String" Hidden="true"></f:RenderField> FieldType="String" Hidden="true">
</f:RenderField>
</Columns> </Columns>
<Listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -269,6 +303,30 @@
function reloadGrid() { function reloadGrid() {
__doPostBack(null, 'reloadGrid'); __doPostBack(null, 'reloadGrid');
} }
var dropDownBox1ClientID = '<%= drpSelect.ClientID %>';
var checkBoxList1ClientID = '<%= drpPrintTypeList.ClientID %>';
function onSelectAllClick() {
var checkBoxList1 = F(checkBoxList1ClientID);
$.each(checkBoxList1.items, function (index, item) {
item.setValue(true);
});
// 将数据控件中的值同步到输入框
F(dropDownBox1ClientID).syncToBox();
}
function onClearAllClick() {
var checkBoxList1 = F(checkBoxList1ClientID);
$.each(checkBoxList1.items, function (index, item) {
item.setValue(false);
});
// 将数据控件中的值同步到输入框
F(dropDownBox1ClientID).syncToBox();
}
</script> </script>
</body> </body>
</html> </html>

44
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.TestPackageManage { namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{
public partial class TestPackageManageAudit { public partial class TestPackageManageAudit
{
/// <summary> /// <summary>
/// Head1 控件。 /// Head1 控件。
@ -120,6 +122,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// </remarks> /// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1; protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// drpSelect 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownBox drpSelect;
/// <summary>
/// SimpleForm2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.SimpleForm SimpleForm2;
/// <summary> /// <summary>
/// drpPrintTypeList 控件。 /// drpPrintTypeList 控件。
/// </summary> /// </summary>
@ -127,7 +147,25 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpPrintTypeList; protected global::FineUIPro.CheckBoxList drpPrintTypeList;
/// <summary>
/// btnSelectAll 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSelectAll;
/// <summary>
/// btnClearAll 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClearAll;
/// <summary> /// <summary>
/// btnPrint 控件。 /// btnPrint 控件。

10
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx
View File

@ -243,14 +243,14 @@
var allCode = ""; var allCode = "";
var grid = F(grid1ClientID); var grid = F(grid1ClientID);
var selectedCell = grid.getSelectedCell(); var selectedCell = grid.getSelectedCell();
var selStrCode = grid.getCellValue(selectedCell[0], "WeldJointCode"); // var selStrCode = grid.getCellValue(selectedCell[0], "WeldJointCode");
if (values) { if (values) {
allCode = values["WeldJointCode"]; allCode = values["WeldJointCode"];
} }
if (selStrCode && selStrCode != "全部") //if (selStrCode && selStrCode != "全部")
{ //{
allCode +=","+selStrCode; // allCode +=","+selStrCode;
} //}
values["WeldJointCode"] = allCode; values["WeldJointCode"] = allCode;
// cancelEdit用来取消编辑 // cancelEdit用来取消编辑
grid.cancelEdit(); grid.cancelEdit();

1
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs
View File

@ -599,6 +599,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
ShowNotify("保存成功！", MessageBoxIcon.Success); ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PTP_ID) PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PTP_ID)
+ ActiveWindow.GetHidePostBackReference()); + ActiveWindow.GetHidePostBackReference());
this.BindGrid();
} }
else else
{ {

2
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx
View File

@ -11,7 +11,7 @@
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Grid1" runat="server" /> <f:PageManager ID="PageManager1" AutoSizePanelID="Grid1" runat="server" />
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息列表" runat="server" EnableCollapse="false" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息列表" runat="server" EnableCollapse="false"
DataKeyNames="WeldJointCode" EnableCheckBoxSelect="true" EnableMultiSelect="true" PageSize="100" AllowPaging="true" > DataKeyNames="WeldJointCode" EnableCheckBoxSelect="true" CheckBoxSelectOnly="true" EnableMultiSelect="true" PageSize="100" AllowPaging="true" >
<Columns> <Columns>
<f:RowNumberField /> <f:RowNumberField />
<f:RenderField ColumnID="WeldJointCode" MinWidth="200px" DataField="WeldJointCode" HeaderText="焊口编号" /> <f:RenderField ColumnID="WeldJointCode" MinWidth="200px" DataField="WeldJointCode" HeaderText="焊口编号" />

2
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs
View File

@ -87,7 +87,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{ {
query = query.Where(t => !listData.Contains(t.WeldJointCode)); query = query.Where(t => !listData.Contains(t.WeldJointCode));
} }
return query.ToList(); return query.OrderBy(t=>t.WeldJointCode).ToList();
} }