Merge branch 'feature/建行扣款限额' into develop

src/main/webapp/WEB-INF/classes/check_after_save_bm/con_check_deduction_limit_after_save.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: gaoyang  
+    $Date: 2015-12-02 下午1:29:07  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+            	begin
+            		cus_con_change_req_pkg.check_con_dedution_limit(
+            			p_change_req_id   =>${@change_req_id},
+                        p_user_id         =>${/session/@user_id},
+                        p_pay_method     =>${@pay_method},
+                        p_bank_branch_num =>${@bank_branch_num},
+                        p_contract_number =>${@contract_number},
+                        p_deduction_limit =>${@deduction_limit},
+                        p_layout_code     =>${@layout_code},
+                        p_err_msg         =>${@err_msg});
+            	end;
+            ]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="err_msg" dataType="java.lang.String" input="false" output="true" outputPath="@err_msg"/>
+            </bm:parameters>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm

@@ -70,7 +70,8 @@
         <bm:field name="rate_method_code" expression="(select t.rate_method_code from gld_exchangerate_types t where t.type_code=t1.exchange_rate_type)" forInsert="false" forUpdate="false"/>
         <bm:field name="zero_amounts_allowed" expression="(select d.zero_amounts_allowed from csh_bank_account_v d where d.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false"/>
         <bm:field name="transaction_type_desc" forInsert="false" forUpdate="false" prompt="HLS.TRANSACTION_TYPE"/>
-        <bm:field name="unwrite_off_amount" expression="(nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0))" forInsert="false" forUpdate="false" prompt="HLS.UNWRITEOFF_AMOUNT"/>
+        <!--        <bm:field name="unwrite_off_amount" expression="(nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0))" forInsert="false" forUpdate="false" prompt="HLS.UNWRITEOFF_AMOUNT"/>-->
+        <bm:field name="unwrite_off_amount" expression="(t1.transaction_amount-nvl((select sum(cw.write_off_due_amount) from csh_write_off cw where cw.csh_transaction_id=t1.transaction_id and cw.reversed_flag='N' and cw.write_off_date &lt;=nvl(to_date(${@write_off_date_to},&apos;yyyy-mm-dd&apos;),sysdate) ),0))" forInsert="false" forUpdate="false" prompt="HLS.UNWRITEOFF_AMOUNT"/>
         <bm:field name="precision" expression="(select g.precision from gld_currency g where g.currency_code =t1.currency_code)" forInsert="false" forUpdate="false"/>
         <bm:field name="reverse_amount" expression="(-1*t1.transaction_amount)" forInsert="false" forUpdate="false" prompt="CSH511.REVERSE_AMOUNT"/>
         <bm:field name="user_desc" expression="(select su.description from sys_user su where su.user_id=t1.created_by)" forInsert="false" forUpdate="false"/>
@@ -132,7 +133,7 @@
                                                    or (decode(${/session/@user_id}, 10600, 1, 2) = 2) )"/>
     </bm:data-filters>
     <bm:query-fields>
-        <bm:query-field name="query_amount_flag" queryExpression="((${@query_amount_flag}='1' and ((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0) )or(${@query_amount_flag}='2' and ((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) =0) )or (${@query_amount_flag}='3' and ((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >=0)))"/>
+        <bm:query-field name="query_amount_flag" queryExpression="((${@query_amount_flag}='1' and ((t1.transaction_amount-nvl((select sum(cw.write_off_due_amount) from csh_write_off cw where cw.csh_transaction_id=t1.transaction_id and cw.reversed_flag='N' and cw.write_off_date &lt;=nvl(to_date(${@write_off_date_to},&apos;yyyy-mm-dd&apos;),sysdate) ),0))>0) )or(${@query_amount_flag}='2' and ( (t1.transaction_amount-nvl((select sum(cw.write_off_due_amount) from csh_write_off cw where cw.csh_transaction_id=t1.transaction_id and cw.reversed_flag='N' and cw.write_off_date &lt;=nvl(to_date(${@write_off_date_to},&apos;yyyy-mm-dd&apos;),sysdate) ),0))=0) )or (${@query_amount_flag}='3' and ( (t1.transaction_amount-nvl((select sum(cw.write_off_due_amount) from csh_write_off cw where cw.csh_transaction_id=t1.transaction_id and cw.reversed_flag='N' and cw.write_off_date &lt;=nvl(to_date(${@write_off_date_to},&apos;yyyy-mm-dd&apos;),sysdate) ),0))>=0)))"/>
         <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
         <bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
         <bm:query-field field="bp_bank_account_name" queryOperator="like"/>

src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_result_query.lwm

