Merge branch 'feature/con_contract_finish_maintain' into develop

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain.lview

@@ -183,7 +183,7 @@
                 <!--<a:lov name="owner_user_id_n" bindTarget="con560_contract_query_ds" prompt="出单人"/>-->
                 <a:comboBox name="lease_organization_name" bindTarget="con560_contract_query_ds" prompt="事业部"/>
             </a:form>
-            <a:grid id="con560_con_contract_grid_ds" bindTarget="con560_contract_result_ds" marginHeight="365"
+            <a:grid id="con560_con_contract_grid_ds" bindTarget="con560_contract_result_ds" height="250"
                     marginWidth="30" navBar="true">
                 <a:columns>
                     <a:column name="contract_number" lock="true" prompt="HLS.CONTRACT_NUMBER"
@@ -210,7 +210,7 @@
             <a:tabPanel marginHeight="420" marginWidth="30">
                 <a:tabs>
                     <a:tab prompt="未收金额" width="110">
-                        <a:grid bindTarget="unreceivedAmountDs" marginHeight="470" marginWidth="55" navBar="true">
+                        <a:grid bindTarget="unreceivedAmountDs" height="250" marginWidth="55" navBar="true">
                             <a:columns>
                                 <a:column name="times" prompt="期数"/>
                                 <a:column name="cf_type_dis" prompt="类型"/>
@@ -227,7 +227,7 @@
                         </a:grid>
                     </a:tab>
                     <a:tab prompt="已收金额" width="110">
-                        <a:grid bindTarget="receivedAmountDs" marginHeight="450" marginWidth="55" navBar="true">
+                        <a:grid bindTarget="receivedAmountDs" height="250" marginWidth="55" navBar="true">
                             <a:columns>
                                 <a:column name="times" prompt="期数"/>
                                 <a:column name="cf_type_dis" prompt="类型"/>