SCP
/
SCPFWBTL
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://gitee.com/zxyabc/COMONE

master
TML 4 years ago
parent
cc1526c337 ef4e2121ed
commit
2aac6db908
5 changed files with 86 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      SCP/Views/PlanData/SCP_ASK.aspx
  2. 58
      SCP/Views/PlanData/SCP_PO_EXTEND.aspx
  3. 3
      SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs
  4. 61
      SCP/Views/PlanData/SCP_PO_EXTEND.aspx.designer.cs
  5. 4
      SCP/default.aspx

4
SCP/Views/PlanData/SCP_ASK.aspx
View File

@ -59,9 +59,9 @@
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
</f:Form> </f:Form>
<f:GroupPanel runat="server" ID="gp1" Hidden="true" Layout="HBox" > <f:GroupPanel runat="server" ID="gp1" Hidden="true" Layout="HBox" ColumnWidth="100%" >
<Items> <Items>
<f:Form runat="server" > <f:Form runat="server" ColumnWidth="100%" Margin="5" BodyPadding ="5">
<Rows> <Rows>
<f:FormRow runat="server"> <f:FormRow runat="server">

58
SCP/Views/PlanData/SCP_PO_EXTEND.aspx
View File

@ -37,7 +37,7 @@
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager runat="server" AutoSizePanelID="Panel1" /> <f:PageManager runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True" Layout="Column"> <f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True" Layout="VBox" >
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" runat="server"> <f:Toolbar ID="Toolbar2" runat="server">
<Items> <Items>
@ -67,27 +67,20 @@
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
<Items> <Items>
<f:Form runat="server" ColumnWidth="100%" ID="gp1" Hidden="true"> <f:Form runat="server" Margin="5" ID="gp1" Hidden="true" BodyPadding ="5">
<Rows> <Rows>
<f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%"> <f:FormRow runat="server" ColumnWidths="33% 33% 33%">
<Items> <Items>
<f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" /> <f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" />
<f:DropDownList runat="server" ID="DropDownList1" Label="地点" DataTextField="FactoryName" DataValueField=" ErpDomain"> <f:DropDownList runat="server" ID="DropDownList1" Label="地点" DataTextField="FactoryName" DataValueField=" ErpDomain">
</f:DropDownList> </f:DropDownList>
<%-- <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_SubSite" />--%>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend1" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend2" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend3" Hidden="true" />
<f:TextBox runat = "server" Label = "供应商编码" EmptyText = "" ID = "TXT_Vendid" /> <f:TextBox runat = "server" Label = "供应商编码" EmptyText = "" ID = "TXT_Vendid" />
<f:TextBox runat = "server" Label = "供应商名称" EmptyText = "" ID = "TXT_VendName" />
<f:TextBox runat = "server" Label = "项目编码" EmptyText = "" ID = "TXT_ProjectId" />
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow runat="server" ColumnWidths="33% 33% 33%"> <f:FormRow runat="server" ColumnWidths="33% 33% 33%">
<Items> <Items>
<f:DatePicker runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="订货日期" EmptyText="请选择日期" ID="DP_StartDate" /> <f:TextBox runat = "server" Label = "供应商名称" EmptyText = "" ID = "TXT_VendName" />
<f:DatePicker runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="至" EmptyText="请选择日期" ID="DP_EndDate" /> <f:TextBox runat = "server" Label = "项目编码" EmptyText = "" ID = "TXT_ProjectId" />
<f:TextBox runat="server" Required ="true" Label="零件编号" EmptyText="查询请填写零件编号" ID="TXT_PartCode" />
<f:DropDownList runat="server" ID="DDL_State" Label="状态"> <f:DropDownList runat="server" ID="DDL_State" Label="状态">
<f:ListItem Text="-" Value=""/> <f:ListItem Text="-" Value=""/>
<f:ListItem Text="关闭" Value="0" /> <f:ListItem Text="关闭" Value="0" />
@ -95,21 +88,40 @@
</f:DropDownList> </f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow runat="server" ColumnWidths="33% 33% 33%">
<Items>
<f:DatePicker runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="订货日期" EmptyText="请选择日期" ID="DP_StartDate" />
<f:DatePicker runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="至" EmptyText="请选择日期" ID="DP_EndDate" />
<f:TextBox runat="server" Required ="true" Label="零件编号" EmptyText="查询请填写零件编号" ID="TXT_PartCode" />
</Items>
</f:FormRow>
<f:FormRow runat="server" > <f:FormRow runat="server" >
<Items> <Items>
<f:Button runat="server" Text="关闭" ID="BtnClose" OnClick="BtnClose_Click"></f:Button> <f:Panel ID="Panel5" runat="server" ShowBorder="false" CssClass="mypanel" ShowHeader="false">
<f:Button ID="BtnSearch" runat="server" OnClick="BtnSearch_Click" Text="快速查找订单"> <Items>
<f:Button runat="server" Text="关闭" ID="BtnClose" OnClick="BtnClose_Click" Margin="5" ></f:Button>
<f:Button ID="BtnSearch" runat="server" OnClick="BtnSearch_Click" Text="快速查找订单" Margin="5" >
</f:Button> </f:Button>
<f:Button ID="BtnSearchDetail" runat="server" OnClick="BtnSearchDetail_Click" Text="快速查找订单明细"> <f:Button ID="BtnSearchDetail" runat="server" OnClick="BtnSearchDetail_Click" Text="快速查找订单明细" Margin="5" >
</f:Button> </f:Button>
</Items>
</f:Panel>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
</f:Form> </f:Form>
<f:Grid ID = "Grid_V_TB_PO" ColumnWidth="45%" PageSize="50" EnableCollapse = "true" ShowBorder = "true" ShowHeader = "true" runat ="server" EnableCheckBoxSelect = "true" DataKeyNames = "UID,PoBillNum,ErpBillNum,VendId,ModType,Contacter,Site,Buyer,BuyerPhone,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,VendName,State_DESC,ModType_DESC" <f:Panel ID="Panel2"
runat="server" BodyPadding="0px" ShowBorder="true" BoxFlex="1" ShowHeader="false" Layout="HBox" AutoScroll="True">
<Items>
<f:Panel ID="Panel3"
runat="server" BodyPadding="0px" ShowBorder="true" ShowHeader="false" BoxFlex="1" Layout="VBox" AutoScroll="True" >
<Items>
<f:Grid ID = "Grid_V_TB_PO" ColumnWidth="45%" PageSize="50" ShowBorder = "true" ShowHeader = "true" runat ="server" EnableCheckBoxSelect = "true" DataKeyNames = "UID,PoBillNum,ErpBillNum,VendId,ModType,Contacter,Site,Buyer,BuyerPhone,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,VendName,State_DESC,ModType_DESC"
CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_PO_Sort" SortField="BeginTime" CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_PO_Sort" SortField="BeginTime"
IsDatabasePaging="True" AllowPaging="True" OnRowSelect="Grid_V_TB_PO_RowSelect" EnableRowSelectEvent="true" IsDatabasePaging="True" AllowPaging="True" OnRowSelect="Grid_V_TB_PO_RowSelect" EnableRowSelectEvent="true"
AutoScroll="True" SortDirection="DESC" OnPageIndexChange="Grid_V_TB_PO_PageIndexChange" > AutoScroll="True" SortDirection="DESC" OnPageIndexChange="Grid_V_TB_PO_PageIndexChange" BoxFlex="1" >
<PageItems> <PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server"> <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator> </f:ToolbarSeparator>
@ -138,12 +150,17 @@
<%--<f:BoundField Width = "100px" DataField = "BuyerPhone" DataFormatString = "{0}" HeaderText = "收货电话" />--%> <%--<f:BoundField Width = "100px" DataField = "BuyerPhone" DataFormatString = "{0}" HeaderText = "收货电话" />--%>
</Columns> </Columns>
</f:Grid> </f:Grid>
</Items>
</f:Panel>
<f:Panel ID="Panel4"
runat="server" BodyPadding="0px" ShowBorder="true" ShowHeader="false" Layout="VBox" BoxFlex="1" >
<Items>
<f:Grid ID = "Grid_V_TB_PO_DETAIL" ShowBorder = "true" EnableMultiSelect="true" ShowHeader = "true" runat ="server" <f:Grid ID = "Grid_V_TB_PO_DETAIL" ShowBorder = "true" EnableMultiSelect="true" ShowHeader = "true" runat ="server"
DataKeyNames = "UID,PoBillNum,PoLine,PartCode,PlanQty,ShippedQty,ReceivedQty,RejectQty,BeginTime,EndTime,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,ErpBillNum,ModType,Contacter,Site,Buyer,BuyerPhone,VendName,PartDesc2,TempQty,PublishQty" DataKeyNames = "UID,PoBillNum,PoLine,PartCode,PlanQty,ShippedQty,ReceivedQty,RejectQty,BeginTime,EndTime,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,ErpBillNum,ModType,Contacter,Site,Buyer,BuyerPhone,VendName,PartDesc2,TempQty,PublishQty"
SortField="PoLine" SortField="PoLine"
AllowPaging="True" AllowPaging="True"
ColumnWidth="55%" SortDirection="DESC" ColumnWidth="55%" SortDirection="DESC"
IsDatabasePaging="true" PageSize="500" > PageSize="500" BoxFlex="1" >
<Columns> <Columns>
<f:BoundField Width = "80px" DataField="ProjectId" HeaderText="项目编号"></f:BoundField> <f:BoundField Width = "80px" DataField="ProjectId" HeaderText="项目编号"></f:BoundField>
<f:BoundField Width = "40px" DataField = "PoLine" DataFormatString = "{0}" HeaderText = "行号" /> <f:BoundField Width = "40px" DataField = "PoLine" DataFormatString = "{0}" HeaderText = "行号" />
@ -159,7 +176,12 @@
</Columns> </Columns>
</f:Grid> </f:Grid>
</Items> </Items>
</f:Panel>
</Items>
</f:Panel>
</Items>
</f:Panel> </f:Panel>
<f:Window runat="server" ID="Window1" Hidden="True" Height="600px" Width="950px" AutoScroll="True" OnClose="Window1_Close" <f:Window runat="server" ID="Window1" Hidden="True" Height="600px" Width="950px" AutoScroll="True" OnClose="Window1_Close"
WindowPosition="Center" IsModal="true" Title="明细详情" Target="Parent" EnableIFrame="true" WindowPosition="Center" IsModal="true" Title="明细详情" Target="Parent" EnableIFrame="true"