@@ -36,8 +36,9 @@
                            AND i.equipment_type =
                                'MAIN')                                                                                            machine_number,
                     --机号
-                    (NVL(ct.int_rate_display, 0) * 100 ||
-                     '%')                                                                                                         int_rate_display,
+                    to_char(NVL(ct.int_rate_display, 0)*100,'FM99,999,999,990.00')||'%' int_rate_display,
+                   -- (NVL(ct.int_rate_display, 0) * 100 ||
+                    -- '%')                                                                                                         int_rate_display,
                     --利率
                     ct.lease_times,
                     --租赁期间
@@ -257,20 +258,20 @@
         <bm:field name="lease_start_date"/>
         <bm:field name="modelcd"/>
         <bm:field name="machine_number"/>
-        <bm:field name="int_rate_display"/>
-        <bm:field name="lease_times"/>
+        <bm:field name="int_rate_display" datatype="java.lang.String"/>
+        <bm:field name="lease_times" datatype="java.lang.Long"/>
         <bm:field name="down_payment_ratio"/>
-        <bm:field name="lease_item_amount"/>
-        <bm:field name="residual_amount"/>
-        <bm:field name="contract_amount"/>
-        <bm:field name="down_payment"/>
-        <bm:field name="month_due_amount"/>
-        <bm:field name="month_due_principal"/>
-        <bm:field name="month_interest"/>
-        <bm:field name="month_residual"/>
-        <bm:field name="business_due_times"/>
-        <bm:field name="business_due_amount"/>
-        <bm:field name="deposit_amount"/>
+        <bm:field name="lease_item_amount" datatype="java.lang.Double"/>
+        <bm:field name="residual_amount" datatype="java.lang.Double"/>
+        <bm:field name="contract_amount" datatype="java.lang.Double"/>
+        <bm:field name="down_payment" datatype="java.lang.Double"/>
+        <bm:field name="month_due_amount" datatype="java.lang.Double"/>
+        <bm:field name="month_due_principal" datatype="java.lang.Double"/>
+        <bm:field name="month_interest" datatype="java.lang.Double"/>
+        <bm:field name="month_residual" datatype="java.lang.Double"/>
+        <bm:field name="business_due_times" datatype="java.lang.Long"/>
+        <bm:field name="business_due_amount" datatype="java.lang.Double"/>
+        <bm:field name="deposit_amount" datatype="java.lang.Double"/>
         <bm:field name="contract_status_n"/>
         <bm:field name="residual_date"/>
         <bm:field name="terminate_date"/>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT122/cus_deposit_record_maintain.lview

@@ -428,6 +428,9 @@
                                     bindTarget="csh_transaction_receipt_maintain_query_ds"/>
                         <a:comboBox name="query_amount_flag_n" bindTarget="csh_transaction_receipt_maintain_query_ds"
                                     prompt="剩余可用金额"/>
+                        <a:datePicker name="write_off_date_to"
+                                      bindTarget="csh_transaction_receipt_maintain_query_ds"
+                                      prompt="核销日期到"/>
                     </a:fieldSet>
                 </a:hBox>
             </a:form>

src/main/webapp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_output.lview

@@ -247,7 +247,7 @@
                         </a:mapping>
                     </a:field>
                     <a:field name="limit_amount" validator="amountValidator"/>
-                    <a:field name="generate_rules_display" readOnly="true" defaultValue="汇总"
+                    <a:field name="generate_rules_display" readOnly="false" defaultValue="汇总"
                              displayField="code_value_name" options="hls_generate_rules_ds" required="true"
                              returnField="generate_rules" valueField="code_value"/>
                     <a:field name="generate_rules" defaultValue="N"/>
@@ -289,9 +289,9 @@
                     <a:column name="bp_name" prompt="客户名称" width="150"/>
                     <a:column name="due_amount" align="right" prompt="应扣金额" renderer="numberRenderer" width="120"/>
                     <a:column name="id_card_no" prompt="证件号" width="150"/>
-<!--                    <a:column name="contract_number" prompt="合同编号" width="150"/>-->
-<!--                    <a:column name="times" prompt="期数" width="150"/>-->
-<!--                    <a:column name="due_date" prompt="计划付款日" width="150"/>-->
+                    <a:column name="contract_number" prompt="合同编号" width="150"/>
+                    <a:column name="times" prompt="期数" width="150"/>
+                    <a:column name="due_date" prompt="计划付款日" width="150"/>
                 </a:columns>
             </a:grid>
             <a:hBox>

src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview

@@ -368,7 +368,12 @@
 
             var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
             var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
