报表页面调整以及逻辑优化

8 months ago · f7b75380a3
3 changed files with 51 additions and 6 deletions
--- a/北京北汽/SCP/Views/PlanData/SCP_TB_ASK_DETAIL_PO.aspx
+++ b/北京北汽/SCP/Views/PlanData/SCP_TB_ASK_DETAIL_PO.aspx
@ -10,10 +10,22 @@
 <body>
    <form id="form1" runat="server">
        <f:PageManager runat="server" AutoSizePanelID="Panel1" />
-        <f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True">
+        <f:Panel ID="Panel1" runat="server" Title="" Layout="VBox"  BoxConfigAlign="Stretch" BoxConfigPosition="Start" >

            <Items>
-                <f:Button ID="Button1" runat="server" EnablePostBack="True" Text="刷新" Icon="Reload" OnClientClick="location.reload();"/>
+
+                <f:Form runat="server">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" runat="server">
+                            <Items>
+                                <f:Button ID="Button1" runat="server" EnablePostBack="True" Text="刷新" Icon="Reload" OnClientClick="location.reload();" />
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                </f:Form>
+
+                <f:GroupPanel runat="server" ID="gp1"  Layout="HBox">
+                    <Items>
                         <f:Form runat="server" Title="">
                    <Items>
                        <f:FormRow runat="server" ColumnWidths="15% 15% 15% 15% ">
@ -45,8 +57,11 @@
                        </f:FormRow>
                    </Items>
                </f:Form>
+                    </Items>
+                    </f:GroupPanel>
+               

-                <f:Grid ID="Grid_V_TB_ASK_DETAIL_PO" ShowBorder="true" ShowHeader="true" PageSize="15" BoxFlex="1" CssClass="maingrid"
+                <f:Grid ID="Grid_V_TB_ASK_DETAIL_PO" ShowBorder="true" ShowHeader="true"  BoxFlex="1" CssClass="maingrid"
                    runat="server" DataKeyNames="UID,PoBillNum,ModType_DESC,AskBillNum,VendName,VendId,BeginTime,PoLine,PartCode,PartDesc,VendPartCode,PoUnit,Price,AskQty,ShippedQty,ReceivedQty,ArriveQty,EndTime,Site_Desc,Buyer,BuyerPhone"
                    IsDatabasePaging="True" AllowPaging="True"
                    EnableRowSelectEvent="True" AutoScroll="True"
--- a/北京北汽/SCP/Views/PlanData/SCP_TB_ASK_DETAIL_PO.aspx.cs
+++ b/北京北汽/SCP/Views/PlanData/SCP_TB_ASK_DETAIL_PO.aspx.cs
@ -40,7 +40,7 @@ namespace SCP.PlanData
            }
            else
            {
-                _entity.TimeBegin = DateTime.Now.AddYears(-1);
+                _entity.TimeBegin = DateTime.Now.AddMonths(-3);
            }
            if (TimeEnd.SelectedDate != null)
            {
@ -65,8 +65,20 @@ namespace SCP.PlanData
            _entity.UserInAddress = CurrentUser.FactoryList;
            if (CurrentUser.VenderList != null && CurrentUser.VenderList.Count > 0)
            {
+                if (User.Identity.Name == "admin")
+                {
+                    _entity.TimeBegin = DateTime.Now.AddMonths(-3);
+                    _entity.TimeEnd = DateTime.Now;
+                    
+                }
                _entity.UserName = User.Identity.Name;
            }
+            else
+            {
+                Alert.Show("您的账号下未绑定供应商账号，请绑定供应商账号");
+                return list;
+            }
+            
            //_entity.UserInSubSite = CurrentUser.SubSiteList;
            #endregion
            list = SCP_ASK_CONTROLLER.Get_V_TB_ASK_DETAIL_PO_List(_entity);
--- a/北京北汽/SCP/Views/PlanData/SCP_TB_ASK_DETAIL_PO.aspx.designer.cs
+++ b/北京北汽/SCP/Views/PlanData/SCP_TB_ASK_DETAIL_PO.aspx.designer.cs
@ -32,6 +32,15 @@ namespace SCP.PlanData
        /// </remarks>
        protected global::FineUI.Panel Panel1;

+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.Toolbar Toolbar1;
+
        /// <summary>
        /// Button1 控件。
        /// </summary>
@ -41,6 +50,15 @@ namespace SCP.PlanData
        /// </remarks>
        protected global::FineUI.Button Button1;

+        /// <summary>
+        /// gp1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.GroupPanel gp1;
+
        /// <summary>
        /// TXT_PoBillNum 控件。
        /// </summary>