Merge branch 'refs/heads/feature/ap_invoice_import' into develop

src/main/webapp/WEB-INF/classes/cont/CON541/hls_bp_masster_for_lov.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: feng
+    $Date: 2013-9-11 下午15:13:20
+    $Revision: 1.0
+    $Purpose:
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql>
+                <![CDATA[
+                select tt.bp_name,tt.bp_id ,tt.bp_code from (
+                select t.bp_id,
+                t.bp_name,
+                t.bp_code,
+                t.bp_type
+                from hls_bp_master t
+                where t.bp_category = 'TENANT'
+                and t.enabled_flag = 'Y'
+                union
+                select t.bp_id   ,
+                t.bp_name ,
+                t.bp_code,
+                t.bp_type
+                from hls_bp_master_role d, hls_bp_master t
+                where d.bp_id = t.bp_id
+                and d.bp_category =  'TENANT'
+                and d.enabled_flag = 'Y')tt #WHERE_CLAUSE#
+                ]]></bm:query-sql>
+        </bm:operation>
+
+    </bm:operations>
+    <bm:fields>
+        <bm:field name="bp_name" fordisplay="true" forQuery="true" prompt="承租人名称"/>
+        <bm:field name="bp_code"  fordisplay="true" forQuery="true" prompt="承租人代码"/>
+        <bm:field name="bp_id"/>
+    </bm:fields>
+    <bm:query-fields>
+    <bm:query-field field="bp_code" queryOperator="like"/>
+    <bm:query-field field="bp_name" queryOperator="like"/>
+    </bm:query-fields>
+</bm:model>

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

@@ -140,14 +140,16 @@
                        model="basic.hls_lease_organization_for_lov"/>
             <a:dataSet id="con560_contract_query_ds" autoCreate="true">
                 <a:fields>
-                    <a:field name="bp_name" autoComplete="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="100"
-                             lovService="cont.CON541.hls_bp_master_v_for_lov?bp_category=TENANT" lovWidth="520"
+                    <a:field name="bp_name"  lovGridHeight="350" lovHeight="500" lovLabelWidth="100"
+                             lovService="cont.CON541.hls_bp_masster_for_lov" lovWidth="520"
                              title="HLS.BP_TITLE">
                         <a:mapping>
                             <a:map from="bp_name" to="bp_name"/>
+                            <a:map from="bp_code" to="bp_code"/>
                             <a:map from="bp_id" to="bp_id_tenant"/>
                         </a:mapping>
                     </a:field>
+                    <a:field name="bp_id_tenant"/>
                     <!-- <a:field name="contract_number" autoComplete="true" lovGridHeight="300" lovHeight="450" lovService="cont.CON531.con_contract_lov" lovWidth="500" title="HLS.CONTRACT_NUMBER">
                         <a:mapping>
                             <a:map from="contract_number" to="contract_number"/>
@@ -206,7 +208,7 @@
                               renderer="con560_render_contractMaintainDs_grid" width="150"/>
                     <a:column name="bp_name" prompt="HLS.TENANT_NAME" width="240"/>
                     <a:column name="inception_of_lease" prompt="起租日期" renderer="Leaf.formatDate" width="100"/>
-                    <a:column name="lease_end_date" prompt="合同预计结束日期" renderer="Leaf.formatDate" width="140"/>
+<!--                    <a:column name="lease_end_date" prompt="合同预计结束日期" renderer="Leaf.formatDate" width="140"/>-->
                     <a:column name="is_terminate" prompt="租金是否结清" width="100"/>
                     <a:column name="residual_value" align="right" prompt="留购价" renderer="Leaf.formatMoney" width="50"/>
                     <!--<a:column name="signing_user_id_n" prompt="签约人" width="100"/>-->