-
+            if (prj_project_ds_id == ds.id && prj_project_ds_id) {
+                if (record.get('pay_method') == 'CCB_THREE' && record.get('deduction_limit') <=0) {
+                    Leaf.showMessage('${l:HLS.PROMPT}', '扣款限额应大于0');
+                    return false;
+                }
+            }
             if (bp_tenant_detail_r && ds.id == prj_project_ds_id) {
                 for (var key in bp_tenant_detail_r.data) {
                     if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n') {
@@ -597,13 +602,13 @@
                     record.getField('repur_contract_id_n').setRequired(true);
                     record.getField('repur_contract_id').setReadOnly(false);
                     record.getField('repur_contract_id_n').setReadOnly(false);
-                }else if(record.get('secondary_lease') == 'NO'){
+                } else if (record.get('secondary_lease') == 'NO') {
                     record.getField('repur_contract_id').setRequired(false);
                     record.getField('repur_contract_id_n').setRequired(false);
                     record.getField('repur_contract_id').setReadOnly(true);
                     record.getField('repur_contract_id_n').setReadOnly(true);
-                    record.set('repur_contract_id',null);
-                    record.set('repur_contract_id_n',null);
+                    record.set('repur_contract_id', null);
+                    record.set('repur_contract_id_n', null);
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
                 }
@@ -624,17 +629,28 @@
 
                 }
                 //深圳美鹏和hcs显示分公司，其他隐藏
-                var bp_code='${/model/user_agent_description/record/@bp_code}';
-                if (!Ext.isEmpty(bp_code)&&bp_code!== 'D00010001'&&bp_code!=='D00000009') {
+                var bp_code = '${/model/user_agent_description/record/@bp_code}';
+                if (!Ext.isEmpty(bp_code) && bp_code !== 'D00010001' && bp_code !== 'D00000009') {
                     record.getField('branch_code').setRequired(false);
                     record.getField('branch_code_n').setRequired(false);
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_BRANCH_CODE_prompt').style.display = 'none';
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_BRANCH_CODE').style.display = 'none';
 
                 }
+                 //新增 “限制金额”字段；
+                 //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
+                if (record.get('PAY_METHOD') == 'CCB_THREE') {
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'block';
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'block';
+                    record.getField('deduction_limit').setRequired(true);
+                } else {
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'none';
+                    record.getField('deduction_limit').setRequired(false);
                 }
                 document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
                 document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
+            }
         };
 
         //更新时调用
@@ -785,9 +801,25 @@
                     }
 
                 }
+                //新增 “限制金额”字段；
+                //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
+                if (name=='pay_method') {
+                    if(value=='CCB_THREE'){
+                        document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'block';
+                        document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'block';
+                        record.getField('deduction_limit').setRequired(true);
+                       if(Ext.isEmpty(record.get('deduction_limit'))){
+                           record.set('deduction_limit',200000);
+                       }
+                    }else{
+                        record.getField('deduction_limit').setRequired(false);
+                        record.set('deduction_limit',null);
+                        document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'none';
+                        document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'none';
+                    }
                 }
 
-
+            }
             if (score_ds_id == ds.id) {
                 if (name == 'bp_birth' && value) {
                     if (jsGetAge(value.format('yyyy-mm-dd').toString()) == -1) {

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview

@@ -768,10 +768,25 @@
                         document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
                         document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
                     }
-
+                }
+                //新增 “限制金额”字段；
+                //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
+                if (name=='pay_method') {
+                    if(value=='CCB_THREE'){
+                        document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'block';
+                        document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'block';
+                        record.getField('deduction_limit').setRequired(true);
+                        if(Ext.isEmpty(record.get('deduction_limit'))){
+                            record.set('deduction_limit',200000);
+                        }
+                    }else{
+                        record.getField('deduction_limit').setRequired(false);
+                        record.set('deduction_limit',null);
+                        document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'none';
+                        document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'none';
+                    }
                 }
             }
