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

4 years ago · 08b958633e
3 changed files with 7 additions and 7 deletions
--- a/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx
+++ b/SCP/Views/PlanData/SCP_PO_CREATE_ASK.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>
@ -50,7 +50,7 @@
                                 <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3"  Hidden="true" />
                            </Items>
                        </f:FormRow>
-                        <f:FormRow runat="server" ColumnWidths="33% 33% 33%">
+                        <f:FormRow runat="server"  ColumnWidths="25% 25% 25% 25%">
                            <Items>

                               <f:DatePicker runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="要货日期" EmptyText="请选择日期" ID="DP_BeginTime" />
@ -93,7 +93,7 @@


                <f:HiddenField   ID="HF_GRID_INDEX" runat="server"></f:HiddenField>
-                <f:Grid ID = "Grid_V_TB_PO_DETAIL"  EnableCollapse = "true" ShowBorder = "true" EnableMultiSelect="true" ShowHeader = "true"  runat ="server" EnableCheckBoxSelect = "true" 
+                <f:Grid ID = "Grid_V_TB_PO_DETAIL"   ShowBorder = "true" EnableMultiSelect="true" ShowHeader = "true"  runat ="server" EnableCheckBoxSelect = "true" 
                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,ReceivedPort,SubSite,Extend1,Extend2,Extend3" 
                     SortField="PoLine" 
                     AllowSorting="true"
@ -101,7 +101,7 @@
                     AllowCellEditing="true" ClicksToEdit="2"
                     IsDatabasePaging="true" PageSize="100" OnPageIndexChange="Grid_V_TB_PO_DETAIL_PageIndexChange" 
                      OnRowDataBound="Grid_V_TB_PO_DETAIL_RowDataBound"
-                       >
+                        BoxFlex="1">
                       <PageItems>
                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
                        </f:ToolbarSeparator>
--- a/SCP/Views/PlanData/SCP_PO_PLAN_EXTEND.aspx
+++ b/SCP/Views/PlanData/SCP_PO_PLAN_EXTEND.aspx
@ -50,7 +50,7 @@
                    </Items>
                </f:GroupPanel>

-               <f:Grid ID = "Grid_V_TB_PO"  EnableCollapse = "true" ShowBorder = "true" ShowHeader = "true"  runat ="server" EnableCheckBoxSelect = "true" EnableTextSelection="true"
+               <f:Grid ID = "Grid_V_TB_PO"   ShowBorder = "true" ShowHeader = "true"  runat ="server" EnableCheckBoxSelect = "true" EnableTextSelection="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" OnRowDoubleClick="Grid_V_TB_PO_RowDoubleClick" BoxFlex="1"
--- a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx
+++ b/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx
@ -15,7 +15,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">
            <Items>
                <f:Form runat="server">
                    <Toolbars>
@ -91,7 +91,7 @@
                </f:GroupPanel>
                <f:Grid ID="Grid_V_TB_RECEIVE" ShowBorder="true" ShowHeader="true" PageSize="20" BoxFlex="1" CssClass="maingrid"
                    runat="server" DataKeyNames="UID,RecvBillNum,ReceiveDetailList,Site,ErpRecvBillNum" IsDatabasePaging="True" AllowPaging="True" EnableRowDoubleClickEvent="True" OnRowDataBound="Grid_V_TB_RECEIVE_RowDataBound"
-                    OnRowDoubleClick="Grid1_OnRowDoubleClick" SortDirection="DESC" SortField="ShipTime" EnableCheckBoxSelect="True" EnableCollapse="true"
+                    OnRowDoubleClick="Grid1_OnRowDoubleClick" SortDirection="DESC" SortField="ShipTime" EnableCheckBoxSelect="True" 
                    EnableRowSelectEvent="False" AutoScroll="True" OnPageIndexChange="Grid1_OnPageIndexChange">
                    <PageItems>
                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">