Merge branch 'feature/农行扣款合并调整' into develop

src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_acr_abc_2_output_temp_for_maintain.lwm

 <?xml version="1.0" encoding="UTF-8"?>
-<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="HLS_ACR_EBANK_OUTPUT_TEMP">
+<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="HLS_ACR_EBANK_OUTPUT_TEMP" defaultOrderBy="t1.ebank_tmp_id">
     <bm:fields>
         <bm:field name="ebank_tmp_id" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EBANK_TMP_ID" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.EBANK_TMP_ID"/>
         <bm:field name="session_id" databaseType="NUMBER" datatype="java.lang.Double" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.SESSION_ID"/>

src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_acr_ebank_output_temp_for_maintain.lwm

 <?xml version="1.0" encoding="UTF-8"?>
-<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="HLS_ACR_EBANK_OUTPUT_TEMP">
+<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="HLS_ACR_EBANK_OUTPUT_TEMP" defaultOrderBy="t1.ebank_tmp_id">
     <bm:fields>
         <bm:field name="ebank_tmp_id" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EBANK_TMP_ID" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.EBANK_TMP_ID"/>
         <bm:field name="session_id" databaseType="NUMBER" datatype="java.lang.Double" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.SESSION_ID"/>

src/main/webapp/modules/hls_acr/HLS_ACR5010/acr_invoice_abc2_interface_excel_sheets.lsc

@@ -66,7 +66,7 @@
                     for (var i = 0;i < export_data.length;i++) {
 		                var f = export_data[i];
                         var write = "";
-	                    write = f.serial_no + split //顺序号
+	                    write = f.sequence_no + split //顺序号
 	                    + f.dd_bank_account_num + split //账号
 	                    + f.bp_name + split //户名
 	                    + f.due_amount + split //金额

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

@@ -38,15 +38,23 @@
             debugger;
             if ($('hls_acr_ebank_output_ds').validate()) {
                 var data = $('hls_acr_ebank_output_ds').getJsonData(false);
+                Leaf.Masker.mask(Ext.getBody(), '正在执行');
                 Leaf.request({
                     url: 'hls_acr_ebank_output_init.lsc',
                     para: data,
                     success: function (args) {
+                        Leaf.Masker.unmask(Ext.getBody());
                         file_name = args.result.file_name;
                         output_id = args.result.record.output_id;
                         $('hls_acr_ebank_output_temp_ds').setQueryParameter('output_id', output_id);
                         $('hls_acr_ebank_output_temp_ds').query();
                     },
+                    failure: function() {
+                        Leaf.Masker.unmask(Ext.getBody());
+                    },
+                    error: function() {
+                        Leaf.Masker.unmask(Ext.getBody());
+                    },
                     scope: this
                 });
             }
@@ -127,6 +135,7 @@
                 return;
             }
 
+     if (hd_record.get('generate_rules') =='N'){
             //add by wdd 20180530 for HL
             //导出时相同客户账号不能有多条校验
             var same_dd_bank_account_num_n = '';
@@ -147,6 +156,7 @@
                     }
                 }
             }
+        }
             if (!Ext.isEmpty(same_dd_bank_account_num_n)) {
                 Leaf.showMessage('提示', '客户账号 ' + same_dd_bank_account_num_n + '存在多条，不可导出，请核实！');
                 return;
@@ -232,9 +242,10 @@
                     <a:field name="currency_name" readOnly="true" defaultValue="人民币" displayField="currency_name"
                              options="hls_currency_ds" required="true" returnField="currency_code"
                              valueField="currency_code"/>
-                    <a:field name="payment_method_display" displayField="code_value_name"
+                    <a:field name="payment_method_display" readOnly="true" displayField="code_value_name"
                              options="hls_acr_payment_method_ds" required="true" returnField="payment_method"
-                             valueField="code_value"/>
+                             valueField="code_value" defaultValue="农行代扣（两方）"/>
+                    <a:field name="payment_method" defaultValue="ABC_2" readOnly="true"/>
                     <!-- <a:field name="payment_method_display" defaultValue="ABC" displayField="code_value_name" readOnly="true"  options="hls_acr_payment_method_ds" required="true" returnField="payment_method" valueField="code_value"/> -->
                     <!-- <a:field name="payment_method_display_n" defaultValue="农行代扣" displayField="code_value_name" readOnly="true" options="hls_acr_payment_method_ds" required="true" returnField="payment_method" valueField="code_value"/> -->
                     <a:field name="customer_type_display" displayField="code_value_name" options="hls_customer_type_ds"
@@ -247,10 +258,10 @@
                         </a:mapping>
                     </a:field>
                     <a:field name="limit_amount" validator="amountValidator"/>
-                    <a:field name="generate_rules_display" readOnly="false" defaultValue="汇总"
+                    <a:field name="generate_rules_display" readOnly="true" 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"/>
+                    <a:field name="generate_rules" defaultValue="Y"/>
                     <a:field name="contract_number"/>
                 </a:fields>
                 <a:events>

src/main/webapp/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_input.lview

@@ -21,8 +21,8 @@
                 var records = hd_ds.getSelected();
                 Leaf.showConfirm('${l:PROMPT}', '是否确定删除？', function() {
                     var detail_mask = Ext.getBody();
-                    Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
                     if (records.length) {
+                        Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
                         for (var i = 0;i < records.length;i++) {
                             var line_record = records[i];
                             if (line_record.get('handle_flag') == 'Y') {