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

SCP/Admin/online.aspx.designer.cs

@@ -2,16 +2,18 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。 
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace SCP.admin {
-    
-    
-    public partial class online {
-        
+namespace SCP.admin
+{
+
+
+    public partial class online
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace SCP.admin {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace SCP.admin {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace SCP.admin {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.Panel Panel1;
-        
+
         /// <summary>
         /// Form2 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace SCP.admin {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.Form Form2;
-        
+
         /// <summary>
         /// FormRow1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace SCP.admin {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.FormRow FormRow1;
-        
+
         /// <summary>
         /// ttbSearchMessage 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace SCP.admin {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.TwinTriggerBox ttbSearchMessage;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace SCP.admin {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.Grid Grid1;
-        
+
         /// <summary>
         /// ToolbarSeparator3 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace SCP.admin {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.ToolbarSeparator ToolbarSeparator3;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace SCP.admin {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlGridPageSize 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace SCP.admin {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.DropDownList ddlGridPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>

SCP/Views/PlanData/SCP_ASK.aspx

@@ -115,6 +115,7 @@
                <f:Grid ID = "Grid_V_TB_ASK"  EnableCollapse = "true" ShowBorder = "true" ShowHeader = "true"  runat ="server"  EnableCheckBoxSelect="true" EnableTextSelection="true"
                DataKeyNames = "UID,PoBillNum,AskBillNum,VendId,Site,Buyer,BuyerPhone,State,Remark,VendName,State_DESC,ModType_DESC,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,GUID,ModType"
                     AllowSorting="true"  BoxFlex="1"
+                    PageSize="100"
                     OnRowDataBound="Grid_V_TB_ASK_RowDataBound" 
                      CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_ASK_Sort" SortField="State"
                      IsDatabasePaging="True" AllowPaging="True" OnRowDoubleClick="Grid_V_TB_ASK_RowDoubleClick"

SCP/Views/PlanData/SCP_ASK.aspx.cs

@@ -60,6 +60,7 @@ namespace SCP.PlanData
             if (CurrentUser.Name == "admin" || CurrentUser.RoleList.Contains("分厂管理员"))
             {
                 btnDelete.Hidden = false;
+            
             }
 
             BindAsk();

SCP/Views/PlanData/SCP_ASN_DETAIL_View.aspx

@@ -62,7 +62,7 @@
                     </Items>
                 </f:Form>
                
-                <f:Grid ID="Grid_V_TB_ASN_DETAIL" ShowBorder="true" ShowHeader="true" PageSize="15" BoxFlex="1" CssClass="maingrid"
+                <f:Grid ID="Grid_V_TB_ASN_DETAIL" ShowBorder="true" ShowHeader="true" PageSize="20"  BoxFlex="1" CssClass="maingrid"
                     runat="server" DataKeyNames="UID,PoBillNum,PoLine,PartCode,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,Site,VendName,PartDesc2,AsnBillNum,Qty,VendBatch,ProduceDate,Batch,VendId,AskBillNum,CanQty,Guid,ReceivedPort" 
                     IsDatabasePaging="True" AllowPaging="True" 
                     EnableRowSelectEvent="True" AutoScroll="True" 
@@ -76,7 +76,7 @@
                         </f:ToolbarText>
                         <f:DropDownList ID="ddlGridPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlGridPageSize_SelectedIndexChanged"
                             runat="server">
-                            <f:ListItem Text="20" Value="10" />
+                            <f:ListItem Text="20" Value="20" />
                             <f:ListItem Text="40" Value="40" />
                             <f:ListItem Text="80" Value="80" />
                             <f:ListItem Text="100" Value="100" />

SCP/Views/PlanData/SCP_PART_LIFE.aspx

@@ -45,7 +45,7 @@
                 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="PoBillNum" 
                      AllowPaging="True" EnableRowDoubleClickEvent="true" 
-                     IsDatabasePaging="true" PageSize="200" OnPageIndexChange="Grid_V_TB_PO_DETAIL_PageIndexChange"  OnRowSelect="Grid_V_TB_PO_DETAIL_RowSelect" OnRowDoubleClick="Grid_V_TB_PO_DETAIL_RowDoubleClick"
+                     IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid_V_TB_PO_DETAIL_PageIndexChange"  OnRowSelect="Grid_V_TB_PO_DETAIL_RowSelect" OnRowDoubleClick="Grid_V_TB_PO_DETAIL_RowDoubleClick"
                        >
                        <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">

SCP/Views/PlanData/SCP_PART_LIFE.aspx.cs

@@ -68,6 +68,7 @@ namespace SCP.Views.PlanData
 
         protected void Grid_V_TB_PO_DETAIL_PageIndexChange(object sender, GridPageEventArgs e)
         {
+          
             BindData();
         }
 
@@ -88,6 +89,7 @@ namespace SCP.Views.PlanData
 
         protected void ddlGridPageSize_SelectedIndexChanged(object sender, EventArgs e)
         {
+            Grid_V_TB_PO_DETAIL.PageSize = Convert.ToInt32(ddlGridPageSize.SelectedValue);
             BindData();
         }
 

SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx

@@ -43,7 +43,8 @@
                         </f:FormRow>
                         <f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%">
                             <Items>
-                                <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true" />
+                               <f:DropDownList ID="DropDownList1" DataTextField="PORT_DESCRIPTION" DataValueField="PORT_NO" Required="false" runat="server" Label="地点">
+                                </f:DropDownList>
                                 <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" />
@@ -56,7 +57,7 @@
 
                                <f:TextBox runat = "server" Label = "发往地点" EmptyText = "" ID = "TXT_Site"   />
 
-                               <%-- <f:DropDownList ID="DDL_PORT" DataTextField="PORT_DESCRIPTION" DataValueField="PORT_NO" Required="true" runat="server" Label="收货口">
+                            <%--    <f:DropDownList ID="DDL_PORT" DataTextField="PORT_DESCRIPTION" DataValueField="PORT_NO" Required="true" runat="server" Label="收货口">
                                 </f:DropDownList>--%>
 
                                 <f:TextBox ID="txtRemark" runat="server" Label="备注" Text="">
@@ -157,7 +158,7 @@
                    </f:RenderField>
                        
                    <f:RenderField Width="100px" ColumnID="SubSite" DataField="SubSite" FieldType="String"
-                    HeaderText="子网站" Hidden="true">
+                    HeaderText="地点" Hidden="false">
                     <Editor>
                         <f:NumberBox ID="NumberBox2" runat="server"  MinValue="0"
                             MaxValue="99999999"    DecimalPrecision="3" >

SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs

@@ -73,7 +73,7 @@ namespace SCP.PlanData
                     this.TXT_State_DESC.Text = _result.State_DESC;                   
                     this.TXT_VendName.Text = _result.VendName;
                     this.txtRemark.Text = _result.Remark;
-                    this.TXT_SubSite.Text = _result.SubSite;
+                    this.DropDownList1.Text = _result.SubSite;
                     this.TXT_Extend1.Text = _result.Extend1;
                     this.TXT_Extend2.Text = _result.Extend2;
                     this.TXT_Extend3.Text = _result.Extend3;
@@ -156,7 +156,7 @@ namespace SCP.PlanData
         protected void btnRelease_Click(object sender, EventArgs e)
         {
             var qadOrder = Session["order"] as V_TB_PO;
-            qadOrder.SubSite = TXT_SubSite.Text;
+            qadOrder.SubSite =DropDownList1.Text;
             qadOrder.Extend1 = TXT_Extend1.Text;
             qadOrder.Extend2 = TXT_Extend2.Text;
             qadOrder.Extend3 = TXT_Extend3.Text;

SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.designer.cs

@@ -105,13 +105,13 @@ namespace SCP.PlanData
         protected global::FineUI.TextBox TXT_VendId;
 
         /// <summary>
-        /// TXT_SubSite 控件。
+        /// DropDownList1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.TextBox TXT_SubSite;
+        protected global::FineUI.DropDownList DropDownList1;
 
         /// <summary>
         /// TXT_Extend1 控件。

SCP/Views/PlanData/SCP_PO_DETAIL_OUT.aspx

@@ -58,7 +58,7 @@
                 DataKeyNames = "UID,PoBillNum,PoLine,PartCode,VendName,ProjectId,PartDesc1,PartDesc2" 
                      SortField="PoLine" 
                      AllowPaging="True"
-                     IsDatabasePaging="true" PageSize="100" OnPageIndexChange="Grid_V_TB_PO_DETAIL_PageIndexChange">
+                     IsDatabasePaging="true" PageSize="500" OnPageIndexChange="Grid_V_TB_PO_DETAIL_PageIndexChange">
                        <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
                         </f:ToolbarSeparator>

SCP/Views/PlanData/SCP_PO_EXTEND.aspx

@@ -105,7 +105,7 @@
                                 </f:FormRow>                          
                             </Rows>
                         </f:Form>
-               <f:Grid ID = "Grid_V_TB_PO" ColumnWidth="45%"  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: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" 
                      CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_PO_Sort" SortField="BeginTime"
                      IsDatabasePaging="True" AllowPaging="True"  OnRowSelect="Grid_V_TB_PO_RowSelect" EnableRowSelectEvent="true"
                     AutoScroll="True"   SortDirection="DESC" OnPageIndexChange="Grid_V_TB_PO_PageIndexChange"  >

SCP/Views/SupplierData/SCP_ASK.aspx

@@ -95,7 +95,7 @@
                     </Items>
                 </f:GroupPanel>
 
-               <f:Grid ID = "Grid_V_TB_ASK"  EnableCollapse = "true" ShowBorder = "true" ShowHeader = "true"  runat ="server" EnableCheckBoxSelect="true"
+               <f:Grid ID = "Grid_V_TB_ASK" PageSize="50" EnableCollapse = "true" ShowBorder = "true" ShowHeader = "true"  runat ="server" EnableCheckBoxSelect="true"
                DataKeyNames = "UID,PoBillNum,AskBillNum,VendId,Site,Buyer,BuyerPhone,State,Remark,VendName,State_DESC,ModType_DESC,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,GUID"    
                      CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_ASK_Sort" SortField="CreateTime"
                      IsDatabasePaging="True" AllowPaging="True" OnRowDoubleClick="Grid_V_TB_ASK_RowDoubleClick" 

SCP/Views/SupplierData/SCP_CLAIM.aspx.cs

@@ -289,6 +289,7 @@ namespace SCP.Views.SupplierData
 
         protected void DropDownList1_SelectedIndexChanged(object sender, EventArgs e)
         {
+            Grid_TM_HYANTOLIN_REVIEW.PageSize=Convert.ToInt32(DropDownList1.SelectedValue);
             Bind();
         }
 

SCP/Views/SupplierData/SCP_INVOICE.aspx

@@ -90,7 +90,7 @@
                         </f:GroupPanel>
 
 	        <f:Grid ID="Grid_V_TB_INVOICE" runat="server" EnableCheckBoxSelect="true" ShowHeader="False" 
-             AllowPaging="True"  PageSize="100" OnPageIndexChange="Grid_V_TB_INVOICE_PageIndexChange"
+             AllowPaging="True"  PageSize="10" OnPageIndexChange="Grid_V_TB_INVOICE_PageIndexChange"
              ShowBorder="False" OnRowDoubleClick="Grid_V_TB_INVOICE_RowDoubleClick"   BoxFlex="1"
              DataKeyNames="UID, InvcBillNum" AllowSorting="true" IsDatabasePaging="true" SortField="State" OnRowDataBound="Grid_V_TB_INVOICE_RowDataBound" >
                <PageItems>

SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx

@@ -121,7 +121,7 @@
 
 
 
-                <f:Grid ID="Grid_V_TB_RECEIVE_LIST" ShowBorder="true" ShowHeader="true" PageSize="20" BoxFlex="1" CssClass="maingrid" 
+                <f:Grid ID="Grid_V_TB_RECEIVE_LIST" ShowBorder="true" ShowHeader="true" PageSize="100" BoxFlex="1" CssClass="maingrid" 
                     runat="server" DataKeyNames="UID,ProjectId,RecvBillNum,PartCode,PoLine,Qty,Price" IsDatabasePaging="true" AllowPaging="True"  SortField="RecvBillNum"
                     AutoScroll="True" OnPageIndexChange="Grid_V_TB_RECEIVE_LIST_PageIndexChange" EnableCheckBoxSelect = "true"  OnRowDataBound="Grid_V_TB_RECEIVE_LIST_RowDataBound" >
                     <PageItems>

SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs

@@ -73,9 +73,9 @@ namespace SCP.SupplierData
         public void LoadData()
         {
             // 每页记录数
-            Grid_V_TB_RECEIVE_LIST.PageSize = ConfigHelper.PageSize;
-            ddlGridPageSize.SelectedValue = ConfigHelper.PageSize.ToString();
-            BindData();
+            //Grid_V_TB_RECEIVE_LIST.PageSize = ConfigHelper.PageSize;
+            //ddlGridPageSize.SelectedValue = ConfigHelper.PageSize.ToString();
+            //BindData();
         }
         private void SearchData(Action<IQueryable<V_TB_RECEIVE_LIST>> p_action)
         {

SCP/Views/WarehouseData/SCP_INVOICE.aspx

@@ -72,7 +72,7 @@
 
 	<f:Grid ID="Grid_V_TB_INVOICE" runat="server" EnableCheckBoxSelect="true" 
                      ShowHeader="False" SortField="State;CreateTime"
-     AllowPaging="True"  PageSize="100" OnPageIndexChange="Grid_V_TB_INVOICE_PageIndexChange"
+     AllowPaging="True"  PageSize="10" OnPageIndexChange="Grid_V_TB_INVOICE_PageIndexChange"
      ShowBorder="False"  OnRowDoubleClick="Grid_V_TB_INVOICE_RowDoubleClick"  BoxFlex="1"
     DataKeyNames="UID, InvcBillNum,State_DESC,InvoiceNum,ExpressNum,VendName,Amount,Tax,TaxAmount,ContractPrice,BlancePrice,Total,CreateTime,Remark,VendId" AllowSorting="true" IsDatabasePaging="true" >
        <PageItems>