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

4 years ago · 5b68d5298a
2 changed files with 3 additions and 3 deletions
--- a/SCP/Views/SupplierData/SCP_ASK_DETAIL.aspx
+++ b/SCP/Views/SupplierData/SCP_ASK_DETAIL.aspx
@ -10,7 +10,7 @@
 <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="" AutoScroll="True" Layout="VBox">
            <Toolbars>
                <f:Toolbar ID="Toolbar2" runat="server">
                    <Items>
@ -54,7 +54,7 @@
               <f:Grid runat="server" ID="Grid_V_TB_ASK_DETAIL" 
               DataKeyNames ="UID,PoBillNum,PoLine,PartCode,ShippedQty,ReceivedQty,BeginTime,EndTime,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,Site,VendName,PartDesc2,AskBillNum,AskQty,TempQty,ReceivedPort"
               IsDatabasePaging="True" AllowPaging="True"  PageSize="10"  OnPageIndexChange="Grid_V_TB_ASK_DETAIL_PageIndexChange"
-                    EnableRowSelectEvent="True" AutoScroll="True"  SortField="PoLine" SortDirection="DESC" >
+                    EnableRowSelectEvent="True" AutoScroll="True"  SortField="PoLine" SortDirection="DESC"  BoxFlex="1">
                    <PageItems>
                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
                        </f:ToolbarSeparator>
--- a/SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx
+++ b/SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx
@ -10,7 +10,7 @@
 <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="" AutoScroll="True" Layout="VBox">
            <Toolbars>
                <f:Toolbar ID="Toolbar2" runat="server">
                    <Items>