Merge branch 'refs/heads/clause_detail' into develop

src/main/webapp/WEB-INF/classes/cont/CON202/con_contract_tmpt_clause_main.lwm

@@ -61,6 +61,10 @@
         <bm:field name="withhold_way_n" expression="(select code_value_name from sys_code_values_v scv where scv.code=&apos;WITHHOLD_WAYS&apos; and scv.code_value = t1.withhold_way)" forInsert="false" forUpdate="false"/>
         <bm:field name="first_contract_flag"/>
         <bm:field name="finance_type"/>
+        <bm:field name="secondary_lease"/>
+        <bm:field name="vender_id"/>
+        <bm:field name="vender_id_n" expression="(select scv.bp_name from hls_bp_master scv where scv.enabled_flag=&apos;Y&apos; and scv.bp_id = t1.vender_id)" forInsert="false" forUpdate="false"/>
+
         <bm:field name="finance_type_n" expression="(select code_value_name from sys_code_values_v scv where scv.code=&apos;FINANCE_TYPE&apos; and scv.code_value = t1.finance_type)" forInsert="false" forUpdate="false"/>
     </bm:fields>
     <bm:features>

src/main/webapp/modules/cont/CON202/con_basic_clause_detail.lview

@@ -17,6 +17,7 @@
     	]]></script>
         <a:dataSets>
             <a:dataSet id="con202_withway_ds" lookupCode="WITHHOLD_WAYS"/>
+            <a:dataSet id="secondary_lease_ds" lookupCode="SECONDARY_LEASE"/>
             <a:dataSet id="con202_finance_type" lookupCode="FINANCE_TYPE"/>
             <a:dataSet id="hls_bp_class_ds" lookupCode="HLS211_BP_CLASS"/>
             <a:dataSet id="other_tmpt_clause_ds" lookupCode="CON202_CON_PRINT_OTHER_CONDITON"/>
@@ -30,6 +31,8 @@
             <a:dataSet id="con_basic_clause_detail_ds" autoQuery="true" model="cont.CON202.con_contract_tmpt_clause_main" queryUrl="${/request/@context_path}/autocrud/cont.CON202.con_contract_tmpt_clause_main/query?tmpt_id=${/parameter/@tmpt_id}" selectable="true">
                 <a:fields>
                     <a:field name="withhold_way_n" displayField="code_value_name" options="con202_withway_ds" returnField="withhold_way" valueField="code_value"/>
+
+                    <a:field name="secondary_lease_n" displayField="code_value_name" options="secondary_lease_ds" returnField="secondary_lease" valueField="code_value"/>
                     <a:field name="finance_type"/>
                     <a:field name="finance_type_n" displayField="code_value_name" options="con202_finance_type" returnField="finance_type" valueField="code_value"/>
                     <a:field name="contract_number" lovGridHeight="360" lovHeight="540" lovService="basic.con_contract_for_lov" lovWidth="680">
@@ -44,6 +47,12 @@
                             <a:map from="description" to="bp_category_n"/>
                         </a:mapping>
                     </a:field>
+                    <a:field name="vender_id_n" lovGridHeight="300" lovHeight="480" lovService="basic.hls_bp_agent_vender_lov" lovWidth="500">
+                        <a:mapping>
+                            <a:map from="bp_name" to="vender_id_n"/>
+                            <a:map from="bp_id" to="vender_id"/>
+                        </a:mapping>
+                    </a:field>
                     <a:field name="bp_class_n" displayField="code_value_name" options="hls_bp_class_ds" returnField="bp_class" valueField="code_value"/>
                     <a:field name="business_type_n" lovGridHeight="300" lovHeight="480" lovService="basic.hls_business_type_for_lov" lovWidth="500">
                         <a:mapping>
@@ -108,6 +117,8 @@
                     <a:column name="contract_number" editor="lov" prompt="合同编号" width="100"/>
                     <a:column name="withhold_way_n" editor="cb" prompt="代扣方式"/>
                     <a:column name="bp_category_n" editor="lov" prompt="商业伙伴类型" width="100"/>
+                    <a:column name="vender_id_n" editor="lov" prompt="厂商" width="100"/>
+                    <a:column name="secondary_lease_n" editor="cb" prompt="二次租赁" width="100"/>
                     <a:column name="bp_class_n" editor="cb" prompt="商业伙伴分类" width="100"/>
                     <a:column name="business_type_n" editor="lov" prompt="业务类型" width="80"/>
                     <a:column name="document_type_n" editor="lov" prompt="单据类型" width="80"/>
@@ -120,6 +131,7 @@
                     <a:column name="price_list_n" editor="lov" prompt="报价方案" width="120"/>
                     <a:column name="first_contract_flag" editor="check" prompt="首个支付表标志" width="120"/>
                     <a:column name="other_tmpt_clause_n" editor="cb" prompt="其他" width="100"/>
+
                 </a:columns>
                 <a:editors>
                     <a:lov id="lov"/>