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

4 years ago · a7844a7095
4 changed files with 6 additions and 6 deletions
--- a/SCP/Views/BasicData/Part.aspx
+++ b/SCP/Views/BasicData/Part.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">
            <Items>
                <f:Form runat="server">
                    <Toolbars>
--- a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
+++ b/SCP/Views/PlanData/SCP_INCOMPLETE_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">
            <Items>
                <f:Form runat="server">
                    <Toolbars>
--- a/SCP/Views/SupplierData/SCP_QUALITY.aspx
+++ b/SCP/Views/SupplierData/SCP_QUALITY.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">
    <Items>
        <f:Form runat="server">
              <Toolbars>
@ -70,7 +70,7 @@
                 EnableCollapse = "true" 
                 ShowBorder = "true" 
                 ShowHeader = "true" 
-                
+                 BoxFlex="1"
                 runat ="server" 
                 EnableCheckBoxSelect = "true"
                 DataKeyNames = "UID,Type,Barcode,Loccode,Pobillnum,Poline,Inspecttype,Partcode,Batch,ReceiveQty,SampleQty,Inspqty,Passqty,Failqty,Crackqty,Inspresult,Failreason,Vendid,Vendbatch,state,Billtime,Domain,Site,By1,By2,By3,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,GUID,UserInAddress,UserInVendIds,BillStateList"
@ -78,7 +78,7 @@
                 IsDatabasePaging="true" AllowPaging="true"
                 AutoScroll="True"
                SortDirection="DESC"  SortField="Billtime"
-                OnPageIndexChange="Grid_TB_QUALITY_PageIndexChange"
+                OnPageIndexChange="Grid_TB_QUALITY_PageIndexChange" 
                 >

                <PageItems>
--- a/SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx
+++ b/SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx
@ -11,7 +11,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" Title="">
                    <Items>