-
             if (score_ds_id == ds.id) {
                 if (name == 'bp_birth' && value) {
                     if (jsGetAge(value.format('yyyy-mm-dd').toString()) == -1) {
@@ -860,6 +875,17 @@
                     record.getField('bank_account_id').setRequired(false);
                     record.getField('bank_account_id_n').setRequired(false);
                 }
+                //新增 “限制金额”字段；
+                //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
+                if (record.get('pay_method') == 'CCB_THREE') {
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'block';
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'block';
+                    record.getField('deduction_limit').setRequired(true);
+                } else {
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'none';
+                    record.getField('deduction_limit').setRequired(false);
+                }
                 if ('${/parameter/@function_usage}' != 'QUERY') {
                     if (record.get('secondary_lease') == 'YES') {
                         document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
@@ -1413,7 +1439,12 @@
             var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
             var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
             var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
-
+            if (prj_project_ds_id == ds.id && prj_project_ds_id) {
+                if (record.get('pay_method') == 'CCB_THREE' && record.get('deduction_limit') <= 0) {
+                    Leaf.showMessage('${l:HLS.PROMPT}', '扣款限额应大于0');
+                    return false;
+                }
+            }
             if (bp_tenant_detail_r && ds.id == prj_project_ds_id) {
                 for (var key in bp_tenant_detail_r.data) {
                     if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n') {

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview

@@ -130,10 +130,10 @@
                 // Leaf.showMessage('${l:PROMPT}', '${l:HLS.CALC_TYPE_IS_NULL}');
                 //    return;
             }
-            /*      if (record.dirty == true) {
+                if (record.dirty == true) {
                       Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
                       return;
-                  }*/
+                  }
             if ($(quotation_ds_id).validate()) {
                 /* if (!record.get('price_list') || !record.get('currency') || !record.get('lease_times')) {
                      Leaf.showMessage('${l:PROMPT}', '${l:HLS.QUOTATION_EXECUTE_AFTER_SAVE}');
@@ -306,7 +306,12 @@
             var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
             var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
             var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
-
+            if (prj_project_ds_id == ds.id && prj_project_ds_id) {
+                    if (record.get('pay_method') == 'CCB_THREE' && record.get('deduction_limit') < 0) {
+                        Leaf.showMessage('${l:HLS.PROMPT}', '扣款限额不能小于0');
+                      return false;
+                    }
+            }
             if (bp_tenant_detail_r && ds.id == prj_project_ds_id) {
                 for (var key in bp_tenant_detail_r.data) {
                     if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' &&  key != 'project_id'&& key != 'third_party_credibility' && key != 'third_party_credibility_n') {
@@ -495,7 +500,7 @@
 
         //选择事件(grid,attach,gridbox,table)
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_select'] = function (ds, record, bp_seq) {
-            var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BP', 'prj_project_bp');
+            var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BP', 'prj_project_bp');
             if (bp_ds_id == ds.id && bp_ds_id) {
                 if (record.get('bp_category') == 'TENANT') {
                     //实际为不选中
@@ -720,6 +725,17 @@
                     record.getField('bank_branch_name_n').setRequired(false);
 
                 }
+                //新增 “限制金额”字段；
+                //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
+                if (record.get('pay_method') == 'CCB_THREE') {
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'block';
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'block';
+                    record.getField('deduction_limit').setRequired(true);
+                } else {
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'none';
+                    record.getField('deduction_limit').setRequired(false);
+                }
                 if('${/parameter/@function_usage}'!='QUERY') {
                     if (record.get('secondary_lease') == 'YES') {
                         document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
@@ -964,7 +980,23 @@
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
                 }
-
+            }
+            //新增 “限制金额”字段；
+            //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
+            if (name=='pay_method') {
+                if(value=='CCB_THREE'){
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'block';
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'block';
+                    record.getField('deduction_limit').setRequired(true);
+                    if(Ext.isEmpty(record.get('deduction_limit'))){
+                        record.set('deduction_limit',200000);
+                    }
+                }else{
+                    record.getField('deduction_limit').setRequired(false);
+                    record.set('deduction_limit',null);
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'none';
+                }
             }
             if (score_ds_id == ds.id) {
                 if (name == 'bp_birth' && value) {

src/main/webapp/modules/rpt/RPT5012/rpt5012_repory_query.lview

@@ -89,7 +89,7 @@
                     <a:column name="is_buyout_n" align="center" prompt="是否买断机"  width="100"/>
                     <a:column name="modelcd" align="center" prompt=" 机型" width="180"/>
                     <a:column name="machine_number" align="center" prompt="机器号码"  width="80"/>
-                    <a:column name="int_rate_display" align="center" prompt="利率"  width="80"/>
+                    <a:column name="int_rate_display" exportDataFormat="" align="center" prompt="利率"  width="80"/>
                     <a:column name="int_rate_display" align="center" prompt="基准利率"  width="80"/>
                     <a:column name="lease_times" align="center" prompt="租赁期间"  width="80"/>
                     <a:column name="down_payment_ratio" align="center" prompt="首付款比率" width="80"/>

src/main/webapp/modules/zjwfl/zj_wfl_workflow.lview

@@ -76,6 +76,7 @@
             
             ]]></script>
         <a:dataSets>
+            <a:dataSet id="yes_no_ds" lookupCode="YES_NO"/>
             <a:dataSet id="sub_category_ds" lookupCode="ZJ_WFL_SUB_CATEGORY"/>
             <a:dataSet id="para_workflowDs" autoCreate="true" model="zjwfl.zj_wfl_workflow">
                 <a:fields>