Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into develop

src/main/webapp/modules/acr/ACR515/acr_invoice_vat.lview

@@ -385,25 +385,16 @@
                 <a:gridButton click="acr515_vat_receive" text="更新开票信息"/> -->
             </a:screenTopToolbar>
             <a:form column="1" marginWidth="30" padding="0">
-                <a:hBox labelSeparator=" " labelWidth="100">
+                <a:hBox labelSeparator=" " labelWidth="100" column="4">
                     <a:textField name="document_number_f" bindTarget="acr515_invoiceVatParaDs" prompt="HLS.DOCUMENT_NUMBER_FROM" width="150"/>
                     <div><![CDATA[${l:HLS.DOCUMENT_NUMBER_TO}]]></div>
                     <a:textField name="document_number_t" bindTarget="acr515_invoiceVatParaDs" prompt="" width="150"/>
-                    <a:lov name="project_number_f" bindTarget="acr515_invoiceVatParaDs" prompt="HLS.PROJECT_NUMBER_FROM" width="150"/>
-                    <div><![CDATA[${l:HLS.DOCUMENT_NUMBER_TO}]]></div>
-                    <a:lov name="project_number_t" bindTarget="acr515_invoiceVatParaDs" prompt="" width="150"/>
-                    <a:comboBox name="business_type_desc" bindTarget="acr515_invoiceVatParaDs" width="150"/>
-                    <a:comboBox name="currency_desc" bindTarget="acr515_invoiceVatParaDs" width="150"/>
-                </a:hBox>
-                <a:hBox labelSeparator=" " labelWidth="100">
-                    <a:textField name="invoice_number_f" bindTarget="acr515_invoiceVatParaDs" prompt="ACR.INVOICE_NUMBER_FROM" width="150"/>
-                    <div><![CDATA[${l:ACR.INVOICE_NUMBER_TO}]]></div>
-                    <a:textField name="invoice_number_t" bindTarget="acr515_invoiceVatParaDs" prompt="" width="150"/>
+
                     <a:lov name="contract_number_f" bindTarget="acr515_invoiceVatParaDs" prompt="HLS.CONTRACT_NUMBER_FROM" width="150"/>
                     <div>到</div>
                     <a:lov name="contract_number_t" bindTarget="acr515_invoiceVatParaDs" prompt="" width="150"/>
-                    <a:comboBox name="invoice_kind_desc" bindTarget="acr515_invoiceVatParaDs" width="150"/>
-                    <a:lov name="created_by_name" bindTarget="acr515_invoiceVatParaDs" width="150"/>
+                    <a:textField name="invoice_title" bindTarget="acr515_invoiceVatParaDs" width="150"/>
+                    <a:lov name="confirmed_by_name" bindTarget="acr515_invoiceVatParaDs" width="150"/>
                 </a:hBox>
                 <a:hBox labelSeparator=" " labelWidth="100">
                     <a:datePicker name="invoice_date_f" bindTarget="acr515_invoiceVatParaDs" prompt="ACR.INVOICE_DATE_FROM" width="150"/>
@@ -412,18 +403,27 @@
                     <a:lov name="invoice_bp_code_f" bindTarget="acr515_invoiceVatParaDs" prompt="HLS.CUSTOMER_NUMBER_FROM" width="150"/>
                     <div><![CDATA[${l:HLS.CUSTOMER_NUMBER_TO}]]></div>
                     <a:lov name="invoice_bp_code_t" bindTarget="acr515_invoiceVatParaDs" prompt="" width="150"/>
-                    <a:textField name="invoice_title" bindTarget="acr515_invoiceVatParaDs" width="150"/>
-                    <a:lov name="confirmed_by_name" bindTarget="acr515_invoiceVatParaDs" width="150"/>
+                    <a:comboBox name="invoice_status_desc" bindTarget="acr515_invoiceVatParaDs" width="150"/>
+                    <a:comboBox name="vat_interface_status_desc" bindTarget="acr515_invoiceVatParaDs" width="150"/>
+
                 </a:hBox>
                 <a:hBox labelSeparator=" " labelWidth="100">
-                    <a:datePicker name="accounting_date_f" bindTarget="acr515_invoiceVatParaDs" prompt="HLS.ACCOUNT_DATE_FROM" width="150"/>
-                    <div><![CDATA[${l:HLS.ACCOUNT_DATE_TO}]]></div>
-                    <a:datePicker name="accounting_date_t" bindTarget="acr515_invoiceVatParaDs" prompt="" width="150"/>
+
                     <a:numberField name="total_amount_f" allowFormat="true" bindTarget="acr515_invoiceVatParaDs" prompt="ACR.TOTAL_AMOUNT_FROM" width="150"/>
                     <div><![CDATA[${l:ACR.TOTAL_AMOUNT_TO}]]></div>
                     <a:numberField name="total_amount_t" allowFormat="true" bindTarget="acr515_invoiceVatParaDs" prompt="" width="150"/>
-                    <a:comboBox name="invoice_status_desc" bindTarget="acr515_invoiceVatParaDs" width="150"/>
-                    <a:comboBox name="vat_interface_status_desc" bindTarget="acr515_invoiceVatParaDs" width="150"/>
+                    <a:datePicker name="accounting_date_f" bindTarget="acr515_invoiceVatParaDs" prompt="HLS.ACCOUNT_DATE_FROM" width="150"/>
+                    <div><![CDATA[${l:HLS.ACCOUNT_DATE_TO}]]></div>
+                    <a:datePicker name="accounting_date_t" bindTarget="acr515_invoiceVatParaDs" prompt="" width="150"/>
+                    <a:comboBox name="invoice_kind_desc" bindTarget="acr515_invoiceVatParaDs" width="150"/>
+                    <a:lov name="created_by_name" bindTarget="acr515_invoiceVatParaDs" width="150"/>
+
+                </a:hBox>
+                <a:hBox labelSeparator=" " labelWidth="100">
+                    <a:textField name="invoice_number_f" bindTarget="acr515_invoiceVatParaDs" prompt="ACR.INVOICE_NUMBER_FROM" width="150"/>
+                    <div><![CDATA[${l:ACR.INVOICE_NUMBER_TO}]]></div>
+                    <a:textField name="invoice_number_t" bindTarget="acr515_invoiceVatParaDs" prompt="" width="150"/>
+
                 </a:hBox>
             </a:form>
             <a:grid id="acr515_invoiceVatDs_grid" bindTarget="acr515_invoiceVatDs"  marginWidth="80" navBar="true" height="300">