Merge branch 'feature/发票创建修改' into develop

src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_billing_object_lov.lwm

@@ -26,6 +26,7 @@
             <bm:query-sql><![CDATA[
     			select v.contract_id,
     				   v.bp_id,
+    				   v.bp_class,
 				       v.bp_code,
 				       v.bp_name,
 				       v.bp_category,

src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview

@@ -20,9 +20,10 @@
         function validate_contractDs(record, name, value) {
             if (name == 'object_tax_registry_num' || name == 'invoice_bp_address_phone_num' || name == 'invoice_bp_bank_account') {
                 if (Ext.isEmpty(value)) {
-                    if (record.get('bill_object_bp_class') == 'NP' || record.get('object_taxpayer_type') == 'SMALL_SCALE_TAXPAYER' || record.get('tax_type_vat') != 'Y') {
+                    //if (record.get('bill_object_bp_class') == 'NP' || record.get('object_taxpayer_type') == 'SMALL_SCALE_TAXPAYER' || record.get('tax_type_vat') != 'Y') {
+                    if (record.get('bill_object_bp_class') == 'NP') {
                         return true;
-                    } else {
+                    } else  if (record.get('bill_object_bp_class') == 'ORG') {
                         return '必输字段不能为空!';
                     }
                 }
@@ -247,6 +248,7 @@
                     <a:field name="invoice_bp_bank_account" validator="validate_contractDs" prompt="开户行及账号"/>
                     <a:field name="billing_object_name" lovGridHeight="300" lovHeight="450" lovLabelWidth="100" lovService="acr.ACR510.acr_invoice_billing_object_lov" lovWidth="650" required="true" title="ACR510.ACR_INVOICE_CONTRACT_V.BILLING_OBJECT_NAME">
                         <a:mapping>
+                            <a:map from="bp_class" to="bill_object_bp_class"/>
                             <a:map from="bp_id" to="billing_object_id"/>
                             <a:map from="bp_name" to="billing_object_name"/>
                             <a:map from="invoice_title" to="invoice_title"/>
@@ -307,8 +309,8 @@
                     <a:tab prompt="开票信息">
                         <a:grid id="cashflowDs_grid" bindTarget="ar510n_cashflow_ds" marginHeight="170" marginWidth="70" navBar="true">
                             <a:columns>
-                                <a:column name="invoice_type_desc" prompt="发票类型"/>
-                                <a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>
+                                <!--<a:column name="invoice_type_desc" prompt="发票类型"/>-->
+                                <!--<a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>-->
                                 <a:column name="contract_number" lock="true" prompt="合同编号" width="150"/>
                                 <a:column name="invoice_title" prompt="承租人"/>
                                 <a:column name="bp_id_agent_level1" prompt="代理店"/>
@@ -339,8 +341,8 @@
                     <a:tab prompt="抬头信息">
                         <a:grid id="contractDs_grid" bindTarget="ar510n_cashflow_ds" marginHeight="170" marginWidth="70" navBar="true">
                             <a:columns>
-                                <a:column name="invoice_type_desc" prompt="发票类型"/>
-                                <a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>
+                                <!--<a:column name="invoice_type_desc" prompt="发票类型"/>-->
+                                <!--<a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>-->
                                 <a:column name="contract_number" prompt="合同编号" width="150"/>
                                 <a:column name="contract_status_desc" prompt="合同状态" width="80"/>
                                 <a:column name="billing_method_desc" prompt="开票规则" width="80"/>