[FIX]修改销项发票查询界面

src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_tenant_lov.lwm

@@ -40,6 +40,6 @@
     <bm:data-filters>
         <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
         <bm:data-filter name="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/>
-        <bm:data-filter name="query" expression="(t1.bp_category = &apos;TENANT&apos; or exists(select 1 from hls_bp_master_role br where br.bp_id = t1.bp_id     and br.bp_category = &apos;TENANT&apos; and br.bp_type = &apos;TENANT&apos;))"/>
+        <bm:data-filter name="query" expression="(t1.bp_category in (&apos;TENANT&apos;,&apos;AGENT&apos;,&apos;GUARANTOR&apos;))"/>
     </bm:data-filters>
 </bm:model>

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

@@ -189,9 +189,9 @@
                     <a:field name="project_name_to" readOnly="true"/>
                     <a:field name="contract_number"/>
                    <!-- <a:field name="invoice_title"/>-->
-                    <a:field name="invoice_title" lovGridHeight="300" lovHeight="450" lovLabelWidth="100" lovService="basic.hls_bp_master_v_for_lov" lovWidth="600" title="承租人">
+                    <a:field name="invoice_title" lovGridHeight="300" lovHeight="450" lovLabelWidth="100" lovService="basic.hls_bp_master_v_for_tenant_lov" lovWidth="600" title="开票对象">
                         <a:mapping>
-                            <a:map from="bp_code" to="invoice_title"/>
+<!--                            <a:map from="bp_code" to="invoice_title"/>-->
                             <a:map from="bp_name" to="invoice_title"/>
                         </a:mapping>
                     </a:field>
@@ -297,7 +297,7 @@
             </a:screenTopToolbar>-
             <a:queryForm id="condition_queryForm" bindTarget="allConditionDs" createSearchButton="false" resultTarget="contractDs">
                 <a:formToolBar labelWidth="100">
-                    <a:lov name="invoice_title" bindTarget="allConditionDs" prompt="承租人"/>
+                    <a:lov name="invoice_title" bindTarget="allConditionDs" prompt="开票对象"/>
 
 <!--
                     <a:comboBox name="bill_object_bp_class_desc" bindTarget="allConditionDs" prompt="客户类型"/>
@@ -343,9 +343,9 @@
                                 <!--<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="times" align="right" lock="true" prompt="期数" width="40"/>
                                 <a:column name="invoice_title" prompt="开票对象名称"/>
                                 <a:column name="bp_id_agent_level1" prompt="代理店"/>
-                                <a:column name="times" align="right" lock="true" prompt="期数" width="40"/>
                                 <a:column name="cf_item_desc" lock="true" prompt="应收项目"/>
                                 <a:column name="due_date" prompt="应收日" renderer="Leaf.formatDate"/>
                                 <a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>