3
SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs
View File

@ -76,9 +76,6 @@ namespace SCP.PlanData
} }
_entity.ErpBillNum = TXT_ProjectId.Text; _entity.ErpBillNum = TXT_ProjectId.Text;
_entity.SubSite = DropDownList1.SelectedValue; _entity.SubSite = DropDownList1.SelectedValue;
_entity.Extend1 = TxT_Extend1.Text;
_entity.Extend2 = TxT_Extend2.Text;
_entity.Extend3 = TxT_Extend3.Text;
_entity.IsDeleted = false; _entity.IsDeleted = false;
_entity.UserInAddress = CurrentUser.FactoryList; _entity.UserInAddress = CurrentUser.FactoryList;
_entity.UserInVendIds = CurrentUser.VenderList; _entity.UserInVendIds = CurrentUser.VenderList;

61
SCP/Views/PlanData/SCP_PO_EXTEND.aspx.designer.cs
View File

@ -141,121 +141,121 @@ namespace SCP.PlanData
protected global::FineUI.DropDownList DropDownList1; protected global::FineUI.DropDownList DropDownList1;
/// <summary> /// <summary>
/// TxT_Extend1 控件。 /// TXT_Vendid 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TxT_Extend1; protected global::FineUI.TextBox TXT_Vendid;
/// <summary> /// <summary>
/// TxT_Extend2 控件。 /// TXT_VendName 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TxT_Extend2; protected global::FineUI.TextBox TXT_VendName;
/// <summary> /// <summary>
/// TxT_Extend3 控件。 /// TXT_ProjectId 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TxT_Extend3; protected global::FineUI.TextBox TXT_ProjectId;
/// <summary> /// <summary>
/// TXT_Vendid 控件。 /// DDL_State 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TXT_Vendid; protected global::FineUI.DropDownList DDL_State;
/// <summary> /// <summary>
/// TXT_VendName 控件。 /// DP_StartDate 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TXT_VendName; protected global::FineUI.DatePicker DP_StartDate;
/// <summary> /// <summary>
/// TXT_ProjectId 控件。 /// DP_EndDate 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TXT_ProjectId; protected global::FineUI.DatePicker DP_EndDate;
/// <summary> /// <summary>
/// DP_StartDate 控件。 /// TXT_PartCode 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.DatePicker DP_StartDate; protected global::FineUI.TextBox TXT_PartCode;
/// <summary> /// <summary>
/// DP_EndDate 控件。 /// Panel5 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.DatePicker DP_EndDate; protected global::FineUI.Panel Panel5;
/// <summary> /// <summary>
/// TXT_PartCode 控件。 /// BtnClose 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TXT_PartCode; protected global::FineUI.Button BtnClose;
/// <summary> /// <summary>
/// DDL_State 控件。 /// BtnSearch 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.DropDownList DDL_State; protected global::FineUI.Button BtnSearch;
/// <summary> /// <summary>
/// BtnClose 控件。 /// BtnSearchDetail 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.Button BtnClose; protected global::FineUI.Button BtnSearchDetail;
/// <summary> /// <summary>
/// BtnSearch 控件。 /// Panel2 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.Button BtnSearch; protected global::FineUI.Panel Panel2;
/// <summary> /// <summary>
/// BtnSearchDetail 控件。 /// Panel3 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.Button BtnSearchDetail; protected global::FineUI.Panel Panel3;
/// <summary> /// <summary>
/// Grid_V_TB_PO 控件。 /// Grid_V_TB_PO 控件。
@ -293,6 +293,15 @@ namespace SCP.PlanData
/// </remarks> /// </remarks>
protected global::FineUI.DropDownList ddlGridPageSize; protected global::FineUI.DropDownList ddlGridPageSize;
/// <summary>
/// Panel4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.Panel Panel4;
/// <summary> /// <summary>
/// Grid_V_TB_PO_DETAIL 控件。 /// Grid_V_TB_PO_DETAIL 控件。
/// </summary> /// </summary>

4
SCP/default.aspx
View File

@ -111,10 +111,10 @@
for (var i = 0; obj.options.length; i++) for (var i = 0; obj.options.length; i++)
{ {
if ('JZ1' == obj.options[i].value) { if ('CNS' == obj.options[i].value) {
obj.options[i].selected = true; obj.options[i].selected = true;
_factory = document.getElementById(_factoryValue); _factory = document.getElementById(_factoryValue);
_factory.value = 'JZ1'; _factory.value = 'CNS';
} }
} }
} }

Write Preview
Loading…
Cancel
Save