[feat]合同变更功能调整

src/main/java/leaf/bm/QueryField.java

+/*
+ * Created on 2008-5-28
+ */
+package leaf.bm;
+
+import leaf.utils.ConfigUtils;
+import uncertain.composite.DynamicObject;
+import uncertain.core.ConfigurationError;
+import uncertain.exception.BuiltinExceptionFactory;
+import leaf.database.sql.BaseField;
+import leaf.database.sql.CompareExpression;
+import leaf.database.sql.Condition;
+import leaf.database.sql.ConditionList;
+import leaf.database.sql.ILogicalExpression;
+import leaf.database.sql.ISqlStatement;
+import leaf.database.sql.RawSqlExpression;
+
+public class QueryField extends DynamicObject {
+    
+    public static final String KEY_LOGICAL_OPERATOR = "logicaloperator";
+
+    public static final String KEY_FIELD = "field";
+    
+    public static final String KEY_NAME = "name";
+    
+    public static final String KEY_QUERY_OPERATOR = "queryoperator";
+    
+    public static final String KEY_MATCH_ANY="matchany";
+    
+    public boolean getMatchAny(){
+        if(Boolean.valueOf(ConfigUtils.getProp("leaf.queryMatchAny"))){
+            return getBoolean(KEY_MATCH_ANY, true);
+        }
+    	return getBoolean(KEY_MATCH_ANY, false);
+    }
+    
+    public void setMatchAny(boolean value){
+    	putBoolean(KEY_MATCH_ANY, value);
+    }
+    
+    public String getQueryOperator(){
+        return getString(KEY_QUERY_OPERATOR);
+    }
+    
+    public void setQueryOperator( String op ){
+        putString(KEY_QUERY_OPERATOR, op);
+    }
+    
+    public String getField(){
+        return getString(KEY_FIELD);
+    }
+    
+    public void setField( String field ){
+        putString(KEY_FIELD, field);
+    }
+    
+    public String getQueryExpression(){
+        return getString(Field.KEY_QUERY_EXPRESSION);
+    }
+    
+    public void setQueryExpression( String exp ){
+        putString( Field.KEY_QUERY_EXPRESSION, exp );
+    }
+    
+    public String getLogicalOperator(){
+        return getString(KEY_LOGICAL_OPERATOR);
+    }
+    
+    public void setLogicalOperator( String op){
+        putString(KEY_LOGICAL_OPERATOR, op);
+    }
+    
+    /*
+    public String getParameterPath(){
+        return getString(Field.KEY_PARAMETER_PATH);
+    }
+    
+    public void setParameterPath(String path){
+        putString(Field.KEY_PARAMETER_PATH, path);
+    }
+    */
+    
+    public String getName(){
+        return getString(Field.KEY_NAME);
+    }
+    
+    public void setName(String name){
+        putString(Field.KEY_NAME, name);
+    }
+    
+    public void addToWhereClause( ConditionList list, String param_path ){
+        addToWhereClause( list, null, param_path);
+    }
+    
+    public void addToWhereClause( ConditionList list, ISqlStatement left_field, String param_path ){
+        String op = getQueryOperator();
+        ILogicalExpression stmt = null;
+        if(op!=null){
+            //ISqlStatement left_field = base_field==null ? new RawSqlExpression(getName()) : (ISqlStatement) base_field;
+            int op_id = CompareExpression.getOperatorID(op);
+            if(op_id<0) throw new ConfigurationError("queryOperator '"+op+"' is invalid in query field config:"+getObjectContext().toXML());
+            if(CompareExpression.isSingleOperator(op_id))
+                stmt = new CompareExpression( left_field, op_id, null);
+            else{
+            	String sqlExpression=Field.defaultParamExpression(param_path);
+            	if(getMatchAny()&&"like".equalsIgnoreCase(op))
+            		sqlExpression="'%'||"+sqlExpression+"||'%'";            	
+            	stmt = new CompareExpression( left_field, op_id, new RawSqlExpression(sqlExpression));
+            }
+        }else{
+            String exp = getQueryExpression();
+            if(exp!=null) stmt = new RawSqlExpression(exp);
+            else
+                throw BuiltinExceptionFactory.createOneAttributeMissing(getObjectContext().asLocatable(), "queryOperator,queryExpression");
+        }
+        String logical_op = getLogicalOperator();
+        if(logical_op==null)
+            logical_op = Condition.AND;
+        if(stmt!=null)
+            list.addCondition(logical_op, stmt);
+        
+    }
+}

src/main/java/leaf/plugin/word2pdf/WordToPdf.java

@@ -35,6 +35,7 @@ public class WordToPdf {
 
     public static boolean word2pdf(String inFilePath, String outFilePath) {
         logger.info("Word转PDF开始启动...");
+        logger.info("Word转PDF开始启动..."+outFilePath);
         long start = System.currentTimeMillis();
         ActiveXComponent app = null;
         Dispatch doc = null;
@@ -170,9 +171,9 @@ public class WordToPdf {
 //		String jacobDllPath = "D:\\ideaProjects\\leaf-hlcm\\src\\main\\webapp\\WEB-INF\\server-script\\jacob\\jacob-1.18-x64.dll";
 //		System.setProperty("jacob.dll.path", jacobDllPath);
 //		System.setProperty("com.jacob.debug", "true");
-//		word2pdf("D:\\hand-Prpjects\\付款请求书打印.doc",
-//				"D:\\hand-Prpjects\\付款请求书打印.pdf");
-        cutPdf("D:\\\\hand-Prpjects\\\\付款请求书打印.pdf");
+//		word2pdf("D:\\u01\\hls_file\\excel\\8F5D12B0B1504518928FDD193C67A0A5con28168",
+//				"D:\\hand-Prpjects\\融资租赁合同文本-4pdf.pdf");
+//        cutPdf("D:\\\\hand-Prpjects\\\\付款请求书打印.pdf");
 //		excel2pdf("D:\\work\\leafProjects\\YondaTl\\src\\test.xlsx",
 //				"D:\\work\\leafProjects\\YondaTl\\src\\付款通知书NEW.pdf");
 //		excel2pdfOrientation("D:\\work\\leafProjects\\YondaTl\\src\\test.xlsx",

src/main/webapp/WEB-INF/classes/acp/ACP522/acp_import_contract_lov.lwm

@@ -15,7 +15,7 @@
                 from con_contract c
                 where c.data_class = 'NORMAL'
                 and c.contract_status  IN ('REPURING','ETING','INCEPT','PENDING')
-                and not exists (select 1 from acp_invoice_ln an where an.contract_id=c.contract_id and an.confirmation_status='APPROVING')
+                and not exists (select 1 from acp_invoice_ln an where an.contract_id=c.contract_id and an.confirmation_status in('APPROVING','APPROVED'))
                 ) V
                 #WHERE_CLAUSE#
                 ]]></bm:query-sql>

src/main/webapp/WEB-INF/classes/cont/CON500/con_file_content_copy_update.lwm

@@ -18,5 +18,22 @@
                 <bm:parameter name="record_id" dataType="java.lang.Double" output="true" outputPath="/parameter/@record_id"/>
              </bm:parameters>
         </bm:operation>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                    hls_doc_file_templet_pkg.office_insert_fnd_atm_new(
+                        p_table_name     =>${@table_name},
+                        p_table_pk_value =>${@content_id},
+                        p_file_name      =>${@file_name},
+                        p_file_path      =>${@file_path},
+                        p_user_id        =>nvl(${@user_id},${/session/@user_id}),
+                        p_source_type   =>${@source_type},
+                        p_file_size    =>${@file_size},
+                        p_file_type_code =>${@file_type_code},
+                        p_mime_type     => ${@mime_type}
+                    );
+                END;
+            ]]></bm:update-sql>
+        </bm:operation>
     </bm:operations>
 </bm:model>

src/main/webapp/WEB-INF/classes/cont/CON620/con_contract_dun_for_query.lwm

@@ -111,10 +111,10 @@
     </bm:operations>
     <bm:query-fields>
         <bm:query-field name="contract_number"
-                        queryExpression="contract_number like upper(&apos;%&apos;||${@contract_number}||&apos;%&apos;)"/>
+                        queryExpression="contract_number like ${@contract_number}"/>
         <bm:query-field name="bp_id_tenant" queryExpression="t1.bp_id_tenant = ${@bp_id_tenant}"/>
-        <bm:query-field name="contract_name" queryExpression="t1.contract_name = ${@contract_name}"/>
-        <bm:query-field name="project_number" queryExpression="t1.project_number = ${@project_number}"/>
+        <bm:query-field name="contract_name" queryExpression="t1.contract_name like ${@contract_name} "/>
+        <bm:query-field name="project_number" queryExpression="t1.project_number like ${@project_number}"/>
         <!--<bm:query-field name="bp_id_tenant_desc" queryExpression="t1.bp_id_tenant_desc like ${@bp_id_tenant_desc}"/>-->
         <bm:query-field name="bp_id_agent_desc" queryExpression="t1.bp_id_agent_desc like ${@bp_id_agent_desc}"/>
         <!-- <bm:query-field name="lease_start_date_from" queryExpression="t1.inception_of_lease &gt;=to_date(${@lease_start_date_from},&apos;yyyy-mm-dd&apos;)"/>

src/main/webapp/WEB-INF/classes/cont/CON_ET001/calc_et_date_amount.lwm

@@ -11,6 +11,8 @@
                 <bm:parameter name="fund_possession_time" dataType="java.lang.Double" input="false" output="true" outputPath="@fund_possession_time"/>
                 <bm:parameter name="fund_possession_cost" dataType="java.lang.Double" input="false" output="true" outputPath="@fund_possession_cost"/>
                 <bm:parameter name="sum_unreceived_principal" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_unreceived_principal"/>
+                <bm:parameter name="fund_possession_rate" dataType="java.lang.Double" input="false" output="true" outputPath="@fund_possession_rate"/>
+                <bm:parameter name="last_rent_due_date" dataType="date"  input="false" output="true" outputPath="@last_rent_due_date"/>
             </bm:parameters>
             <bm:update-sql><![CDATA[
                 BEGIN
@@ -25,6 +27,9 @@
                                                        p_fund_possession_time       => ${@fund_possession_time},
                                                        p_fund_possession_cost       => ${@fund_possession_cost},
                                                        p_sum_unreceived_principal   => ${@sum_unreceived_principal},
+                                                       p_fund_possession_rate=>${@fund_possession_rate},
+                                                       p_last_rent_due_date=>${@last_rent_due_date},
+                                                       p_residual_value=>${@residual_value},
                                                        p_user_id                    => ${/session/@user_id});
                 END;
                 ]]>

src/main/webapp/WEB-INF/classes/cont/CON_REPO001/calc_repo_date_amount.lwm

@@ -9,6 +9,7 @@
                 <bm:parameter name="sum_overdue_amount" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_overdue_amount"/>
                 <bm:parameter name="sum_unreceived_principal" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_unreceived_principal"/>
                 <bm:parameter name="due_amount" dataType="java.lang.Double" input="false" output="true" outputPath="@due_amount"/>
+                <bm:parameter name="penalty" dataType="java.lang.Double" input="false" output="true" outputPath="@penalty"/>
             </bm:parameters>
             <bm:update-sql><![CDATA[
                 BEGIN
@@ -20,6 +21,7 @@
                                                                 p_sum_overdue_amount         => ${@sum_overdue_amount},
                                                                 p_sum_unreceived_principal   => ${@sum_unreceived_principal},
                                                                 p_due_amount                 => ${@due_amount},
+                                                                p_penalty                     => ${@penalty},
                                                                 p_user_id                    => ${/session/@user_id});
                 END;
                 ]]>

src/main/webapp/WEB-INF/classes/cont/CON_REPO001/con_change_calc_from_con.lwm

 <?xml version="1.0" encoding="UTF-8"?>
-<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
     <bm:operations>
         <bm:operation name="execute">
             <bm:update-sql><![CDATA[

src/main/webapp/WEB-INF/classes/cont/CON_REPO001/con_change_calc_single_variable_calc.lwm

@@ -10,7 +10,8 @@
         <bm:operation name="update">
             <bm:update-sql><![CDATA[
             	begin
-            		  aux_single_variable_calc_pkg.calc_real_rate(p_calc_session_id =>${@calc_session_id},
+            		  cus_con_contract_repo_pkg.calc_repo_cashflow(p_contract_id=>${@contract_id},
+            		  p_calc_session_id =>${@calc_session_id},
                                               p_user_id => ${/session/@user_id},
                                               p_msg => ${@msg});
             	end;
@@ -22,12 +23,10 @@
         <bm:operation name="execute">
             <bm:update-sql><![CDATA[
             	begin
-            		  aux_single_variable_calc_pkg.manual_trial_after_calc(p_calc_session_id =>${@calc_session_id},
+            		  cus_con_contract_repo_pkg.calc_repo_cashflow(p_contract_id=>${@contract_id},
+            		                                  p_calc_session_id =>${@calc_session_id},
                                               p_user_id => ${/session/@user_id},
-                                              p_msg => ${@msg}
-
-                                            );
-
+                                              p_msg => ${@msg});
             	end;
             ]]></bm:update-sql>
             <bm:parameters>

src/main/webapp/WEB-INF/classes/csh/CSH514/csh_transaction_write_off_reverse.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
     <bm:operations>
         <bm:operation name="update">
             <bm:update-sql><![CDATA[

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/csh_transaction_miantain_query.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
+<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num" needAccessControl="false">
     <bm:fields>
         <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
         <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
@@ -116,8 +116,8 @@
         <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"/>
-        <bm:query-field field="receipt_type" queryOperator="="/>
-        <bm:query-field field="opposite_band_na" queryOperator="="/>
+        <bm:query-field field="receipt_type" queryOperator="like"/>
+        <bm:query-field field="opposite_band_na" queryOperator="like"/>
         <bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
         <bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
         <bm:query-field name="bank_slip_num" queryExpression="t1.bank_slip_num like &apos;%&apos;||${@bank_slip_num}||&apos;%&apos;"/>
@@ -145,6 +145,7 @@
         <bm:query-field field="reversed_flag" queryOperator="="/>
         <bm:query-field field="period_name" queryOperator="="/>
         <bm:query-field field="payment_method_id" queryOperator="="/>
+        <bm:query-field field="bp_bank_account_num" queryOperator="like"/>
         <!-- <bm:query-field field="posted_flag" queryOperator="="/> -->
         <bm:query-field field="transaction_category" queryOperator="="/>
         <bm:query-field field="transaction_type" queryOperator="="/>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_deposit_transfer_execute.lwm

@@ -27,6 +27,7 @@
             <bm:update-sql><![CDATA[
             	begin
            hlcm_cux_deposit_pkg.create_deposit_transfer_je(
+                          p_hd_contract_id=>${@hd_contract_id},
 			              p_contract_id=>${@source_contract_id},
 			              p_user_id=>${/session/@user_id}
             		);

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_query.lwm

@@ -26,6 +26,7 @@
             select * from ( select v1.contract_id,
             (select cc.contract_number from con_contract cc where cc.contract_id=v1.contract_id)contract_number,
             (select cc.contract_name from con_contract cc where cc.contract_id=v1.contract_id)contract_name,
+       --to_char(v1.unwrite_off_amount,'FM999,999,999,990.00')unwrite_off_amount,
        v1.unwrite_off_amount,
        v1.deposit_trans_type,
        (select t.bp_name
@@ -42,7 +43,8 @@
        (select v.code_value_name
           from sys_code_values_v v
          where v.code = 'DEPOSIT_TRANS_TYPE'
-           and v.code_value = v1.deposit_trans_type) deposit_trans_type_n
+           and v.code_value = v1.deposit_trans_type) deposit_trans_type_n,
+          nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id=>v1.contract_id,p_user_id=>1) ),'正常')approve_status
 
   from (select tt.ref_contract_id contract_id,
                tt.deposit_trans_type,
@@ -53,14 +55,15 @@
            and tt.ref_contract_id is not null
            and tt.transaction_amount > 0
            and tt.deposit_trans_type is not null
-         group by tt.ref_contract_id, tt.deposit_trans_type) v1)v
+         group by tt.ref_contract_id, tt.deposit_trans_type) v1
+          where v1.unwrite_off_amount>0)v
                 #WHERE_CLAUSE#
                 ]]></bm:query-sql>
         </bm:operation>
     </bm:operations>
-    <bm:data-filters>
-        <bm:data-filter name="query" expression="(v.unwrite_off_amount>0)"/>
-    </bm:data-filters>
+    <!--<bm:data-filters>-->
+        <!--<bm:data-filter name="query" expression="(to_number(v.unwrite_off_amount)>0)"/>-->
+    <!--</bm:data-filters>-->
     <bm:query-fields>
         <bm:query-field name="contract_number" queryExpression="v.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
         <bm:query-field name="bp_name_n" queryExpression="v.bp_name = ${@bp_name_n}"/>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT104/csh_transaction_maintain_query.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
+<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num" needAccessControl="false">
     <bm:fields>
         <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
         <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
@@ -103,6 +103,7 @@
         <bm:field name="deposit_trans_type_desc"  expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/>
         <bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
         <bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
+        <bm:field name="approve_status" expression=" nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_transaction_id=>t1.transaction_id,p_user_id=>1) ),'正常')" forInsert="false" forUpdate="false"/>
     </bm:fields>
     <bm:features>
         <f:standard-who/>
@@ -121,7 +122,7 @@
         <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"/>
         <bm:query-field field="receipt_type" queryOperator="="/>
-        <bm:query-field field="opposite_band_na" queryOperator="="/>
+        <bm:query-field field="opposite_band_na" queryOperator="like"/>
         <bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
         <bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
         <bm:query-field name="bank_slip_num" queryExpression="t1.bank_slip_num like &apos;%&apos;||${@bank_slip_num}||&apos;%&apos;"/>
@@ -149,6 +150,7 @@
         <bm:query-field field="reversed_flag" queryOperator="="/>
         <bm:query-field field="period_name" queryOperator="="/>
         <bm:query-field field="payment_method_id" queryOperator="="/>
+        <bm:query-field field="bp_bank_account_num" queryOperator="like"/>
         <!-- <bm:query-field field="posted_flag" queryOperator="="/> -->
         <bm:query-field field="transaction_category" queryOperator="="/>
         <bm:query-field field="transaction_type" queryOperator="="/>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
+<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num " needAccessControl="false">
     <bm:fields>
         <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
         <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
@@ -104,7 +104,7 @@
        <bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
         <bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
         <bm:field name="deposit_trans_type_desc"  expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/>
-
+       <bm:field name="approve_status" expression=" nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_transaction_id=>t1.transaction_id,p_user_id=>1) ),'正常')" forInsert="false" forUpdate="false"/>
     </bm:fields>
     <bm:features>
         <f:standard-who/>
@@ -123,7 +123,8 @@
         <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"/>
         <bm:query-field field="receipt_type" queryOperator="="/>
-        <bm:query-field field="opposite_band_na" queryOperator="="/>
+        <bm:query-field field="opposite_band_na" queryOperator="like"/>
+        <bm:query-field field="bp_bank_account_num" queryOperator="like"/>
         <bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
         <bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
         <bm:query-field name="bank_slip_num" queryExpression="t1.bank_slip_num like &apos;%&apos;||${@bank_slip_num}||&apos;%&apos;"/>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT110/csh_transaction_maintain_query.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
+<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num" needAccessControl="false">
     <bm:fields>
         <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
         <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT120/cus_deposit_calc_overdue_list_query.lwm

@@ -27,21 +27,22 @@
                nvl(t.accr_overdue_amount, 0) accr_overdue_amount
           from cus_deposit_overdue_temp t, CON_CONTRACT CC
          where t.contract_id = cc.contract_id
-         order by cc.contract_number, t.times) v
-
+         and  (nvl(t.overdue_amount, 0)>0 or nvl(t.accr_overdue_amount, 0)>0)
+         order by cc.contract_number, t.times
+        ) v
                 #WHERE_CLAUSE#
                 #ORDER_BY_CLAUSE#
                 ]]></bm:query-sql>
         </bm:operation>
     </bm:operations>
     <bm:query-fields>
-        <bm:query-field name="contract_number" queryExpression="v.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
+        <bm:query-field name="contract_number" queryExpression="v.contract_number like ${@contract_number}"/>
         <bm:query-field name="bp_id_agent_level1" queryExpression="v.bp_id_agent_level1 = ${@bp_id_agent_level1}"/>
         <bm:query-field name="bp_id_tenant" queryExpression="v.bp_id_tenant =${@bp_id_tenant}"/>
         <bm:query-field name="overdue_max_days_from" queryExpression="v.overdue_max_days &lt;= ${@overdue_max_days_from}"/>
         <bm:query-field name="overdue_max_days_to" queryExpression="v.overdue_max_days &gt;= ${@overdue_max_days_to}"/>
-        <bm:query-field name="due_date_from" queryExpression="v.due_date &lt;= ${@due_date_from}"/>
-        <bm:query-field name="due_date_to" queryExpression="v.due_date &gt;= ${@due_date_to}"/>
+        <bm:query-field name="due_date_from" queryExpression="v.due_date &gt;= ${@due_date_from}"/>
+        <bm:query-field name="due_date_to" queryExpression="v.due_date &lt;= ${@due_date_to}"/>
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter name="session_id" expression="v.session_id=${/session/@session_id}"/>

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

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
+<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num" needAccessControl="false">
     <bm:fields>
         <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
         <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
@@ -103,6 +103,7 @@
         <bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
         <bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
         <bm:field name="source_type"/>
+        <bm:field name="approve_status" expression=" nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_transaction_id=>t1.transaction_id,p_user_id=>1) ),'正常')" forInsert="false" forUpdate="false"/>
     </bm:fields>
     <bm:features>
         <f:standard-who/>
@@ -123,7 +124,7 @@
         <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"/>
         <bm:query-field field="receipt_type" queryOperator="="/>
-        <bm:query-field field="opposite_band_na" queryOperator="="/>
+        <bm:query-field field="opposite_band_na" queryOperator="like"/>
         <bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
         <bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
         <bm:query-field name="bank_slip_num" queryExpression="t1.bank_slip_num like &apos;%&apos;||${@bank_slip_num}||&apos;%&apos;"/>
@@ -155,6 +156,7 @@
         <bm:query-field field="transaction_type" queryOperator="="/>
         <bm:query-field field="transaction_id" queryOperator="="/>
         <bm:query-field field="collection_classes" queryOperator="="/>
+        <bm:query-field field="bp_bank_account_num" queryOperator="like"/>
         <bm:query-field name="bp_id_from" queryExpression="t1.bp_id &gt;= ${@bp_id_from}"/>
         <bm:query-field name="bp_id_to" queryExpression="t1.bp_id &lt;= ${@bp_id_to}"/>
         <bm:query-field name="reverse_write_off_amount_flag" queryExpression="t1.write_off_amount &gt; 0 and ${@reverse_write_off_amount_flag}=&apos;Y&apos;"/>

src/main/webapp/WEB-INF/classes/hls/HLS500/hls_fin_calc_single_variable_calc.lwm

@@ -10,7 +10,7 @@
         <bm:operation name="update">
             <bm:update-sql><![CDATA[
             	begin
-            		  aux_single_variable_calc_pkg.calc_real_rate(p_calc_session_id =>${@calc_session_id},
+            		  aux_single_variable_calc_pkg.calc_main(p_calc_session_id =>${@calc_session_id},
                                               p_user_id => ${/session/@user_id},
                                               p_msg => ${@msg});
             	end;
@@ -22,7 +22,7 @@
         <bm:operation name="execute">
             <bm:update-sql><![CDATA[
             	begin
-            		  aux_single_variable_calc_pkg.manual_trial_after_calc(p_calc_session_id =>${@calc_session_id},
+            		  aux_single_variable_calc_pkg.calc_main(p_calc_session_id =>${@calc_session_id},
                                               p_user_id => ${/session/@user_id},
                                               p_msg => ${@msg});
             	end;

src/main/webapp/WEB-INF/classes/rpt/RPT5010/rpt5010_date.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+                SELECT to_char(to_date(month||'01','YYYYMMDD'),'YYYY-MM-DD') AS DAY_1,
+                to_char(to_date(month||'01','YYYYMMDD') +1,'YYYY-MM-DD') AS DAY_2,
+                to_char(to_date(month||'01','YYYYMMDD') +2,'YYYY-MM-DD') AS DAY_3,
+                to_char(to_date(month||'01','YYYYMMDD') +3,'YYYY-MM-DD') AS DAY_4,
+                to_char(to_date(month||'01','YYYYMMDD') +4,'YYYY-MM-DD') AS DAY_5,
+                to_char(to_date(month||'01','YYYYMMDD') +5,'YYYY-MM-DD') AS DAY_6,
+                to_char(to_date(month||'01','YYYYMMDD') +6,'YYYY-MM-DD') AS DAY_7,
+                to_char(to_date(month||'01','YYYYMMDD') +7,'YYYY-MM-DD') AS DAY_8,
+                to_char(to_date(month||'01','YYYYMMDD') +8,'YYYY-MM-DD') AS DAY_9,
+                to_char(to_date(month||'01','YYYYMMDD') +9,'YYYY-MM-DD') AS DAY_10,
+                to_char(to_date(month||'01','YYYYMMDD') +10,'YYYY-MM-DD') AS DAY_11,
+                to_char(to_date(month||'01','YYYYMMDD') +11,'YYYY-MM-DD') AS DAY_12,
+                to_char(to_date(month||'01','YYYYMMDD') +12,'YYYY-MM-DD') AS DAY_13,
+                to_char(to_date(month||'01','YYYYMMDD') +13,'YYYY-MM-DD') AS DAY_14,
+                to_char(to_date(month||'01','YYYYMMDD') +14,'YYYY-MM-DD') AS DAY_15,
+                to_char(to_date(month||'01','YYYYMMDD') +15,'YYYY-MM-DD') AS DAY_16,
+                to_char(to_date(month||'01','YYYYMMDD') +16,'YYYY-MM-DD') AS DAY_17,
+                to_char(to_date(month||'01','YYYYMMDD') +17,'YYYY-MM-DD') AS DAY_18,
+                to_char(to_date(month||'01','YYYYMMDD') +18,'YYYY-MM-DD') AS DAY_19,
+                to_char(to_date(month||'01','YYYYMMDD') +19,'YYYY-MM-DD') AS DAY_20,
+                to_char(to_date(month||'01','YYYYMMDD') +20,'YYYY-MM-DD') AS DAY_21,
+                to_char(to_date(month||'01','YYYYMMDD') +21,'YYYY-MM-DD') AS DAY_22,
+                to_char(to_date(month||'01','YYYYMMDD') +22,'YYYY-MM-DD') AS DAY_23,
+                to_char(to_date(month||'01','YYYYMMDD') +23,'YYYY-MM-DD') AS DAY_24,
+                to_char(to_date(month||'01','YYYYMMDD') +24,'YYYY-MM-DD') AS DAY_25,
+                to_char(to_date(month||'01','YYYYMMDD') +25,'YYYY-MM-DD') AS DAY_26,
+                to_char(to_date(month||'01','YYYYMMDD') +26,'YYYY-MM-DD') AS DAY_27,
+                to_char(to_date(month||'01','YYYYMMDD') +27,'YYYY-MM-DD') AS DAY_28,
+                to_char(to_date(month||'01','YYYYMMDD') +28,'YYYY-MM-DD') AS DAY_29,
+                to_char(to_date(month||'01','YYYYMMDD') +29,'YYYY-MM-DD') AS DAY_30,
+                to_char(to_date(month||'01','YYYYMMDD') +30,'YYYY-MM-DD') AS DAY_31
+                FROM RPT5010_DAY_REPORT
+                where
+                 month = ${@month}
+                and rownum=1
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:data-filters><![CDATA[
+    ]]></bm:data-filters>
+</bm:model>

src/main/webapp/WEB-INF/classes/rpt/RPT5010/rpt5010_four_month.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+             select to_number(to_char(sysdate, 'YYYYMM')) value_code,
+       to_char(sysdate, 'YYYY') || '年' || to_char(sysdate, 'MM') || '月' value_name
+  from dual
+union
+select to_number(to_char(add_months(sysdate, -1), 'YYYYMM')) value_code,
+       to_char(add_months(sysdate, -1), 'YYYY') || '年' ||
+       to_char(add_months(sysdate, -1), 'MM') || '月' value_name
+  from dual
+union
+select to_number(to_char(add_months(sysdate, -2), 'YYYYMM')) value_code,
+       to_char(add_months(sysdate, -2), 'YYYY') || '年' ||
+       to_char(add_months(sysdate, -2), 'MM') || '月' value_name
+  from dual
+union
+select to_number(to_char(add_months(sysdate, -3), 'YYYYMM')) value_code,
+       to_char(add_months(sysdate, -3), 'YYYY') || '年' ||
+       to_char(add_months(sysdate, -3), 'MM') || '月' value_name
+  from dual
+order by value_code desc
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:data-filters><![CDATA[
+    ]]></bm:data-filters>
+</bm:model>

src/main/webapp/WEB-INF/classes/rpt/RPT5010/rpt5010_print.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: wuts  
+    $Date: 2018-12-21 上午10:43:21  
+    $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
+            		rpt5010_not_write_off_pkg.calc_month_days(
+            			p_month    =>${@month},
+                        p_user_id  =>${/session/@user_id},
+                        p_days     => ${@days}
+            		);
+            	end;
+            ]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="days" dataType="java.lang.Long" input="true" output="true" outputPath="/parameter/@days"/>
+            </bm:parameters>
+        </bm:operation>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+            	begin
+            		rpt5010_not_write_off_pkg.rpt5010_run_job(
+                        p_user_id  =>${/session/@user_id}
+            		);
+            	end;
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/rpt/RPT5010/rpt5010_result_query.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+                SELECT
+                    to_Char(amount_1,'FM999,999,999,999,990.00') amount_1,
+                    to_Char(principal_1,'FM999,999,999,999,990.00') principal_1,
+                    to_Char(interest_1,'FM999,999,999,999,990.00') interest_1,
+                    to_Char(amount_2,'FM999,999,999,999,990.00') amount_2,
+                    to_Char(principal_2,'FM999,999,999,999,990.00') principal_2,
+                    to_Char(interest_2,'FM999,999,999,999,990.00') interest_2,
+                    to_Char(amount_3,'FM999,999,999,999,990.00') amount_3,
+                    to_Char(principal_3,'FM999,999,999,999,990.00') principal_3,
+                    to_Char(interest_3,'FM999,999,999,999,990.00') interest_3,
+                    to_Char(amount_4,'FM999,999,999,999,990.00') amount_4,
+                    to_Char(principal_4,'FM999,999,999,999,990.00') principal_4,
+                    to_Char(interest_4,'FM999,999,999,999,990.00') interest_4,
+                    to_Char(amount_5,'FM999,999,999,999,990.00') amount_5,
+                    to_Char(principal_5,'FM999,999,999,999,990.00') principal_5,
+                    to_Char(interest_5,'FM999,999,999,999,990.00') interest_5,
+                    to_Char(amount_6,'FM999,999,999,999,990.00') amount_6,
+                    to_Char(principal_6,'FM999,999,999,999,990.00') principal_6,
+                    to_Char(interest_6,'FM999,999,999,999,990.00') interest_6,
+                    to_Char(amount_7,'FM999,999,999,999,990.00') amount_7,
+                    to_Char(principal_7,'FM999,999,999,999,990.00') principal_7,
+                    to_Char(interest_7,'FM999,999,999,999,990.00') interest_7,
+                    to_Char(amount_8,'FM999,999,999,999,990.00') amount_8,
+                    to_Char(principal_8,'FM999,999,999,999,990.00') principal_8,
+                    to_Char(interest_8,'FM999,999,999,999,990.00') interest_8,
+                    to_Char(amount_9,'FM999,999,999,999,990.00') amount_9,
+                    to_Char(principal_9,'FM999,999,999,999,990.00') principal_9,
+                    to_Char(interest_9,'FM999,999,999,999,990.00') interest_9,
+                    to_Char(amount_10,'FM999,999,999,999,990.00') amount_10,
+                    to_Char(principal_10,'FM999,999,999,999,990.00') principal_10,
+                    to_Char(interest_10,'FM999,999,999,999,990.00') interest_10,
+                    to_Char(amount_11,'FM999,999,999,999,990.00') amount_11,
+                    to_Char(principal_11,'FM999,999,999,999,990.00') principal_11,
+                    to_Char(interest_11,'FM999,999,999,999,990.00') interest_11,
+                    to_Char(amount_12,'FM999,999,999,999,990.00') amount_12,
+                    to_Char(principal_12,'FM999,999,999,999,990.00') principal_12,
+                    to_Char(interest_12,'FM999,999,999,999,990.00') interest_12,
+                    to_Char(amount_13,'FM999,999,999,999,990.00')amount_13,
+                    to_Char(principal_13,'FM999,999,999,999,990.00') principal_13,
+                    to_Char(interest_13,'FM999,999,999,999,990.00') interest_13,
+                    to_Char(amount_14,'FM999,999,999,999,990.00') amount_14,
+                    to_Char(principal_14,'FM999,999,999,999,990.00') principal_14,
+                    to_Char(interest_14,'FM999,999,999,999,990.00') interest_14,
+                    to_Char(amount_15,'FM999,999,999,999,990.00') amount_15,
+                    to_Char(principal_15,'FM999,999,999,999,990.00') principal_15,
+                    to_Char(interest_15,'FM999,999,999,999,990.00') interest_15,
+                    to_Char(amount_16,'FM999,999,999,999,990.00') amount_16,
+                    to_Char(principal_16,'FM999,999,999,999,990.00') principal_16,
+                    to_Char(interest_16,'FM999,999,999,999,990.00') interest_16,
+                    to_Char(amount_17,'FM999,999,999,999,990.00') amount_17,
+                    to_Char(principal_17,'FM999,999,999,999,990.00') principal_17,
+                    to_Char(interest_17,'FM999,999,999,999,990.00') interest_17,
+                    to_Char(amount_18,'FM999,999,999,999,990.00') amount_18,
+                    to_Char(principal_18,'FM999,999,999,999,990.00') principal_18,
+                    to_Char(interest_18,'FM999,999,999,999,990.00') interest_18,
+                    to_Char(amount_19,'FM999,999,999,999,990.00') amount_19,
+                    to_Char(principal_19,'FM999,999,999,999,990.00') principal_19,
+                    to_Char(interest_19,'FM999,999,999,999,990.00') interest_19,
+                    to_Char(amount_20,'FM999,999,999,999,990.00') amount_20,
+                    to_Char(principal_20,'FM999,999,999,999,990.00') principal_20,
+                    to_Char(interest_20,'FM999,999,999,999,990.00') interest_20,
+                    to_Char(amount_21,'FM999,999,999,999,990.00') amount_21,
+                    to_Char(principal_21,'FM999,999,999,999,990.00') principal_21,
+                    to_Char(interest_21,'FM999,999,999,999,990.00')interest_21,
+                    to_Char(amount_22,'FM999,999,999,999,990.00') amount_22,
+                    to_Char(principal_22,'FM999,999,999,999,990.00') principal_22,
+                    to_Char(interest_22,'FM999,999,999,999,990.00') interest_22,
+                    to_Char(amount_23,'FM999,999,999,999,990.00') amount_23,
+                    to_Char(principal_23,'FM999,999,999,999,990.00') principal_23,
+                    to_Char(interest_23,'FM999,999,999,999,990.00') interest_23,
+                    to_Char(amount_24,'FM999,999,999,999,990.00') amount_24,
+                    to_Char(principal_24,'FM999,999,999,999,990.00') principal_24,
+                    to_Char(interest_24,'FM999,999,999,999,990.00') interest_24,
+                    to_Char(amount_25,'FM999,999,999,999,990.00') amount_25,
+                    to_Char(principal_25,'FM999,999,999,999,990.00') principal_25,
+                    to_Char(interest_25,'FM999,999,999,999,990.00') interest_25,
+                    to_Char(amount_26,'FM999,999,999,999,990.00') amount_26,
+                    to_Char(principal_26,'FM999,999,999,999,990.00') principal_26,
+                    to_Char(interest_26,'FM999,999,999,999,990.00') interest_26,
+                    to_Char(amount_27,'FM999,999,999,999,990.00') amount_27,
+                    to_Char(principal_27,'FM999,999,999,999,990.00') principal_27,
+                    to_Char(interest_27,'FM999,999,999,999,990.00') interest_27,
+                    to_Char(amount_28,'FM999,999,999,999,990.00') amount_28,
+                    to_Char(principal_28,'FM999,999,999,999,990.00') principal_28,
+                    to_Char(interest_28,'FM999,999,999,999,990.00') interest_28,
+                    to_Char(amount_29,'FM999,999,999,999,990.00') amount_29,
+                    to_Char(principal_29,'FM999,999,999,999,990.00') principal_29,
+                    to_Char(interest_29,'FM999,999,999,999,990.00') interest_29,
+                    to_Char(amount_30,'FM999,999,999,999,990.00') amount_30,
+                    to_Char(principal_30,'FM999,999,999,999,990.00') principal_30,
+                    to_Char(interest_30,'FM999,999,999,999,990.00') interest_30,
+                    to_Char(amount_31,'FM999,999,999,999,990.00') amount_31,
+                    to_Char(principal_31,'FM999,999,999,999,990.00') principal_31,
+                    to_Char(interest_31,'FM999,999,999,999,990.00') interest_31,
+                    t1.contract_id,
+                    t1.contract_number,
+                    t1.tenant_name,
+                    t1.record_id
+                FROM
+                    RPT5010_DAY_REPORT T1 #WHERE_CLAUSE#
+                    order  BY T1.contract_id desc
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <!--   <bm:fields>
+        <bm:field name="record_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="RECORD_ID" prompt="RPT5010_DAY_REPORT.RECORD_ID"/>
+        <bm:field name="contract_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CONTRACT_ID" prompt="RPT5010_DAY_REPORT.CONTRACT_ID"/>
+        <bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NUMBER" prompt="RPT5010_DAY_REPORT.CONTRACT_NUMBER"/>
+        <bm:field name="tenant_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TENANT_NAME" prompt="RPT5010_DAY_REPORT.TENANT"/>
+        <bm:field name="amount_1" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_1" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_1"/>
+        <bm:field name="principal_1" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_1" prompt="RPT5010_DAY_REPORT.PRINCIPAL_1"/>
+        <bm:field name="interest_1" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_1" prompt="RPT5010_DAY_REPORT.INTEREST_1"/>
+        <bm:field name="amount_2" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_2" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_2"/>
+        <bm:field name="principal_2" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_2" prompt="RPT5010_DAY_REPORT.PRINCIPAL_2"/>
+        <bm:field name="interest_2" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_2" prompt="RPT5010_DAY_REPORT.INTEREST_2"/>
+        <bm:field name="amount_3" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_3" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_3"/>
+        <bm:field name="principal_3" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_3" prompt="RPT5010_DAY_REPORT.PRINCIPAL_3"/>
+        <bm:field name="interest_3" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_3" prompt="RPT5010_DAY_REPORT.INTEREST_3"/>
+        <bm:field name="amount_4" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_4" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_4"/>
+        <bm:field name="principal_4" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_4" prompt="RPT5010_DAY_REPORT.PRINCIPAL_4"/>
+        <bm:field name="interest_4" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_4" prompt="RPT5010_DAY_REPORT.INTEREST_4"/>
+        <bm:field name="amount_5" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_5" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_5"/>
+        <bm:field name="principal_5" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_5" prompt="RPT5010_DAY_REPORT.PRINCIPAL_5"/>
+        <bm:field name="interest_5" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_5" prompt="RPT5010_DAY_REPORT.INTEREST_5"/>
+        <bm:field name="amount_6" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_6" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_6"/>
+        <bm:field name="principal_6" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_6" prompt="RPT5010_DAY_REPORT.PRINCIPAL_6"/>
+        <bm:field name="interest_6" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_6" prompt="RPT5010_DAY_REPORT.INTEREST_6"/>
+        <bm:field name="amount_7" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_7" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_7"/>
+        <bm:field name="principal_7" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_7" prompt="RPT5010_DAY_REPORT.PRINCIPAL_7"/>
+        <bm:field name="interest_7" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_7" prompt="RPT5010_DAY_REPORT.INTEREST_7"/>
+        <bm:field name="amount_8" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_8" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_8"/>
+        <bm:field name="principal_8" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_8" prompt="RPT5010_DAY_REPORT.PRINCIPAL_8"/>
+        <bm:field name="interest_8" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_8" prompt="RPT5010_DAY_REPORT.INTEREST_8"/>
+        <bm:field name="amount_9" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_9" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_9"/>
+        <bm:field name="principal_9" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_9" prompt="RPT5010_DAY_REPORT.PRINCIPAL_9"/>
+        <bm:field name="interest_9" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_9" prompt="RPT5010_DAY_REPORT.INTEREST_9"/>
+        <bm:field name="amount_10" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_10" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_10"/>
+        <bm:field name="principal_10" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_10" prompt="RPT5010_DAY_REPORT.PRINCIPAL_10"/>
+        <bm:field name="interest_10" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_10" prompt="RPT5010_DAY_REPORT.INTEREST_10"/>
+        <bm:field name="amount_11" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_11" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_11"/>
+        <bm:field name="principal_11" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_11" prompt="RPT5010_DAY_REPORT.PRINCIPAL_11"/>
+        <bm:field name="interest_11" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_11" prompt="RPT5010_DAY_REPORT.INTEREST_11"/>
+        <bm:field name="amount_12" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_12" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_12"/>
+        <bm:field name="principal_12" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_12" prompt="RPT5010_DAY_REPORT.PRINCIPAL_12"/>
+        <bm:field name="interest_12" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_12" prompt="RPT5010_DAY_REPORT.INTEREST_12"/>
+        <bm:field name="amount_13" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_13" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_13"/>
+        <bm:field name="principal_13" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_13" prompt="RPT5010_DAY_REPORT.PRINCIPAL_13"/>
+        <bm:field name="interest_13" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_13" prompt="RPT5010_DAY_REPORT.INTEREST_13"/>
+        <bm:field name="amount_14" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_14" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_14"/>
+        <bm:field name="principal_14" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_14" prompt="RPT5010_DAY_REPORT.PRINCIPAL_14"/>
+        <bm:field name="interest_14" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_14" prompt="RPT5010_DAY_REPORT.INTEREST_14"/>
+        <bm:field name="amount_15" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_15" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_15"/>
+        <bm:field name="principal_15" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_15" prompt="RPT5010_DAY_REPORT.PRINCIPAL_15"/>
+        <bm:field name="interest_15" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_15" prompt="RPT5010_DAY_REPORT.INTEREST_15"/>
+        <bm:field name="amount_16" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_16" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_16"/>
+        <bm:field name="principal_16" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_16" prompt="RPT5010_DAY_REPORT.PRINCIPAL_16"/>
+        <bm:field name="interest_16" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_16" prompt="RPT5010_DAY_REPORT.INTEREST_16"/>
+        <bm:field name="amount_17" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_17" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_17"/>
+        <bm:field name="principal_17" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_17" prompt="RPT5010_DAY_REPORT.PRINCIPAL_17"/>
+        <bm:field name="interest_17" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_17" prompt="RPT5010_DAY_REPORT.INTEREST_17"/>
+        <bm:field name="amount_18" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_18" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_18"/>
+        <bm:field name="principal_18" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_18" prompt="RPT5010_DAY_REPORT.PRINCIPAL_18"/>
+        <bm:field name="interest_18" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_18" prompt="RPT5010_DAY_REPORT.INTEREST_18"/>
+        <bm:field name="amount_19" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_19" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_19"/>
+        <bm:field name="principal_19" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_19" prompt="RPT5010_DAY_REPORT.PRINCIPAL_19"/>
+        <bm:field name="interest_19" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_19" prompt="RPT5010_DAY_REPORT.INTEREST_19"/>
+        <bm:field name="amount_20" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_20" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_20"/>
+        <bm:field name="principal_20" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_20" prompt="RPT5010_DAY_REPORT.PRINCIPAL_20"/>
+        <bm:field name="interest_20" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_20" prompt="RPT5010_DAY_REPORT.INTEREST_20"/>
+        <bm:field name="amount_21" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_21" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_21"/>
+        <bm:field name="principal_21" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_21" prompt="RPT5010_DAY_REPORT.PRINCIPAL_21"/>
+        <bm:field name="interest_21" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_21" prompt="RPT5010_DAY_REPORT.INTEREST_21"/>
+        <bm:field name="amount_22" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_22" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_22"/>
+        <bm:field name="principal_22" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_22" prompt="RPT5010_DAY_REPORT.PRINCIPAL_22"/>
+        <bm:field name="interest_22" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_22" prompt="RPT5010_DAY_REPORT.INTEREST_22"/>
+        <bm:field name="amount_23" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_23" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_23"/>
+        <bm:field name="principal_23" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_23" prompt="RPT5010_DAY_REPORT.PRINCIPAL_23"/>
+        <bm:field name="interest_23" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_23" prompt="RPT5010_DAY_REPORT.INTEREST_23"/>
+        <bm:field name="amount_24" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_24" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_24"/>
+        <bm:field name="principal_24" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_24" prompt="RPT5010_DAY_REPORT.PRINCIPAL_24"/>
+        <bm:field name="interest_24" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_24" prompt="RPT5010_DAY_REPORT.INTEREST_24"/>
+        <bm:field name="amount_25" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_25" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_25"/>
+        <bm:field name="principal_25" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_25" prompt="RPT5010_DAY_REPORT.PRINCIPAL_25"/>
+        <bm:field name="interest_25" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_25" prompt="RPT5010_DAY_REPORT.INTEREST_25"/>
+        <bm:field name="amount_26" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_26" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_26"/>
+        <bm:field name="principal_26" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_26" prompt="RPT5010_DAY_REPORT.PRINCIPAL_26"/>
+        <bm:field name="interest_26" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_26" prompt="RPT5010_DAY_REPORT.INTEREST_26"/>
+        <bm:field name="amount_27" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_27" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_27"/>
+        <bm:field name="principal_27" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_27" prompt="RPT5010_DAY_REPORT.PRINCIPAL_27"/>
+        <bm:field name="interest_27" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_27" prompt="RPT5010_DAY_REPORT.INTEREST_27"/>
+        <bm:field name="amount_28" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_28" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_28"/>
+        <bm:field name="principal_28" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_28" prompt="RPT5010_DAY_REPORT.PRINCIPAL_28"/>
+        <bm:field name="interest_28" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_28" prompt="RPT5010_DAY_REPORT.INTEREST_28"/>
+        <bm:field name="amount_29" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_29" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_29"/>
+        <bm:field name="principal_29" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_29" prompt="RPT5010_DAY_REPORT.PRINCIPAL_29"/>
+        <bm:field name="interest_29" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_29" prompt="RPT5010_DAY_REPORT.INTEREST_29"/>
+        <bm:field name="amount_30" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_30" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_30"/>
+        <bm:field name="principal_30" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_30" prompt="RPT5010_DAY_REPORT.PRINCIPAL_30"/>
+        <bm:field name="interest_30" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_30" prompt="RPT5010_DAY_REPORT.INTEREST_30"/>
+        <bm:field name="amount_31" databaseType="NUMBER" datatype="java.lang.Double" physicalName="AMOUNT_31" prompt="RPT5010_DAY_REPORT.ATTRIBUTE_31"/>
+        <bm:field name="principal_31" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL_31" prompt="RPT5010_DAY_REPORT.PRINCIPAL_31"/>
+        <bm:field name="interest_31" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST_31" prompt="RPT5010_DAY_REPORT.INTEREST_31"/>
+        </bm:fields> -->
+    <bm:data-filters><![CDATA[
+    ]]></bm:data-filters>
+</bm:model>

src/main/webapp/WEB-INF/leaf.plugin.export.word/payment_apply_content.xml

@@ -5,7 +5,7 @@
 
 	</settings>
 	<body>
-		<p align="center" line="100" >
+		<p align="center" line="100">
 			<t bold="true" fontFamily="宋体" fontSize="20" fontColor="000000" >付款请求书</t>
 		</p>
 		<p line="200" >
@@ -141,134 +141,9 @@
 			</tr>
 		    </#list>
 		</#if>
-      <!-- 合计数据-->
-			<tr>
-					<tc width="2">
-						<!--
-								type:类型(top,bottom,left,right)
-								color:颜色 默认黑色
-								style: 边框style，默认single
-							-->
-						<p  align="center">
-							<t  fontFamily="宋体" fontSize="12" fontColor="000000"></t>
-						</p>
-					</tc>
-					<tc  span="3">
-						<p align="center">
-							<t  fontFamily="宋体" fontSize="12" fontColor="000000">合计</t>
-						</p>
-					</tc>
-					<tc width="2">
-						<p align="center">
-							<t  fontFamily="宋体" fontSize="12" fontColor="000000"></t>
-						</p>
-					</tc>
-	          <!--合同金额-->
-					<tc width="2">
-						<p align="center">
-							<t  fontFamily="宋体" fontSize="12" fontColor="000000">${model.getObject('/model/static_data/record/@sum_amount')!''}</t>
-						</p>
-					</tc>
-					<tc width="6">
-						<p align="center">
-							<t  fontFamily="宋体" fontSize="12" fontColor="000000">${model.getObject('/model/static_data/record/@sum_amount_vender')!''}</t>
-						</p>
-					</tc>
-					<tc width="4">
-						<p align="center">
-							<t  fontFamily="宋体" fontSize="12" fontColor="000000">${model.getObject('/model/static_data/record/@sum_amount_agent')!''}</t>
-						</p>
-					</tc>
-	            <!--客户名称-->
-					<tc width="6">
-						<p align="center">
-							<t  fontFamily="宋体" fontSize="12" fontColor="000000"></t>
-						</p>
-					</tc>
-					<tc width="6">
-						<p align="center">
-							<t  fontFamily="宋体" fontSize="12" fontColor="000000">${model.getObject('/model/static_data/record/@sum_other_payment')!''}</t>
-						</p>
-					</tc>
-					<tc width="4">
-						<p align="center">
-							<t  fontFamily="宋体" fontSize="12" fontColor="000000"></t>
-						</p>
-					</tc>
-
-				</tr>
 
        </tbl>
 
-		<p line="200" >
-			<t fontFamily="宋体" fontSize="12" fontColor="000000" >备注:以上款项如核对无误,烦请贵司向我司付款${model.getObject('/model/static_data/record/@sum_amount_agent')!''}元,向${model.getObject('/model/bank_info/record/@vender_name')!''}付款${model.getObject('/model/static_data/record/@sum_amount_vender')!''}元。特此申请!	</t>
-		</p>
-		<p indFirstLine="1" line="200" >
-			<t fontFamily="宋体" fontSize="12" fontColor="000000" >本公司和${model.getObject('/model/bank_info/record/@vender_name')!''}的一切债权债务关系由本公司和${model.getObject('/model/bank_info/record/@vender_name')!''}自行解决和宏菱融资租赁（上海）有限公司无关。</t>
-		</p>
-		<p indFirstLine="1" line="200" >
-			<t fontFamily="宋体" fontSize="12" fontColor="000000" >烦请贵司将款项汇至以下账号:</t>
-		</p>
-        <p height="0.1"/>
-		<tbl indLeft="1" border="false">
-		<tr height="0.3">
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体">开户名:${model.getObject('/model/bank_info/record/@agent_account_name')!''}</t></p>
-			</tc>
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体">开户名:${model.getObject('/model/bank_info/record/@vender_account_name')!''}</t></p>
-			</tc>
-		</tr>
-		<tr height="0.3">
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体">开户行:${model.getObject('/model/bank_info/record/@agent_bank_name')!''}</t></p>
-			</tc>
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体">开户行:${model.getObject('/model/bank_info/record/@vender_bank_name')!''}</t></p>
-			</tc>
-		</tr>
-		<tr height="0.3">
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体">账号:${model.getObject('/model/bank_info/record/@agent_bank_num')!''}</t></p>
-			</tc>
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体">账号:${model.getObject('/model/bank_info/record/@vender_bank_num')!''}</t></p>
-			</tc>
-		</tr>
-		<tr height="0.3">
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体"></t></p>
-			</tc>
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体"></t></p>
-			</tc>
-
-		</tr>
-		<tr height="0.3">
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体">委托收款人确认金额无误</t></p>
-			</tc>
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体">委托公司名称:${model.getObject('/model/bank_info/record/@agent_name')!''}</t></p>
-			</tc>
-		</tr>
-		<tr height="0.3">
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体">收款人:${model.getObject('/model/bank_info/record/@vender_name')!''}</t></p>
-			</tc>
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体">申请日期:${model.getObject('/model/bank_info/record/@current_date')!''}</t></p>
-			</tc>
-		</tr>
-		<tr height="0.3">
-			<tc width="10">
-				<p indFirstLine="1"><t fontSize="12" fontFamily="宋体">确认日期:</t></p>
-			</tc>
-			<tc width="10">
-				<p align="left"><t fontSize="12" fontFamily="宋体"></t></p>
-			</tc>
-		</tr>
-		</tbl>
 <!--		<p indFirstLine="1" line="200" >-->
 <!--			<t fontFamily="宋体" fontSize="12" fontColor="000000" >开户名:${model.getObject('/model/bank_info/record/@agent_account_name')!''}			                         开户名:${model.getObject('/model/bank_info/record/@vender_account_name')!''}	</t>-->
 <!--		</p>-->
@@ -287,7 +162,7 @@
 <!--		<p indFirstLine="9" line="200">-->
 <!--			<t fontFamily="宋体" fontSize="12" fontColor="000000">                                                               确认日期:</t>-->
 <!--		</p>-->
-        <p orientation="landscape">
-		</p>
+<!--        <p orientation="landscape">-->
+<!--		</p>-->
 	</body>
 </doc>
\ No newline at end of file

src/main/webapp/WEB-INF/server-script/contract_print_path.js

@@ -20,5 +20,6 @@ var con_print_path = {
 
 
 function set_parameter_file_path(name) {
-	$ctx.parameter.file_path = '/u01/hls_file/excel/';
+	$ctx.parameter.file_path = 'D:/u01/hls_file/excel/';
+	$ctx.parameter.pdf_path = 'D:/u01/hls_file/content_pdf/';
 };

src/main/webapp/WEB-INF/server-script/layoutconfig/jcredit_entrance_con_detail_g_result_queryfields.js

+var override_queryfields = [
+    {
+        field : 'bp_credit_hd_id',
+        queryoperator : "="
+    }
+
+];
+
+override();

src/main/webapp/WEB-INF/server-script/layoutconfig/project_modify_entrance_g_project_result_queryfields.js

@@ -19,10 +19,7 @@ var override_queryfields = [
 	name : 'bp_id',
 	queryexpression : "exists (select 1 from prj_project_bp b where b.project_id=t1.project_id and b.bp_id=${@bp_id})"
 },
-{
-	name : 'bp_name',
-	queryexpression : "exists (select 1 from prj_project_bp_v b where b.project_id=t1.project_id and b.bp_name like ${@bp_name})"
-},
+
 //{
 //	field : 'employee_id',
 //	queryoperator : "="

src/main/webapp/main.lview

@@ -40,6 +40,8 @@
             $session.subject = 'HAP';
             }
             $ctx.parameter.global_tab_flag='Y';
+
+
             ]]>
         </s:server-script>
     </a:init-procedure>
@@ -187,6 +189,87 @@
             }
         </style>
         <script type="text/javascript"><![CDATA[
+
+        if (!document.querySelectorAll) {
+            document.querySelectorAll = function (selectors) {
+                var style = document.createElement('style'), elements = [], element;
+                document.documentElement.firstChild.appendChild(style);
+                document._qsa = [];
+
+                style.styleSheet.cssText = selectors + '{x-qsa:expression(document._qsa && document._qsa.push(this))}';
+                window.scrollBy(0, 0);
+                style.parentNode.removeChild(style);
+
+                while (document._qsa.length) {
+                    element = document._qsa.shift();
+                    element.style.removeAttribute('x-qsa');
+                    elements.push(element);
+                }
+                document._qsa = null;
+                return elements;
+            };
+        }
+
+        if (!document.querySelector) {
+            document.querySelector = function (selectors) {
+                var elements = document.querySelectorAll(selectors);
+                return (elements.length) ? elements[0] : null;
+            };
+        }
+
+        // 用于在IE6和IE7浏览器中，支持Element.querySelectorAll方法
+        var qsaWorker = (function () {
+            var idAllocator = 10000;
+
+            function qsaWorkerShim(element, selector) {
+                var needsID = element.id === "";
+                if (needsID) {
+                    ++idAllocator;
+                    element.id = "__qsa" + idAllocator;
+                }
+                try {
+                    return document.querySelectorAll("#" + element.id + " " + selector);
+                }
+                finally {
+                    if (needsID) {
+                        element.id = "";
+                    }
+                }
+            }
+
+            function qsaWorkerWrap(element, selector) {
+                return element.querySelectorAll(selector);
+            }
+
+            // Return the one this browser wants to use
+            return document.createElement('div').querySelectorAll ? qsaWorkerWrap : qsaWorkerShim;
+        })();
+        if ( !Array.prototype.forEach ) {
+            Array.prototype.forEach = function forEach( callback, thisArg ) {
+                var T, k;
+                if ( this == null ) {
+                    throw new TypeError( "this is null or not defined" );
+                }
+                var O = Object(this);
+                var len = O.length >>> 0;
+                if ( typeof callback !== "function" ) {
+                    throw new TypeError( callback + " is not a function" );
+                }
+                if ( arguments.length > 1 ) {
+                    T = thisArg;
+                }
+                k = 0;
+                while( k < len ) {
+                    var kValue;
+                    if ( k in O ) {
+                        kValue = O[ k ];
+                        callback.call( T, kValue, k, O );
+                    }
+                    k++;
+                }
+            };
+        }
+
         function refreshFrame() {
             $("mainTab").selectTab($("mainTab").getTab($("mainTab").activeTab).index, true);
         }
@@ -2172,7 +2255,7 @@
         !function () {
             document.getElementById('fast_button').style.width = '336px';
             Leaf.request({
-                url: $('bmLink_function_query').getUrl(),
+                url: $('').getUrl(),
                 para: {
                     role_id: ${/session/@role_id}
                 },

src/main/webapp/modules/acp/ACP522/ap_invoice_import_detail.lview

@@ -7,6 +7,7 @@
     <a:view>
         <a:link id="acp_invoice_inf_import_link" model="acp.ACP522.acp_invoice_inf_import" modelaction="update"/>
         <a:link id="acp_invoice_inf_import_submit_link" model="acp.ACP522.acp_invoice_inf_import" modelaction="execute"/>
+        <script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
         <script><![CDATA[
         //移除前事件(grid,attach,gridbox,table)
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_brfore_remove'] = function(ds, record, bp_seq) {
@@ -39,7 +40,7 @@
             var hd_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'acp_invoice_ln');
             var hd_record = $(hd_id).getAt(0);
-            var lease_item_amount=hd_record.get('lease_item_amount')*1;
+            var lease_item_amount=hd_record.get('lease_item_amount');
             if($(ds_id).getAll().dirty){
                 alert(111);
                 return;
@@ -59,7 +60,8 @@
                         return;
                     }
                     var tempa=records[i].get('total_amount')||0;
-                    var tempb=((records[i].get('net_amount')||0)+(records[i].get('tax_amount')||0));
+                    //var tempb=((records[i].get('net_amount')||0)+(records[i].get('tax_amount')||0));
+                    var tempb=plus((records[i].get('net_amount')||0),(records[i].get('tax_amount')||0));
                     if(tempa!=tempb){
                         Leaf.showMessage('提示', '发票明细行存在价税合计不等于不含税金额和税额之和！');
                         return;
@@ -70,12 +72,12 @@
                     if (!isNaN(n)) {
                         sum = plus(sum, n);
                     }
-                    for (var j =i+1;j < records.length;j++) {
-                        if(records[i].get('invoice_code')==records[j].get('invoice_code')||records[i].get('invoice_number')==records[j].get('invoice_number')){
-                            Leaf.showMessage('提示', '发票代码和发票号码不能重复！');
-                            return;
-                        }
-                    }
+                    // for (var j =i+1;j < records.length;j++) {
+                    //     if(records[i].get('invoice_code')==records[j].get('invoice_code')||records[i].get('invoice_number')==records[j].get('invoice_number')){
+                    //         Leaf.showMessage('提示', '发票代码和发票号码不能重复！');
+                    //         return;
+                    //     }
+                    // }
                 }
                 if(sum!=lease_item_amount){
                     Leaf.showMessage('提示', '本次发票明细含税总计不等于该合同设备价！');

src/main/webapp/modules/acr/ACR510/acr_invoice_create_penalty_invoice.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	&author:niminmin
+	$date:2013/05/08
+	$purpose:罚息发票创建
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
+    <a:init-procedure>
+        <a:model-query model="basic.sys_session_info" rootPath="default_value_record"/>
+        <a:model-query model="acr.ACR510.acr_invoice_group_billing_method" rootPath="group_billing_method_list"/>
+    </a:init-procedure>
+    <a:view>
+        <a:link id="svcLink_create_invoice" url="${/request/@context_path}/modules/acr/ACR510/acr_invoice_create.lsc"/>
+        <a:screen-include screen="modules/hls/hls_common_javascript.lview"/>
+        <script><![CDATA[
+        function createScreen_close()
+        {
+            var win = $('acr_invoice_create_invoice');
+            win.close();
+        }
+        function colum_caculateTotal(data, name) {
+            var total = 0;
+            var length = data.length;
+            var value = 0;
+            for (var i = 0;i < length;i++) {
+                if (Ext.isEmpty(data[i].get(name))) {
+                    value = 0;
+                } else {
+                    value = data[i].get(name);
+                }
+                total = plus(total, value);
+            }
+            return '<font color=red>' + Leaf.formatMoney(total) + '</font>';
+        }
+
+        function sum_foot(data, name) {
+            if (name == 'billing_amount') {
+                return colum_caculateTotal(data, name);
+            }
+
+        }
+
+        function createScreen_create()
+        {
+            var win = $('acr_invoice_create_invoice');
+            var ds=$('headDs');
+            if(!ds.validate(true))
+            {
+                Leaf.Masker.unmask(Ext.getBody());
+                return;
+            }
+            //判断本次开票金额是否为租金，本金，和利息之中某一个
+            var selectedDs=$('selectedDs').getAll();
+            for(var i=0;i<selectedDs.length;i++){
+                var billing_amount=selectedDs[i].get('billing_amount');
+                var due_amount=selectedDs[i].get('due_amount');
+                var principal=selectedDs[i].get('principal');
+                var interest=selectedDs[i].get('interest');
+                var cf_billing_amount=selectedDs[i].get('cf_billing_amount');
+
+
+                if(billing_amount!=due_amount &&billing_amount!=principal &&billing_amount!=interest){
+                   $L.showErrorMessage("提示","本次开票金额需与应收金额，应收本金，应收利息中的某一金额一致！");
+                   return;
+                }
+                if(billing_amount==cf_billing_amount){
+                    $L.showErrorMessage("提示","该金额已经开票过！");
+                    return;
+                }
+
+
+
+            }
+
+            var datas = ds.getJsonData();
+            Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认开票？',function()
+            {
+                Leaf.request({
+                    url: $('svcLink_create_invoice').getUrl(),
+                    para: datas,
+                    success: function(res) {
+                        createScreen_close();
+                        contractDs_grid_query();
+                    },
+                    failure: function() {
+                        Leaf.Masker.unmask(Ext.getBody());
+
+                    },
+                    error: function() {
+                        Leaf.Masker.unmask(Ext.getBody());
+
+                    },
+                    scope: this
+                });
+            },function (){
+                Leaf.Masker.unmask(Ext.getBody());
+
+            });
+
+        }
+
+        function unSelect_selectedDs(ds,record){
+            record.dirty = false;
+        }
+
+        function onSelect_selectedDs(ds,record){
+            record.dirty = true;
+        }
+
+        function onLoad_selectedDs(ds)
+        {
+            ds.selectAll.defer(5,ds);
+            var records=ds.getAll();
+            for (var i=0;i<records.length;i++) {
+                if (records[i].get('invoice_kind') && records[i].get('invoice_kind')=='RECEIPT' && records[i].get('cf_item') && records[i].get('cf_item')=='51') {
+                    records[i].set('product_name','保证金');
+                }
+            }
+        }
+        ]]></script>
+        <style><![CDATA[
+        .item-radio-option {
+            margin-right: 50px;
+        }
+        ]]></style>
+        <a:dataSets>
+            <a:dataSet id="invoiceKindDs" lookupCode="ACR510_INVOICE_KIND"/>
+            <a:dataSet id="headDs" autoCreate="true">
+                <a:fields>
+                    <a:field name="company_id" defaultValue="${/parameter/@company_id}"/>
+                    <a:field name="group_billing_method" defaultValue="GROUP_BY_TIMES"/>
+                    <a:field name="accounting_date" defaultValue="${/model/default_value_record/record/@today}" required="true"/>
+                    <a:field name="invoice_date" defaultValue="${/model/default_value_record/record/@today}" required="true"/>
+                </a:fields>
+            </a:dataSet>
+
+            <a:dataSet id="selectedDs" autoQuery="true" bindName="line_info" bindTarget="headDs" fetchAll="true" model="acr.ACR510.acr_invoice_create" selectable="true">
+                <a:fields>
+                    <a:field name="billing_amount" required="true"/>
+                    <a:field name="product_name" required="true"/>
+                    <a:field name="invoice_kind"/>
+                    <a:field name="invoice_kind_desc" displayField="code_value_name" options="invoiceKindDs" required="true" returnField="invoice_kind" valueField="code_value"/>
+                    <a:field name="billing_object"/>
+                    <a:field name="billing_object_name" prompt="开票对象名称"/>
+
+                </a:fields>
+                <a:events>
+                    <a:event name="load" handler="onLoad_selectedDs"/>
+                    <a:event name="select" handler="onSelect_selectedDs"/>
+                    <a:event name="unselect" handler="unSelect_selectedDs"/>
+                </a:events>
+            </a:dataSet>
+        </a:dataSets>
+        <a:screenBody>
+            <a:screenTopToolbar>
+                <a:gridButton click="createScreen_close" text="HLS.CLOSE"/>
+                <a:gridButton click="createScreen_create" text="HLS.CREATE"/>
+            </a:screenTopToolbar>
+            <a:form column="3" labelWidth="120">
+                <a:datePicker name="invoice_date" bindTarget="headDs" prompt="开票申请日期"/>
+                <a:datePicker name="accounting_date" bindTarget="headDs" prompt="HLS.ACCOUNT_DATE"/>
+            </a:form>
+            <a:tabPanel marginHeight="220" marginWidth="30">
+                <a:tabs>
+                    <a:tab prompt="ACR510.TAB.BILLING_INFO" width="100">
+                        <a:grid id="selectedDs_grid" bindTarget="selectedDs" marginHeight="270" marginWidth="60">
+                            <a:columns>
+                                <a:column name="contract_number" width="150"/>
+                                <a:column name="times" align="right" width="40"/>
+                                <a:column name="cf_item_desc"/>
+                                <a:column name="product_name" editor="selectedDs_grid_editor_tf" width="150"/>
+                                <a:column name="invoice_kind_desc" editor="selectedDs_grid_editor_comb"/>
+                                <a:column name="billing_object_name" width="150"/>
+
+                                <a:column name="currency_desc" align="center"/>
+                                <a:column name="due_amount" align="right" renderer="Leaf.formatMoney"/>
+                                <a:column name="principal" align="right" renderer="Leaf.formatMoney"/>
+                                <a:column name="interest" align="right" renderer="Leaf.formatMoney"/>
+                                <a:column name="received_amount" align="right" renderer="Leaf.formatMoney"/>
+                                <a:column name="cf_billing_amount" align="right" renderer="Leaf.formatMoney"/>
+                                <a:column name="billing_amount" align="right" editor="selectedDs_grid_editor_nf" renderer="Leaf.formatMoney" footerRenderer="sum_foot"/>
+                            </a:columns>
+                            <a:editors>
+                                <a:comboBox id="selectedDs_grid_editor_comb"/>
+                                <a:textField id="selectedDs_grid_editor_tf"/>
+                                <a:numberField id="selectedDs_grid_editor_nf"/>
+                            </a:editors>
+                        </a:grid>
+                    </a:tab>
+                    <a:tab prompt="ACR510.TAB.ASSIST_INFO" width="100">
+                        <a:grid id="selectedDs_grid_2" bindTarget="selectedDs" marginHeight="270" marginWidth="60">
+                            <a:columns>
+                                <a:column name="contract_number" width="150"/>
+                                <a:column name="times" align="right" width="40"/>
+                                <a:column name="cf_item_desc"/>
+                                <a:column name="contract_name" width="200"/>
+                                <a:column name="project_number" width="150" prompt="报单编号"/>
+                                <a:column name="project_name" width="200" prompt="报单名称"/>
+                                <a:column name="last_received_date" renderer="Leaf.formatDate" width="80"/>
+                             <!--   <a:column name="exchange_rate" align="right"/>
+                                <a:column name="exchange_rate_type_desc"/>-->
+                            </a:columns>
+                        </a:grid>
+                    </a:tab>
+                </a:tabs>
+            </a:tabPanel>
+            <a:fieldSet title="ACR.GROUP_BILLING_METHOD">
+                <a:radio name="group_billing_method" bindTarget="headDs" labelField="code_value_name" options="/model/group_billing_method_list" prompt="" radioSeparator="" valueField="code_value" width="600"/>
+            </a:fieldSet>
+        </a:screenBody>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc

@@ -3,9 +3,11 @@
     <a:init-procedure>
         <a:model-query fetchAll="true" model="cont.CON500.con_contract_get_guid_file_name" rootPath="guid_file_name_path"/>
         <!--<a:model-query fetchAll="true" model="cont.CON500.con_doc_file_templet_get_atm" rootPath="file_templet_get_atm_path"/>-->
-        <s:server-script><![CDATA[
-            importPackage(Packages.hls.plugin.docx4j);
+        <s:server-script import="contract_print_path.js"><![CDATA[
             importPackage(java.io);
+            importPackage(Packages.hls.plugin.docx4j);
+            importPackage(Packages.leaf.plugin.word2pdf);
+            importPackage(Packages.org.apache.commons.io);
             
             function copyFile(fOld, fNew) {
                 var fis = new java.io.FileInputStream(fOld);
@@ -18,15 +20,49 @@
                 fis.close();
                 fos.close();
             }
+                //删除文件
+            function deleteFile(filePath) {
+                var file = new File(filePath);
+                if (file.exists()) {
+                    file.delete();
+                }
+            }
+
+            //生成pdf
+               function wordToPdf(word_file_path,pdf_file_path) {
+                // word转pdf
+                var pdf_file_path_new = pdf_file_path + '.pdf';
+                var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.18-x64.dll");
+                wordToPdf.word2pdf(word_file_path, pdf_file_path_new);
+                //删除word文件
+               // deleteFile(word_file_path);
+
+                return pdf_file_path_new;
+            }
+
+             //按日期创建目录
+            function getDatePath() {
+                set_parameter_file_path();
+                var file_path = $ctx.parameter.pdf_path; //file_path = c:/hls_test_files/content_files/
+                var now = new Date()
+                y = now.getFullYear()
+                m = now.getMonth() + 1
+                m = m < 10 ? "0" + m : m
+                var datePath = file_path + y + "/" + m + "/";
+                return datePath; //datePath = d:/hls_test_files/fileupload/2018/04/
+            }
+
             //第一步生成合同文本
                $bm('cont.CON505.con_contract_create_content').update({
                 contract_id: $ctx.parameter.contract_id,
                 content_type:'NORMAL'
                });
-            //var from_file_data = $ctx.get('/model/file_templet_get_atm_path').getChildren();
+               var datePath = getDatePath();
+                FileUtils.forceMkdir(new File(datePath)); //根据日期创建目录
+
              var from_file_data_map=$bm('cont.CON500.con_doc_file_templet_get_atm').queryAsMap({
                 contract_id:$ctx.parameter.contract_id,
-                batch_flag:$ctx.parameter.batch_flag,
+                batch_flag:$ctx.parameter.batch_flag
                 });
               var from_file_data = from_file_data_map.getChildren();
             for (var i = 0;i < from_file_data.length;i++) {
@@ -42,28 +78,36 @@
 
                     copyFile(from_file_path, to_file_path);
 
-                    $bm('cont.CON500.con_file_content_copy_update').update({
-                        table_name: 'CON_CONTRACT_CONTENT',
-                        content_id: record_data.content_id,
-                        file_name: to_file_name.toString(),
-                        file_path: to_file_path.toString()
-                    });
             
                     try {
-                       // println(111);
                         var brwt = new BookmarksReplaceWithText($instance('leaf.database.service.IDatabaseServiceFactory'), $instance('uncertain.ocm.IObjectRegistry'), $ctx.getData());
-                      //  println($ctx.getData());
                         brwt.replaceBookmarkFromContent(to_file_path.toString(), record_data.content_id);
                     } catch (e) {
                         raise_app_error(e);
                     }
+                       // word转pdf
+                       var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con' + record_data.content_id;
+                        var outputfilepath = wordToPdf(to_file_path,pdf_file_path);
+                        var outputfilename= record_data.to_file_name +'.pdf';
+                        var pdf_file = new File(outputfilepath);
+                        println(outputfilepath);
+                        var file_size = 0;
+                        if (pdf_file.exists()) {
+                            file_size = pdf_file.length();
+                        }
+                         //保存文本名及路径
+                        $bm('cont.CON500.con_file_content_copy_update').execute({
+                            table_name: 'CON_CONTRACT_CONTENT',
+                            content_id: record_data.content_id,
+                            file_name: outputfilename.toString(),
+                            file_path: outputfilepath.toString(),
+                            file_size: file_size,
+                            file_type_code: 'pdf',
+                            mime_type: 'application/pdf',
+                            user_id: $ctx.parameter.user_id
+                        });
                 }
             }
-            //remove by chenlingfeng
-           // var last_check_bm = $bm('cont.CON500.con_calc_due_date_after_print');
-           // last_check_bm.update({
-            //    contract_id: $ctx.parameter.contract_id
-           // });
         ]]></s:server-script>
     </a:init-procedure>
 </a:service>
\ No newline at end of file

src/main/webapp/modules/cont/CON620/con_contract_rent_dun_query.lview

@@ -284,12 +284,6 @@
                     <a:column name="bp_id_agent_desc" align="center" prompt="代理店" width="200"/>
                     <a:column name="business_type_n" align="center" prompt="业务类型" width="60"/>
                     <a:column name="division_n" align="center" prompt="租赁物" width="60"  footerRenderer="summaryRenderer"/>
-                    <a:column name="account_due_times" align="center" prompt="会计逾期总期数"
-                              width="100"/>
-                    <a:column name="account_due_days" align="center" prompt="会计逾期总天数"
-                              width="100"/>
-                    <a:column name="account_due_amount" align="right" prompt="会计逾期总金额" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
-                              width="100"/>
                     <a:column name="business_due_times" align="center" prompt="营业逾期总期数"
                               width="100"/>
                     <a:column name="business_due_days" align="center" prompt="营业逾期总天数"
@@ -298,6 +292,12 @@
                               width="100"/>
                     <a:column name="over_due_amount" align="right" prompt="违约金" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
                               width="100"/>
+                    <a:column name="account_due_times" align="center" prompt="会计逾期总期数"
+                              width="100"/>
+                    <a:column name="account_due_days" align="center" prompt="会计逾期总天数"
+                              width="100"/>
+                    <a:column name="account_due_amount" align="right" prompt="会计逾期总金额" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
+                              width="100"/>
                 </a:columns>
             </a:grid>
         </a:screenBody>

src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview

 <?xml version="1.0" encoding="UTF-8"?>
-<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"
+          trace="true">
     <a:view>
-<!--        <a:link id="con731_calc_ccr_fee_link" model="cont.CON731.calc_ccr_fee" modelaction="execute"/>-->
+        <!--        <a:link id="con731_calc_ccr_fee_link" model="cont.CON731.calc_ccr_fee" modelaction="execute"/>-->
         <a:link id="calc_leasse_amount_link" model="cont.CON731.calc_leasse_date" modelaction="execute"/>
         <a:link id="calc_pay_amount_link" model="cont.CON731.calc_leasse_pay" modelaction="execute"/>
         <a:link id="calc_tenant_amount_link" model="cont.CON733.calc_tenant_change_req" modelaction="execute"/>
-        <a:link id="con731_quote_link" url="${/request/@context_path}/modules/cont/CON731/hls_fin_calculator_update_n.lview"/>
+        <a:link id="con731_quote_link"
+                url="${/request/@context_path}/modules/cont/CON731/hls_fin_calculator_update_n.lview"/>
         <a:link id="con733_quote_calc_change_req_link" model="cont.CON733.calc_change_req" modelaction="execute"/>
         <a:link id="con731_submit_link" model="cont.CON731.submit_change_req" modelaction="execute"/>
         <a:link id="con731_cancel_link" model="cont.CON731.cancel_change_req" modelaction="execute"/>
-        <a:link id="${/parameter/@layout_code}_prj500_cdd_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
-        <a:link id="${/parameter/@layout_code}_prj500_cdd_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
+        <a:link id="${/parameter/@layout_code}_prj500_cdd_uploadFile_id"
+                url="${/request/@context_path}/uploadFile.lview"/>
+        <a:link id="${/parameter/@layout_code}_prj500_cdd_downloadFile_id"
+                url="${/request/@context_path}/downloadFile.lview"/>
         <script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>
         <link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
-        <a:link id="${/parameter/@layout_code}${/parameter/@tree_code}_hls_fin_doc_quotation_link_id" url="${/request/@context_path}/modules/hls/HLS500/hls_fin_doc_quotation.lsc"/>
-            <a:link id="set_sum_unreceived_principal_cancel_link" model="cont.CON731.con_change_calc" modelaction="update"/>
-            <a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id"
-                    url="${/request/@context_path}/uploadFile.lview"/>
-            <a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id"
-                    url="${/request/@context_path}/downloadFile.lview"/>
+        <a:link id="${/parameter/@layout_code}${/parameter/@tree_code}_hls_fin_doc_quotation_link_id"
+                url="${/request/@context_path}/modules/hls/HLS500/hls_fin_doc_quotation.lsc"/>
+        <a:link id="set_sum_unreceived_principal_cancel_link" model="cont.CON731.con_change_calc" modelaction="update"/>
+        <a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id"
+                url="${/request/@context_path}/uploadFile.lview"/>
+        <a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id"
+                url="${/request/@context_path}/downloadFile.lview"/>
         <script type="text/javascript"><![CDATA[
         Ext.ux.Lightbox.register('a[ref=img]', true);
-        Leaf.onReady(function() {
-                var ds_con_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_QUOTATION_01', 'con_contract');
-                if ($(ds_con_id)) {
-                        $(ds_con_id).setQueryParameter('contract_id','${/parameter/@contract_id}');
-                        $(ds_con_id).query();
-                }
+        Leaf.onReady(function () {
+            var ds_con_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_01', 'con_contract');
+            if ($(ds_con_id)) {
+                $(ds_con_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
+                $(ds_con_id).query();
+            }
         });
+
         function open_contract_win(ds_id, record_id) {
             var record = $(ds_id).findById(record_id);
             var param = record.data;
@@ -38,9 +44,10 @@
             param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_modify_link', ds_id);
         }
-        window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function() {
-                $('${/parameter/@layout_code}_quote').disable(); //按钮不可用
-            var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_QUOTATION_01', 'con_contract');
+
+        window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () {
+            //  $('${/parameter/@layout_code}_quote').disable(); //按钮不可用
+            var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_01', 'con_contract');
             var req_record = $(req_ds_id).getAt(0);
             var calc_session_id = req_record.get('calc_session_id');
             var quo_win;
@@ -65,13 +72,14 @@
                         ccr_outstanding_times: ccr_outstanding_times,
                         calc_session_id: calc_session_id
                     },
-                    success: function(res) {
-                            $('${/parameter/@layout_code}_quote').enable();
+                    success: function (res) {
+                        //     $('${/parameter/@layout_code}_quote').enable();
                         req_record.set('calc_session_id', res.result.calc_session_id);
                         req_record.dirty = false;
                         quo_win = new Leaf.Window({
                             id: '${/parameter/@layout_code}_hls_fin_calc_quotation_link_winid',
                             params: {
+                                price_list: req_record.get('price_list'),
                                 document_id: '${/parameter/@change_req_id}',
                                 document_category: document_category,
                                 maintain_type: 'UPDATE',
@@ -88,20 +96,20 @@
                             fullScreen: true,
                             draggable: true
                         });
-                        quo_win.addListener('close', function() {
+                        quo_win.addListener('close', function () {
                             $(req_ds_id).query();
-                            var cf_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_QUOTATION_04', 'con_contract_cashflow');
-                            $(cf_ds_id).setQueryParameter('contract_id','${/parameter/@contract_id}');
+                            var cf_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_QUOTATION_04', 'con_contract_cashflow');
+                            $(cf_ds_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
                             $(cf_ds_id).query();
                         });
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     },
-                    failure: function() {
-                            $('${/parameter/@layout_code}_quote').enable();
+                    failure: function () {
+                        //    $('${/parameter/@layout_code}_quote').enable();
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     },
-                    error: function() {
-                            $('${/parameter/@layout_code}_quote').enable();
+                    error: function () {
+                        //   $('${/parameter/@layout_code}_quote').enable();
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     },
                     scope: this
@@ -110,143 +118,180 @@
         };
 
 
-        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
-                var ds_con_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_QUOTATION_01', 'con_contract');
-                if (ds.id == ds_con_id) {
-                        // 承租人变更
-                        if ('${/parameter/@layout_code}' == 'CON_TENANT_CHANGE_MODIFY') {
-                                // 承租人变更日計算應繳金額相關信息
-                                if(name == 'ccr_lease_date'){
-                                        Leaf.request({
-                                                url: $('calc_tenant_amount_link').getUrl(),
-                                                para: {
-                                                        change_req_id: ${/parameter/@change_req_id},
-                                                        ccr_lease_date: record.get('ccr_lease_date')
-                                                },
-                                                success: function(res) {
-                                                        record.set('ccr_lease_rental', res.result.ccr_lease_rental);
-                                                        record.set('ccr_lease_principal', res.result.ccr_lease_principal);
-                                                        record.set('ccr_lease_interest', res.result.ccr_lease_interest);
-                                                        record.set('ccr_lease_penalty', res.result.ccr_lease_penalty);
-                                                },
-                                                error: function() {
-                                                },
-                                                failure: function() {
-                                                },
-                                                sync: true,
-                                                scope: this
-                                        });
-                                }
-
-                        }
-                        // 回款賬戶變更
-                        if('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY'){
-                                if(name == 'BANK_BRANCH_NUM'){
-                                        var bank_account_num_s =record.get('bank_account_num_s');
-                                        if(bank_account_num_s == value){
-                                                Leaf.showMessage('警告', '现扣款账号和原扣款账号不能重复！');
-                                                return;
-                                        }
-                                }
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
+            var ds_con_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_01', 'con_contract');
+            if (ds.id == ds_con_id) {
+                // 承租人变更
+                if ('${/parameter/@layout_code}' == 'CON_TENANT_CHANGE_MODIFY') {
+                    // 承租人变更日計算未收金額相關信息
+                    if (name == 'ccr_lease_date' && value) {
+                        Leaf.request({
+                            url: $('calc_tenant_amount_link').getUrl(),
+                            para: {
+                                change_req_id: ${/parameter/@change_req_id},
+                                ccr_lease_date: record.get('ccr_lease_date')
+                            },
+                            success: function (res) {
+                                record.set('ccr_lease_rental', res.result.ccr_lease_rental);
+                                record.set('ccr_lease_principal', res.result.ccr_lease_principal);
+                                record.set('ccr_lease_interest', res.result.ccr_lease_interest);
+                                record.set('ccr_lease_penalty', res.result.ccr_lease_penalty);
+                            },
+                            error: function () {
+                            },
+                            failure: function () {
+                            },
+                            sync: true,
+                            scope: this
+                        });
+                    }
+                }
+                // 回款賬戶變更
+                if ('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY') {
+                    if (name == 'pay_method') {
+                        if (record.get('pay_method') == 'WIRE_TRANSFER') {
+                            record.set('bank_account_id', null);
+                            record.set('bank_account_id_n', null);
+                            record.getField('bank_account_id').setReadOnly(true);
+                            record.getField('bank_account_id_n').setReadOnly(true);
+                            record.getField('bank_account_id').setRequired(false);
+                            record.getField('bank_account_id_n').setRequired(false);
+                            record.set('bank_account_name', null);
+                            record.set('bank_branch_num', null);
+                            record.set('bank_branch_name', null);
+                        } else {
+                            record.getField('bank_account_id').setReadOnly(false);
+                            record.getField('bank_account_id_n').setReadOnly(false);
+                            record.getField('bank_account_id').setRequired(true);
+                            record.getField('bank_account_id_n').setRequired(true);
                         }
-                        // 租赁计划變更
-                        if('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY'){
-                                var lease_times = record.get('lease_times')||0;
-                                if(name == 'ccr_start_times'){
-                                        Leaf.request({
-                                                url: $('set_sum_unreceived_principal_cancel_link').getUrl(),
-                                                para: {
-                                                        contract_id: record.get('contract_id'),
-                                                        ccr_start_times: value
-                                                },
-                                                success: function (res) {
-                                                        record.set('sum_unreceived_principal', res.result.sum_unreceived_principal);
-                                                },
-                                                failure: function () {
 
-                                                },
-                                                error: function () {
+                    }
+                }
+                // 租赁计划變更
+                if ('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY') {
+                    var lease_times = record.get('lease_times') || 0;
+                    if (name == 'ccr_start_times') {
+                        Leaf.request({
+                            url: $('set_sum_unreceived_principal_cancel_link').getUrl(),
+                            para: {
+                                contract_id: record.get('contract_id'),
+                                ccr_start_times: value
+                            },
+                            success: function (res) {
+                                record.set('sum_unreceived_principal', res.result.sum_unreceived_principal);
+                            },
+                            failure: function () {
 
-                                                },
-                                                scope: this
-                                        });
-                                        var ccr_outstanding_times = record.get('ccr_outstanding_times')||0;
-                                        var curr_times = minus(plus(value || 0,ccr_outstanding_times||0),1);
-                                        if(curr_times > lease_times){
-                                                record.set('extend_flag','Y');
-                                                record.set('deflation_flag','N');
-                                        }
-                                }
-                                if(name == 'ccr_outstanding_times'){
-                                        var ccr_start_times = record.get('ccr_start_times')||0;
-                                        var curr_times = minus(plus(value || 0,ccr_start_times||0),1);
-                                        if(curr_times < lease_times){
-                                                record.set('extend_flag','N');
-                                                record.set('deflation_flag','Y');
-                                        }
-                                }
+                            },
+                            error: function () {
+
+                            },
+                            scope: this
+                        });
+                        var ccr_outstanding_times = record.get('ccr_outstanding_times') || 0;
+                        var curr_times = minus(plus(value || 0, ccr_outstanding_times || 0), 1);
+                        if (curr_times > lease_times) {
+                            record.set('extend_flag', 'Y');
+                            record.set('deflation_flag', 'N');
                         }
+                    }
+                    if (name == 'ccr_outstanding_times') {
+                        var ccr_start_times = record.get('ccr_start_times') || 0;
+                        var curr_times = minus(plus(value || 0, ccr_start_times || 0), 1);
+                        if (curr_times < lease_times) {
+                            record.set('extend_flag', 'N');
+                            record.set('deflation_flag', 'Y');
+                        }
+                    }
                 }
+            }
         };
 
         //新增和加载时调用form
-        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
+            if (ds_id == ds.id && ds_id) {
+                if (record.get('pay_method') == 'WIRE_TRANSFER') {
+                    record.set('bank_account_id', null);
+                    record.set('bank_account_id_n', null);
+                    record.getField('bank_account_id').setReadOnly(true);
+                    record.getField('bank_account_id_n').setReadOnly(true);
+                    record.getField('bank_account_id').setRequired(false);
+                    record.getField('bank_account_id_n').setRequired(false);
+                    record.set('bank_account_name', null);
+                    record.set('bank_branch_num', null);
+                    record.set('bank_branch_name', null);
 
+                }
+            }
         };
 
-        window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
-                $('${/parameter/@layout_code}_submit_approval').disable();
+        window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function () {
+            //  $('${/parameter/@layout_code}_submit_approval').disable();
+            debugger;
             var req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
             var req_ds_id2 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_change_req');
+            var attch_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
             var req_record = $(req_ds_id).getAt(0);
             var case_type = '';
             var document_type = '${/parameter/@document_type}';
             var calc_session_id = req_record.get('calc_session_id');
-                window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
+           // window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
+           for (var i=0;i<$(attch_id).getAll().length;i++){
+               if ($(attch_id).getAll()[i].dirty == true) {
+                   Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
+                   //  $('${/parameter/@layout_code}_submit_approval').enable();
+                  // window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                   return false;
+               }
+           }
             if (req_record.dirty == true) {
                 Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
-                $('${/parameter/@layout_code}_submit_approval').enable();
-                window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                //  $('${/parameter/@layout_code}_submit_approval').enable();
+               // window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 return false;
             }
-                if ($(req_ds_id).validate($('${/parameter/@layout_code}_submit_approval').enable()) && $(req_ds_id2).validate($('${/parameter/@layout_code}_submit_approval').enable())) {
-                    // if (req_record.dirty) {
-                    //     Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
-                    //     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                    //     return;
-                    // }
-                        // 回款賬戶變更
-                        if('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY'){
-                               var bank_account_num_s =req_record.get('bank_account_num_s');
-                               var bank_account_num_c =req_record.get('bank_account_name');
-                               if(bank_account_num_s == bank_account_num_c){
-                                       Leaf.showMessage('警告', '现扣款账号和原扣款账号不能重复！');
-                                   window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                                   return  false;
-                               }else{
-                                       $('${/parameter/@layout_code}_submit_approval').disable();
-                                       $('${/parameter/@layout_code}_save').disable();
-                                       if ('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY') {
-                                               $('${/parameter/@layout_code}_quote').disable();
-                                       }
-                                       $('${/parameter/@layout_code}_user_button1').disable();
-                                       setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con731_submit), 2000);
-                               }
-                        }else {
-                                $('${/parameter/@layout_code}_submit_approval').disable();
-                                $('${/parameter/@layout_code}_save').disable();
-                                if ('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY') {
-                                        $('${/parameter/@layout_code}_quote').disable();
-                                }
-                                $('${/parameter/@layout_code}_user_button1').disable();
-                                setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con731_submit), 2000);
-                        }
+            if ($(req_ds_id).validate($('${/parameter/@layout_code}_submit_approval').enable()) && $(req_ds_id2).validate($('${/parameter/@layout_code}_submit_approval').enable())) {
+                // if (req_record.dirty) {
+                //     Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
+                //     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                //     return;
+                // }
+                // 回款賬戶變更
+                if ('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY') {
+                    var bank_account_num_s = req_record.get('bank_account_num_s');
+                    var bank_account_num_c = req_record.get('bank_branch_num');
+                    if (bank_account_num_s == bank_account_num_c) {
+                        Leaf.showMessage('警告', '现扣款账号和原扣款账号不能重复！');
+                   //     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                        return false;
+
+                    } else {
+                        con731_submit();
+                    }
+                } else if ('${/parameter/@layout_code}' == 'CON_TENANT_CHANGE_MODIFY') {
+                    var bp_id_tenant = req_record.get('bp_id_tenant');
+                    var bp_id_tenant_old = req_record.get('bp_id_tenant_old');
+                    if (bp_id_tenant == bp_id_tenant_old) {
+                        Leaf.showMessage('警告', '变更承租人和原承租人不能重复！');
+                    //    window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                        return false;
+                    }
+                    else {
+                        con731_submit();
+                    }
+
                 } else {
-                    window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    con731_submit();
                 }
+            } else {
+                window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+            }
         };
 
         function con731_submit() {
+            Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认提交审批？', function () {
             var req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
             var req_record = $(req_ds_id).getAt(0);
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
@@ -256,34 +301,36 @@
                     change_req_id: '${/parameter/@change_req_id}',
                     layout_code: '${/parameter/@layout_code}'
                 },
-                success: function(res) {
-                    $('${/parameter/@winid}').close();
+                success: function (res) {
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    $('${/parameter/@winid}').close();
+
                 },
-                failure: function() {
-                        $('${/parameter/@layout_code}_submit_approval').enable();
-                        $('${/parameter/@layout_code}_save').enable();
-                        if('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY'){
-                                $('${/parameter/@layout_code}_quote').enable();
-                        }
-                        $('${/parameter/@layout_code}_user_button1').enable();
+                failure: function () {
+                    // $('${/parameter/@layout_code}_submit_approval').enable();
+                    // $('${/parameter/@layout_code}_save').enable();
+                    //  if('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY'){
+                    //          $('${/parameter/@layout_code}_quote').enable();
+                    //  }
+                    //  $('${/parameter/@layout_code}_user_button1').enable();
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 },
-                error: function() {
-                        $('${/parameter/@layout_code}_submit_approval').enable();
-                        $('${/parameter/@layout_code}_save').enable();
-                        if('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY'){
-                                $('${/parameter/@layout_code}_quote').enable();
-                        }
-                        $('${/parameter/@layout_code}_user_button1').enable();
+                error: function () {
+                    // $('${/parameter/@layout_code}_submit_approval').enable();
+                    // $('${/parameter/@layout_code}_save').enable();
+                    // if('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY'){
+                    //         $('${/parameter/@layout_code}_quote').enable();
+                    // }
+                    // $('${/parameter/@layout_code}_user_button1').enable();
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 },
                 scope: this
             });
+            }, null, 300, 150);
         }
 
         //保存submitsuccess调用
-        window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function(ds, record, res, bp_seq) {
+        window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res, bp_seq) {
             var ca_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_cashflow');
             if (ca_ds_id) {
                 $(ca_ds_id).query();
@@ -321,26 +368,26 @@
         };
 
 
-        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
-                $('${/parameter/@layout_code}_user_button1').disable();
-            Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认取消变更？', function() {
+        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
+            //  $('${/parameter/@layout_code}_user_button1').disable();
+            Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认取消变更？', function () {
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
                 Leaf.request({
                     url: $('con731_cancel_link').getUrl(),
                     para: {
                         change_req_id: ${/parameter/@change_req_id}
                     },
-                    success: function(res) {
-                            $('${/parameter/@layout_code}_user_button1').enable();
+                    success: function (res) {
+                        //   $('${/parameter/@layout_code}_user_button1').enable();
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                         $('${/parameter/@winid}').close();
                     },
-                    failure: function() {
-                            $('${/parameter/@layout_code}_user_button1').enable();
+                    failure: function () {
+                        //    $('${/parameter/@layout_code}_user_button1').enable();
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     },
-                    error: function() {
-                            $('${/parameter/@layout_code}_user_button1').enable();
+                    error: function () {
+                        //      $('${/parameter/@layout_code}_user_button1').enable();
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     },
                     scope: this
@@ -351,76 +398,74 @@
         //附件上传
 
         function con_repo001_upload_file(id, name, query_only) {
-                var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
-                if (record.get('check_id')) {
-                        var url;
-                        if (query_only == 'Y' || '${/parameter/@function_usage}' == 'QUERY') {
-                                url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
-                        } else {
-                                url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
-                        }
-                        var win = new Leaf.Window({
-                                url: url,
-                                title: '${l:HLS.SUPPORTING_DOCUMENT}',
-                                id: 'prj500_cdd_uploadFile_screen_id',
-                                width: 850,
-                                height: 400
-                        });
-
-                        win.on('close', function () {
-                                record.ds.query();
-                        });
+            var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
+            if (record.get('check_id')) {
+                var url;
+                if (query_only == 'Y' || '${/parameter/@function_usage}' == 'QUERY') {
+                    url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
                 } else {
-                        Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
+                    url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
                 }
+                var win = new Leaf.Window({
+                    url: url,
+                    title: '${l:HLS.SUPPORTING_DOCUMENT}',
+                    id: 'prj500_cdd_uploadFile_screen_id',
+                    width: 850,
+                    height: 400
+                });
+
+                win.on('close', function () {
+                    record.ds.query();
+                });
+            } else {
+                Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
+            }
         }
+
         window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
-                var link_function = '';
-                window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
-                if (name == 'attachment') {
-                        link_function = 'con_repo001_upload_file';
-                        return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
-                } else if (name == 'attach_file_name') {
-                        if (value != null ) {
-                                var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
-                                var str = value.split(';;');
-                                var url = '';
-                                for (var i = 0;i < str.length;i++) {
-                                        //
-                                        var temp = str[i].split('--');
-                                        if (!Leaf.isEmpty(temp[0])) {
+            var link_function = '';
+            window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
+            if (name == 'attachment') {
+                link_function = 'con_repo001_upload_file';
+                return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
+            } else if (name == 'attach_file_name') {
+                if (value != null) {
+                    var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
+                    var str = value.split(';;');
+                    var url = '';
+                    for (var i = 0; i < str.length; i++) {
+                        //
+                        var temp = str[i].split('--');
+                        if (!Leaf.isEmpty(temp[0])) {
 
-                                                var file_name = temp[0].toUpperCase();
-                                                var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
-                                                if (file_name.indexOf('.PDF') >= 0) {
-                                                        url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ',';
-                                                } //else if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') {
-                                                else if (file_name.indexOf('.BMP') >= 0 || file_name.indexOf('.JPG') >= 0  || file_name.indexOf('.JPEG') >= 0 || file_name.indexOf('.PNG') >= 0 || file_name.indexOf('.GIF') >= 0) {
-                                                        url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
-                                                } else {
-                                                        url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
-                                                }
-                                        }
-                                }
-                                return url;
+                            var file_name = temp[0].toUpperCase();
+                            var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
+                            if (file_name.indexOf('.BMP') >= 0 || file_name.indexOf('.JPG') >= 0 || file_name.indexOf('.JPEG') >= 0 || file_name.indexOf('.PNG') >= 0 || file_name.indexOf('.GIF') >= 0) {
+                                url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
+                            } else {
+                                url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
+                            }
                         }
+                    }
+                    return url;
                 }
+            }
         };
         //图片渲染
-        window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function(record, name, bp_seq) {
-                var result = name.match(/(.*)_pic$/);
-                if (result) {
-                        var pic_value = record.get(result[1]);
-                        if (pic_value == 'OUTFLOW') {
-                                return '<img src="${/request/@context_path}/images/outflow.png" style="margin-top:4px"/>';
-                        } else if (pic_value == 'INFLOW') {
-                                return '<img src="${/request/@context_path}/images/inflow.png" style="margin-top:4px"/>';
-                        } else if (pic_value == 'NONCASH') {
-                                return '<img src="${/request/@context_path}/images/noncash.png" style="margin-top:4px"/>';
-                        } else if (pic_value == 'CASH') {
-                                return '<img src="${/request/@context_path}/images/cash.png" style="margin-top:4px"/>';
-                        }
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function (record, name, bp_seq) {
+            var result = name.match(/(.*)_pic$/);
+            if (result) {
+                var pic_value = record.get(result[1]);
+                if (pic_value == 'OUTFLOW') {
+                    return '<img src="${/request/@context_path}/images/outflow.png" style="margin-top:4px"/>';
+                } else if (pic_value == 'INFLOW') {
+                    return '<img src="${/request/@context_path}/images/inflow.png" style="margin-top:4px"/>';
+                } else if (pic_value == 'NONCASH') {
+                    return '<img src="${/request/@context_path}/images/noncash.png" style="margin-top:4px"/>';
+                } else if (pic_value == 'CASH') {
+                    return '<img src="${/request/@context_path}/images/cash.png" style="margin-top:4px"/>';
                 }
+            }
         };
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>

src/main/webapp/modules/cont/CON732/hls_ccr_modify_entrance.lview

@@ -3,7 +3,9 @@
     2019-09 变更申请-维护
  -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
-    <a:init-procedure/>
+    <a:init-procedure>
+        <a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
+    </a:init-procedure>
     <a:view>
         <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
         <a:link id="con_contract_modify_link" url="${/request/@context_path}/modules/cont/CON501N/con_contract_modify.lview"/>
@@ -16,6 +18,18 @@
             var current_index = 0;
             var file_path = '${/parameter/@file_path}';
             var download_arr = [];
+
+        Leaf.onReady(function() {
+            debugger;
+            if("${/model/role_info/record/@role_code}"!="0018"&&"${/model/role_info/record/@role_code}"!="0019") {
+                document.getElementById("CON736_F_QUERY_NULL_BP_ID_AGENT_LEVEL1_prompt").style.display = "";
+                document.getElementById("CON736_F_QUERY_NULL_BP_ID_AGENT_LEVEL1").style.display = "";
+            } else {
+                document.getElementById("CON736_F_QUERY_NULL_BP_ID_AGENT_LEVEL1_prompt").style.display = "none";
+                document.getElementById("CON736_F_QUERY_NULL_BP_ID_AGENT_LEVEL1").style.display = "none";
+            }
+
+        });
             
             function open_contract_win(ds_id, record_id) {
                 var record = $(ds_id).findById(record_id);
@@ -110,14 +124,14 @@
             };
             
             //变更申请打印单
-            window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
-                var xmlTemp = '';
-                var fileName = '';
-                xmlTemp = 'con_contract_change_req_apply.xml';
-                fileName = '变更申请单.pdf';
-                var url = $('con_contract_change_req_link').getUrl() + '?xmlTemp=' + xmlTemp + '&fileName=' + fileName;
-                window.open(url);
-            };
+            // window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
+            //     var xmlTemp = '';
+            //     var fileName = '';
+            //     xmlTemp = 'con_contract_change_req_apply.xml';
+            //     fileName = '变更申请单.pdf';
+            //     var url = $('con_contract_change_req_link').getUrl() + '?xmlTemp=' + xmlTemp + '&fileName=' + fileName;
+            //     window.open(url);
+            // };
             
             window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) { //查询权限
                 var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');

src/main/webapp/modules/cont/CON732/hls_ccr_query_entrance.lview

@@ -121,42 +121,42 @@
         };
 
         //变更申请打印单
-        window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
-            var xmlTemp = '';
-            var fileName = '';
-            xmlTemp = 'con_contract_change_req_apply.xml';
-            fileName = '变更申请单.pdf';
-            var url = $('con_contract_change_req_link').getUrl() + '?xmlTemp=' + xmlTemp + '&fileName=' + fileName;
-            window.open(url);
-        };
+        // window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
+        //     var xmlTemp = '';
+        //     var fileName = '';
+        //     xmlTemp = 'con_contract_change_req_apply.xml';
+        //     fileName = '变更申请单.pdf';
+        //     var url = $('con_contract_change_req_link').getUrl() + '?xmlTemp=' + xmlTemp + '&fileName=' + fileName;
+        //     window.open(url);
+        // };
 
         //生成权利义务转让协议书
-        window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function () {
-            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
-            var prj_project_result_ds = $(ds_id);
-            var records = prj_project_result_ds.getSelected();
-            if (records.length != 1) {
-                Leaf.showMessage('${l:PROMPT}', '${l:HLS.SELECT_RECORD}');
-                return false;
-            }
-            var record = records[0];
-            var ccr_document_type = record.get('ccr_document_type');
-            var req_status = record.get('req_status');
-            var contract_id = record.get('contract_id');
-            if (req_status != 'APPROVED') {
-                Leaf.showMessage('${l:PROMPT}', '只有审批通过的合同才能打印！');
-                return false;
-            }
-            if (ccr_document_type == 'LEASE_CHAG') {
-                var templet_code = 'ASSIGNMENT_AGREEMENT';
-                var url = $('assignment_agreement_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
-                window.open(url, '_self');
-            }
-            if(ccr_document_type == 'ACC_CHAG'){
-            }
-
-
-        };
+        // window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function () {
+        //     var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
+        //     var prj_project_result_ds = $(ds_id);
+        //     var records = prj_project_result_ds.getSelected();
+        //     if (records.length != 1) {
+        //         Leaf.showMessage('${l:PROMPT}', '${l:HLS.SELECT_RECORD}');
+        //         return false;
+        //     }
+        //     var record = records[0];
+        //     var ccr_document_type = record.get('ccr_document_type');
+        //     var req_status = record.get('req_status');
+        //     var contract_id = record.get('contract_id');
+        //     if (req_status != 'APPROVED') {
+        //         Leaf.showMessage('${l:PROMPT}', '只有审批通过的合同才能打印！');
+        //         return false;
+        //     }
+        //     if (ccr_document_type == 'LEASE_CHAG') {
+        //         var templet_code = 'ASSIGNMENT_AGREEMENT';
+        //         var url = $('assignment_agreement_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
+        //         window.open(url, '_self');
+        //     }
+        //     if(ccr_document_type == 'ACC_CHAG'){
+        //     }
+        //
+        //
+        // };
 
         window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function (ds, qpara, bp_seq) { //查询权限
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');

src/main/webapp/modules/cont/CON733/hls_con_contract_et_create_entrance.lview

@@ -36,7 +36,7 @@
             return value;
         };
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
-            $('${/parameter/@layout_code}_user_button1').disable(); //按钮不可用
+           // $('${/parameter/@layout_code}_user_button1').disable(); //按钮不可用
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
             var prj_project_result_ds = $(ds_id);
             var records = prj_project_result_ds.getSelected();
@@ -91,11 +91,11 @@
                             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_change_link', ds_id);
                         },
                         failure: function () {
-                            $('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
+                         //   $('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
                             Leaf.Masker.unmask(Ext.getBody());
                         },
                         error: function () {
-                            $('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
+                         //   $('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
                             Leaf.Masker.unmask(Ext.getBody());
                         },
                         scope: this

src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview

@@ -12,15 +12,20 @@
         <a:link id="con_et001_calc_cashflow_link1" model="cont.CON_ET001.insert_calc_cashflow" modelaction="execute"/>
         <a:link id="con_et001_calc_et_date_amount_link" model="cont.CON_ET001.calc_et_date_amount" modelaction="execute"/>
         <script type="text/javascript"><![CDATA[
+        var calc_flag='Y';
         //新增和加载时调用form
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
 
         };
 
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
+            debugger;
+            if(value!=old_value){
+                calc_flag='N';
+            }
             var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req');
             if (ds == $(ds_id)) {
-                if (name == 'termination_date') {
+                if (name == 'termination_date'&&value) {
                     // 根据结清日计算结清相关金额字段
                     Leaf.request({
                         url: $('con_et001_calc_et_date_amount_link').getUrl(),
@@ -28,27 +33,49 @@
                             contract_id: record.get('contract_id'),
                             termination_date: value,
                             et_fee:record.get('et_fee'),
-                            et_interest_rate:record.get('et_interest_rate')
+                            et_interest_rate:record.get('et_interest_rate'),
+                            residual_value:record.get('residual_value')
                         },
                         success: function (res) {
-                            record.set('et_fee', res.result.et_fee);
+                           //record.set('et_fee', res.result.et_fee);
                             record.set('et_total_amount', res.result.et_total_amount);
                             record.set('et_due_amount', res.result.et_due_amount);
-                            record.set('overdue_amount', res.result.overdue_amount);
-                            record.set('penalty', res.result.penalty);
+                            record.set('overdue_amount', res.result.overdue_amount||0);
+                            record.set('penalty', res.result.penalty||0);
                             record.set('fund_possession_time', res.result.fund_possession_time);
                             record.set('fund_possession_cost', res.result.fund_possession_cost);
-                            record.set('sum_unreceived_principal', res.result.sum_unreceived_principal);
+                            record.set('fund_possession_rate', res.result.fund_possession_rate);
+                            record.set('last_rent_due_date',res.result.last_rent_due_date);
+                            record.set('sum_unreceived_principal',res.result.sum_unreceived_principal);
                         },
                         failure: function () {
-
+                            record.set('termination_date','');
+                            record.set('et_total_amount','');
+                            record.set('et_due_amount','');
+                            record.set('overdue_amount', '');
+                            record.set('penalty', '');
+                            record.set('fund_possession_time','');
+                            record.set('fund_possession_cost','');
+                            record.set('fund_possession_rate','');
+                            record.set('last_rent_due_date','');
+                            record.set('sum_unreceived_principal','');
                         },
                         error: function () {
-
+                            record.set('termination_date','');
+                            record.set('et_total_amount','');
+                            record.set('et_due_amount','');
+                            record.set('overdue_amount', '');
+                            record.set('penalty', '');
+                            record.set('fund_possession_time','');
+                            record.set('fund_possession_cost','');
+                            record.set('fund_possession_rate','');
+                            record.set('last_rent_due_date','');
+                            record.set('sum_unreceived_principal','');
                         },
                         scope: this
                     });
                 }
+
             }
         };
 
@@ -60,26 +87,34 @@
                 var document_type = '${/parameter/@document_type}';
                 var calc_session_id = req_record.get('calc_session_id');
 
-                window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
+               // window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
                 if ($(req_ds_id).validate($('${/parameter/@layout_code}_submit_approval').enable())) {
-                    // if (req_record.dirty) {
-                    //     Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
-                    //     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                    //     return;
-                    // }
+                    if (req_record.dirty) {
+                        Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
+                     //   window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                        return;
+                    }
+                    if (calc_flag=='N') {
+                        Leaf.showMessage('${l:HLS.PROMPT}', '请先计算！');
+                   //     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                        return;
+                    }
                     $('${/parameter/@layout_code}_submit_approval').disable();
                     $('${/parameter/@layout_code}_save').disable();
                     $('${/parameter/@layout_code}_user_button1').disable();
                     $('${/parameter/@layout_code}_user_button3').disable();
-                    setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit), 2000);
+                    //setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit), 2000);
+                 // window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit);
+                    con_repo001_submit();
                 } else {
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 }
         };
         function con_repo001_submit() {
+            Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认提交审批？', function () {
             var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract_change_req');
             var req_record = $(req_ds_id).getAt(0);
-            window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
+           // window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
             Leaf.request({
                 url: $('con_et002_submit_link').getUrl(),
                 para: {
@@ -87,29 +122,33 @@
                     layout_code: '${/parameter/@layout_code}'
                 },
                 success: function(res) {
+                    window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     $('${/parameter/@layout_code}_submit_approval').enable();
                     $('${/parameter/@layout_code}_save').enable();
                     $('${/parameter/@layout_code}_user_button1').enable();
                     $('${/parameter/@layout_code}_user_button3').enable();
                     $('${/parameter/@winid}').close();
-                    window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+
                 },
                 failure: function() {
+                    window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     $('${/parameter/@layout_code}_submit_approval').enable();
                     $('${/parameter/@layout_code}_save').enable();
                     $('${/parameter/@layout_code}_user_button1').enable();
                     $('${/parameter/@layout_code}_user_button3').enable();
-                    window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+
                 },
                 error: function() {
+                    window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     $('${/parameter/@layout_code}_submit_approval').enable();
                     $('${/parameter/@layout_code}_save').enable();
                     $('${/parameter/@layout_code}_user_button1').enable();
                     $('${/parameter/@layout_code}_user_button3').enable();
-                    window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+
                 },
                 scope: this
             });
+            }, null, 300, 150);
         }
 
         //保存submitsuccess调用
@@ -131,11 +170,12 @@
             var con_contract_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req');
             var con_record = $(con_contract_ds_id).getAt(0);
             if ($(con_contract_ds_id).validate()) {
-                // if (con_record.dirty) {
-                //     Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
-                //     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                //     return;
-                // }
+                if (con_record.dirty) {
+                    Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
+                    window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    $('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
+                    return;
+                }
               clac();
             } else {
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
@@ -152,8 +192,9 @@
                 success: function(res) {
                     Leaf.SideBar.enable = true;
                     Leaf.SideBar.show({msg: '计算成功！',duration: 2000});
+                    calc_flag='Y';
                     //con_record.getField('ccr_start_times').setReadOnly(true);
-                    var ca_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_QUOTATION_04', 'con_contract_cashflow');
+                    var ca_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_QUOTATION_02', 'con_contract_cashflow');
                     if (ca_ds_id) {
                         $(ca_ds_id).query();
                     }

src/main/webapp/modules/cont/CON_ET001/con_early_termination_query.lview

@@ -23,7 +23,7 @@
             }
             
             function contractQueryScreen_add() {
-                $('et_create').disable(); //按钮不可用
+                //$('et_create').disable(); //按钮不可用
                 var records = $('contractQueryScreen_mainDs').getSelected();
                 var record = records[0],
                     contract_id = record.get('contract_id');
@@ -38,7 +38,7 @@
                             req_type: ccr_document_type
                         },
                         success: function (res) {
-                            $('et_create').enable(); //按钮启用
+                         //   $('et_create').enable(); //按钮启用
                             var param = record.data;
                             param['change_req_id'] = res.result.change_req_id;
                             param['contract_id'] = res.result.change_req_id;
@@ -54,16 +54,16 @@
                         },
                         failure: function () {
                             Leaf.Masker.unmask(Ext.getBody());
-                            $('et_create').enable(); //按钮启用
+                         //   $('et_create').enable(); //按钮启用
                         },
                         error: function () {
                             Leaf.Masker.unmask(Ext.getBody());
-                            $('et_create').enable(); //按钮启用
+                          //  $('et_create').enable(); //按钮启用
                         },
                         scope: this
                     });
                 }, function () {
-                    $('et_create').enable(); //按钮启用
+                   // $('et_create').enable(); //按钮启用
                 }, 300, 150);
             }
         ]]></script>

src/main/webapp/modules/cont/CON_ET003/con_early_termination_modify_query.lview

@@ -27,7 +27,7 @@
                 var req_status = record.get('req_status');
                 var change_req_id = record.get('change_req_id');
                 var contract_id=record.get('contract_id');
-                if('NEW' == req_status || 'REJECT' == req_status){
+                if('NEW' == req_status){
                     return '<a href="javascript:open_change_req_detail(' + change_req_id + ',' + contract_id + ')">'+value+'</a>';
                 }else{
                     return '<a href="javascript:open_change_req_readonly_detail(' + change_req_id + ',' + contract_id + ')">'+value+'</a>';
@@ -141,7 +141,7 @@
                 <a:screenTitle/>
                 <a:gridButton click="contractQueryScreen_query" text="HLS.QUERY"/>
                 <a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/>
-                <a:gridButton click="con_gur_np_pint" text="提前结清补充协议"/>
+                <!--<a:gridButton click="con_gur_np_pint" text="提前结清补充协议"/>-->
             </a:screenTopToolbar>
             <a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
                 <a:textField name="change_req_number" bindTarget="contractQueryScreen_paraDs" prompt="合同变更编号"/>

src/main/webapp/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview

@@ -24,7 +24,7 @@
         Leaf.onReady(function() {
             var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract');
             if ($(ds_id)) {
-                $(ds_id).setQueryParameter('contract_id','${/parameter/@contract_id}');
+                $(ds_id).setQueryParameter('contract_id',${/parameter/@contract_id});
                 $(ds_id).query();
             }
         });
@@ -65,147 +65,229 @@
         //     }
         // };
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
+           debugger;
             var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract');
             if (ds == $(ds_id)) {
-                var repurchase_types = record.get('repurchase_types');
-                if (name != 'repurchase_types_n') {
-                    if (repurchase_types == null || repurchase_types == undefined) {
-                        Leaf.showMessage('${l:HLS.PROMPT}', '请先维护基本信息中的回购类型！');
-                        return;
-                    }
-                }
-                // 一次性回购
-                if (repurchase_types == 'ONE_TIME_REPURCHASE') {
-                    // 回购价款总额 = 逾期租金 + 逾期罚息（调整后）+ 剩余本金 + 留购价 + 手续费 + 资金占用费
-                    // sum_overdue_amount+ccr_due_amount+sum_unreceived_principal+residual_value+repurchase_service_charges+fund_possession_cost
-                    // 回购价款计算基数 = 逾期租金 + 逾期罚息（调整后）+ 剩余本金 + 留购价
-                    // 逾期罚息（调整后）
-                    record.getField('payment_frequency_n').setRequired(false);
-                    record.getField('payment_frequency').setRequired(false);
-                    record.getField('payment_period').setRequired(false);
-                    record.getField('payment_frequency_n').setReadOnly(true);
-                    record.getField('payment_period').setReadOnly(true);
-                    record.set('payment_period', 1);
-                    record.set('payment_frequency', 'MONTH');
-                    if (name == 'ccr_due_amount') {
-                        var due_amount = record.get('due_amount') || 0;
-                        if (due_amount < value) {
-                            Leaf.showMessage('${l:HLS.PROMPT}', '调整后的罚息必须小于等于逾期罚息！');
-                        }
-                        var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, value || 0), record.get('sum_unreceived_principal') || 0)
-                            , record.get('residual_value') || 0);
-                        var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
-                        record.set('repurchase_tatal_amount', repurchase_tatal_amount);
-                        record.set('repurchase_count_amount', repurchase_count_amount);
-                    }
-                    // 手续费
-                    if (name == 'repurchase_service_charges') {
-                        var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
-                            , record.get('residual_value') || 0);
-                        var repurchase_tatal_amount = plus(plus(repurchase_count_amount, value || 0), record.get('fund_possession_cost') || 0);
-                        record.set('repurchase_tatal_amount', repurchase_tatal_amount);
-                        record.set('repurchase_count_amount', repurchase_count_amount);
-                    }
-                    // 资金占用费value
-                    if (name == 'fund_possession_cost') {
-                        var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
-                            , record.get('residual_value') || 0);
-                        var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), value || 0);
-                        record.set('repurchase_tatal_amount', repurchase_tatal_amount);
-                        record.set('repurchase_count_amount', repurchase_count_amount);
-                    }
-                    // 分期回购
-                } else if (repurchase_types == 'STAGE_REPURCHASE') {
-                    record.getField('payment_frequency_n').setRequired(true);
-                    record.getField('payment_frequency').setRequired(true);
-                    record.getField('payment_period').setRequired(true);
-                    record.getField('payment_frequency_n').setReadOnly(false);
-                    record.getField('payment_period').setReadOnly(false);
-                    // 回购价款总额 = 逾期租金 + 逾期罚息（调整后）+ 剩余本金 + 留购价 + 手续费 + 资金占用费
-                    // sum_overdue_amount+ccr_due_amount+sum_unreceived_principal+residual_value+repurchase_service_charges+fund_possession_cost
-                    // 回购价款计算基数 = 逾期租金 + 逾期罚息（调整后）+ 剩余本金 + 留购价
-                    // 逾期罚息（调整后）
-                    if(name == 'payment_period'){
-                        if(value <= 0 || value == NaN || value == undefined){
-                            Leaf.showMessage('${l:HLS.PROMPT}', '支付期数请填写大于0的整数！');
-                            return;
+                // var repurchase_types = record.get('repurchase_types');
+                // if (name != 'repurchase_types_n') {
+                //     if (repurchase_types == null || repurchase_types == undefined) {
+                //         Leaf.showMessage('${l:HLS.PROMPT}', '请先维护基本信息中的回购类型！');
+                //         return;
+                //     }
+                // }
+                var depoist_remaining_amount;
+                if(record.get('depoist_offset_flag')=='Y'){
+                    depoist_remaining_amount=record.get('depoist_remaining_amount')||0;
+                }else{
+                    depoist_remaining_amount=0*1;
+                };
+                        // 回购价款总额 = 逾期租金 + 逾期罚息+ 剩余本金 + 留购价 + 手续费 + 资金占用费-保证金余额(抵扣情况下)
+                        // sum_overdue_amount+due_amount+sum_unreceived_principal+residual_value+repurchase_service_charges+fund_possession_cost
+                // 回购价款计算基数 = 回购价款总额
+                        // 逾期罚息（调整后）
+                        if(name == 'payment_period'){
+                            if(value <= 0 || value == NaN || value == undefined){
+                                Leaf.showMessage('${l:HLS.PROMPT}', '支付期数请填写大于0的整数！');
+                                return;
+                            }
                         }
-                    }
-                    if (name == 'ccr_due_amount') {
-                        var due_amount = record.get('due_amount') || 0;
-                        if (due_amount < value) {
-                            Leaf.showMessage('${l:HLS.PROMPT}', '调整后的罚息必须小于等于逾期罚息！');
-                            return;
+                        if (name == 'ccr_due_amount'&&value) {
+                            var due_amount = record.get('due_amount') || 0;
+                            if (due_amount < value) {
+                                Leaf.showMessage('${l:HLS.PROMPT}', '调整后的罚息必须小于等于逾期罚息！');
+                                setTimeout(function() {
+                                record.set('ccr_due_amount', 0);
+                                }, 500);
+                                return;
+                            }
                         }
-                        var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, value || 0), record.get('sum_unreceived_principal') || 0)
-                            , record.get('residual_value') || 0);
-                        var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
-                        record.set('repurchase_tatal_amount', repurchase_tatal_amount);
-                        record.set('repurchase_count_amount', repurchase_count_amount);
-                    }
-                    // 手续费
-                    if (name == 'repurchase_service_charges') {
-                        var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
-                            , record.get('residual_value') || 0);
-                        var repurchase_tatal_amount = plus(plus(repurchase_count_amount, value || 0), record.get('fund_possession_cost') || 0);
-                        record.set('repurchase_tatal_amount', repurchase_tatal_amount);
-                        record.set('repurchase_count_amount', repurchase_count_amount);
-                    }
-                    // 资金占用费value
-                    if (name == 'fund_possession_cost') {
-                        var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
-                            , record.get('residual_value') || 0);
-                        var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), value || 0);
-                        record.set('repurchase_tatal_amount', repurchase_tatal_amount);
-                        record.set('repurchase_count_amount', repurchase_count_amount);
-                    }
+                if (name == 'due_amount'&&value) {
+                    var due_amount = record.get('due_amount') || 0;
+                    var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, value || 0), record.get('sum_unreceived_principal') || 0)
+                        , record.get('residual_value') || 0);
+                    var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
+                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount,depoist_remaining_amount));
+                    record.set('repurchase_count_amount', minus(repurchase_tatal_amount,depoist_remaining_amount));
                 }
-            }
-            if(name == 'sum_overdue_amount'){
-                var repurchase_count_amount = plus(plus(plus(value || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
-                    , record.get('residual_value') || 0);
-                var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
-                record.set('repurchase_tatal_amount', repurchase_tatal_amount);
-                record.set('repurchase_count_amount', repurchase_count_amount);
-            }
-            if(name == 'sum_unreceived_principal'){
-                var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), value || 0)
-                    , record.get('residual_value') || 0);
-                var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
-                record.set('repurchase_tatal_amount', repurchase_tatal_amount);
-                record.set('repurchase_count_amount', repurchase_count_amount);
-            }
-            if (name == 'repurchase_date') {
-                // last_rent_due_date 前期租金支付约定日：自动带出原合同报价现金流中，回购解约日上一期应收租金的日期。
-                Leaf.request({
-                    url: $('con_repo001_calc_repo_date_amount_link').getUrl(),
-                    para: {
-                        contract_id: record.get('contract_id'),
-                        repurchase_date: value
-                    },
-                    success: function (res) {
-                        record.set('last_rent_due_date', res.result.last_rent_due_date);
-                        record.set('sum_received_rent_amount', res.result.sum_received_rent_amount);
-                        record.set('sum_unreceived_rent_amount', res.result.sum_unreceived_rent_amount);
-                        record.set('sum_overdue_amount', res.result.sum_overdue_amount);
-                        record.set('sum_unreceived_principal', res.result.sum_unreceived_principal);
-                        record.set('due_amount', res.result.due_amount);
-                        record.set('ccr_due_amount', res.result.due_amount);
-                    },
-                    failure: function () {
+                        // 手续费
+                        if (name == 'repurchase_service_charges') {
+                            var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('due_amount') || 0), record.get('sum_unreceived_principal') || 0)
+                                , record.get('residual_value') || 0);
+                            var repurchase_tatal_amount = plus(plus(repurchase_count_amount, value || 0), record.get('fund_possession_cost') || 0);
+                            record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount,depoist_remaining_amount));
+                            record.set('repurchase_count_amount', minus(repurchase_tatal_amount,depoist_remaining_amount));
+                        }
+                        // 资金占用费value
+                        if (name == 'fund_possession_cost') {
+                            var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('due_amount') || 0), record.get('sum_unreceived_principal') || 0)
+                                , record.get('residual_value') || 0);
+                            var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), value || 0);
+                            record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount,depoist_remaining_amount));
+                            record.set('repurchase_count_amount', minus(repurchase_tatal_amount,depoist_remaining_amount));
+                        }
 
-                    },
-                    error: function () {
 
-                    },
-                    scope: this
-                });
+                if(name == 'sum_overdue_amount'){
+                    var repurchase_count_amount = plus(plus(plus(value || 0, record.get('due_amount') || 0), record.get('sum_unreceived_principal') || 0)
+                        , record.get('residual_value') || 0);
+                    var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
+                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount,depoist_remaining_amount));
+                    record.set('repurchase_count_amount', minus(repurchase_tatal_amount,depoist_remaining_amount));
+                }
+                if(name == 'sum_unreceived_principal'){
+                    var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('due_amount') || 0), value || 0)
+                        , record.get('residual_value') || 0);
+                    var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
+                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount,depoist_remaining_amount));
+                    record.set('repurchase_count_amount', minus(repurchase_tatal_amount,depoist_remaining_amount));
+                }
+                // 一次性回购
+                //     if (repurchase_types == 'ONE_TIME_REPURCHASE') {
+                //         // 回购价款总额 = 逾期租金 + 逾期罚息（调整后）+ 剩余本金 + 留购价 + 手续费 + 资金占用费
+                //         // sum_overdue_amount+ccr_due_amount+sum_unreceived_principal+residual_value+repurchase_service_charges+fund_possession_cost
+                //         // 回购价款计算基数 = 逾期租金 + 逾期罚息（调整后）+ 剩余本金 + 留购价
+                //         // 逾期罚息（调整后）
+                //         record.getField('payment_frequency_n').setRequired(false);
+                //         record.getField('payment_frequency').setRequired(false);
+                //         record.getField('payment_period').setRequired(false);
+                //         record.getField('payment_frequency_n').setReadOnly(true);
+                //         record.getField('payment_period').setReadOnly(true);
+                //         record.set('payment_period', 1);
+                //         record.set('payment_frequency', 'MONTH');
+                //         if (name == 'ccr_due_amount') {
+                //             var due_amount = record.get('due_amount') || 0;
+                //             if (due_amount < value) {
+                //                 Leaf.showMessage('${l:HLS.PROMPT}', '调整后的罚息必须小于等于逾期罚息！');
+                //             }
+                //             var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, value || 0), record.get('sum_unreceived_principal') || 0)
+                //                 , record.get('residual_value') || 0);
+                //             var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
+                //             record.set('repurchase_tatal_amount', repurchase_tatal_amount);
+                //             record.set('repurchase_count_amount', repurchase_count_amount);
+                //         }
+                //         // 手续费
+                //         if (name == 'repurchase_service_charges') {
+                //             var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
+                //                 , record.get('residual_value') || 0);
+                //             var repurchase_tatal_amount = plus(plus(repurchase_count_amount, value || 0), record.get('fund_possession_cost') || 0);
+                //             record.set('repurchase_tatal_amount', repurchase_tatal_amount);
+                //             record.set('repurchase_count_amount', repurchase_count_amount);
+                //         }
+                //         // 资金占用费value
+                //         if (name == 'fund_possession_cost') {
+                //             var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
+                //                 , record.get('residual_value') || 0);
+                //             var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), value || 0);
+                //             record.set('repurchase_tatal_amount', repurchase_tatal_amount);
+                //             record.set('repurchase_count_amount', repurchase_count_amount);
+                //         }
+                //         // 分期回购
+                //     } else if (repurchase_types == 'STAGE_REPURCHASE') {
+                //         record.getField('payment_frequency_n').setRequired(true);
+                //         record.getField('payment_frequency').setRequired(true);
+                //         record.getField('payment_period').setRequired(true);
+                //         record.getField('payment_frequency_n').setReadOnly(false);
+                //         record.getField('payment_period').setReadOnly(false);
+                //         // 回购价款总额 = 逾期租金 + 逾期罚息（调整后）+ 剩余本金 + 留购价 + 手续费 + 资金占用费
+                //         // sum_overdue_amount+ccr_due_amount+sum_unreceived_principal+residual_value+repurchase_service_charges+fund_possession_cost
+                //         // 回购价款计算基数 = 逾期租金 + 逾期罚息（调整后）+ 剩余本金 + 留购价
+                //         // 逾期罚息（调整后）
+                //         if(name == 'payment_period'){
+                //             if(value <= 0 || value == NaN || value == undefined){
+                //                 Leaf.showMessage('${l:HLS.PROMPT}', '支付期数请填写大于0的整数！');
+                //                 return;
+                //             }
+                //         }
+                //         if (name == 'ccr_due_amount') {
+                //             var due_amount = record.get('due_amount') || 0;
+                //             if (due_amount < value) {
+                //                 Leaf.showMessage('${l:HLS.PROMPT}', '调整后的罚息必须小于等于逾期罚息！');
+                //                 return;
+                //             }
+                //             var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, value || 0), record.get('sum_unreceived_principal') || 0)
+                //                 , record.get('residual_value') || 0);
+                //             var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
+                //             record.set('repurchase_tatal_amount', repurchase_tatal_amount);
+                //             record.set('repurchase_count_amount', repurchase_count_amount);
+                //         }
+                //         // 手续费
+                //         if (name == 'repurchase_service_charges') {
+                //             var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
+                //                 , record.get('residual_value') || 0);
+                //             var repurchase_tatal_amount = plus(plus(repurchase_count_amount, value || 0), record.get('fund_possession_cost') || 0);
+                //             record.set('repurchase_tatal_amount', repurchase_tatal_amount);
+                //             record.set('repurchase_count_amount', repurchase_count_amount);
+                //         }
+                //         // 资金占用费value
+                //         if (name == 'fund_possession_cost') {
+                //             var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
+                //                 , record.get('residual_value') || 0);
+                //             var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), value || 0);
+                //             record.set('repurchase_tatal_amount', repurchase_tatal_amount);
+                //             record.set('repurchase_count_amount', repurchase_count_amount);
+                //         }
+                //     }
+                // }
+                // if(name == 'sum_overdue_amount'){
+                //     var repurchase_count_amount = plus(plus(plus(value || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
+                //         , record.get('residual_value') || 0);
+                //     var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
+                //     record.set('repurchase_tatal_amount', repurchase_tatal_amount);
+                //     record.set('repurchase_count_amount', repurchase_count_amount);
+                // }
+                // if(name == 'sum_unreceived_principal'){
+                //     var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), value || 0)
+                //         , record.get('residual_value') || 0);
+                //     var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
+                //     record.set('repurchase_tatal_amount', repurchase_tatal_amount);
+                //     record.set('repurchase_count_amount', repurchase_count_amount);
+                // }
+                if (name == 'repurchase_date'&&value) {
+                    // last_rent_due_date 前期租金支付约定日：自动带出原合同报价现金流中，回购解约日上一期应收租金的日期。
+                    Leaf.request({
+                        url: $('con_repo001_calc_repo_date_amount_link').getUrl(),
+                        para: {
+                            contract_id: record.get('contract_id'),
+                            repurchase_date: value
+                        },
+                        success: function (res) {
+                            record.set('last_rent_due_date', res.result.last_rent_due_date);
+                            record.set('sum_received_rent_amount', res.result.sum_received_rent_amount||0);
+                            record.set('sum_unreceived_rent_amount', res.result.sum_unreceived_rent_amount||0);
+                            record.set('sum_overdue_amount', res.result.sum_overdue_amount||0);
+                            record.set('sum_unreceived_principal', res.result.sum_unreceived_principal||0);
+                            record.set('due_amount', res.result.due_amount||0);
+                            record.set('ccr_due_amount', res.result.due_amount||0);
+                        },
+                        failure: function () {
+                            record.set('last_rent_due_date','');
+                            record.set('repurchase_date','');
+                            record.set('sum_received_rent_amount','');
+                            record.set('sum_unreceived_rent_amount','');
+                            record.set('sum_overdue_amount', '');
+                            record.set('sum_unreceived_principal','');
+                            record.set('due_amount', '');
+                            record.set('ccr_due_amount','');
+                        },
+                        error: function () {
+                            record.set('repurchase_date','');
+                            record.set('last_rent_due_date','');
+                            record.set('sum_received_rent_amount','');
+                            record.set('sum_unreceived_rent_amount','');
+                            record.set('sum_overdue_amount','');
+                            record.set('sum_unreceived_principal', '');
+                            record.set('due_amount','');
+                            record.set('ccr_due_amount', '');
+                        },
+                        scope: this
+                    });
+                }
             }
         };
 
         window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
-            $('${/parameter/@layout_code}_submit_approval').disable();
+           // $('${/parameter/@layout_code}_submit_approval').disable();
                 var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract');
                 var req_record = $(req_ds_id).getAt(0);
                 var case_type = '';
@@ -213,7 +295,7 @@
                 var calc_session_id = req_record.get('calc_session_id');
             if (req_record.dirty == true) {
                 Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
-                $('${/parameter/@layout_code}_submit_approval').enable();
+               // $('${/parameter/@layout_code}_submit_approval').enable();
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 return false;
             }
@@ -223,11 +305,13 @@
                     //     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     //     return;
                     // }
-                    $('${/parameter/@layout_code}_submit_approval').disable();
-                    $('${/parameter/@layout_code}_save').disable();
-                    $('${/parameter/@layout_code}_user_button1').disable();
-                    $('${/parameter/@layout_code}_user_button3').disable();
-                    setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit), 2000);
+                   // $('${/parameter/@layout_code}_submit_approval').disable();
+                   // $('${/parameter/@layout_code}_save').disable();
+                  //  $('${/parameter/@layout_code}_user_button1').disable();
+                  //  $('${/parameter/@layout_code}_user_button3').disable();
+                   // setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit), 2000);
+                   // window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit);
+                    con_repo001_submit();
                 } else {
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 }
@@ -271,6 +355,7 @@
 
         //报价计算
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
+            debugger;
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var ds_id_head = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'con_contract');
             var cashflow_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_cashflow');
@@ -319,6 +404,8 @@
                                'contract_id': record.get('contract_id')
                            },
                            success: function(res) {
+                              var  url = $('${/parameter/@layout_code}${/parameter/@tree_code}_hls_fin_calculator_update_link_id').getUrl();
+                               window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                                if (calc_session_id) {
                                    //直接进入报价页面
                                    var win = new Leaf.Window({
@@ -343,10 +430,12 @@
                                        draggable: true
                                    });
                                    win.on('close', function () {
+                                       window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                                       if(cashflow_ds_id&&ds_id_head){
                                        $(cashflow_ds_id).query();
-                                       $(ds_id_head).query();
+                                       $(ds_id_head).query();}
                                    });
-                                   window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+
                                }
                            },
                            failure: function() {
@@ -368,13 +457,13 @@
         //取消变更
         window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
-            $('${/parameter/@layout_code}_user_button3').disable(); //按钮不可用
+           // $('${/parameter/@layout_code}_user_button3').disable(); //按钮不可用
             Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认取消变更？', function() {
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
                 Leaf.request({
                     url: $('con_repo001_cancel_link').getUrl(),
                     para: {
-                        change_req_id:' ${/parameter/@change_req_id}'
+                        change_req_id: ${/parameter/@change_req_id}
                     },
                     success: function(res) {
                         $('${/parameter/@layout_code}_user_button3').enable(); //按钮启用

src/main/webapp/modules/cont/CON_REPO001/hls_fin_calculator_update_n.lview

@@ -37,6 +37,7 @@
         <a:link id="hls_fin_calc_show_display_line_link_id" url="${/request/@context_path}/modules/hls/HLS500N/hls_fin_calc_show_display_line_n.lview"/>
         <a:link id="prj_check_prj_record_link_id" model="hls.HLS500N.check_prj_record" modelaction="execute"/>
         <a:link id="hls_fin_calc_single_variable_calc_link_id" model="hls.HLS500.hls_fin_calc_single_variable_calc" modelaction="update"/>
+        <!--<a:link id="hls_fin_calc_single_variable_manual_link_id" model="cont.CON_REPO001.con_change_calc_single_variable_calc" modelaction="execute"/>-->
         <a:link id="hls_fin_calc_single_variable_manual_link_id" model="cont.CON_REPO001.con_change_calc_single_variable_calc" modelaction="execute"/>
         <style><![CDATA[
         .finGrid td[dataindex=percent]{
@@ -53,7 +54,7 @@
         }
         ]]></style>
         <script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
-        <a:screen-include screen="modules/hls/HLS500/hls_fin_calculator_dynamic.lview?calc_session_id=${/parameter/@calc_session_id}&amp;calc_type=CLASSIC_CALCULATOR&amp;document_category=${/parameter/@document_category}&amp;winId=${/parameter/@winId}"/>
+        <a:screen-include screen="${/request/@context_path}/modules/hls/HLS500/hls_fin_calculator_dynamic.lview?calc_session_id=${/parameter/@calc_session_id}&amp;calc_type=CLASSIC_CALCULATOR&amp;document_category=${/parameter/@document_category}&amp;winId=${/parameter/@winId}"/>
         <script type="text/javascript"><![CDATA[
         var formula_column_name = '';
         var formula_column_code = '';
@@ -708,7 +709,7 @@
         }
 
         function onEditorHdload(ds) {
-
+        debugger;
             var headRecords = ds.getAll();
             for (var i = 0;i < headRecords.length;i++) {
                 headRecords[i].set('input_mode','READONLY');
@@ -1112,12 +1113,15 @@
             flag = 'Y';
             lock_calc_current_window();
             Leaf.request({
-                url: $('hls_fin_calc_single_variable_calc_link_id').getUrl(),
+                url: $('hls_fin_calc_single_variable_manual_link_id').getUrl(),
                 para: {
-                    calc_session_id: '${/parameter/@calc_session_id}'
+                    calc_session_id: '${/parameter/@calc_session_id}',
+                    contract_id:'${/parameter/@document_id}'
                 },
                 success: function() {
-
+               if('${/parameter/@document_category}'=='CONTRACT'){
+                        $('CON_BUYBACK_02_G_QUOTATION_04_con_contract_cashflow_ds').query();
+                    }
                     open_after_save_execute();
                 },
                 failure: function() {
@@ -1130,6 +1134,45 @@
             });
 
         }
+        function hls_hls500_save_new(nextStep, source_procedure) {
+
+
+            lock_calc_current_window('${l:HLS.SAVING}');
+            if (!$('hls_fin_calculator_hd_ds').validate() || !$('hls_fin_calculator_ln_ds').validate()) {
+                unlock_calc_current_window();
+                return;
+            }
+                var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
+                for (var i = 0;i < temp_head_records.length;i++) {
+                    if (!$('temp_hd_attribute_ds').find('column_code', temp_head_records[i].get('column_code'))) {
+                        $('temp_hd_attribute_ds').create(temp_head_records[i].data);
+                    }
+                }
+                var all_records = $('temp_hd_attribute_ds').getAll();
+                var headRecord = $('hls_fin_cal_save_hd_ds').getAt(0);
+                headRecord.isNew = false;
+                headRecord.dirty = true;
+                create_record_column(all_records, headRecord);
+
+                function hls_fin_cal_save_hd_submitsuccess_new(ds, res) {
+                    if (typeof(nextStep) == 'function') {
+                        nextStep(source_procedure);
+                    } else {
+                        function on_ln_formula_load(ds) {
+                            Leaf.SideBar.enable = true;
+                            success_sidebar_show();
+                            unlock_calc_current_window();
+                            $('ln_formula_ds').un('load', on_ln_formula_load);
+                        }
+                        $('ln_formula_ds').on('load', on_ln_formula_load);
+                        $('ln_formula_ds').query();
+                    }
+                }
+                $('hls_fin_cal_save_hd_ds').on('submitsuccess', hls_fin_cal_save_hd_submitsuccess_new);
+                Leaf.SideBar.enable = false;
+                $('hls_fin_cal_save_hd_ds').submit();
+        }
+
         function hls_hls500_user_button2() {
             flag = 'Y';
             lock_calc_current_window();
@@ -1138,10 +1181,12 @@
                 url: $('hls_fin_calc_single_variable_manual_link_id').getUrl(),
                 para: {
                     calc_session_id: '${/parameter/@calc_session_id}',
-                    document_id:'${/parameter/@document_id}'
+                    contract_id:'${/parameter/@document_id}'
                 },
                 success: function() {
-
+                    if('${/parameter/@document_category}'=='CONTRACT'){
+                        $('CON_BUYBACK_02_G_QUOTATION_04_con_contract_cashflow_ds').query();
+                    }
                     open_after_save_execute();
                 },
                 failure: function() {
@@ -1153,6 +1198,96 @@
                 scope: this
             });
 
+        }
+
+        function calc_execute_JD_new(source_procedure) {
+
+            var final_recreate_H_formula, final_recreate_L_formula;
+            if (source_procedure == 'RE_CALC') {
+                final_recreate_H_formula = 'Y';
+                final_recreate_L_formula = 'Y';
+            } else {
+                final_recreate_H_formula = recreate_H_formula;
+                final_recreate_L_formula = recreate_L_formula;
+            }
+            Leaf.request({
+                url: '${/request/@context_path}/autocrud/hls.HLS500.hls_fin_calculator_calc/update',
+                para: {
+                    calc_session_id: '${/parameter/@calc_session_id}',
+                    document_id: '${/parameter/@document_id}',
+                    document_category: '${/parameter/@document_category}',
+                    recreate_H_formula: final_recreate_H_formula,
+                    recreate_L_formula: final_recreate_L_formula,
+                    quotation_id: '${/parameter/@quotation_id}'
+                },
+                success: function(res) {
+                    on_calc_success_query('${/parameter/@dsId}', '${/parameter/@document_category}');
+                    //get_warning_message(res.result.warning_message);
+                    recreate_H_formula = 'N';
+                    recreate_L_formula = 'N';
+                    //open_after_save_execute();
+                    hls_hls500_user_button1();
+                },
+                failure: function() {
+                    unlock_calc_current_window();
+                },
+                error: function() {
+                    unlock_calc_current_window();
+                },
+                scope: this
+            });
+        }
+        function calc_execute_NJD_new(source_procedure) {
+
+            var final_recreate_H_formula, final_recreate_L_formula;
+            if (source_procedure == 'RE_CALC') {
+                final_recreate_H_formula = 'Y';
+                final_recreate_L_formula = 'Y';
+            } else {
+                final_recreate_H_formula = recreate_H_formula;
+                final_recreate_L_formula = recreate_L_formula;
+            }
+            Leaf.request({
+                url: '${/request/@context_path}/autocrud/hls.HLS500.hls_fin_calculator_calc/update',
+                para: {
+                    calc_session_id: '${/parameter/@calc_session_id}',
+                    document_id: '${/parameter/@document_id}',
+                    document_category: '${/parameter/@document_category}',
+                    recreate_H_formula: final_recreate_H_formula,
+                    recreate_L_formula: final_recreate_L_formula,
+                    quotation_id: '${/parameter/@quotation_id}'
+                },
+                success: function(res) {
+                    on_calc_success_query('${/parameter/@dsId}', '${/parameter/@document_category}');
+                    //get_warning_message(res.result.warning_message);
+                    recreate_H_formula = 'N';
+                    recreate_L_formula = 'N';
+                    //open_after_save_execute();
+                    hls_hls500_user_button2();
+                },
+                failure: function() {
+                    unlock_calc_current_window();
+                },
+                error: function() {
+                    unlock_calc_current_window();
+                },
+                scope: this
+            });
+        }
+
+
+        //均等计算合并计算按钮一起
+        function hls_hls500_JD() {
+
+            hls_hls500_save_new(calc_execute_JD_new, 'CALC');
+
+        }
+        //不均等
+        function hls_hls500_NJD() {
+
+            hls_hls500_save_new(calc_execute_NJD_new, 'CALC');
+
+
         }
         ]]></script>
         <a:dataSets>
@@ -1204,7 +1339,7 @@
                 </a:fields>
                 <a:events>
                     <a:event name="update" handler="do_hls500_head_update"/>
-                    <a:event name="load" handler="onEditorHdload"/>
+                    <!--<a:event name="load" handler="onEditorHdload"/>-->
                 </a:events>
             </a:dataSet>
             <a:dataSet id="hls_fin_calculator_ln_ds" autoQuery="true" bindName="ln_calc_bind_name" bindTarget="hls_fin_cal_save_hd_ds" fetchAll="true" processfunction="hls500_ln_process" queryUrl="${/request/@context_path}/modules/hls/HLS500N/hls_fin_calculator_base_query.lsc?calc_session_id=${/parameter/@calc_session_id}&amp;ln_table_flag=Y" selectable="true">
@@ -1372,14 +1507,26 @@
                             <a:gridButton id="hls_hls500_show_col_id" click="hls_hls500_show_col" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>
                         </c:process-config>
                     </p:case>
+                    <!--<p:case value="USER_BUTTON1">-->
+                        <!--<c:process-config>-->
+                            <!--<a:gridButton id="hls_hls500_user_button1_col_id" click="hls_hls500_user_button1" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>-->
+                        <!--</c:process-config>-->
+                    <!--</p:case>-->
+                    <!--<p:case value="USER_BUTTON2">-->
+                        <!--<c:process-config>-->
+                            <!--<a:gridButton id="hls_hls500_user_button2_col_id" click="hls_hls500_user_button2" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>-->
+                        <!--</c:process-config>-->
+                    <!--</p:case>-->
                     <p:case value="USER_BUTTON1">
                         <c:process-config>
-                            <a:gridButton id="hls_hls500_user_button1_col_id" click="hls_hls500_user_button1" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>
+                            <!--<a:gridButton id="hls_hls500_user_button1_col_id" click="hls_hls500_user_button1" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>-->
+                            <!--<div style="margin-top:10px;margin-left:10px;color: red">请先点计算按钮,再执行均等计算(若改变参数值,请先点击公式重算！) </div>-->
+                            <a:gridButton id="hls_hls500_user_button1_col_id" click="hls_hls500_JD" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>
                         </c:process-config>
                     </p:case>
                     <p:case value="USER_BUTTON2">
                         <c:process-config>
-                            <a:gridButton id="hls_hls500_user_button2_col_id" click="hls_hls500_user_button2" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>
+                            <a:gridButton id="hls_hls500_user_button2_col_id" click="hls_hls500_NJD" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>
                         </c:process-config>
                     </p:case>
                     <p:case value="*">

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT100/cus_deposit_entry_maintain.lview

@@ -295,7 +295,7 @@
                     <a:field name="receipt_type"/>
                     <a:field name="receipt_type_des" displayField="code_value_name" options="receipt_type_ds" returnField="receipt_type" valueField="code_value"/>
                     <a:field name="description"/>
-                    <a:field name="bp_name" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov" lovWidth="500" title="HLS.BP_TITLE">
+                    <a:field name="bp_name" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov?bp_category=AGENT" lovWidth="500" title="HLS.BP_TITLE">
                         <a:mapping>
                             <a:map from="bp_id" to="bp_id"/>
                             <a:map from="bp_name" to="bp_name"/>
@@ -304,27 +304,27 @@
 
                     <a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
                     <!--对方账户的-->
-                    <a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
-                    <a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
-                    <a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
+                    <!--<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
+                    <!--<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
+                    <!--<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="cus_deposit.CUS_DEPOSIT100.csh_transaction_for_lov?bp_bank_account_name is not null" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
 
                 </a:fields>
                 <a:events>
@@ -357,11 +357,11 @@
                         <!--银行流水号-->
                         <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
                         <!--对方账户户名-->
-                        <a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
+                        <a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
                         <!--对方银行名称-->
-                        <a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
+                        <a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
                         <!--对方账户账号-->
-                        <a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
+                        <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
                         <a:lov name="bp_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="代理店"/>
                     </a:fieldSet>
                 </a:hBox>
@@ -373,20 +373,20 @@
                 </a:toolBar>-->
                     <a:columns>
                         <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="seedetail_transaction_num" width="110" align="center"/>
+                        <a:column name="bp_name" prompt="代理店" align="center"/>
                         <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
                         <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
                         <a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
-                        <a:column name="bp_name" prompt="代理店" align="center"/>
-                        <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
+                        <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center" forExport="false"/>
                         <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
+                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center" forExport="false"/>
+                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center" forExport="false"/>
+                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center" forExport="false"/>
                     </a:column>
                         <a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center"/>
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center"/>
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center" forExport="false"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center" forExport="false"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center" forExport="false"/>
                         </a:column>
                         <!--<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/>-->
                         <!--<a:column name="debt_confirmed_by_desc" prompt="CSH510.CSH_TRANSACTION.DEPT_CONFIRMER" align="center"/>-->

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/csh_transaction_deposit_transfer_detail.lview

@@ -24,8 +24,19 @@
                 var saveData = [];
                 debugger;
                 param['source_contract_id'] = '${/parameter/@contract_id}';
+                param['je_date'] =deposit_records[0].get('je_date');
+                param['hd_contract_id'] =deposit_records[0].get('contract_id');
                 //param['bp_id'] = head_record.get('bp_id');
                // param['bp_category'] = head_record.get('bp_category');
+                for (var k = 0; k < deposit_records.length; k++) {
+                    for (var m = k+1; m< deposit_records.length; m++) {
+                       if ( Leaf.formatDate(deposit_records[k].get('je_date'))!= Leaf.formatDate(deposit_records[m].get('je_date'))){
+                           Leaf.showMessage('${l:PROMPT}', "经济发生日请保持一致！");
+                           return;
+                       }
+                    }
+
+                }
                 for (var i = 0; i < deposit_records.length; i++) {
                     var deposit_record;
                     deposit_record = deposit_records[i];
@@ -109,14 +120,14 @@
                     var change_value = get_minus_amount(value, oldvalue);
                     var current_apply_amount = get_current_amount(head_record.get('current_apply_amount') || 0);
                     if (((current_apply_amount - oldvalue + (value || 0))) < 0) {
-                        Leaf.showMessage('${l:PROMPT}', "本次入账金额不能为负！");
+                        Leaf.showMessage('${l:PROMPT}', "本次划转金额不能为负！");
                         setTimeout(function () {
                             record.set('deposit_amount', '');
                         }, 10);
                         head_record.set('current_apply_amount', 0);
                         return;
                     }
-                    if ((current_apply_amount - oldvalue + (value || 0)) <= unwrite_off_amount && (current_apply_amount - oldvalue + (value || 0)) >= 0) {
+                    if ((current_apply_amount - oldvalue + (value || 0)) <=unwrite_off_amount && (current_apply_amount - oldvalue + (value || 0)) >= 0) {
                         head_record.set('current_apply_amount', current_apply_amount - oldvalue + (value || 0));
                     } else {
                         Leaf.showMessage('${l:PROMPT}', "本次入账金额小于剩余可入账金额！");
@@ -141,7 +152,7 @@
 
         }
         function on_csh_trx_deposit_write_off_add(ds, record, index) {
-               record.set('je_date', '${/model/sys_time_default_value_path/record/@now_time}');
+            //   record.set('je_date', '${/model/sys_time_default_value_path/record/@now_time}');
            //     record.set('write_off_type', 'DEPOSIT_ENTRY');
 
         }
@@ -152,6 +163,7 @@
             <a:dataSet id="CUS102_DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
             <a:dataSet id="deposit_transfer_detail_result_ds" loadData="true" selectable="true">
                 <a:fields>
+                    <a:field name="je_date" required="true" prompt="经济业务发生日"/>
                     <a:field name="transaction_category" defaultValue="BUSINESS"/>
                     <a:field name="transaction_type" defaultValue="DEPOSIT"/>
                     <a:field name="document_category" defaultValue="CONTRACT"/>
@@ -181,7 +193,7 @@
                 <a:events>
                     <a:event name="update" handler="on_csh_trx_deposit_write_off_update"/>
                     <a:event name="remove" handler="on_csh_trx_deposit_write_off_remove"/>
-                    <a:event name="add" handler="on_csh_trx_deposit_write_off_add"/>
+                    <!--<a:event name="add" handler="on_csh_trx_deposit_write_off_add"/>-->
                 </a:events>
             </a:dataSet>
         </a:dataSets>
@@ -204,7 +216,7 @@
 
                 </a:box>
             </a:fieldSet>
-            <a:grid id="deposit_transfer_detail_result_grid" bindTarget="deposit_transfer_detail_result_ds" height="200"
+            <a:grid id="deposit_transfer_detail_result_grid" bindTarget="deposit_transfer_detail_result_ds" marginHeight="170"
                     navBar="false" width="800">
                 <a:toolBar>
                     <a:button type="add"/>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/cus_deposit_transfer_maintain.lview

@@ -107,12 +107,13 @@
             <a:fieldSet  labelWidth="150" style="margin-left:20px">
             <a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="deposit_transfer_maintain_result_ds" marginHeight="165" marginWidth="100" navBar="true" >
                     <a:columns>
-                        <a:column name="contract_number" prompt="合同编号" align="center"/>
-                        <a:column name="contract_name" prompt="合同名称" align="center" width="150"/>
                         <a:column name="bp_name" prompt="代理店" align="center" width="200"/>
                         <a:column name="bp_id_telnet_n" prompt="承租人" align="center" width="120"/>
+                        <a:column name="contract_number" prompt="合同编号" align="center"/>
+                        <a:column name="contract_name" prompt="合同名称" align="center" width="150"/>
                         <a:column name="deposit_trans_type_n" prompt="保证金类型" width="110" align="center"/>
-                        <a:column name="unwrite_off_amount" prompt="剩余可用金额" width="110"  align="right" renderer="Leaf.formatMoney"/>
+                        <a:column name="unwrite_off_amount" prompt="剩余可用金额" width="110"  renderer="Leaf.formatMoney"  align="right" />
+                        <a:column name="approve_status" prompt="状态" width="120" align="center"/>
                     </a:columns>
             </a:grid>
             </a:fieldSet>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT104/cus_deposit_write_off_maintain.lview

@@ -418,33 +418,33 @@
 
                     <!--<a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>-->
                     <!--对方账户的-->
-                    <a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550"
-                             lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"
-                             title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
-                    <a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550"
-                             lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"
-                             title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
-                    <a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550"
-                             lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"
-                             title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
+                    <!--<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550"-->
+                             <!--lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"-->
+                             <!--title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
+                    <!--<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550"-->
+                             <!--lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"-->
+                             <!--title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
+                    <!--<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550"-->
+                             <!--lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"-->
+                             <!--title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
 
                 </a:fields>
                 <a:events>
@@ -491,13 +491,13 @@
                         <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
                                      prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
                         <!--对方账户户名-->
-                        <a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
+                        <a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
                                prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
                         <!--对方银行名称-->
-                        <a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds"
+                        <a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds"
                                prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
                         <!--对方账户账号-->
-                        <a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
+                        <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
                                prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
                         <a:textField name="contract_number" prompt="合同编号"
                                      bindTarget="csh_transaction_receipt_maintain_query_ds"/>
@@ -521,30 +521,31 @@
                         <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" width="110"
                                   align="center"/>
                         <!--<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="csh531n_detail_renderer" width="110" align="center"/>-->
+                        <a:column name="bp_name" prompt="代理店" align="center"/>
+                        <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
+                        <a:column name="contract_number" prompt="合同编号" align="center"/>
                         <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT"
                                   width="100" renderer="Leaf.formatMoney"/>
                         <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
                         <a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
-                        <a:column name="bp_name" prompt="代理店" align="center"/>
-                        <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
-                        <a:column name="contract_number" prompt="合同编号" align="center"/>
                         <a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>
-                        <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
+                        <a:column name="approve_status" prompt="状态" width="120" align="center"/>
+                        <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center" forExport="false"/>
                         <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
                             <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name"
-                                      align="center"/>
+                                      align="center" forExport="false"/>
                             <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name"
-                                      align="center"/>
+                                      align="center" forExport="false"/>
                             <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num"
-                                      align="center"/>
+                                      align="center" forExport="false"/>
                         </a:column>
                         <a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
                             <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name"
-                                      align="center"/>
+                                      align="center" forExport="false"/>
                             <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na"
-                                      align="center"/>
+                                      align="center" forExport="false"/>
                             <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num"
-                                      align="center"/>
+                                      align="center" forExport="false" />
                         </a:column>
                     </a:columns>
                 </a:grid>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/cus_deposit_write_off_return_maintain.lview

@@ -87,7 +87,7 @@
             });
         }
 
-        function openWindow(url) {
+        function openReturnWindow(url) {
             new Leaf.Window({
                 id: 'csh_transaction_deposit_link_winid',
                 params: {
@@ -267,27 +267,27 @@
 
                     <!--<a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>-->
                     <!--对方账户的-->
-                    <a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
-                    <a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
-                    <a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
+                    <!--<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
+                    <!--<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
+                    <!--<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
 
                 </a:fields>
                 <a:events>
@@ -320,11 +320,11 @@
                         <!--银行流水号-->
                         <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
                         <!--对方账户户名-->
-                        <a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
+                        <a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
                         <!--对方银行名称-->
-                        <a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
+                        <a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
                         <!--对方账户账号-->
-                        <a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
+                        <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
                         <a:textField name="contract_number" prompt="合同编号" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
                         <a:textField name="bp_name_n"  prompt="代理店" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
                         <a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
@@ -339,24 +339,25 @@
                 </a:toolBar>-->
                     <a:columns>
                         <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" width="110" align="center"/>
-                        <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
-                        <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
-                        <a:column name="unwrite_off_amount" prompt="剩余可退金额" align="right" renderer="Leaf.formatMoney"/>
-                        <a:column name="applying_amount" prompt="退款中金额" align="right"  renderer="seedetail_return_num"/>
                         <a:column name="bp_name" prompt="代理店" align="center"/>
                         <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
                         <a:column name="contract_number" prompt="合同编号" align="center"/>
+                        <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
+                        <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
+                        <a:column name="unwrite_off_amount" prompt="剩余可退金额" align="right" renderer="Leaf.formatMoney"/>
                         <a:column name="deposit_trans_type_desc" prompt="保证金类型" width="110" align="center"/>
-                        <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
+                        <a:column name="applying_amount" prompt="退款中金额" align="right"  renderer="seedetail_return_num"/>
+                        <a:column name="approve_status" prompt="状态" width="120" align="center"/>
+                        <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center" forExport="false"/>
                         <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
+                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center" forExport="false"/>
+                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center" forExport="false"/>
+                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center" forExport="false"/>
                     </a:column>
                         <a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center"/>
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center"/>
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center" forExport="false"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center" forExport="false"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center" forExport="false"/>
                         </a:column>
                     </a:columns>
             </a:grid>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT110/cus_deposit_write_off_reserve_maintain.lview

@@ -240,27 +240,27 @@
 
                     <a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
                     <!--对方账户的-->
-                    <a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
-                    <a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
-                    <a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
+                    <!--<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
+                    <!--<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
+                    <!--<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
 
                 </a:fields>
                 <a:events>
@@ -292,11 +292,11 @@
                         <!--银行流水号-->
                         <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
                         <!--对方账户户名-->
-                        <a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
+                        <a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
                         <!--对方银行名称-->
-                        <a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
+                        <a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
                         <!--对方账户账号-->
-                        <a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
+                        <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
                         <a:textField name="contract_number" prompt="合同编号" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
                         <a:textField name="bp_name_n"  prompt="代理店" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
                         <a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
@@ -318,16 +318,16 @@
                         <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
                         <a:column name="contract_number" prompt="合同编号" align="center"/>
                         <a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>
-                        <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
+                        <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center" forExport="false"/>
                         <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
+                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center" forExport="false"/>
+                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center" forExport="false"/>
+                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center" forExport="false"/>
                     </a:column>
                         <a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center"/>
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center"/>
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center" forExport="false"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center" forExport="false"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center" forExport="false"/>
                         </a:column>
                     </a:columns>
             </a:grid>

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

@@ -287,28 +287,28 @@
                     </a:field>
 
                     <a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
-                    <!--对方账户的-->
-                    <a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
-                    <a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
-                    <a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
-                        <a:mapping>
-                            <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
-                            <a:map from="opposite_band_na" to="opposite_band_na"/>
-                            <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
-                        </a:mapping>
-                    </a:field>
+                    <!--&lt;!&ndash;对方账户的&ndash;&gt;-->
+                    <!--<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
+                    <!--<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
+                    <!--<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
+                        <!--<a:mapping>-->
+                            <!--<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>-->
+                            <!--<a:map from="opposite_band_na" to="opposite_band_na"/>-->
+                            <!--<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>-->
+                        <!--</a:mapping>-->
+                    <!--</a:field>-->
 
                 </a:fields>
                 <a:events>
@@ -340,11 +340,11 @@
                         <!--银行流水号-->
                         <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
                         <!--对方账户户名-->
-                        <a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
+                        <a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
                         <!--对方银行名称-->
-                        <a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
+                        <a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
                         <!--对方账户账号-->
-                        <a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
+                        <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
                         <a:textField name="contract_number" prompt="合同编号" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
                         <a:textField name="bp_name_n"  prompt="代理店" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
                         <a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
@@ -357,23 +357,24 @@
             <a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="csh_transaction_receipt_maintain_result_ds" marginHeight="200" marginWidth="80" navBar="true" >
                     <a:columns>
                         <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="seedetail_transaction_num" width="110" align="center"/>
-                        <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
-                        <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
-                        <a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
                         <a:column name="bp_name" prompt="代理店" align="center"/>
                         <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
                         <a:column name="contract_number" prompt="合同编号" align="center"/>
+                        <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
+                        <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
+                        <a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
                         <a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>
-                        <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
+                        <a:column name="approve_status" prompt="状态" width="120" align="center"/>
+                        <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center" forExport="false"/>
                         <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
+                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center" forExport="false"/>
+                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center" forExport="false"/>
+                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center" forExport="false"/>
                     </a:column>
                         <a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center"/>
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center"/>
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center" forExport="false"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center" forExport="false"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center" forExport="false"/>
                         </a:column>
                     </a:columns>
             </a:grid>

src/main/webapp/modules/hls/HLS361N/credit_credit_maintain.lview

@@ -16,8 +16,7 @@ $Purpose: 商业伙伴授信维护
         <script type="text/javascript"><![CDATA[
         Leaf.onReady(function() {
             var credit_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd');
-            console.log('${/parameter/@bp_credit_hd_id}');
-            $(credit_ds).setQueryParameter('bp_credit_hd_id', '${/parameter/@bp_credit_hd_id}')
+            $(credit_ds).setQueryParameter('bp_credit_hd_id', ${/parameter/@bp_credit_hd_id});
             $(credit_ds).query();
 
         })

src/main/webapp/modules/hls/HLS361N/hls_bp_master_credit.lview

@@ -105,7 +105,7 @@ $Purpose: 商业伙伴授信维护
             param['credit_date_from']=datas[0].get('credit_date_from');
             param['credit_total_amount']=datas[0].get('credit_total_amount');
             param['bp_code']=datas[0].get('bp_code');
-            param['bp_id']=datas[0].get('bp_id');
+          //  param['bp_id']=datas[0].get('bp_id');
             param['credit_status']=datas[0].get('credit_status');
             param['winid']='hls_bp_credit_winId';
 

src/main/webapp/modules/hls/HLS362N/credit_entrance_detail_confirm.lview

@@ -16,9 +16,9 @@ $Purpose: 商业伙伴授信维护
         <script type="text/javascript"><![CDATA[
         Leaf.onReady(function(){
 
-            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd');
             var record = $(ds_id).getCurrentRecord();
-            $(ds_id).setQueryParameter('bp_id','${/parameter/@bp_id}');
+            $(ds_id).setQueryParameter('bp_credit_hd_id',${/parameter/@bp_credit_hd_id});
             $(ds_id).query();
 
         })

src/main/webapp/modules/hls/HLS500/hls_fin_calculator_dynamic.lview

@@ -336,6 +336,7 @@
                 hd_lov_mapping_ds.on('load', clear_mapping_detail);
                 hd_lov_mapping_ds.query();
             }
+
             
             function onEditorupdate_setEmpty(ds, record, name, value, old_value, fromLoad) {
                 if (!fromLoad) {
@@ -359,14 +360,52 @@
                     call_back_after_check_limit(ds, record, name, value, old_value);
                 }
             }
-            
+
+        function getNextMonth(date) {
+                debugger;
+            var arr = date.toString().split('-');
+            var year = arr[0]; //获取当前日期的年份
+            var month = arr[1]; //获取当前日期的月份
+            var day = arr[2]; //获取当前日期的日
+            var month2 = parseInt(month) + 1;
+            if (month2 == 13) {
+                year = parseInt(year) + 1;
+                month2 = 1;
+            }
+            var day2 = day;
+            var days2 = new Date(year, month2, 0);
+            days2 = days2.getDate();
+            if (day2 > days2) {
+                day2 = days2;
+            }
+            if (month2 < 10) {
+                month2 = '0' + month2;
+            }
+            var t2 = year + '-' + month2 + '-' + day2;
+            return t2;
+        }
             function onEditorupdate(ds, record, name, value, old_value, fromLoad) {
+                debugger;
                 if (record.get('lov_return_vcode') == 'N' && (record.get('validation_type') == 'COMBOBOX' || record.get('validation_type') == 'LOV') && name == 'column_value') {
                     return;
                 }
                 var column_name = record.get('column_name');
+                var column_value = record.get('column_value');
                 var temp_hd_attribute_ds = $('temp_hd_attribute_ds');
                 var exchange_rate_type_record, exchange_rate_record, currency_record, lease_start_date_record, exchange_rate_type_field;
+                 //add by niminmin 填写租赁开始日期 自动带出支付日
+                if (column_name == 'lease_start_date'&&value&&column_value==value&&'${/parameter/@document_category}'!='CONTRACT') {
+                    var lease_start_date_record = get_ds_record(ds, temp_hd_attribute_ds, 'lease_start_date');
+                    var contract_inception_date_reocrd = get_ds_record(ds, temp_hd_attribute_ds, 'contract_inception_date');
+                    var lease_start_date = get_record_column_value(lease_start_date_record);
+                    var    contract_inception_date = get_record_column_value(contract_inception_date_reocrd);
+                    if(lease_start_date_record){
+                        //var day = new Date(value.replace(/-/g, '/')).getDate();
+                        var day = new Date(column_value).format('yyyy-mm-dd');
+                        var nextDay=getNextMonth(day);
+                        from_load_or_update_set(contract_inception_date_reocrd, fromLoad, 'column_value', nextDay);
+                    }
+                }
                 if (column_name == 'lease_times' || column_name == 'annual_pay_times') {
                     var lease_times_record = get_ds_record(ds, temp_hd_attribute_ds, 'lease_times'),
                         annual_pay_times_record = get_ds_record(ds, temp_hd_attribute_ds, 'annual_pay_times'),

src/main/webapp/modules/hls/HLS500N/hls_fin_calc_save_n.lsc

@@ -2,8 +2,17 @@
 <a:service xmlns:s="leaf.plugin.script" xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
     <a:init-procedure>
         <s:server-script><![CDATA[
-            // println($ctx.parameter.toXML());
-            
+             println($ctx.parameter.toXML());
+            var root=$ctx.parameter;
+            var children = root.getChildren();
+
+         for (var i = 0;i < children.length;i++) {
+       var sub_children = children[i].getChildren();
+        println(sub_children[0]);
+       println(sub_children[1]);
+        println(sub_children[2]);
+         }
+
             function recursive_dynamic_save(root, base_table) {
                 if (!root || !base_table) return;
                 var children = root.getChildren();

src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_n.lview

@@ -428,8 +428,31 @@
                     window.location.href = url;
                 }
             }
-            
+
+        function getNextMonth(date) {
+            var arr = date.split('-');
+            var year = arr[0]; //获取当前日期的年份
+            var month = arr[1]; //获取当前日期的月份
+            var day = arr[2]; //获取当前日期的日
+            var month2 = parseInt(month) + 1;
+            if (month2 == 13) {
+                year = parseInt(year) + 1;
+                month2 = 1;
+            }
+            var day2 = day;
+            var days2 = new Date(year, month2, 0);
+            days2 = days2.getDate();
+            if (day2 > days2) {
+                day2 = days2;
+            }
+            if (month2 < 10) {
+                month2 = '0' + month2;
+            }
+            var t2 = year + '-' + month2 + '-' + day2;
+            return t2;
+        }
             function do_hls500_head_update(ds, record, name, value, old_value) {
+
                 if (record.get('lov_return_vcode') == 'N' && (record.get('validation_type') == 'COMBOBOX' || record.get('validation_type') == 'LOV')) {
                     value = record.get('column_value_c');
                 } else {
@@ -515,7 +538,7 @@
                 <a:screenTopToolbar style="height:40px;padding:0;border-bottom-color:#000;">
                     <div style="font-size:15px;margin:10px 5px 0 5px"><![CDATA[${l:HLS.FIN_CALCULATOR}]]></div>
                     <a:gridButton click="hls_hls500_return" style="margin-top:10px;margin-left:5px" text="HLS.RETURN"/>
-                    <a:gridButton id="hls_hls500_save_id" click="hls_hls500_save" style="margin-top:10px;margin-left:5px" text="HLS.CALCULATIONS"/>
+                    <a:gridButton id="hls_hls500_save_id" click="hls_hls500_save" style="margin-top:10px;margin-left:5px" text="保存"/>
                 </a:screenTopToolbar>
                 <a:hBox padding="0" style="padding:3px">
                     <a:grid id="hls_fin_calculator_hd_grid_id" bindTarget="hls_fin_calculator_hd_ds" marginHeight="120" rowRenderer="hd_grid_rowrenderer" style="margin-right:3px" width="${/model/calc_config_hd_path/record/@grid_left_width}">

src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview

@@ -236,9 +236,12 @@
             
             
             function hls_hls500_calc() {
+                debugger;
                 lock_calc_current_window('${l:HLS.CALCULATING}');
 
                 hls_hls500_save(calc_execute, 'CALC');
+
+
             }
             
             function hls_hls500_re_calc() {
@@ -685,8 +688,9 @@
                 }
                 onLineupdate_setEmpty(ds, record, name, value, old_value);
             }
-            
+
             function do_hls500_head_update(ds, record, name, value, old_value) {
+
                 if (record.get('column_code') == 'H54' ) {
                     var sum=record.get('column_value')-4.75
                     if(sum<0){
@@ -836,79 +840,80 @@
             function onEditorHdload(ds) {
                 debugger;
                 var headRecords = ds.getAll();
-                // if('${/parameter/@document_category}'=='CONTRACT'){
-                //     Leaf.request({
-                //         url: $('con_check_con_record_link_id').getUrl(),
-                //         para: {
-                //             'contract_id': '${/parameter/@document_id}'
-                //         },
-                //         success: function(res) {
-                //             var contract_status = res.result.contract_status;
-                //             var sign_contract_status = res.result.sign_contract_status;
-                //             if(sign_contract_status=='SIGN'||sign_contract_status=='SIGNING'|| contract_status=='NEW' || contract_status=='INCEPT_RETURN'){
-                //                 for (var i = 0;i < headRecords.length;i++) {
-                //                     var column_name = headRecords[i].get('column_name')
-                //                     if(column_name !="lease_start_date"&&column_name !="contract_inception_date"){
-                //                         headRecords[i].set('input_mode','READONLY');
-                //                         headRecords[i].set('readonly_input_mode','TRUE');
-                //                         headRecords[i].getField('column_value').setReadOnly(true);
-                //                         headRecords[i].getField('column_value_c').setReadOnly(true);
-                //                     }
-                //                 }
-                //             }else{
-                //                 for (var i = 0;i < headRecords.length;i++) {
-                //                     headRecords[i].set('input_mode','READONLY');
-                //                     headRecords[i].set('readonly_input_mode','TRUE');
-                //                     headRecords[i].getField('column_value').setReadOnly(true);
-                //                     headRecords[i].getField('column_value_c').setReadOnly(true);
-                //
-                //                 }
-                //             }
-                //         },
-                //         failure: function() {
-                //             unlock_calc_current_window('${l:HLS.SAVING}');
-                //
-                //         },
-                //         error: function() {
-                //             unlock_calc_current_window('${l:HLS.SAVING}');
-                //
-                //         },
-                //         scope: this
-                //     });
-                //
-                //
-                // }
-                // if('${/parameter/@document_category}'=='PROJECT'){
-                //     Leaf.request({
-                //         url: $('prj_check_prj_record_link_id').getUrl(),
-                //         para: {
-                //             'project_id': '${/parameter/@document_id}'
-                //         },
-                //         success: function(res) {
-                //             var detention = res.result.detention;
-                //                 for (var i = 0;i < headRecords.length;i++) {
-                //                     var column_name = headRecords[i].get('column_name')
-                //                     if(column_name =="residual_value"){
-                //                         headRecords[i].set('column_value',detention);
-                //                         headRecords[i].set('column_value_c',detention);
-                //                     }
-                //                 }
-                //
-                //
-                //         },
-                //         failure: function() {
-                //             unlock_calc_current_window('${l:HLS.SAVING}');
-                //
-                //         },
-                //         error: function() {
-                //             unlock_calc_current_window('${l:HLS.SAVING}');
-                //
-                //         },
-                //         scope: this
-                //     });
-                //
-                //
-                // }
+                if('${/parameter/@document_category}'=='CONTRACT'){
+                    Leaf.request({
+                        url: $('con_check_con_record_link_id').getUrl(),
+                        para: {
+                            'contract_id': '${/parameter/@document_id}'
+                        },
+                        success: function(res) {
+                            var contract_status = res.result.contract_status;
+                            var sign_contract_status = res.result.sign_contract_status;
+                            if(sign_contract_status=='SIGN'||sign_contract_status=='SIGNING'|| contract_status=='NEW' || contract_status=='INCEPT_RETURN'){
+                                for (var i = 0;i < headRecords.length;i++) {
+                                    var column_name = headRecords[i].get('column_name')
+                                    if(column_name !="lease_start_date"&&column_name !="contract_inception_date"){
+                                        headRecords[i].set('input_mode','READONLY');
+                                        headRecords[i].set('readonly_input_mode','TRUE');
+                                        headRecords[i].getField('column_value').setReadOnly(true);
+                                        headRecords[i].getField('column_value_c').setReadOnly(true);
+                                    }
+                                }
+                            }else{
+                                for (var i = 0;i < headRecords.length;i++) {
+                                    headRecords[i].set('input_mode','READONLY');
+                                    headRecords[i].set('readonly_input_mode','TRUE');
+                                    headRecords[i].getField('column_value').setReadOnly(true);
+                                    headRecords[i].getField('column_value_c').setReadOnly(true);
+
+                                }
+                            }
+                        },
+                        failure: function() {
+                            unlock_calc_current_window('${l:HLS.SAVING}');
+
+                        },
+                        error: function() {
+                            unlock_calc_current_window('${l:HLS.SAVING}');
+
+                        },
+                        scope: this
+                    });
+
+
+                }
+                if('${/parameter/@document_category}'=='PROJECT'){
+                    Leaf.request({
+                        url: $('prj_check_prj_record_link_id').getUrl(),
+                        para: {
+                            'project_id': '${/parameter/@document_id}'
+                        },
+                        success: function(res) {
+                            var detention = res.result.detention;
+                                for (var i = 0;i < headRecords.length;i++) {
+                                    var column_name = headRecords[i].get('column_name')
+                                    if(column_name =="residual_value"){
+                                        headRecords[i].set('column_value',detention);
+                                        headRecords[i].set('column_value_c',detention);
+                                    }
+                                }
+
+
+                        },
+                        failure: function() {
+                            unlock_calc_current_window('${l:HLS.SAVING}');
+
+                        },
+                        error: function() {
+                            unlock_calc_current_window('${l:HLS.SAVING}');
+
+                        },
+                        scope: this,
+                        sync:true
+                    });
+
+
+                }
                 if (headRecords.length>0&&headRecords[0].get('show_column_code') == 'N') {
                     $('hls_fin_calculator_hd_grid_id').hideColumn('column_code');
                     $('hls_fin_calculator_export_grid_id').hideColumn('column_code');
@@ -1299,7 +1304,7 @@
             }
 
         //add by syj 单变量求解
-
+       //均等计算
         function hls_hls500_user_button1() {
             flag = 'Y';
             lock_calc_current_window();
@@ -1308,14 +1313,15 @@
                         para: {
                             calc_session_id: '${/parameter/@calc_session_id}'
                         },
-                        success: function() {
+                        success: function(res) {
                             if('${/parameter/@document_category}'=='PROJECT'){
                                 $('PROJECT_CREATE_NP_F_QUOTATION_N_prj_quotation_ds').query();
                                 $('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_ds').query();
                             }else if('${/parameter/@document_category}'=='CONTRACT'){
                                 $('CONTRACT_CREATE_INC_G_CASHFLOW_1_con_contract_cashflow_ds').query();
                             }
-
+                           // success_sidebar_show();
+                            get_warning_message(res.result.msg);
                             open_after_save_execute();
                         },
                         failure: function() {
@@ -1326,10 +1332,245 @@
                         },
                         scope: this
                     });
+        }
+        //均等计算合并计算按钮一起
+        function hls_hls500_JD() {
+
+            hls_hls500_save_new(calc_execute_JD_new, 'CALC');
+
+        }
+        //不均等
+        function hls_hls500_NJD() {
+
+                hls_hls500_save_new(calc_execute_NJD_new, 'CALC');
+
+
+        }
+
+            function hls_hls500_save_new(nextStep, source_procedure) {
+
+
+            lock_calc_current_window('${l:HLS.SAVING}');
+            if (!$('hls_fin_calculator_hd_ds').validate() || !$('hls_fin_calculator_ln_ds').validate()) {
+                unlock_calc_current_window();
+                return;
+            }
+            if('${/parameter/@document_category}'=='PROJECT'){
+                Leaf.request({
+                    url: $('prj_check_prj_record_link_id').getUrl(),
+                    para: {
+                        'project_id': '${/parameter/@document_id}'
+                    },
+                    success: function(res) {
+                        debugger;
+                        var secondary_lease = res.result.secondary_lease;
+                        var payment_deduction = res.result.payment_deduction;
+                        var price_list = res.result.price_list;
+                        var down_payment_rate_new=res.result.down_payment_rate_new;
+                        if((price_list=='HL_PRICR_E'||price_list=='HL_PRICR_TEST'||price_list=='HL_PRICR_NTEST'||price_list=='HL_PRICR_EN') && secondary_lease=='NO'){
+                            //比例=(H16+H97)/(H99+H102-H16)
+                            var H16,H97,H99,H102;
+                            var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
+                            for (var i = 0;i < temp_head_records.length;i++) {
+                                if(temp_head_records[i].get('column_code')=='H16'){
+                                    H16=temp_head_records[i].get('column_value')||0
+                                }else if(temp_head_records[i].get('column_code')=='H97'){
+                                    H97=temp_head_records[i].get('column_value')||0
+                                }else if(temp_head_records[i].get('column_code')=='H99'){
+                                    H99=temp_head_records[i].get('column_value')||0
+                                }else if(temp_head_records[i].get('column_code')=='H102'){
+                                    H102=temp_head_records[i].get('column_value')||0
+                                }
+                            }
+                            var aa=H16+H97;
+                            var bb=H99+H102-H16;
+                            var cc=div((H16+H97),(H99+H102-H16));
+                            //  alert(div((H16+H97), (H99+H102-H16)).toFixed(2) * 1);
+                            var show=down_payment_rate_new*100;
+                            if((div((H16+H97), (H99+H102-H16)).toFixed(2) * 1)<down_payment_rate_new){
+                                unlock_calc_current_window();
+                                Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于'+down_payment_rate_new*100+'%');
+                                return false;
+                            }
+
+                            var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
+                            for (var i = 0;i < temp_head_records.length;i++) {
+                                if (!$('temp_hd_attribute_ds').find('column_code', temp_head_records[i].get('column_code'))) {
+                                    $('temp_hd_attribute_ds').create(temp_head_records[i].data);
+                                }
+                            }
+                            var all_records = $('temp_hd_attribute_ds').getAll();
+                            var headRecord = $('hls_fin_cal_save_hd_ds').getAt(0);
+                            headRecord.isNew = false;
+                            headRecord.dirty = true;
+                            create_record_column(all_records, headRecord);
+
+                            if(price_list=='HL_PRICR_E' ||price_list=='HL_PRICR_TEST'||price_list=='HL_PRICR_NTEST'||price_list=='HL_PRICR_EN'){
+                                if(payment_deduction!='TRADE_IN' && payment_deduction!='TRI_AGREEMENT' ){
+                                    var record = $('hls_fin_calculator_hd_ds').getAll();
+                                    for (var i = 0;i < temp_head_records.length;i++) {
+                                        if(record[i].get('column_code')=='H109') {
+                                            record[i].set('column_value',0);
+                                            record[i].set('column_value_c',0);
+                                            var a= document.getElementById('hls_fin_calculator_hd_grid_id_column_value_'+record[i].id);
+                                            document.getElementById('hls_fin_calculator_hd_grid_id_column_value_'+record[i].id).innerHTML=0;
+                                            document.getElementById('hls_fin_calculator_hd_grid_id_column_value_'+record[i].id).title=0;
+                                        }
+                                    }
+                                }else{
+                                    var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
+                                    for (var i = 0;i < temp_head_records.length;i++) {
+                                        var H16;
+                                        if(temp_head_records[i].get('column_code')=='H16'){
+                                            H16=temp_head_records[i].get('column_value');
+                                        }
+                                        if(temp_head_records[i].get('column_code')=='H109') {
+                                            temp_head_records[i].set('column_value',H16);
+                                            //  temp_head_records[i].set('column_value_c',0);
+                                        }
+                                    }
+                                }
+                            }
+
+                            function hls_fin_cal_save_hd_submitsuccess_new(ds, res) {
+                                if (typeof(nextStep) == 'function') {
+                                    nextStep(source_procedure);
+                                } else {
+                                    function on_ln_formula_load(ds) {
+                                        Leaf.SideBar.enable = true;
+                                        success_sidebar_show();
+                                        unlock_calc_current_window();
+                                        $('ln_formula_ds').un('load', on_ln_formula_load);
+                                    }
+                                    $('ln_formula_ds').on('load', on_ln_formula_load);
+                                    $('ln_formula_ds').query();
+                                }
+                            }
+                            $('hls_fin_cal_save_hd_ds').on('submitsuccess', hls_fin_cal_save_hd_submitsuccess_new);
+                            Leaf.SideBar.enable = false;
+                            $('hls_fin_cal_save_hd_ds').submit();
+                        }
+                    },
+                    failure: function() {
+                        unlock_calc_current_window('${l:HLS.SAVING}');
+
+                    },
+                    error: function() {
+                        unlock_calc_current_window('${l:HLS.SAVING}');
 
+                    },
+                    scope: this
+                });
 
+            }else{
+                var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
+                for (var i = 0;i < temp_head_records.length;i++) {
+                    if (!$('temp_hd_attribute_ds').find('column_code', temp_head_records[i].get('column_code'))) {
+                        $('temp_hd_attribute_ds').create(temp_head_records[i].data);
+                    }
+                }
+                var all_records = $('temp_hd_attribute_ds').getAll();
+                var headRecord = $('hls_fin_cal_save_hd_ds').getAt(0);
+                headRecord.isNew = false;
+                headRecord.dirty = true;
+                create_record_column(all_records, headRecord);
+
+                function hls_fin_cal_save_hd_submitsuccess_new(ds, res) {
+                    if (typeof(nextStep) == 'function') {
+                        nextStep(source_procedure);
+                    } else {
+                        function on_ln_formula_load(ds) {
+                            Leaf.SideBar.enable = true;
+                            success_sidebar_show();
+                            unlock_calc_current_window();
+                            $('ln_formula_ds').un('load', on_ln_formula_load);
+                        }
+                        $('ln_formula_ds').on('load', on_ln_formula_load);
+                        $('ln_formula_ds').query();
+                    }
+                }
+                $('hls_fin_cal_save_hd_ds').on('submitsuccess', hls_fin_cal_save_hd_submitsuccess_new);
+                Leaf.SideBar.enable = false;
+                $('hls_fin_cal_save_hd_ds').submit();
+            }
 
         }
+
+        function calc_execute_JD_new(source_procedure) {
+
+            var final_recreate_H_formula, final_recreate_L_formula;
+            if (source_procedure == 'RE_CALC') {
+                final_recreate_H_formula = 'Y';
+                final_recreate_L_formula = 'Y';
+            } else {
+                final_recreate_H_formula = recreate_H_formula;
+                final_recreate_L_formula = recreate_L_formula;
+            }
+            Leaf.request({
+                url: '${/request/@context_path}/autocrud/hls.HLS500.hls_fin_calculator_calc/update',
+                para: {
+                    calc_session_id: '${/parameter/@calc_session_id}',
+                    document_id: '${/parameter/@document_id}',
+                    document_category: '${/parameter/@document_category}',
+                    recreate_H_formula: final_recreate_H_formula,
+                    recreate_L_formula: final_recreate_L_formula,
+                    quotation_id: '${/parameter/@quotation_id}'
+                },
+                success: function(res) {
+                    on_calc_success_query('${/parameter/@dsId}', '${/parameter/@document_category}');
+                    //get_warning_message(res.result.warning_message);
+                    recreate_H_formula = 'N';
+                    recreate_L_formula = 'N';
+                    //open_after_save_execute();
+                    hls_hls500_user_button1();
+                },
+                failure: function() {
+                    unlock_calc_current_window();
+                },
+                error: function() {
+                    unlock_calc_current_window();
+                },
+                scope: this
+            });
+        }
+        function calc_execute_NJD_new(source_procedure) {
+
+            var final_recreate_H_formula, final_recreate_L_formula;
+            if (source_procedure == 'RE_CALC') {
+                final_recreate_H_formula = 'Y';
+                final_recreate_L_formula = 'Y';
+            } else {
+                final_recreate_H_formula = recreate_H_formula;
+                final_recreate_L_formula = recreate_L_formula;
+            }
+            Leaf.request({
+                url: '${/request/@context_path}/autocrud/hls.HLS500.hls_fin_calculator_calc/update',
+                para: {
+                    calc_session_id: '${/parameter/@calc_session_id}',
+                    document_id: '${/parameter/@document_id}',
+                    document_category: '${/parameter/@document_category}',
+                    recreate_H_formula: final_recreate_H_formula,
+                    recreate_L_formula: final_recreate_L_formula,
+                    quotation_id: '${/parameter/@quotation_id}'
+                },
+                success: function(res) {
+                    on_calc_success_query('${/parameter/@dsId}', '${/parameter/@document_category}');
+                    //get_warning_message(res.result.warning_message);
+                    recreate_H_formula = 'N';
+                    recreate_L_formula = 'N';
+                    //open_after_save_execute();
+                    hls_hls500_user_button2();
+                },
+                failure: function() {
+                    unlock_calc_current_window();
+                },
+                error: function() {
+                    unlock_calc_current_window();
+                },
+                scope: this
+            });
+        }
+
         function hls_hls500_user_button2() {
             flag = 'Y';
             lock_calc_current_window();
@@ -1577,13 +1818,14 @@
                     </p:case>
                     <p:case value="USER_BUTTON1">
                         <c:process-config>
-                            <a:gridButton id="hls_hls500_user_button1_col_id" click="hls_hls500_user_button1" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>
+                            <!--<a:gridButton id="hls_hls500_user_button1_col_id" click="hls_hls500_user_button1" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>-->
                             <!--<div style="margin-top:10px;margin-left:10px;color: red">请先点计算按钮,再执行均等计算(若改变参数值,请先点击公式重算！) </div>-->
+                            <a:gridButton id="hls_hls500_user_button1_col_id" click="hls_hls500_JD" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>
                         </c:process-config>
                     </p:case>
                     <p:case value="USER_BUTTON2">
                         <c:process-config>
-                            <a:gridButton id="hls_hls500_user_button2_col_id" click="hls_hls500_user_button2" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>
+                            <a:gridButton id="hls_hls500_user_button2_col_id" click="hls_hls500_NJD" style="margin-top:10px;margin-left:5px" text="${@prompt}"/>
                         </c:process-config>
                     </p:case>
                     <p:case value="*">

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

@@ -375,6 +375,7 @@ function prj501n_contract_number_renderer(id, name, query_only){
 
         //超链接渲染
         window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
+            debugger;
             var link_function = '';
             window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
             if (name == 'attachment') {
@@ -415,10 +416,8 @@ function prj501n_contract_number_renderer(id, name, query_only){
 
                             var file_name = temp[0].toUpperCase();
                             var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
-                            if (file_name.indexOf('.PDF') >= 0) {
-                                url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ',';
-                            } //else if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') {
-                            else if (file_name.indexOf('.BMP') >= 0 || file_name.indexOf('.JPG') >= 0  || file_name.indexOf('.JPEG') >= 0 || file_name.indexOf('.PNG') >= 0 || file_name.indexOf('.GIF') >= 0) {
+
+                            if (file_name.indexOf('.BMP') >= 0 || file_name.indexOf('.JPG') >= 0  || file_name.indexOf('.JPEG') >= 0 || file_name.indexOf('.PNG') >= 0 || file_name.indexOf('.GIF') >= 0) {
                                 url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
                             } else {
                                 url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
@@ -485,6 +484,17 @@ function prj501n_contract_number_renderer(id, name, query_only){
         };
         //更新时调用
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
+            // var lease_item_info_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
+            // if (lease_item_info_ds_id == ds.id) {
+            //     var quoation_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_QUOTATION_N', 'prj_quotation');
+            //     var quoation_record = $(quoation_ds_id).getCurrentRecord();
+            //     if (name == 'accounts_amount' || name == 'policy_amount') {
+            //
+            //
+            //             quotation_record.set('other_fee', other_fee_sum_02);
+            //
+            //     }
+            // }
             if(name=='pay_method'){
                 if ( record.get('pay_method') == 'WIRE_TRANSFER') {
                     record.set('bank_account_id',null);
@@ -507,9 +517,9 @@ function prj501n_contract_number_renderer(id, name, query_only){
                 var down_payment = quoation_record.get('down_payment') || 0;
                 var calc_session_id= quoation_record.get('calc_session_id');
                 var other_payment2;
-                if (old_value && value &&calc_session_id&& value == 'NO_DEDUCTION') {
+                if (value &&calc_session_id&& value == 'NO_DEDUCTION') {
                     other_payment2 = 0;
-                } else if (old_value && value &&calc_session_id&& value != 'NO_DEDUCTION'){
+                } else if (value &&calc_session_id&& value != 'NO_DEDUCTION'){
                     other_payment2=down_payment;
                 }
                 window['${/parameter/@layout_code}_lock_layout_dynamic_window']();

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

@@ -56,6 +56,7 @@
         <!--<link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
         <script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>-->
         <script type="text/javascript"><![CDATA[
+
         window['${/parameter/@layout_code}_user_button5_layout_dynamic_click'] = function () {
             Leaf.showConfirm('提示', '是否确认生成合同?', function () {
                 var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
@@ -389,6 +390,7 @@ function prj501n_contract_number_renderer(id, name, query_only){
 
                 }*/
                 if (value != null ) {
+                    debugger;
                     var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
                     var str = value.split(';;');
                     var url = '';
@@ -399,10 +401,7 @@ function prj501n_contract_number_renderer(id, name, query_only){
 
                             var file_name = temp[0].toUpperCase();
                             var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
-                            if (file_name.indexOf('.PDF') >= 0) {
-                                url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ',';
-                            } //else if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') {
-                            else if (file_name.indexOf('.BMP') >= 0 || file_name.indexOf('.JPG') >= 0  || file_name.indexOf('.JPEG') >= 0 || file_name.indexOf('.PNG') >= 0 || file_name.indexOf('.GIF') >= 0) {
+                           if (file_name.indexOf('.BMP') >= 0 || file_name.indexOf('.JPG') >= 0  || file_name.indexOf('.JPEG') >= 0 || file_name.indexOf('.PNG') >= 0 || file_name.indexOf('.GIF') >= 0) {
                                 url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
                             } else {
                                 url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
@@ -616,9 +615,9 @@ function prj501n_contract_number_renderer(id, name, query_only){
                 var down_payment = quoation_record.get('down_payment') || 0;
                 var calc_session_id= quoation_record.get('calc_session_id');
                 var other_payment2;
-                if (old_value && value &&calc_session_id&& value == 'NO_DEDUCTION') {
+                if (value &&calc_session_id&& value == 'NO_DEDUCTION') {
                     other_payment2 = 0;
-                } else if (old_value && value &&calc_session_id&& value != 'NO_DEDUCTION'){
+                } else if (value &&calc_session_id&& value != 'NO_DEDUCTION'){
                     other_payment2=down_payment;
                 }
                 window['${/parameter/@layout_code}_lock_layout_dynamic_window']();

src/main/webapp/modules/rpt/RPT5010/export_excel_sheets.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:dr="leaf.plugin.excelreport" trace="true">
+    <a:init-procedure>
+        <a:model-query defaultWhereClause="" fetchAll="true" model="rpt.RPT5010.rpt5010_result_query" rootPath="/model/datasource"/>
+        <a:model-query fetchAll="true" model="rpt.RPT5010.rpt5010_date" rootPath="/model/day"/>
+        <dr:excel-report enableTask="false" filename="${/parameter/@file_name}">
+            <dr:styles>
+                <dr:cell-style name="cell1" align="ALIGN_LEFT" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="宋体" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell2" align="ALIGN_RIGHT" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="Arial" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell3" align="ALIGN_CENTER" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="Arial" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="header" cell_style_id="2" foregroundcolor="BLACK">
+                    <dr:font cell_style_id="2" fontname="宋体" height="10"/>
+                </dr:cell-style>
+            </dr:styles>
+            <dr:sheets>
+                <dr:sheet name="sheet1" autoSizeColumns="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119" displayGridlines="true">
+                    <dr:static-content cell="A" dataModel="/model/day" row="1">
+                        <dr:cell-data cell="A" offset="false" range="$A$1:$A$2" row="1" styleName="cell3" type="content" value="合同编号"/>
+                        <dr:cell-data cell="B" offset="false" range="$B$1:$D$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="E" offset="false" range="$E$1:$G$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="H" offset="false" range="$H$1:$J$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="K" offset="false" range="$K$1:$M$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="N" offset="false" range="$N$1:$P$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="Q" offset="false" range="$Q$1:$S$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="T" offset="false" range="$T$1:$V$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="W" offset="false" range="$W$1:$Y$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="Z" offset="false" range="$Z$1:$AB$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AC" offset="false" range="$AC$1:$AE$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AF" offset="false" range="$AF$1:$AH$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AI" offset="false" range="$AI$1:$AK$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AL" offset="false" range="$AL$1:$AN$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AO" offset="false" range="$AO$1:$AQ$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AR" offset="false" range="$AR$1:$AT$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AU" offset="false" range="$AU$1:$AW$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AX" offset="false" range="$AX$1:$AZ$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="BA" offset="false" range="$BA$1:$BC$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BD" offset="false" range="$BD$1:$BF$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BG" offset="false" range="$BG$1:$BI$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BJ" offset="false" range="$BJ$1:$BL$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BM" offset="false" range="$BM$1:$BO$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BP" offset="false" range="$BP$1:$BR$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BS" offset="false" range="$BS$1:$BU$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BV" offset="false" range="$BV$1:$BX$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BY" offset="false" range="$BY$1:$CA$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CB" offset="false" range="$CB$1:$CD$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CE" offset="false" range="$CE$1:$CG$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                        <dr:cell-data cell="CH" offset="false" range="$CH$1:$CJ$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_29}"/>
+                        <dr:cell-data cell="CK" offset="false" range="$CK$1:$CM$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_30}"/>
+                        <dr:cell-data cell="CN" offset="false" range="$CN$1:$CP$1" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_31}"/>
+                    </dr:static-content>
+                    <dr:dynamic-content cell="A" dataModel="/model/datasource" row="2">
+                        <dr:columns>
+                            <dr:table-column cellStyle="cell1" field="contract_number" title="合同编号" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_1" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_1" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_1" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_2" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_2" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_2" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_3" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_3" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_3" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_4" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_4" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_4" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_5" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_5" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_5" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_6" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_6" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_6" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_7" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_7" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_7" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_8" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_8" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_8" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_9" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_9" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_9" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_10" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_10" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_10" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_11" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_11" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_11" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_12" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_12" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_12" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_13" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_13" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_13" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_14" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_14" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_14" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_15" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_15" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_15" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_16" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_16" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_16" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_17" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_17" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_17" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_18" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_18" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_18" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_19" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_19" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_19" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_20" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_20" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_20" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_21" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_21" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_21" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_22" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_22" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_22" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_23" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_23" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_23" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_24" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_24" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_24" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_25" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_25" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_25" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_26" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_26" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_26" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_27" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_27" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_27" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_28" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_28" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_28" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_29" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_29" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_29" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_30" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_30" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_30" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_31" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_31" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_31" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                        </dr:columns>
+                    </dr:dynamic-content>
+                </dr:sheet>
+            </dr:sheets>
+        </dr:excel-report>
+    </a:init-procedure>
+</a:service>

src/main/webapp/modules/rpt/RPT5010/export_excel_sheets28.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:dr="leaf.plugin.excelreport" trace="true">
+    <a:init-procedure>
+        <a:model-query defaultWhereClause="t1.month =${/parameter/@month} " fetchAll="true" model="rpt.RPT5010.rpt5010_result_query" rootPath="/model/datasource"/>
+        <a:model-query defaultWhereClause="t1.month =${/parameter/@month}" fetchAll="true" model="rpt.RPT5010.rpt5010_date" rootPath="/model/day"/>
+        <dr:excel-report enableTask="false" filename="${/parameter/@file_name}">
+            <dr:styles>
+                <dr:cell-style name="cell1" align="ALIGN_LEFT" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="宋体" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell2" align="ALIGN_RIGHT" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="Arial" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell3" align="ALIGN_CENTER" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="Arial" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="header" cell_style_id="2" foregroundcolor="BLACK">
+                    <dr:font cell_style_id="2" fontname="宋体" height="10"/>
+                </dr:cell-style>
+            </dr:styles>
+            <dr:sheets>
+                <dr:sheet name="sheet1" autoSizeColumns="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119" displayGridlines="true">
+                    <dr:static-content cell="A" dataModel="/model/day" row="1">
+                        <dr:cell-data cell="A" offset="false" row="1" styleName="cell3" type="content" value="承租人名称"/>
+                        <dr:cell-data cell="B" offset="false" row="1" styleName="cell3" type="content" value="合同编号"/>
+                        <dr:cell-data cell="C" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="D" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="E" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="F" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="G" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="H" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="I" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="J" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="K" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="L" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="M" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="N" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="O" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="P" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="Q" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="R" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="S" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="T" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="U" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="V" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="W" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="X" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="Y" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="Z" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="AA" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AB" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AC" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AD" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AE" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AF" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AG" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AH" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AI" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AJ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AK" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AL" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AM" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AN" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AO" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AP" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AQ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AR" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AS" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AT" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AU" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AV" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AW" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AX" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AY" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="AZ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="BA" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="BB" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BC" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BD" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BE" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BF" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BG" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BH" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BI" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BJ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BK" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BL" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BM" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BN" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BO" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BP" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BQ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BR" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BS" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BT" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BU" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BV" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BW" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BX" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BY" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BZ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CA" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CB" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CC" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CD" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CE" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CF" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                        <dr:cell-data cell="CG" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                        <dr:cell-data cell="CH" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                    </dr:static-content>
+                    <dr:dynamic-content cell="A" dataModel="/model/datasource" row="2">
+                        <dr:columns>
+                            <dr:table-column cellStyle="cell1" field="tenant_name" title="" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell1" field="contract_number" title="" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_1" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_1" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_1" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_2" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_2" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_2" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_3" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_3" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_3" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_4" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_4" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_4" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_5" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_5" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_5" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_6" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_6" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_6" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_7" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_7" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_7" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_8" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_8" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_8" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_9" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_9" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_9" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_10" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_10" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_10" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_11" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_11" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_11" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_12" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_12" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_12" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_13" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_13" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_13" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_14" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_14" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_14" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_15" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_15" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_15" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_16" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_16" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_16" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_17" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_17" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_17" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_18" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_18" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_18" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_19" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_19" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_19" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_20" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_20" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_20" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_21" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_21" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_21" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_22" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_22" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_22" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_23" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_23" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_23" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_24" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_24" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_24" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_25" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_25" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_25" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_26" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_26" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_26" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_27" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_27" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_27" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_28" title="租金总额（未核销）" titlestyle="header" type="money"/>
+                            <dr:table-column cellStyle="cell2" field="principal_28" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_28" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                        </dr:columns>
+                    </dr:dynamic-content>
+                </dr:sheet>
+            </dr:sheets>
+        </dr:excel-report>
+    </a:init-procedure>
+</a:service>

src/main/webapp/modules/rpt/RPT5010/export_excel_sheets29.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:dr="leaf.plugin.excelreport" trace="true">
+    <a:init-procedure>
+        <a:model-query defaultWhereClause="t1.month =${/parameter/@month} " fetchAll="true" model="rpt.RPT5010.rpt5010_result_query" rootPath="/model/datasource"/>
+        <a:model-query defaultWhereClause="t1.month =${/parameter/@month}" fetchAll="true" model="rpt.RPT5010.rpt5010_date" rootPath="/model/day"/>
+        <dr:excel-report enableTask="false" filename="${/parameter/@file_name}">
+            <dr:styles>
+                <dr:cell-style name="cell1" align="ALIGN_LEFT" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="宋体" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell2" align="ALIGN_RIGHT" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="Arial" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell3" align="ALIGN_CENTER" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="Arial" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="header" cell_style_id="2" foregroundcolor="BLACK">
+                    <dr:font cell_style_id="2" fontname="宋体" height="10"/>
+                </dr:cell-style>
+            </dr:styles>
+            <dr:sheets>
+                <dr:sheet name="sheet1" autoSizeColumns="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119" displayGridlines="true">
+                    <dr:static-content cell="A" dataModel="/model/day" row="1">
+                        <dr:cell-data cell="A" offset="false" row="1" styleName="cell3" type="content" value="承租人名称"/>
+                        <dr:cell-data cell="B" offset="false" row="1" styleName="cell3" type="content" value="合同编号"/>
+                        <dr:cell-data cell="C" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="D" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="E" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="F" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="G" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="H" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="I" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="J" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="K" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="L" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="M" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="N" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="O" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="P" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="Q" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="R" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="S" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="T" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="U" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="V" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="W" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="X" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="Y" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="Z" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="AA" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AB" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AC" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AD" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AE" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AF" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AG" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AH" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AI" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AJ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AK" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AL" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AM" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AN" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AO" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AP" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AQ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AR" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AS" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AT" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AU" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AV" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AW" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AX" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AY" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="AZ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="BA" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="BB" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BC" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BD" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BE" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BF" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BG" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BH" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BI" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BJ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BK" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BL" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BM" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BN" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BO" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BP" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BQ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BR" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BS" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BT" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BU" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BV" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BW" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BX" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BY" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BZ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CA" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CB" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CC" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CD" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CE" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CF" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                        <dr:cell-data cell="CG" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                        <dr:cell-data cell="CH" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                        <dr:cell-data cell="CI" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_29}"/>
+                        <dr:cell-data cell="CJ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_29}"/>
+                        <dr:cell-data cell="CK" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_29}"/>
+                    </dr:static-content>
+                    <dr:dynamic-content cell="A" dataModel="/model/datasource" row="2">
+                        <dr:columns>
+                            <dr:table-column cellStyle="cell1" field="tenant_name" title="" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell1" field="contract_number" title="" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_1" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_1" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_1" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_2" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_2" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_2" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_3" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_3" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_3" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_4" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_4" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_4" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_5" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_5" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_5" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_6" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_6" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_6" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_7" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_7" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_7" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_8" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_8" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_8" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_9" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_9" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_9" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_10" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_10" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_10" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_11" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_11" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_11" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_12" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_12" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_12" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_13" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_13" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_13" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_14" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_14" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_14" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_15" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_15" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_15" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_16" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_16" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_16" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_17" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_17" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_17" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_18" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_18" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_18" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_19" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_19" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_19" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_20" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_20" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_20" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_21" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_21" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_21" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_22" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_22" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_22" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_23" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_23" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_23" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_24" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_24" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_24" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_25" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_25" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_25" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_26" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_26" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_26" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_27" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_27" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_27" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_28" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_28" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_28" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_29" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_29" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_29" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                        </dr:columns>
+                    </dr:dynamic-content>
+                </dr:sheet>
+            </dr:sheets>
+        </dr:excel-report>
+    </a:init-procedure>
+</a:service>

src/main/webapp/modules/rpt/RPT5010/export_excel_sheets30.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:dr="leaf.plugin.excelreport" trace="true">
+    <a:init-procedure>
+        <a:model-query defaultWhereClause="t1.month =${/parameter/@month} " fetchAll="true" model="rpt.RPT5010.rpt5010_result_query" rootPath="/model/datasource"/>
+        <a:model-query defaultWhereClause="t1.month =${/parameter/@month}" fetchAll="true" model="rpt.RPT5010.rpt5010_date" rootPath="/model/day"/>
+        <dr:excel-report enableTask="false" filename="${/parameter/@file_name}">
+            <dr:styles>
+                <dr:cell-style name="cell1" align="ALIGN_LEFT" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="宋体" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell2" align="ALIGN_RIGHT" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="Arial" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell3" align="ALIGN_CENTER" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="Arial" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="header" cell_style_id="2" foregroundcolor="BLACK">
+                    <dr:font cell_style_id="2" fontname="宋体" height="10"/>
+                </dr:cell-style>
+            </dr:styles>
+            <dr:sheets>
+                <dr:sheet name="sheet1" autoSizeColumns="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119" displayGridlines="true">
+                    <dr:static-content cell="A" dataModel="/model/day" row="1">
+                        <dr:cell-data cell="A" offset="false" row="1" styleName="cell3" type="content" value="承租人名称"/>
+                        <dr:cell-data cell="B" offset="false" row="1" styleName="cell3" type="content" value="合同编号"/>
+                        <dr:cell-data cell="C" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="D" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="E" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="F" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="G" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="H" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="I" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="J" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="K" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="L" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="M" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="N" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="O" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="P" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="Q" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="R" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="S" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="T" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="U" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="V" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="W" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="X" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="Y" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="Z" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="AA" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AB" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AC" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AD" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AE" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AF" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AG" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AH" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AI" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AJ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AK" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AL" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AM" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AN" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AO" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AP" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AQ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AR" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AS" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AT" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AU" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AV" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AW" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AX" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AY" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="AZ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="BA" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="BB" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BC" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BD" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BE" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BF" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BG" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BH" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BI" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BJ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BK" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BL" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BM" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BN" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BO" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BP" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BQ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BR" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BS" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BT" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BU" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BV" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BW" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BX" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BY" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BZ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CA" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CB" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CC" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CD" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CE" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CF" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                        <dr:cell-data cell="CG" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                        <dr:cell-data cell="CH" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                        <dr:cell-data cell="CI" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_29}"/>
+                        <dr:cell-data cell="CJ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_29}"/>
+                        <dr:cell-data cell="CK" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_29}"/>
+                        <dr:cell-data cell="CL" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_30}"/>
+                        <dr:cell-data cell="CM" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_30}"/>
+                        <dr:cell-data cell="CN" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_30}"/>
+                    </dr:static-content>
+                    <dr:dynamic-content cell="A" dataModel="/model/datasource" row="2">
+                        <dr:columns>
+                            <dr:table-column cellStyle="cell1" field="tenant_name" title="" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell1" field="contract_number" title="" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_1" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_1" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_1" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_2" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_2" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_2" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_3" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_3" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_3" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_4" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_4" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_4" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_5" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_5" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_5" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_6" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_6" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_6" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_7" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_7" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_7" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_8" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_8" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_8" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_9" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_9" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_9" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_10" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_10" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_10" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_11" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_11" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_11" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_12" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_12" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_12" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_13" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_13" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_13" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_14" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_14" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_14" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_15" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_15" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_15" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_16" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_16" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_16" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_17" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_17" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_17" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_18" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_18" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_18" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_19" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_19" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_19" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_20" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_20" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_20" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_21" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_21" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_21" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_22" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_22" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_22" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_23" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_23" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_23" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_24" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_24" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_24" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_25" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_25" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_25" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_26" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_26" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_26" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_27" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_27" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_27" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_28" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_28" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_28" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_29" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_29" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_29" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_30" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_30" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_30" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                        </dr:columns>
+                    </dr:dynamic-content>
+                </dr:sheet>
+            </dr:sheets>
+        </dr:excel-report>
+    </a:init-procedure>
+</a:service>

src/main/webapp/modules/rpt/RPT5010/export_excel_sheets31.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:dr="leaf.plugin.excelreport" trace="true">
+    <a:init-procedure>
+        <a:model-query defaultWhereClause="t1.month =${/parameter/@month}" fetchAll="true" model="rpt.RPT5010.rpt5010_result_query" rootPath="/model/datasource"/>
+        <a:model-query defaultWhereClause="t1.month =${/parameter/@month}" fetchAll="true" model="rpt.RPT5010.rpt5010_date" rootPath="/model/day"/>
+        <dr:excel-report enableTask="false" filename="${/parameter/@file_name}">
+            <dr:styles>
+                <dr:cell-style name="cell1" align="ALIGN_LEFT" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="宋体" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell2" align="ALIGN_RIGHT" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="Arial" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell3" align="ALIGN_CENTER" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="Arial" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="header" cell_style_id="2" foregroundcolor="BLACK">
+                    <dr:font cell_style_id="2" fontname="宋体" height="10"/>
+                </dr:cell-style>
+            </dr:styles>
+            <dr:sheets>
+                <dr:sheet name="sheet1" autoSizeColumns="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119" displayGridlines="true">
+                    <dr:static-content cell="A" dataModel="/model/day" row="1">
+                        <dr:cell-data cell="A" offset="false" row="1" styleName="cell3" type="content" value="承租人名称"/>
+                        <dr:cell-data cell="B" offset="false" row="1" styleName="cell3" type="content" value="合同编号"/>
+                        <dr:cell-data cell="C" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="D" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="E" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_1}"/>
+                        <dr:cell-data cell="F" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="G" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="H" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_2}"/>
+                        <dr:cell-data cell="I" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="J" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="K" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_3}"/>
+                        <dr:cell-data cell="L" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="M" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="N" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_4}"/>
+                        <dr:cell-data cell="O" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="P" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="Q" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_5}"/>
+                        <dr:cell-data cell="R" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="S" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="T" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_6}"/>
+                        <dr:cell-data cell="U" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="V" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="W" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_7}"/>
+                        <dr:cell-data cell="X" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="Y" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="Z" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_8}"/>
+                        <dr:cell-data cell="AA" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AB" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AC" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_9}"/>
+                        <dr:cell-data cell="AD" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AE" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AF" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_10}"/>
+                        <dr:cell-data cell="AG" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AH" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AI" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_11}"/>
+                        <dr:cell-data cell="AJ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AK" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AL" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_12}"/>
+                        <dr:cell-data cell="AM" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AN" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AO" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_13}"/>
+                        <dr:cell-data cell="AP" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AQ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AR" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_14}"/>
+                        <dr:cell-data cell="AS" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AT" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AU" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_15}"/>
+                        <dr:cell-data cell="AV" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AW" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AX" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_16}"/>
+                        <dr:cell-data cell="AY" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="AZ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="BA" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_17}"/>
+                        <dr:cell-data cell="BB" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BC" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BD" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_18}"/>
+                        <dr:cell-data cell="BE" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BF" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BG" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_19}"/>
+                        <dr:cell-data cell="BH" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BI" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BJ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_20}"/>
+                        <dr:cell-data cell="BK" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BL" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BM" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_21}"/>
+                        <dr:cell-data cell="BN" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BO" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BP" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_22}"/>
+                        <dr:cell-data cell="BQ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BR" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BS" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_23}"/>
+                        <dr:cell-data cell="BT" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BU" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BV" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_24}"/>
+                        <dr:cell-data cell="BW" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BX" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BY" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_25}"/>
+                        <dr:cell-data cell="BZ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CA" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CB" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_26}"/>
+                        <dr:cell-data cell="CC" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CD" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CE" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_27}"/>
+                        <dr:cell-data cell="CF" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                        <dr:cell-data cell="CG" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                        <dr:cell-data cell="CH" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_28}"/>
+                        <dr:cell-data cell="CI" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_29}"/>
+                        <dr:cell-data cell="CJ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_29}"/>
+                        <dr:cell-data cell="CK" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_29}"/>
+                        <dr:cell-data cell="CL" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_30}"/>
+                        <dr:cell-data cell="CM" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_30}"/>
+                        <dr:cell-data cell="CN" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_30}"/>
+                        <dr:cell-data cell="CO" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_31}"/>
+                        <dr:cell-data cell="CP" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_31}"/>
+                        <dr:cell-data cell="CQ" offset="false" row="1" styleName="cell3" type="content" value="${/model/day/record/@day_31}"/>
+                    </dr:static-content>
+                    <dr:dynamic-content cell="A" dataModel="/model/datasource" row="2">
+                        <dr:columns>
+                            <dr:table-column cellStyle="cell1" field="tenant_name" title="" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell1" field="contract_number" title="" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_1" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_1" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_1" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_2" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_2" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_2" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_3" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_3" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_3" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_4" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_4" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_4" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_5" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_5" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_5" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_6" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_6" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_6" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_7" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_7" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_7" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_8" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_8" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_8" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_9" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_9" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_9" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_10" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_10" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_10" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_11" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_11" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_11" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_12" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_12" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_12" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_13" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_13" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_13" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_14" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_14" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_14" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_15" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_15" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_15" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_16" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_16" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_16" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_17" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_17" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_17" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_18" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_18" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_18" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_19" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_19" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_19" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_20" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_20" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_20" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_21" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_21" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_21" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_22" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_22" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_22" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_23" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_23" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_23" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_24" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_24" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_24" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_25" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_25" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_25" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_26" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_26" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_26" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_27" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_27" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_27" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_28" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_28" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_28" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_29" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_29" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_29" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_30" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_30" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_30" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="amount_31" title="租金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="principal_31" title="本金总额（未核销）" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="interest_31" title="利息总额（未核销）" titlestyle="header" type="content"/>
+                        </dr:columns>
+                    </dr:dynamic-content>
+                </dr:sheet>
+            </dr:sheets>
+        </dr:excel-report>
+    </a:init-procedure>
+</a:service>

src/main/webapp/modules/rpt/RPT5010/rpt5010_report_print.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: wutuansen  
+    $Date: 2018-12-20 上午9:30:25  
+    $Revision: 1.0  
+    $Purpose: 会计需求
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" customizationEnabled="true" trace="true">
+    <a:init-procedure><![CDATA[
+    ]]></a:init-procedure>
+    <a:view>
+        <a:link id="rpt5010_print_link_id" model="rpt.RPT5010.rpt5010_print" modelaction="update"/>
+        <a:link id="rpt5010_run_job_link_id" model="rpt.RPT5010.rpt5010_print" modelaction="execute"/>
+        <script><![CDATA[
+            function rpt5110_reset() {
+                $('rpt5110_query_ds').reset();
+            }
+            
+            function ref_n01_time(record, name, value) {
+                var reg = /^\d\d\d\d\d\d$/;
+                if (reg.test(value)) {
+                    return true;
+                }
+                return '时间格式应为【yyyymm】,举例【201812】';
+            }
+            
+            function rpt5110_print() {
+                debugger;
+                Leaf.Masker.mask(Ext.getBody(), '${l:BEING_IMPLEMENTED}');
+                var record = $('rpt5110_query_ds').getAt(0);
+                if (!record) {
+                    Leaf.Masker.unmask(Ext.getBody());
+                    Leaf.showMessage('${l:PROMPT}', '年月未填写');
+                    return;
+                }
+                var month = record.get('month');
+                if (!month) {
+                    Leaf.Masker.unmask(Ext.getBody());
+                    Leaf.showMessage('${l:PROMPT}', '年月未填写');
+                    return;
+                }
+            
+                // var reg = /^\d\d\d\d\d\d$/;
+                // if (reg.test(month)) {
+                // } else {
+                // Leaf.Masker.unmask(Ext.getBody());
+                // Leaf.showMessage('${l:PROMPT}', '时间格式应为【yyyymm】,举例【201812】');
+                // return;
+                // }
+                Leaf.request({
+                    url: $('rpt5010_print_link_id').getUrl(),
+                    para: {
+                        month: month
+                    },
+                    success: function(res) {
+                        var days = res.result.days;
+                        Leaf.Masker.unmask(Ext.getBody());
+                        var url = '${/request/@context_path}/modules/rpt/RPT5010/export_excel_sheets' + days + '.lsc?month=' + month + '&file_name=' + month + '每日合同未收本金表.xls';
+                        window.open(encodeURI(url), '_self');
+                    },
+                    error: function() {
+                        Leaf.Masker.unmask(Ext.getBody());
+                    },
+                    failure: function() {
+                        Leaf.Masker.unmask(Ext.getBody());
+                    },
+                    scope: this
+                });
+            
+            
+            }
+            
+            function rpt5110_run_job() {
+                Leaf.showConfirm('${l:HLS.PROMPT}', '<font color="red">该任务需执行约1小时，请耐心等待！</font></br></br><font color="red">【特别注意】任务发起后1小时内请勿重复点击</font>', function() {
+                    Leaf.Masker.mask(Ext.getBody(), '${l:BEING_IMPLEMENTED}');
+                    Leaf.request({
+                        url: $('rpt5010_run_job_link_id').getUrl(),
+                        para: {},
+                        success: function(res) {
+                            Leaf.Masker.unmask(Ext.getBody());
+                            Leaf.SideBar.show({
+                                msg: '发起成功！',
+                                duration: 2000
+                            });
+                        },
+                        error: function() {
+                            Leaf.Masker.unmask(Ext.getBody());
+                        },
+                        failure: function() {
+                            Leaf.Masker.unmask(Ext.getBody());
+                        },
+                        scope: this
+                    });
+                }, null, 300, 150);
+            }
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="four_month_date_ds" loadData="true" model="rpt.RPT5010.rpt5010_four_month"/>
+            <a:dataSet id="rpt5110_query_ds">
+                <a:fields>
+                    <a:field name="month"/>
+                    <a:field name="month_desc" displayField="value_name" options="four_month_date_ds" required="true" returnField="month" valueField="value_code"/>
+                </a:fields>
+            </a:dataSet>
+        </a:dataSets>
+        <a:screenBody>
+            <a:screenTopToolbar>
+                <a:screenTitle/>
+                <a:gridButton click="rpt5110_print" text="打印"/>
+                <a:gridButton click="rpt5110_reset" text="HLS.RESET"/>
+<!--                <a:gridButton click="rpt5110_run_job" text="发起校准任务"/>-->
+            </a:screenTopToolbar>
+            <a:form Width="250" column="1" labelWidth="100" title="条件" width="300">
+                <a:comboBox name="month_desc" bindTarget="rpt5110_query_ds" prompt="年月"/>
+            </a:form>
+        </a:screenBody>
+    </a:view>
+</a:screen>

src/main/webapp/modules/test/bgt_trial_balance.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: ouyangzhaochang2663 $
+    $Date: 2012/05/11 09:58:18 $
+    $Revision: 1.62 $
+    $Purpose: 租金试算的新建和维护页面
+    
+    updated by ouyangzhaochang 2012/02/27
+     contents: 机号校验添加一个参数 'budgetno',相关修改有 js函数verify_serialno及其调用
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
+    <a:init-procedure>
+        <!--<model-query fetchAll="true" model="agent.bgt.bgt_downpayrate" rootPath="downpayrate_model"/>-->
+        <!--<model-query fetchAll="true" model="agent.bgt.bgt_init_budget_head_info" rootPath="head_model"/>-->
+        <!--<model-query fetchAll="true" model="agent.bgt.bgt_init_floating_para" rootPath="floating_interest_para_model"/>-->
+    </a:init-procedure>
+    <a:view>
+        <style><![CDATA[
+        html,body{overflow-x: hidden}
+        .lov-field{background-color:#b5b8c8;}
+        ]]></style>
+        <!--<script src="${/request/@context_path}/javascripts/finereport.js"><![CDATA[ ]]></script>-->
+        <script><![CDATA[
+            // 新增标记，1新增，0修改
+            var isAdd = Ext.isEmpty('${/parameter/@isAdd}') ? 1 : 0;
+            
+            var isRecalculatFlg = '0';
+            
+            // 保存标记。当有数据修改时，修改为false，保存后修改为true;
+            var isSaved = true;
+            // 读取明细数据的次数，判断当前加载数据次数，如果是第一次打开页面，在读取数据后将isSaved还原为true;
+            var loadDetailCount = 0;
+            
+            // 备份数组，当用户选择了“不均等付款”，
+            // 改变了某一行数值的时候，取消当前行勾选，将数据还原
+            var back_data_array = null;
+            
+            var budgetno = null; // 保存时传递budgetno到页面
+            
+            var mdf_array_size = 16;
+            var mdf_array = new Array(mdf_array_size); // “重要数据是否修改的标记”的数组，用于存放所有“改变即需要重算”的变量
+            var mdf_message_array = new Array(mdf_array_size);
+            
+            /*
+             * WARNING ! DON'T change the variable's value below,they were designed to be
+             * CONSTANTS in this program. But the JavaScript itself doesn't support
+             * CONSTANTS.
+             */
+            var BUDGET_TYPE_INDEX = 0; // 合同类型标志
+            var BUDGET_CATEGORY_INDEX = 1;
+            var CUSTOMER_NAME_INDEX = 2; // 客户名称标志
+            var MACHAMT_INDEX = 3; // 主机金额
+            var OPTIONSAMT_INDEX = 4; // 附件金额
+            var DOWNPAYMENT_INDEX = 5; // 首付款
+            var MODELCD_INDEX = 6; // 机型
+            var LEASEBGNDT_INDEX = 7; // 租赁开始日
+            var PAYBGNDT_INDEX = 8; // 支付开始日
+            var LEASEPRD_INDEX = 9; // 租赁期间
+            var INTEREST_INDEX = 10; // 利率
+            var RTNWAY_INDEX = 11; // 均等付款
+            var ROUNDCALCFLAG_INDEX = 12; // 百元取整
+            var RESULT_PAYAMT_INDEX = 13; //
+            var OVHDEXPENSES_INDEX = 14; // 管理费
+            var MARGIN_INDEX = 15; // 保证金
+            
+            /*
+             * the end;
+             */
+            
+            function initValidArray() {
+                for (var i = 0;i < mdf_array.length;i++) {
+                    mdf_array[i] = 0;
+                }
+            
+                mdf_message_array[BUDGET_TYPE_INDEX] = "概算书类型";
+                mdf_message_array[BUDGET_CATEGORY_INDEX] = "概算书类别";
+                mdf_message_array[CUSTOMER_NAME_INDEX] = "客户名称";
+                mdf_message_array[MACHAMT_INDEX] = "主机金额";
+                mdf_message_array[OPTIONSAMT_INDEX] = "附件金额";
+                mdf_message_array[DOWNPAYMENT_INDEX] = "首付款";
+                mdf_message_array[MODELCD_INDEX] = "机型";
+                mdf_message_array[LEASEBGNDT_INDEX] = "租赁开始日";
+                mdf_message_array[PAYBGNDT_INDEX] = "支付开始日";
+                mdf_message_array[LEASEPRD_INDEX] = "租赁期间";
+                mdf_message_array[INTEREST_INDEX] = "利率";
+                mdf_message_array[RTNWAY_INDEX] = "不均等付款";
+                mdf_message_array[ROUNDCALCFLAG_INDEX] = "百元取整";
+                mdf_message_array[RESULT_PAYAMT_INDEX] = "支付金额";
+                mdf_message_array[OVHDEXPENSES_INDEX] = "管理费";
+                mdf_message_array[MARGIN_INDEX] = "保证金";
+            }
+            
+            function reset_form() {
+                var ds = $("ord_contract_ds");
+                ds.reset();
+                record = ds.getCurrentRecord();
+                record.set("budget_category", '${/parameter/@budget_category}');
+                if ('${/parameter/@budget_category}' == 'FIXED') {
+                    record.set('hclc_budget_category_dis', '${l:EOSBizdict.businID.BUDGET_CATEGORY.FIXED}');
+                } else {
+                    record.set('hclc_budget_category_dis', '${l:EOSBizdict.businID.BUDGET_CATEGORY.FLOATING}');
+                }
+            }
+            
+            /**
+             * 页面初始化用，主要用于初始化UI
+             */
+            
+            function initPageView() {
+            
+                //alert("${/model/floating_interest_para_model/record/@lowest_unequal_payment}");
+            
+                var budget_category = '${/parameter/@budget_category}';
+                if (budget_category) {
+                    if (budget_category == 'FIXED') {
+                        $('ord_contract_ds').getCurrentRecord().set('hclc_budget_category', 'FIXED');
+                        $('ord_contract_ds').getCurrentRecord().set('budget_category', 'FIXED');
+                        $('ord_contract_ds').getCurrentRecord().set('hclc_budget_category_dis', '${l:EOSBizdict.businID.BUDGET_CATEGORY.FIXED}');
+                    } else {
+                        $('ord_contract_ds').getCurrentRecord().set('hclc_budget_category', 'FLOATING');
+                        $('ord_contract_ds').getCurrentRecord().set('budget_category', 'FLOATING');
+                        $('ord_contract_ds').getCurrentRecord().set('hclc_budget_category_dis', '${l:EOSBizdict.businID.BUDGET_CATEGORY.FLOATING}');
+                    }
+                }
+            
+                if (isAdd == 0) {
+                    // 试算结果框
+                    var result_div = document.getElementById('calculate_result_div');
+                    result_div.style.display = "block";
+            
+                    var record = $("ord_contract_ds").getCurrentRecord();
+                    var pattern_field = record.getMeta().getField('pattern');
+                    pattern_field.setLovPara('modelcd', record.get('modelcd'));
+            
+                    var old_box = document.getElementById("old_box");
+                    var release_box = document.getElementById("release_box");
+                    var budget_type = record.get("hclc_budget_type");
+                    // 显示以旧换新内容
+                    if (budget_type == "OLD") {
+                        if (record.get("dp_cash_amt") > record.get("downpayment")) {
+                            Aurora.showMessage('提示信息', '现金支付金额大于首付款');
+                            return false;
+                        }
+                        old_box.style.display = "block";
+                        var amt = ((record.get("downpayment") || 0) - (record.get("dp_cash_amt") || 0)).toFixed(2);
+                        record.set("dp_interfree_amt", amt);
+                        var dp_interfree_paydt_field = record.getMeta().getField('dp_interfree_paydt');
+                        dp_interfree_paydt_field.setRequired(true);
+                    }
+                    // 显示二次租赁内容
+                    if (budget_type == "RELEASE") {
+                        release_box.style.display = "block";
+                        var hclc_repur_number_field = record.getMeta().getField('hclc_repur_number');
+                        var serialno_field = record.getMeta().getField('serialno');
+                        var modelcd_field = record.getMeta().getField('modelcd');
+                        var pattern_field = record.getMeta().getField('pattern');
+            
+                        hclc_repur_number_field.setRequired(true);
+                        modelcd_field.setRequired(false);
+                        pattern_field.setRequired(false);
+            
+                        serialno_field.setReadOnly(true);
+                        modelcd_field.setReadOnly(true);
+                        pattern_field.setReadOnly(true);
+                    }
+            
+                    // 针对利率类型进行页面UI调整
+                    // 百元取整和不均等付款复选组
+                    var calculateOptionsBox = document.getElementById('try_calculat_box');
+                    // 试算结果中的浮动利率框
+                    var resultRatebox = document.getElementById('result_fRate_box');
+            
+                    if (record.get("budget_category") == "FIXED") {
+                        calculateOptionsBox.style.display = "block";
+                        resultRatebox.style.display = "none";
+                    } else if (record.get("budget_category") == "FLOATING") {
+                        // calculateOptionsBox.style.display = "block";
+                        calculateOptionsBox.style.display = "none";
+                        if (record.get("rtnway") == '1') {
+                            resultRatebox.style.display = "block";
+                        } else if (record.get("rtnway") == '2') {
+                            resultRatebox.style.display = "none";
+                        }
+                    }
+            
+                    document.getElementById('reset_btn').style.display = 'none';
+            
+                    record.set("budgetno_temp", "${/parameter/@budgetno}");
+            
+                    $("detail_ds").setQueryUrl("${/request/@context_path}/autocrud/agent.bgt.ld005/query?budgetno=${/parameter/@budgetno}"); //
+                    $("detail_ds").query();
+                }
+            }
+            
+            initValidArray();
+            
+            function query() {
+                $('ord_contract_ds').query();
+            }
+            
+            /**
+             * 获得基准利率
+             */
+            
+            function getBaseIntr() {
+                var info_ds = $("ord_contract_ds");
+                var record = info_ds.getCurrentRecord();
+            
+                // 获取销售金额
+                var saleamt = parseFloat(record.get("saleamt")) || 0;
+            
+                // 获取主机金额
+                var machamt = record.get("machamt");
+            
+                // 获取首付款
+                var downpayment = record.get("downpayment");
+            
+                // 获取租赁开始日
+                var leasebgndt = record.get("leasebgndt");
+            
+                // 支付开始日
+                var paybgndt = record.get("paybgndt");
+            
+                // 获取租赁期间
+                var leaseprd = record.get("leaseprd");
+                // 获取机型
+                var modelcd = record.get("modelcd");
+            
+                // 获取首付款比率
+                var init_downpayrate = parseFloat("${/model/downpayrate_model/record/@businname}") || 0;
+            
+                if ((!Ext.isEmpty(machamt)) && (!Ext.isEmpty(downpayment)) && (!Ext.isEmpty(leasebgndt)) && (!Ext.isEmpty(leaseprd)) && !Ext.isEmpty(modelcd)) {
+                    optionsamt = parseFloat(machamt) || 0;
+            
+                    // 校验首付款比率
+                    var temp_pay_rate = parseFloat((downpayment / saleamt) * 100).toFixed(2);
+                    var is_payRate = verify_payRate(temp_pay_rate, init_downpayrate);
+            
+                    // 校验期数范围
+                    var is_times = verify_times(record.get("hclc_budget_type"), leaseprd);
+            
+                    // 校验支付日
+                    var is_paybgdt = verify_paydate(paybgndt, leasebgndt);
+            
+                    if (is_payRate && is_times && is_paybgdt) {
+                        // 请求得到基准利率
+                        Leaf.request({
+                            url: '${/request/@context_path}/autocrud/agent.bgt.bgt_calculate_rent_get_stdintrrate/execute',
+                            para: {
+                                budget_category: record.get("budget_category"),
+                                leasebgndt: leasebgndt,
+                                leaseprd: leaseprd,
+                                pay_rate: temp_pay_rate,
+                                dealercd: "${/session/@dealer_cd}",
+                                modelcd: modelcd
+                            },
+                            success: function(result) {
+            
+                                record.set("_stdinterest_errorcode", result.result.errcode);
+                                if (result.result.errcode == 0) {
+                                    record.set("stdintrrate", result.result.stdintrrate);
+                                    record.set("pbc_bcmk_interest_rate", result.result.pbc_bcmk_interest_rate);
+                                    record.set("pbc_bcmk_interest_effdate", Aurora.dateFormat.parseDate(result.result.pbc_bcmk_interest_effdate, 'yyyy-mm-dd'));
+                                    record.set("hclc_interest_effdate", Aurora.dateFormat.parseDate(result.result.hclc_interest_effdate, 'yyyy-mm-dd'));
+                                    record.set("fnd_interest_head_id", result.result.fnd_interest_head_id);
+                                } else {
+                                    if (result.result.errcode == '-1') {
+                                        Aurora.showMessage('提示信息', '未取到合适的利率表');
+                                    } else if (result.result.errcode == '-2') {
+                                        Aurora.showMessage('提示信息', '未取到合适的利率');
+                                    } else if (result.result.errcode == '-9') {
+                                        Aurora.showMessage('提示信息', '取利率错误');
+                                    }
+                                    record.set("_stdinterest_errorcode", -9);
+                                    record.set("stdintrrate", null);
+                                    record.set("pbc_bcmk_interest_rate", null);
+                                    record.set("pbc_bcmk_interest_effdate", null);
+                                    record.set("hclc_interest_effdate", null);
+                                    record.set("fnd_interest_head_id", null);
+                                }
+                            },
+                            scope: this,
+                            sync: true
+                        });
+                    } else {
+                        record.set("stdintrrate", null);
+                        record.set("_stdinterest_errorcode", -9);
+                    }
+                } else {
+                    record.set("stdintrrate", null);
+                }
+            }
+            
+            /**
+             * 校验机号
+             *
+             * @param serialno
+             * @param modelcd
+             * @returns {Boolean}
+             */
+            
+            function verify_serialno(serialno, modelcd, budgetno) {
+            
+                var result_boolean = true;
+                var strlength = 0;
+            
+                if (Ext.isEmpty(serialno)) {
+                    result_boolean = true;
+                    return result_boolean;
+                }
+            
+                if ((serialno != "") && (serialno != null)) {
+                    strlength = serialno.length;
+            
+                    if ((strlength != 10 && strlength != 12) && (strlength != 0)) {
+                        Aurora.showMessage('提示信息', '机号长度应为10位或12位');
+                        result_boolean = false;
+                        return result_boolean;
+                    }
+                    var str1 = serialno.substring(0, 4);
+                    // 判断是否为全英文大写
+                    var reg = /^[A-Z]+$$/;
+                    if (!reg.test(str1)) {
+                        Aurora.showMessage('提示信息', '机号前4位应为英文字母');
+                        result_boolean = false;
+                        return result_boolean;
+                    }
+                    var str2;
+                    if (strlength == 10) {
+                        str2 = serialno.substring(4, 10);
+                        reg = /^[0-9]+$$/;
+                        if (!reg.test(str2)) {
+                            Aurora.showMessage('提示信息', '机号后6位应为数字');
+                            result_boolean = false;
+                            return result_boolean;
+                        }
+                    } else if (strlength == 12) {
+                        str2 = serialno.substring(6, 12);
+                        reg = /^[0-9]+$$/;
+                        if (!reg.test(str2)) {
+                            Aurora.showMessage('提示信息', '机号后6位应为数字');
+                            result_boolean = false;
+                            return result_boolean;
+                        }
+                    }
+                }
+            
+                var para;
+                if ( !! budgetno) {
+                    para = {
+                        modelcd: modelcd,
+                        serialno: serialno,
+                        budgetno: budgetno
+                    };
+                } else {
+                    para = {
+                        modelcd: modelcd,
+                        serialno: serialno
+                    };
+                }
+
+                Leaf.request({
+                    url: '${/request/@context_path}/autocrud/agent.bgt.bgt_calculate_rent_validate_serialno/execute',
+                    para: para,
+                    success: function(result) {
+                        var verify_serialno_code = result.result.error_code;
+                        if (verify_serialno_code != 0) {
+                            Aurora.showMessage('提示信息', result.result.error_message);
+                            result_boolean = false;
+                        } else {
+                            result_boolean = true;
+                        }
+                    },
+                    scope: this,
+                    sync: true
+                });
+            
+                return result_boolean;
+            }
+            
+            
+            /**
+             * 校验支付开始日
+             *
+             * @param paybgndt
+             *            支付开始日
+             * @param leasebgndt
+             *            租赁起始日
+             * @returns {Boolean} 通过true，非法false
+             */
+            
+            function verify_paydate(paybgndt, leasebgndt) {
+                var result = false;
+            
+                var year1 = leasebgndt.getYear();
+                var year2 = paybgndt.getYear();
+            
+                var month1 = leasebgndt.getMonth();
+                var month2 = paybgndt.getMonth();
+            
+            
+                if ((year1 + 1) == year2) {
+            
+                    if ((month1 == 11) && (month2 == 0)) {
+                        result = true;
+                    } else {
+                        result = false;
+                    }
+                } else if (year1 == year2) {
+                    if ((month1 + 1) == month2) {
+                        result = true;
+                    } else {
+                        result = false;
+                    }
+                } else {
+                    result = false;
+                }
+            
+                if (!result) {
+                    Aurora.showMessage('提示信息', "支付开始日必须在租赁开始日所在月的次月范围内");
+                }
+            
+                return result;
+            
+            }
+            
+            /**
+             * 校验期数范围
+             *
+             * @param hclc_budget_type
+             *            概算类型
+             * @param leaseprd
+             *            期数
+             * @returns {Boolean} 通过true，非法false
+             */
+            
+            function verify_times(hclc_budget_type, leaseprd) {
+                // 如果是二次租赁
+                if (hclc_budget_type == 'RELEASE') {
+                    var info_ds = $("ord_contract_ds");
+                    var record = info_ds.getCurrentRecord();
+            
+                    var repurno = record.get("hclc_repur_number");
+                    if (Ext.isEmpty(repurno)) {
+                        Leaf.showMessage('提示信息', '请先填写回购函号');
+                        return false;
+                    }
+            
+                    var leasebgndt = record.get("leasebgndt");
+                    if (Ext.isEmpty(leasebgndt)) {
+                        Leaf.showMessage('提示信息', '请先填写租赁开始日');
+                        return false;
+                    }
+            
+                    var result_boolean = false;
+                    Leaf.request({
+                        url: '${/request/@context_path}/autocrud/agent.bgt.bgt_calculate_rent_validate_repur_times/execute',
+                        para: {
+                            repurno: repurno,
+                            leasebgndt: leasebgndt,
+                            leaseprd: leaseprd
+                        },
+                        success: function(rst) {
+                            var resultcd = rst.result.resultcd;
+                            //if (resultcd == 1) {
+                                result_boolean = true;
+                            //} else {
+                            //    Aurora.showMessage('提示信息', '租赁期数与原合同足额支付期数之和超过二次租赁最大期数');
+                            //    result_boolean = false;
+                            //}
+                        },
+                        scope: this,
+                        sync: true
+                    });
+                    return result_boolean;
+            
+                }
+                // else {
+                // if ((leaseprd < 6) || (leaseprd > 60)) {
+                // stdintrrate = null;
+                // Aurora.showMessage('提示信息', '租赁期间必须在6到60个月之间');
+                // return false;
+                // }
+                // }
+            
+                return true;
+            }
+            
+            /**
+             * 校验首付款比率
+             *
+             * @param temp_pay_rate
+             *            临时计算出的首付款比率
+             * @param init_downpayrate
+             *            页面加载时从数据库读取的首付款比率
+             * @returns {Boolean} 通过true，非法false
+             */
+            
+            function verify_payRate(temp_pay_rate, init_downpayrate) {
+                if ((temp_pay_rate < init_downpayrate) && (init_downpayrate > 0)) {
+                    Aurora.showMessage('提示信息', '首付款比率不足');
+                    return false;
+                }
+                return true;
+            }
+            
+            /**
+             * 校验租赁起始日期
+             *
+             * @param leasebgndt
+             *            租赁起始日
+             * @returns {Boolean}
+             */
+            
+            function verify_leasebgndt(leasebgndt) {
+            
+                var result_boolean = false;
+                if (leasebgndt != null) {
+                    Leaf.request({
+                        url: "${/request/@context_path}/autocrud/agent.bgt.bgt_calculate_rent_validate_leasebgndt/execute",
+                        para: {
+                            leasebgndt: leasebgndt,
+                            operator_id: "${/session/@operator_id}"
+                        },
+                        success: function(result) {
+                            result_boolean = true;
+                        },
+                        error: function() {
+                            result_boolean = false;
+                        },
+                        scope: this,
+                        sync: true
+                    });
+                }
+                return result_boolean;
+            }
+            
+            /**
+             * 判断不均等付款时，校验支付计划表中是否所有的记录都被选中
+             *
+             * @returns {Boolean} 全选则不符合规则，返回false；没全选符合规则，返回true;
+             */
+            
+            function verify_isAllDetailRecordSelected() {
+                var ds = $("detail_ds");
+                var allRecords = ds.getAll();
+            
+                if (Ext.isEmpty(allRecords)) {
+                    // 结果表为空，说明还没有进行试算，返回true
+                    return true;
+                }
+            
+                var allLength = allRecords.length;
+                var selectedLength = 0;
+            
+                for (var i = 0;i < allRecords.length;i++) {
+                    if (allRecords[i].get('manualflag') == '1') selectedLength++;
+                }
+            
+                if (allLength == selectedLength) {
+                    Aurora.showMessage('提示信息', "不能修改所有回数的支付金额！");
+                    return false;
+                }
+                return true;
+            }
+            
+            /**
+             * 校验基准利率
+             *
+             * @param stdintrrate
+             *            取利率
+             * @param interest
+             *            用户输入的利率
+             * @returns {Boolean} 通过true，非法false
+             */
+            
+            function verify_interest(stdintrrate, errcode, interest) {
+            
+                var head_record = $("ord_contract_ds").getCurrentRecord();
+                errcode = head_record.get("_stdinterest_errorcode");
+            
+                if (Ext.isEmpty(errcode)) {
+                    getBaseIntr();
+                }
+                errcode = head_record.get("_stdinterest_errorcode");
+            
+                if (errcode == -1) {
+                    Leaf.showMessage('提示信息', "未取到合适的利率表");
+                    return false;
+                } else if (errcode == -2) {
+                    Leaf.showMessage('提示信息', "未取到合适的利率");
+                    return false;
+                } else if (errcode == -9) {
+                    Leaf.showMessage('提示信息', "取利率过程发生错误");
+                    return false;
+                } else if (errcode == 0) {
+            
+            
+                    if (stdintrrate > interest) {
+                        Leaf.showMessage('提示信息', "利率不允许小于基准利率！");
+                        return false;
+                    } else {
+                        return true;
+                    }
+                } else {
+                    return false;
+                }
+            }
+            
+            /**
+             * 头信息更新时触发
+             *
+             * @param ds
+             * @param record
+             * @param name
+             * @param value
+             * @param oldValue
+             */
+            
+            function formUpdate(ds, record, name, value, oldValue) {
+            
+                if (name != "printflg") {
+                    isSaved = false;
+                }
+            
+                if (name == "webcustomercd") {
+                    if ((value != null) && (value != '')) {
+                        var ctitype = record.get('ctitype');
+                        var ctino = record.get('ctino');
+                        record.set('ctitype_ctino', ctitype + "/" + ctino);
+            
+                        var branchcd = record.get('branchcd');
+                        var dealercd = record.get('dealercd');
+                        record.set('dealercd_dis', dealercd + "-" + branchcd);
+            
+                        var hometel = record.get("homtel");
+                        var offtel = record.get("offtel");
+                        var mobtel = record.get("mobtel");
+                        if (hometel) {
+                            record.set("customtel", hometel);
+                        } else if (offtel) {
+                            record.set("customtel", offtel);
+                        } else if (mobtel) {
+                            record.set("customtel", mobtel);
+                        }
+            
+                        if (Ext.isEmpty(record.get("score"))) {
+                            Leaf.showMessage('提示信息', "该客户没有评分，请进行客户信息更新或选择其他客户");
+                        }
+            
+                    } else {
+                        record.set('ctitype_ctino', null);
+                        record.set('dealercd_dis', null);
+                        record.set('branchcd', null);
+                        record.set('dealercd', null);
+                        record.set('customtel', null);
+                    }
+            
+                    mdf_array[CUSTOMER_NAME_INDEX] = 1; // 设置修改标记
+                } else if (name == "hclc_budget_type") {
+                    var ob = document.getElementById('old_box');
+                    var rb = document.getElementById('release_box');
+            
+                    record.set('dp_interfree_paydt', null);
+                    record.set('dp_cash_amt', null);
+                    record.set('hclc_repur_number', null);
+                    record.set('dp_interfree_amt', null);
+            
+                    var repurno_field = record.getMeta().getField("hclc_repur_number");
+                    var dp_cash_amt_field = record.getMeta().getField("dp_cash_amt");
+                    var serialno_field = record.getMeta().getField("serialno");
+                    var modelcd_field = record.getMeta().getField('modelcd');
+                    var pattern_field = record.getMeta().getField('pattern');
+                    var dp_interfree_paydt_field = record.getMeta().getField("dp_interfree_paydt");
+            
+                    repurno_field.setRequired(false);
+                    dp_cash_amt_field.setRequired(false);
+                    modelcd_field.setRequired(true);
+                    pattern_field.setRequired(true);
+                    dp_interfree_paydt_field.setRequired(false);
+            
+                    serialno_field.setReadOnly(false);
+                    modelcd_field.setReadOnly(false);
+                    pattern_field.setReadOnly(false);
+            
+                    if (value == "NORMAL") {
+                        ob.style.display = "none";
+                        rb.style.display = "none";
+                    } else if (value == "OLD") {
+                        dp_cash_amt_field.setRequired(true);
+                        dp_interfree_paydt_field.setRequired(true);
+                        ob.style.display = "block";
+                        rb.style.display = "none";
+                    } else if (value == "RELEASE") {
+                        repurno_field.setRequired(true);
+                        modelcd_field.setRequired(false);
+                        pattern_field.setRequired(false);
+            
+                        ob.style.display = "none";
+                        rb.style.display = "block";
+            
+                        serialno_field.setReadOnly(true);
+                        modelcd_field.setReadOnly(true);
+                        pattern_field.setReadOnly(true);
+                    }
+            
+                    mdf_array[BUDGET_TYPE_INDEX] = 1;
+                } else if (name == "budget_category") {
+                    // 百元取整和不均等付款复选组
+                    var calculateOptionsBox = document.getElementById('try_calculat_box');
+                    // 试算结果中的浮动利率框
+                    var resultRatebox = document.getElementById('result_fRate_box');
+            
+                    record.set('rtnway', 1);
+                    record.set('roundcalcflag', 1);
+            
+                    if (value == "FIXED") {
+                        calculateOptionsBox.style.display = "block";
+                        resultRatebox.style.display = "none";
+                    } else if (value == "FLOATING") {
+                        // calculateOptionsBox.style.display = "block";
+                        calculateOptionsBox.style.display = "none";
+                        resultRatebox.style.display = "block";
+                    }
+            
+                    mdf_array[BUDGET_CATEGORY_INDEX] = 1;
+                }
+            
+                if ((name == "machamt") || (name == "optionsamt") || (name == "downpayment")) {
+                    var machamt = parseFloat(record.get('machamt')) || 0;
+                    var optionsamt = parseFloat(record.get('optionsamt')) || 0;
+                    var downpayment = parseFloat(record.get('downpayment')) || 0;
+            
+                    if (name == "optionsamt") {
+                        if (Ext.isEmpty(oldValue) && value == 0) {
+                            return;
+                        }
+                        var saleamt = parseFloat((machamt + optionsamt) || 0).toFixed(2);
+                        record.set('saleamt', saleamt);
+            
+                        mdf_array[OPTIONSAMT_INDEX] = 1;
+            
+                        // record.set('leaseprnc', leaseprnc);
+                    } else if (name == "machamt") {
+                        var saleamt = parseFloat((machamt + optionsamt) || 0).toFixed(2);
+                        record.set('saleamt', saleamt);
+            
+                        mdf_array[MACHAMT_INDEX] = 1;
+                    } else if (name == "downpayment") {
+                        var saleamt = parseFloat(record.get('saleamt')) || 0;
+                        var leaseprnc = parseFloat((saleamt - downpayment) || 0).toFixed(2);
+                        record.set('leaseprnc', leaseprnc);
+            
+                        mdf_array[DOWNPAYMENT_INDEX] = 1;
+                    }
+                } else if (name == "saleamt") {
+                    var downpayment = parseFloat(record.get('downpayment')) || 0;
+                    var leaseprnc = parseFloat((value - downpayment) || 0).toFixed(2);
+                    record.set('leaseprnc', leaseprnc);
+                } else if (name == "modelcd") {
+                    var pattern_field = record.getMeta().getField('pattern');
+                    if (value) {
+                        pattern_field.setLovPara('modelcd', record.get('modelcd'));
+                        if (oldValue != value) {
+                            record.set("pattern", null);
+                        }
+                    } else {
+                        pattern_field.setLovPara('modelcd', null);
+                    }
+            
+                    mdf_array[MODELCD_INDEX] = 1;
+            
+                } else if (name == "leasebgndt") {
+                    // 校验租赁开始日期
+                    if (!verify_leasebgndt(value)) return;
+                    if (record.get("hclc_budget_type") == "OLD") {
+                        var dpInterfreePaydt = Aurora.dateFormat.parseDate(get_dp_interfree_paydt(value,record.get('dp_interfree_prd')), 'yyyy-mm-dd');
+                        record.set("dp_interfree_paydt", dpInterfreePaydt);
+                    } else {
+                        record.set("dp_interfree_paydt", null);
+                    }
+                    mdf_array[LEASEBGNDT_INDEX] = 1;
+                }else if (name == "dp_interfree_prd") {
+                    // 校验租赁开始日期
+                    if (!verify_leasebgndt(record.get('leasebgndt'))) return;
+                    if (record.get("hclc_budget_type") == "OLD") {
+                        var dpInterfreePaydt = Aurora.dateFormat.parseDate(get_dp_interfree_paydt(record.get('leasebgndt'),value), 'yyyy-mm-dd');
+                        record.set("dp_interfree_paydt", dpInterfreePaydt);
+                    } else {
+                        record.set("dp_interfree_paydt", null);
+                    }
+                    mdf_array[LEASEBGNDT_INDEX] = 1;
+                } else if (name == "rtnway") {
+                    var result_grid = $("result_table");
+                    if (value == 1) {
+                        result_grid.hideColumn('manualflag');
+                    } else {
+                        result_grid.showColumn('manualflag');
+                    }
+                    mdf_array[RTNWAY_INDEX] = 1;
+                } else if (name == "serialno") {
+                    if (record.get("hclc_budget_type") != "RELEASE") {
+                        //updated by ouyangzhaochang 2012/02/27 start
+                        //verify_serialno(record.get("serialno"), record.get("modelcd"));
+                        verify_serialno(head_record.get("serialno"), head_record.get("modelcd"), head_record.get("budgetno"));
+                        //updated by ouyangzhaochang 2012/02/27 end
+                    }
+
+                } else if (name == "roundcalcflag") {
+                    mdf_array[ROUNDCALCFLAG_INDEX] = 1;
+                } else if (name == "paybgndt") {
+                    mdf_array[PAYBGNDT_INDEX] = 1;
+                } else if (name == "leaseprd") {
+                    mdf_array[LEASEPRD_INDEX] = 1;
+                } else if (name == "interest") {
+                    validte_interest(value);
+                    mdf_array[INTEREST_INDEX] = 1;
+                } else if (name == "ovhdexpenses") {
+                    if (Ext.isEmpty(oldValue) && value == 0) {
+                        return;
+                    }
+                    mdf_array[OVHDEXPENSES_INDEX] = 1;
+                } else if (name == "margin") {
+                    if (Ext.isEmpty(oldValue) && value == 0) {
+                        return;
+                    }
+                    mdf_array[MARGIN_INDEX] = 1;
+                }
+            }
+            
+            function get_dp_interfree_paydt(leasebgndt,dp_interfree_prd) {
+                var p_result_dt = null;
+                Aurora.request({
+                    url: "${/request/@context_path}/autocrud/agent.bgt.bgt_calculate_rent_get_dp_interfree_paydt/execute",
+                    para: {
+                        leasebgndt: leasebgndt,
+                        dp_interfree_prd:dp_interfree_prd
+                    },
+                    success: function(rst) {
+                        p_result_dt = rst.result.dp_interfree_paydt;
+                    },
+                    scope: this,
+                    sync: true
+                });
+                return p_result_dt;
+            }
+            
+            function validte_interest(interest) {
+                if (interest >= 99.999) {
+                    Leaf.showMessage('提示信息', '利率应介于“0”至“99.999”之间');
+                    return false;
+                }
+                return true;
+            }
+            
+            /**
+             * 以旧换新 校验现金支付金额
+             *
+             * @param downpayment
+             *            主机金额
+             * @param dp_cash_amt
+             *            现金支付金额
+             * @returns {Boolean} 通过true，非法false
+             */
+            
+            function validate_dp_cash_amt(downpayment, dp_cash_amt, dp_interfree_paydt) {
+                if (dp_cash_amt > downpayment) {
+                    Aurora.showMessage('提示信息', '现金支付金额不能大于首付款金额');
+                    return false;
+                }
+            
+                var p_resultcd = null;
+                Leaf.request({
+                    url: "${/request/@context_path}/autocrud/agent.bgt.bgt_calculate_rent_validate_dp_cash_amt/execute",
+                    para: {
+                        dealercd: '${/session/@dealer_cd}',
+                        dp_cash_amt: dp_cash_amt
+                    },
+                    success: function(rst) {
+                        p_resultcd = rst.result.p_resultcd;
+                    },
+                    scope: this,
+                    sync: true
+                });
+                if (p_resultcd == 0) {
+                    return true;
+                } else if (p_resultcd == 1) {
+                    Aurora.showMessage('提示信息', '没有维护可用额度，不可创建');
+                    return false;
+                } else if (p_resultcd == 2) {
+                    Aurora.showMessage('提示信息', '超过可用额度，不可创建！请修改现金支付额度！');
+                    return false;
+                }
+            }
+            
+            
+            /**
+             * 校验回购业务是否完成
+             *
+             * @param serialNo
+             * @param repurno
+             * @param modelcd
+             * @returns {Boolean}
+             */
+            
+            function verify_repur() {
+                var check_repur = true;
+                var head_record = $("ord_contract_ds").getCurrentRecord();
+            
+                var repurno = head_record.get("hclc_repur_number");
+                if (Ext.isEmpty(repurno)) return;
+
+                Leaf.request({
+                    url: "${/request/@context_path}/autocrud/agent.bgt.bgt_calculate_rent_validate_repur_serialno/execute",
+                    para: {
+                        repurno: repurno,
+                        budgetno: head_record.get("budgetno")
+                    },
+                    success: function(rst) {
+                        var resultcd = rst.result.resultcd;
+                        if (resultcd < 0) {
+                            Aurora.showMessage('提示信息', rst.result.message);
+                            /*
+                             * head_record.set("modelcd", null);
+                             * head_record.set("serialno", null);
+                             * head_record.set("pattern", null);
+                             * head_record.set("modelname", null);
+                             * head_record.set("detention", null);
+                             * head_record.set("spec", null);
+                             */
+                            check_repur = false;
+                        } else {
+                            check_repur = true;
+                            head_record.set("modelcd", rst.result.modelcd);
+                            head_record.set("serialno", rst.result.serialno);
+                            head_record.set("pattern", rst.result.pattern);
+                            head_record.set("modelname", rst.result.modelname);
+                            head_record.set("detention", rst.result.detention);
+                            head_record.set("spec", rst.result.name_c);
+            
+                        }
+                    },
+                    scope: this,
+                    sync: true
+                });
+                return check_repur;
+            }
+            
+            /**
+             * 检查客户分数
+             *
+             * @param score
+             * @returns
+             */
+            
+            function verify_customer_score(score) {
+                var result_boolean = Ext.isEmpty(score);
+                if (result_boolean) {
+                    Leaf.showMessage('提示信息', '该客户没有评分，请进行客户信息更新或选择其他客户');
+                }
+                return !result_boolean;
+            }
+            
+            /**
+             * 检查不均等付款时，每期金额是否小于 表 ord_floating_interest_para.lowest_unequal_payment 定义的值
+             *
+             * @returns true：校验通过  false：不通过
+             */
+            
+            function verify_rtnway_amount(headRecord) {
+                var ds = $("detail_ds");
+                var records = ds.getAll(); //取出明细的所有数据
+            
+                if ((Ext.isEmpty(records)) || (records.length == 0) || (headRecord.get("rtnway") == "1")) {
+                    //明细为空，或数据条数为空，说明还没有进行试算，无法填写数值，不做校验；
+                    //均等付款不做检测
+                    return true;
+                }
+            
+                //取出 lowest_unequal_payment 数值
+                var lowest_unequal_payment = "${/model/floating_interest_para_model/record/@lowest_unequal_payment}";
+                for (var i = 0;i < records.length;i++) {
+                    if ((parseFloat(records[i].get("payamt")) < parseFloat(lowest_unequal_payment)) && (records[i].get("manualflag") == "1")) {
+                        //找到比系统数值小的，并且被选中的
+                        Leaf.showMessage('提示信息', '第' + records[i].get("times") + "期： 支付金额不允许小于“" + lowest_unequal_payment + "”");
+                        return false;
+                    }
+                }
+            
+                return true;
+            }
+            
+            function detailUpdate(ds, record, name, value, oldValue) {
+                if (name == "manualflag") {
+                    if (value == 0) {
+                        var location = ds.indexOf(record);
+                        if ((record.get("payamt")) != back_data_array[location]) { // 对比是否改变了数值
+                            /*
+                             * 如改变，恢复原值(理由是：如果简单的将原值直接覆盖上去， 当出现“用户勾选了某一行，没有改变其值后又取消勾选”的情况时，
+                             * 就会造成误判，认为用户改变了关键值);
+                             */
+                            record.set("payamt", back_data_array[location]);
+                        }
+                    }
+                } else if (name == "payamt") {
+                    mdf_array[RESULT_PAYAMT_INDEX] = 1;
+                }
+            }
+            
+            /**
+             * 校验试算前数据是否符合要求
+             *
+             * @returns {Boolean}
+             */
+            
+            function validate_calculate_data() {
+            
+                var head_record = $("ord_contract_ds").getCurrentRecord();
+                var stdintrrate = parseFloat(head_record.get("stdintrrate") || (-1));
+                var interest = parseFloat(head_record.get("interest"));
+                var stdinterest_errorcd = head_record.get("_stdinterest_errorcode");
+                var hclc_budget_type = head_record.get("hclc_budget_type");
+            
+                //add by ouyangzhaochang 2012/05/23 start 校验支付开始日必须在租赁开始日的下个月内
+                var paybgndt = head_record.get("paybgndt");
+                var leasebgndt = head_record.get("leasebgndt");
+                if (!verify_paydate(paybgndt, leasebgndt)) {
+                    return;
+                }
+                //add by ouyangzhaochang 2012/05/23 end
+            
+                // 利率校验结果
+                var check_interest = verify_interest(stdintrrate, stdinterest_errorcd, interest);
+                if (!check_interest) return false;
+            
+                if (hclc_budget_type == "OLD") {
+                    var dpInterfreePaydt = Aurora.dateFormat.parseDate(get_dp_interfree_paydt(head_record.get("leasebgndt"),head_record.get("dp_interfree_prd")), 'yyyy-mm-dd');
+                    if (Ext.isEmpty(dpInterfreePaydt)) {
+                        Leaf.showMessage('提示信息', '取得“免息支付日”出错');
+                        return false;
+                    }
+                    head_record.set("dp_interfree_paydt", dpInterfreePaydt);
+                } else {
+                    head_record.set("dp_interfree_paydt", null);
+                }
+            
+                if (head_record.get("dp_cash_amt") > head_record.get("downpayment")) {
+                    Leaf.showMessage('提示信息', '现金支付金额大于首付款');
+                    return false;
+                }
+            
+                // 以旧换新校验结果
+                var check_dp_cash_amt = true;
+                if ((hclc_budget_type) == "OLD") {
+                    head_record.set("dp_interfree_amt", head_record.get("downpayment") - head_record.get("dp_cash_amt"));
+            
+            
+                    check_dp_cash_amt = validate_dp_cash_amt(head_record.get("downpayment") || 0, head_record.get("dp_interfree_amt") || 0, head_record.get("dp_interfree_paydt"));
+            
+            
+                }
+                if (!check_dp_cash_amt) return false;
+            
+                // 二次租赁校验结果
+                var check_repur = true;
+                if ((hclc_budget_type) == "RELEASE") {
+                    check_repur = verify_repur();
+                }
+                if (!check_repur) return false;
+            
+                // 校验机号（普通）
+                if ((hclc_budget_type) != "RELEASE") {
+                    //updated by ouyangzhaochang 2012/02/27 start
+                    //var check_serialno = verify_serialno(head_record.get("serialno"), head_record.get("modelcd"));
+                    var check_serialno = verify_serialno(head_record.get("serialno"), head_record.get("modelcd"), head_record.get("budgetno"));
+                    //updated by ouyangzhaochang 2012/02/27 end
+                    if (!check_serialno) return false;
+                }
+            
+                // 检查租赁起始日
+                var check_leasebgdt = verify_leasebgndt(head_record.get("leasebgndt"));
+                if (!check_leasebgdt) return false;
+            
+                // 检查客户评分
+                var check_customerscore = verify_customer_score(head_record.get("score"));
+                if (!check_customerscore) return false;
+            
+                // 检查利率范围
+                var check_interest = validte_interest(head_record.get("interest"));
+                if (!check_interest) return false;
+            
+                var check_selectAll = verify_isAllDetailRecordSelected();
+                if (!check_selectAll) return false;
+            
+                var check_rtnway_amount = verify_rtnway_amount(head_record);
+                if (!check_rtnway_amount) return false;
+            
+                return true;
+            
+            }
+            
+            /*
+             * 试算过程开始
+             */
+            
+            function try_calculate() {
+                //add by ouyangzhaochang 2012/05/01 start
+                var saveButton = $('saveButton');
+                saveButton.disable();
+                //add by ouyangzhaochang 2012/05/11 end
+                if (!$('ord_contract_ds').validate()) {
+                    return;
+                }
+                if (!validate_calculate_data()) {
+                    return;
+                }
+            
+                var record = $('ord_contract_ds').getCurrentRecord();
+            
+                record.set("margin", record.get("margin") || 0);
+                record.set("ovhdexpenses", record.get("ovhdexpenses") || 0);
+                record.set("optionsamt", record.get("optionsamt") || 0);
+            
+                var roundcalcflag = record.get("roundcalcflag"); // 百元取整
+                var rtnway = record.get("rtnway"); // 不均等付款
+            
+                // 试算调用过程地址
+                var destination_bm_url = "";
+                if (roundcalcflag == '1') {
+                    // 非百元取整
+                    destination_bm_url = "${/request/@context_path}/autocrud/agent.bgt.bgt_pab001_lease_calculation/execute";
+                } else if (roundcalcflag == '2') {
+                    // 百元取整
+                    destination_bm_url = "${/request/@context_path}/autocrud/agent.bgt.bgt_pab002_lease_calculation/execute";
+                }
+            
+                // 获取每期付款字符串
+                var paymentSeq = generateSequence();
+                Leaf.request({
+                    url: destination_bm_url,
+                    para: {
+                        saleamt: record.get("saleamt"),
+                        leaseprnc: record.get("leaseprnc"),
+                        interest: (parseFloat(record.get("interest")) / 100),
+                        leasebgndt: record.get("leasebgndt").format('yyyymmdd'),
+                        paybgndt: record.get("paybgndt").format('yyyymmdd'),
+                        leaseprd: record.get("leaseprd"),
+                        downpayment: record.get("downpayment"),
+                        detention: record.get("detention") || 0,
+                        i_baoxianfei: 0,
+                        ovhdexpenses: record.get("ovhdexpenses") || 0,
+                        i_dingjin: 0,
+                        margin: record.get("margin") || 0,
+                        rtnway: rtnway,
+                        i_editserial: paymentSeq,
+                        dealercd: '${/session/@dealer_cd}',
+                        modelcd: record.get("modelcd"),
+                        budget_category: record.get("budget_category")
+                    },
+                    success: function(result) {
+                        isRecalculatFlg = '1'; // 将试算标记标1
+                        var errorcd = result.result.errcode;
+                        if (errorcd == 0) {
+                            // alert("成功");
+                            record.set("seq", result.result.seq);
+            
+                            // 查询数据到结果表中
+                            var detail_ds = $("detail_ds");
+                            detail_ds.setQueryParameter("seq", result.result.seq); // 设置查询条件
+            
+                            var floatingCalculatSuccess = true;
+                            if (record.get("budget_category") == 'FLOATING') {
+                                Leaf.request({
+                                    url: "${/request/@context_path}/autocrud/agent.bgt.bgt_calculate_rent_calc_adjust_interest_amount/execute",
+                                    para: {
+                                        principal: record.get("leaseprnc"),
+                                        interest: (parseFloat(record.get("stdintrrate")) / 100),
+                                        leasing_period: record.get("leaseprd")
+                                    },
+                                    success: function(args) {
+                                        record.set("delay_execute_period", args.result.delay_execute_period);
+                                        record.set("adj_step", args.result.adj_step);
+                                        record.set("adj_range", args.result.adj_range);
+                                        record.set("unit_adjust_amount", args.result.result);
+                                        floatingCalculatSuccess = true;
+                                    },
+                                    error: function(args) {
+                                        floatingCalculatSuccess = false;
+                                    },
+                                    scope: this,
+                                    sync: true
+                                });
+                            }
+            
+                            if (floatingCalculatSuccess) {
+                                // 指定查询路径,试算均需从TEMP_KINRI表中查数据
+                                detail_ds.setQueryUrl("${/request/@context_path}/autocrud/agent.bgt.TEMP_KINRI/query");
+                                detail_ds.query(); // 查询数据
+            
+                                // 将验证数组恢复初始化
+                                initValidArray();
+                            }
+            
+                        } else {
+                            Leaf.showMessage('提示信息', result.result.error_message);
+                            //add by ouyangzhaochang 2012/05/11 start
+                            var saveButton = $('saveButton');
+                            saveButton.enable();
+                            //add by ouyangzhaochang 2012/05/11 end
+                        }
+                    },
+                    scope: this,
+                    sync: true
+                });
+            }
+            
+            function afterLoadData(ds) {
+                var record = $('ord_contract_ds').getCurrentRecord();
+                var records = ds.getAll(); // 得到加载的全部数据
+                back_data_array = new Array(records.length);
+            
+                var totalSalestax = parseFloat(0); // 营业税总和
+                var totalpaytimes = parseFloat(0);
+                var totalPayment = parseFloat(0);
+                var totalInt = parseFloat(0); // 利息总和
+                var totalPrn = parseFloat(0); // 本金总和
+                var totalCsgchg = parseFloat(0);
+            
+                var find_min_paytime = false;
+            
+                // 将初始数据写入备份数组中，同时，计算每行的营业税和营业税总和
+                for (var i = 0;i < back_data_array.length;i++) {
+                    var current_payamt = parseFloat(records[i].get("payamt")); // 得到当前付款金额
+                    back_data_array[i] = current_payamt; // 写入备份数组
+            
+                    totalPayment += current_payamt; // 计算付款总和
+            
+                    var current_int = parseFloat(records[i].get("interest"));
+                    totalInt += current_int;
+            
+                    var current_tax = (current_int * 0.05).toFixed(2); // 计算当前行营业税
+                    totalSalestax += parseFloat(current_tax); // 计算营业税总和
+                    records[i].set("salestax", current_tax); // 设置当前行营业税
+            
+                    if (current_payamt > 0) {
+                        totalpaytimes += 1; // 计算支付回数
+                        if (!find_min_paytime) {
+                            record.set("perlchg_fir", records[i].get("payamt")); // 取第一期支付金额>0的，作为“每月租金(第一期)”
+                            find_min_paytime = true;
+                        }
+                    }
+            
+            
+            
+                    var current_csgchg = parseFloat(records[i].get("csgchg"));
+                    totalCsgchg += current_csgchg;
+            
+                    var current_prn = parseFloat(records[i].get("principal"));
+                    totalPrn += current_prn;
+                }
+            
+                // 设置第二期租金
+                var rtnway = record.get("rtnway");
+                record.set("perlchg_sec", null);
+                if (rtnway == 1) {
+                    if (records.length > 1) { //add by shuangyi.li 去除只有1期的情况
+                        record.set("perlchg_sec_dis", parseFloat(records[1].get("payamt")));
+                        record.set("perlchg_sec", parseFloat(records[1].get("payamt")));
+                        (document.getElementById('perlchg_sec_number')).style.display = "block";
+                        (document.getElementById('perlchg_sec_text')).style.display = "none";
+                        Ext.get("result_table").child('td.table_title').update("预定支付表（均等）");
+                    }
+                    // zhangyi@2012/02/21
+                    if (record.get("budget_category") == 'FLOATING') {
+                        //如果是浮动利率并且是均等付款，显示“调整租金(每0.1%)”界面字段
+                        (document.getElementById('result_fRate_box')).style.display = "block";
+                    }
+                } else {
+                    record.set("perlchg_sec_dis", "详细付款状况参见下列的租金支付计划表");
+                    record.set("perlchg_sec", parseFloat(0));
+                    (document.getElementById('perlchg_sec_text')).style.display = "block";
+                    (document.getElementById('perlchg_sec_number')).style.display = "none";
+                    Ext.get("result_table").child('td.table_title').update("预定支付表（不均等）");
+            
+                    // zhangyi@2012/02/21
+                    if (record.get("budget_category") == 'FLOATING') {
+                        //如果是浮动利率并且是不均等付款，隐藏“调整租金(每0.1%)”界面字段
+                        (document.getElementById('result_fRate_box')).style.display = "none";
+                    }
+                }
+            
+                record.set("tolleasechg", totalPayment.toFixed(2));
+            
+                record.set("paytimes", totalpaytimes);
+                record.set("tolsaltax", (parseFloat(totalPayment.toFixed(2)) * 0.05).toFixed(2));
+                record.set("tolconschg", totalCsgchg.toFixed(2));
+                record.set("tolintamt", totalInt.toFixed(2));
+                record.set("paysum", record.get("downpayment"));
+                record.set("totalPrn", totalPrn.toFixed(2));
+            
+                // 动态设置grid大小
+                var result_table = $("result_table");
+                var height = 60 + (back_data_array.length) * 25;
+                result_table.setHeight(height);
+            
+                // 显示下半部分
+                var result_div = document.getElementById('calculate_result_div');
+                result_div.style.display = "block";
+            
+                // 设置隐藏列
+                var result_grid = $("result_table");
+                if (rtnway == 1) {
+                    result_grid.hideColumn('manualflag');
+                } else {
+                    result_grid.showColumn('manualflag');
+                }
+            
+                if (isAdd == 0 && loadDetailCount == 0) isSaved = true;
+            
+                loadDetailCount++;
+                //add by ouyangzhaochang 2012/05/11 start
+                var saveButton = $('saveButton');
+                saveButton.enable();
+                //add by ouyangzhaochang 2012/05/11 end
+            }
+            
+            // 生成不均等付款的标识序列
+            
+            function generateSequence() {
+            
+                var records = $("detail_ds").getAll();
+                if (records.length == 0) {
+                    return '-1';
+                }
+            
+                var sequenceStr = "";
+                for (var i = 0;i < records.length;i++) {
+                    if (records[i].get("manualflag") == 0) {
+                        sequenceStr += -1;
+                    } else {
+                        sequenceStr += (records[i].get("payamt"));
+                    }
+                    sequenceStr += "^";
+                }
+                return sequenceStr;
+            }
+            
+            /**
+             * 检测是否有关键数据被更改
+             */
+            
+            function checkIfKeyDataUpdated() {
+                var index = -1;
+                for (var i = 0;i < mdf_array.length;i++) {
+                    if (mdf_array[i] == 1) {
+                        index = i;
+                        break;
+                    }
+                }
+                return index;
+            }
+            
+            /**
+             * 保存结果
+             */
+            
+            function saveResult() {
+                var head_record = $("ord_contract_ds").getCurrentRecord();
+                var form_ds = $("ord_contract_ds");
+            
+                if (!form_ds.validate()) {
+                    return;
+                }
+            
+                //add by ouyangzhaochang 2012/05/11 start 以旧换新的现金支付额不能为空
+                var hclc_budget_type = head_record.get('hclc_budget_type');
+                if (hclc_budget_type == 'OLD') {
+                    var dp_cash_amt = head_record.get('dp_cash_amt');
+                    if (typeof(dp_cash_amt) == "undefined" || (dp_cash_amt === '')) {
+                        Leaf.showMessage('提示信息', '现金支付金额不能为空');
+                        return;
+                    }
+                }
+                //add by ouyangzhaochang 2012/05/11 end
+            
+                var check_index = checkIfKeyDataUpdated();
+                if (check_index != -1) {
+                    Leaf.showMessage('提示信息', "“" + mdf_message_array[check_index] + '”数据已改变，请在重新试算后再保存');
+                    return;
+                }
+            
+            
+                if (!validate_calculate_data()) {
+                    return;
+                }
+            
+            
+                var tolleasechg = parseFloat(head_record.get("tolleasechg") || 0);
+                var downpayment = parseFloat(head_record.get("downpayment") || 0);
+                var detention = parseFloat(head_record.get("detention") || 0);
+                head_record.set('contractamt', (tolleasechg + downpayment + detention).toFixed(2)); // 合同总金额
+            
+                head_record.set('companycd', "${/session/@companyCd}");
+                head_record.set('userid', "${/session/@user_id}");
+                head_record.set('org_cd', "${/session/@org_id}");
+                head_record.set('recalculat_flg', isRecalculatFlg);
+                // 如果是新增状态
+                if (isAdd == 1) {
+                    var comfirm = Aurora.showConfirm('${l:JAVASCRIPT_MESSAGE}', '确定提交？', function() {
+                        comfirm.close();
+                        form_ds.setSubmitParameter('dealercd', head_record.get('dealercd'));
+                        form_ds.setSubmitParameter('branchcd', '00');
+                        form_ds.setSubmitUrl("bgt_trial_balance_insert.svc");
+                        form_ds.submit();
+                    });
+                } else {
+                    var comfirm = Aurora.showConfirm('${l:JAVASCRIPT_MESSAGE}', '确定修改？', function() {
+                        comfirm.close();
+                        // alert(result.result.p_bugetno);
+            
+                        // 设置提交地址
+                        form_ds.setSubmitUrl("${/request/@context_path}/autocrud/agent.bgt.bgt_calculate_rent_update_ld004_05/batch_update");
+                        form_ds.submit();
+                    }, null, null, 100);
+                }
+            
+            }
+            
+            function saveSuccess(dataSet, datas) {
+            
+                if (isAdd == 1) {
+                    budgetno = datas.result.budgetno_temp;
+                    $("ord_contract_ds").getCurrentRecord().set("budgetno_temp", budgetno);
+                    $("ord_contract_ds").getCurrentRecord().set("budgetno", budgetno);
+                    Leaf.showMessage('提示信息', '新增成功，概算书编号为：' + budgetno);
+                    isAdd = 0;
+                } else {
+                    Leaf.showMessage('提示信息', '修改成功');
+                }
+                $("ord_contract_ds").getCurrentRecord().set("status", 0);
+                isSaved = true;
+            }
+            
+            function opt1Validator(record, name, value) {
+                if (Ext.isEmpty(value)) {
+                    return true;
+                }
+            
+                if (value.length > 20) {
+                    return '最多输入600字';
+                }
+            
+                return true;
+            }
+            
+            
+            
+            function back() {
+                window.history.go(-1);
+            }
+            
+            function paydtRenderer(value, record, name) {
+                if (record) {
+                    var str = value.substring(0, 4) + "/" + value.substring(4, 6) + "/" + value.substring(6, 8);
+                    return str;
+                }
+                return '';
+            }
+            
+            function numberRenderer(value, record, name) {
+                return Leaf.formatNumber(value, 2);
+            }
+            
+            function interestRenderer(value, record, name) {
+                return Leaf.formatNumber(value, 3);
+            }
+            
+            function footTitle(data, name) {
+                return "合计";
+            }
+            
+            function footPayAmt(data, name) {
+                var value = $("ord_contract_ds").getCurrentRecord().get("tolleasechg");
+                return Leaf.formatNumber(value, 2);
+            }
+            
+            function footPrn(data, name) {
+                var value = $("ord_contract_ds").getCurrentRecord().get("totalPrn");
+                return Leaf.formatNumber(value, 2);
+            }
+            
+            function footInt(data, name) {
+                var value = $("ord_contract_ds").getCurrentRecord().get("tolintamt");
+                return Leaf.formatNumber(value, 2);
+            }
+            
+            function footConschg(data, name) {
+                var value = $("ord_contract_ds").getCurrentRecord().get("tolconschg");
+                return Leaf.formatNumber(value, 2);
+            }
+            
+            function payamtEditFunction(record, name) {
+                var manualflag = record.get("manualflag");
+                if (manualflag == 0) {
+                    return '';
+                } else {
+                    return 'grid_nf';
+                }
+            }
+            
+            function print() {
+                if (!isSaved) {
+                    Leaf.showMessage('提示信息', '数据已修改，请先保存再打印');
+                    return;
+                }
+            
+                var record = $("ord_contract_ds").getCurrentRecord();
+                var currentStatus = record.get("status");
+                var printflg = record.get("printflg");
+            
+                if (Ext.isEmpty(printflg)) return;
+            
+                var requestSuccess = false;
+                var requestStatus = "";
+                Leaf.request({
+                    url: '${/request/@context_path}/autocrud/agent.bgt.bgt_budgetapprove_get_status/execute',
+                    para: {
+                        budgetno: record.get("budgetno")
+                    },
+                    success: function(result) {
+                        requestSuccess = true;
+                        requestStatus = result.result.status;
+            
+                    },
+                    scope: this,
+                    sync: true
+                });
+            
+                if (requestSuccess) {
+            
+                    if (requestStatus != currentStatus) {
+                        Aurora.showMessage('提示信息', '该概算书信息已被其他用户更改，请重新查询！');
+                        return;
+                    }
+            
+                    if (requestStatus == 7) {
+                        Aurora.showMessage('提示信息', '该概算书已被删除！');
+                        return;
+                    }
+            
+                    var msg = "";
+                    if (printflg == 1) {
+                        msg = "是否打印概算书（客户用）？";
+                    } else if (printflg == 2) {
+                        msg = "是否打印概算书（代理店用）？";
+                    } else {
+                        return;
+                    }
+            
+                    var comfirm = Aurora.showConfirm('${l:JAVASCRIPT_MESSAGE}', msg, function() {
+                        comfirm.close();
+                        var success2 = false;
+                        Aurora.request({
+                            url: '${/request/@context_path}/autocrud/agent.bgt.bgt_budgetedit_print/execute',
+                            para: {
+                                budgetno: record.get("budgetno"),
+                                status: currentStatus,
+                                printflg: printflg
+                            },
+                            success: function(rst) {
+                                record.set("status", rst.result.newstatus);
+            
+                                isSaved = true;
+                                success2 = true;
+                            },
+                            scope: this,
+                            sync: true
+                        });
+                        if (success2) {
+                            printRep(printflg, record.get("customerflg"), record.get("budgetno"));
+                        }
+                    }, null, null, 100);
+                }
+            }
+            
+            // 打印帐票
+            
+            function printRep(publishType, custFlg, budgetno) {
+                var obj = new FineReport();
+                obj.ReportTemplate = "";
+            
+                // var url1 = '${/request/@context_path}/preview?__format=';
+                // var url2 = '&__report=modules/agent/report/';
+                // 概算书（本纸）
+                if (publishType == "1") {
+                    // var reportURL = url1 + "pdf" + url2 + "RA07.rptdesign" +
+                    // "&budgetno="+budgetno;
+                    // window.open(reportURL);
+            
+                    obj.ReportTemplate = "PAR007.cpt";
+                }
+                // 概算书（代理店控）
+                else if (publishType == "2") {
+                    // var reportURL = url1 + "pdf" + url2 + "RA08.rptdesign" +
+                    // "&budgetno="+budgetno;
+                    // window.open(reportURL);
+            
+                    obj.ReportTemplate = "PAR008.cpt";
+                }
+            
+                obj.setParameter("BUDGETNO", budgetno);
+                obj.setParameter("format", "PDF");
+                obj.openReport();
+            }
+        ]]></script>
+
+        <a:screenBody>
+            <div/>
+            <table border="0" cellpadding="0" cellspacing="0" width="766">
+                <tr align="right">
+                    <td width="71">
+                        <span><![CDATA[概算书编号]]></span>
+                    </td>
+                    <td width="112">
+                        <a:textField name="budgetno" bindTarget="ord_contract_ds" readOnly="true" width="105"/>
+                    </td>
+                    <td width="81">
+                        <span><![CDATA[概算书打印日]]></span>
+                    </td>
+                    <td width="112">
+                        <a:textField name="estisudate" bindTarget="ord_contract_ds" readOnly="true" renderer="Aurora.formatDate" width="105"/>
+                    </td>
+                    <td width="92">
+                        <span><![CDATA[概算书类别]]></span>
+                    </td>
+                    <td width="102">
+                        <a:comboBox name="hclc_budget_category_dis" bindTarget="ord_contract_ds" width="95"/>
+                    </td>
+                    <td width="72">
+                        <span><![CDATA[概算书类型]]></span>
+                    </td>
+                    <td width="124">
+                        <a:comboBox name="hclc_budget_type_dis" bindTarget="ord_contract_ds" width="115"/>
+                    </td>
+                </tr>
+            </table>
+            <table id="old_box" border="0" cellpadding="0" cellspacing="0" style="display:none" width="766">
+                <tr align="right">
+                    <td width="71">
+                        <span><![CDATA[现金支付额]]></span>
+                    </td>
+                    <td width="112">
+                        <a:numberField name="dp_cash_amt" allowFormat="true" allowNegative="false" bindTarget="ord_contract_ds" width="105"/>
+                    </td>
+                    <td width="92">
+                        <span><![CDATA[免息首付款额度]]></span>
+                    </td>
+                    <td width="102">
+                        <a:numberField name="dp_interfree_amt" allowFormat="true" allowNegative="false" bindTarget="ord_contract_ds" readOnly="true" width="95"/>
+                    </td>
+                    <td width="92">
+                        <span><![CDATA[免息周期]]></span>
+                    </td>
+                    <td width="104">
+                        <a:comboBox name="dp_interfree_prd_dis" bindTarget="ord_contract_ds" width="95"/>
+                    </td>
+                    <td width="81">
+                        <span><![CDATA[免息支付日]]></span>
+                    </td>
+                    <td width="112">
+                        <a:datePicker name="dp_interfree_paydt" bindTarget="ord_contract_ds" width="115"/>
+                    </td>
+                </tr>
+            </table>
+            <table id="release_box" border="0" cellpadding="0" cellspacing="0" style="display:none" width="766">
+                <tr align="right">
+                    <td width="642">
+                        <span><![CDATA[回购函号]]></span>
+                    </td>
+                    <td width="124">
+                        <a:textField name="hclc_repur_number" bindTarget="ord_contract_ds" width="115">
+                            <a:events>
+                                <a:event name="blur" handler="verify_repur"/>
+                            </a:events>
+                        </a:textField>
+                    </td>
+                </tr>
+            </table>
+            <table>
+                <tr>
+                    <td>
+                        <a:form labelWidth="100" showmargin="false" title="客户信息" width="290">
+                            <a:lov name="customername" bindTarget="ord_contract_ds" prompt="客户名称" width="170"/>
+                            <a:textField name="customtel" bindTarget="ord_contract_ds" prompt="电话" width="170"/>
+                            <a:textField name="ctitype_ctino" bindTarget="ord_contract_ds" prompt="证件类型/号码" width="170"/>
+                            <a:textField name="delvinaddr" bindTarget="ord_contract_ds" prompt="交货地址" width="170"/>
+                        </a:form>
+                    </td>
+                    <td>
+                        <a:form labelWidth="90" showmargin="false" title="评分信息" width="207">
+                            <a:textField name="basic_score" bindTarget="ord_contract_ds" prompt="基本分" readOnly="true" width="100"/>
+                            <a:textField name="trade_score" bindTarget="ord_contract_ds" prompt="交易系数" readOnly="true" width="100"/>
+                            <a:textField name="guarantor_score" bindTarget="ord_contract_ds" prompt="担保人系数" readOnly="true" width="100"/>
+                            <a:textField name="score" bindTarget="ord_contract_ds" prompt="综合分" readOnly="true" width="100"/>
+                        </a:form>
+                    </td>
+                    <td>
+                        <a:form labelWidth="90" showmargin="false" title="代理店信息" width="257">
+                            <a:textField name="dealercd_dis" bindTarget="ord_contract_ds" prompt="代理店代码" width="150"/>
+                            <a:textField name="branchname" bindTarget="ord_contract_ds" prompt="分公司名称" width="150"/>
+                            <a:textField name="tel" bindTarget="ord_contract_ds" prompt="电话" width="150"/>
+                            <a:lov name="regionname" bindTarget="ord_contract_ds" prompt="发往地" width="150"/>
+                        </a:form>
+                    </td>
+                </tr>
+            </table>
+            <table>
+                <tr>
+                    <td>
+                        <a:form height="290" padding="0" showmargin="false" title="租赁详细信息" width="210">
+                            <a:box column="1" labelWidth="70">
+                                <a:numberField name="saleamt" allowFormat="true" allowNegative="false" bindTarget="ord_contract_ds" prompt="销售金额" width="120"/>
+                            </a:box>
+                            <a:box column="1" labelWidth="70">
+                                <a:numberField name="machamt" allowFormat="true" allowNegative="false" bindTarget="ord_contract_ds" prompt="主机金额" width="120">
+                                    <a:events>
+                                        <a:event name="blur" handler="getBaseIntr"/>
+                                    </a:events>
+                                </a:numberField>
+                            </a:box>
+                            <a:box column="1" labelWidth="70">
+                                <a:numberField name="optionsamt" allowFormat="true" allowNegative="false" bindTarget="ord_contract_ds" prompt="附件金额" width="120">
+                                    <a:events>
+                                        <a:event name="blur" handler="getBaseIntr"/>
+                                    </a:events>
+                                </a:numberField>
+                            </a:box>
+                            <a:box column="1" labelWidth="70">
+                                <a:numberField name="downpayment" allowFormat="true" allowNegative="false" bindTarget="ord_contract_ds" prompt="首付款" width="120">
+                                    <a:events>
+                                        <a:event name="blur" handler="getBaseIntr"/>
+                                    </a:events>
+                                </a:numberField>
+                            </a:box>
+                            <a:box column="1" labelWidth="70">
+                                <a:numberField name="ovhdexpenses" allowFormat="true" allowNegative="false" bindTarget="ord_contract_ds" prompt="管理费" width="120"/>
+                            </a:box>
+                            <a:box column="1" labelWidth="70">
+                                <a:numberField name="margin" allowFormat="true" allowNegative="false" bindTarget="ord_contract_ds" prompt="保证金" width="120"/>
+                            </a:box>
+                            <a:box column="1" labelWidth="70">
+                                <a:numberField name="detention" allowFormat="true" allowNegative="false" bindTarget="ord_contract_ds" prompt="留购金" width="120"/>
+                            </a:box>
+                            <a:box column="2" labelWidth="70">
+                                <a:numberField name="stdintrrate" bindTarget="ord_contract_ds" prompt="基准利率" readOnly="true" renderer="interestRenderer" width="100"/>
+                                <label><![CDATA[%]]></label>
+                            </a:box>
+                            <a:box column="1" labelWidth="70">
+                                <span><![CDATA[&nbsp;]]></span>
+                            </a:box>
+                        </a:form>
+                    </td>
+                    <td>
+                        <a:form height="290" padding="0" showmargin="false" title="物件名称" width="287">
+                            <a:box labelWidth="90">
+                                <a:textField name="modelname" bindTarget="ord_contract_ds" prompt="机种名称" width="180"/>
+                            </a:box>
+                            <a:box labelWidth="90">
+                                <a:lov name="modelcd" bindTarget="ord_contract_ds" prompt="机型" width="180">
+                                    <a:events>
+                                        <a:event name="select" handler="getBaseIntr"/>
+                                    </a:events>
+                                </a:lov>
+                            </a:box>
+                            <a:box labelWidth="90">
+                                <a:lov name="pattern" bindTarget="ord_contract_ds" prompt="型号" width="180"/>
+                            </a:box>
+                            <a:box labelWidth="90">
+                                <a:textField name="serialno" bindTarget="ord_contract_ds" prompt="机号" width="180"/>
+                            </a:box>
+                            <a:box column="1" labelWidth="90">
+                                <a:datePicker name="leasebgndt" bindTarget="ord_contract_ds" prompt="租赁开始日" width="180">
+                                    <a:events>
+                                        <a:event name="select" handler="getBaseIntr"/>
+                                    </a:events>
+                                </a:datePicker>
+                            </a:box>
+                            <a:box labelWidth="90">
+                                <a:datePicker name="paybgndt" bindTarget="ord_contract_ds" prompt="支付开始日" width="180">
+                                    <a:events>
+                                        <a:event name="select" handler="getBaseIntr"/>
+                                    </a:events>
+                                </a:datePicker>
+                            </a:box>
+                            <a:box labelWidth="90">
+                                <a:numberField name="leaseprnc" bindTarget="ord_contract_ds" prompt="租赁本金" renderer="numberRenderer" width="180"/>
+                            </a:box>
+                            <a:box column="2" labelWidth="90">
+                                <a:numberField name="leaseprd" allowDecimals="false" allowNegative="false" bindTarget="ord_contract_ds" prompt="租赁期间" width="180">
+                                    <a:events>
+                                        <a:event name="blur" handler="getBaseIntr"/>
+                                    </a:events>
+                                </a:numberField>
+                            </a:box>
+                            <a:box column="2" labelWidth="90">
+                                <a:numberField name="interest" bindTarget="ord_contract_ds" decimalPrecision="3" prompt="利率" width="160"/>
+                                <label><![CDATA[%]]></label>
+                            </a:box>
+                        </a:form>
+                    </td>
+                    <td>
+                        <a:form padding="0" showmargin="false" title="配置">
+                            <a:textArea name="spec" bindTarget="ord_contract_ds" height="161" padding="0" width="249"/>
+                        </a:form>
+                        <a:form padding="0" showmargin="false" title="附属品">
+                            <a:textArea name="opt1" bindTarget="ord_contract_ds" height="60" padding="0" width="250"/>
+                        </a:form>
+                    </td>
+                </tr>
+            </table>
+            <table border="0" cellpadding="0" cellspacing="0" width="766">
+                <tr>
+                    <td width="220">
+                        <!--style="display:none;" -->
+                        <div>
+                            <a:hBox>
+                                <a:checkBox name="rtnway" bindTarget="ord_contract_ds" style="margin-right:0;"/>
+                                <label><![CDATA[不均等付款]]></label>
+                                <div><![CDATA[&nbsp;&nbsp;&nbsp;]]></div>
+                                <div id="try_calculat_box">
+                                    <table>
+                                        <tr>
+                                            <td>
+                                                <a:checkBox name="roundcalcflag" bindTarget="ord_contract_ds" style="margin-right:0;"/>
+                                            </td>
+                                            <td>
+                                                <label><![CDATA[百元取整]]></label>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </a:hBox>
+                        </div>
+                    </td>
+                    <td align="center" width="576">
+                        <div style="width:100%">
+                            <a:hBox showmargin="false">
+                                <a:button name="try_btn" click="try_calculate" text="租金试算"/>
+                                <div><![CDATA[&nbsp;&nbsp;&nbsp;]]></div>
+                                <a:button name="back_btn" id="reset_btn" click="reset_form" text="清除"/>
+                            </a:hBox>
+                        </div>
+                    </td>
+                </tr>
+            </table>
+            <div id="calculate_result_div" style="display:none">
+                <!-- style="display:none"-->
+                <a:form padding="0" showmargin="false" title="试算结果" width="768">
+                    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                        <tr>
+                            <td width="50%">
+                                <a:box column="1" labelWidth="120">
+                                    <a:numberField name="tolleasechg" bindTarget="ord_contract_ds" prompt="租金合计" readOnly="true" renderer="numberRenderer" width="220"/>
+                                </a:box>
+                            </td>
+                            <td>
+                                <a:box column="1" labelWidth="120">
+                                    <a:numberField name="perlchg_fir" bindTarget="ord_contract_ds" prompt="每月租金(第一期)" readOnly="true" renderer="numberRenderer" width="220"/>
+                                </a:box>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <a:box column="1" labelWidth="120">
+                                    <a:numberField name="paysum" bindTarget="ord_contract_ds" prompt="签约时支付款" readOnly="true" renderer="numberRenderer" width="220"/>
+                                </a:box>
+                            </td>
+                            <td>
+                                <div id="perlchg_sec_number" style="display:none">
+                                    <a:box column="1" labelWidth="120">
+                                        <a:numberField name="perlchg_sec_dis" bindTarget="ord_contract_ds" prompt="每月租金(第二期)" readOnly="true" renderer="numberRenderer" width="220"/>
+                                    </a:box>
+                                </div>
+                                <div id="perlchg_sec_text" style="display:none">
+                                    <a:box column="1" labelWidth="120">
+                                        <a:textField name="perlchg_sec_dis" bindTarget="ord_contract_ds" prompt="每月租金(第二期)" readOnly="true" width="220"/>
+                                    </a:box>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <a:box column="1" labelWidth="120">
+                                    <a:numberField name="paytimes" allowDecimals="false" allowFormat="false" allowNegative="false" bindTarget="ord_contract_ds" prompt="支付总回数（回）" readOnly="true" width="220"/>
+                                </a:box>
+                            </td>
+                            <td>
+                                <div id="result_fRate_box" style="display:block">
+                                    <a:box column="1" labelWidth="120">
+                                        <a:numberField name="unit_adjust_amount" bindTarget="ord_contract_ds" prompt="调整租金(每0.1%)" readOnly="true" width="220"/>
+                                    </a:box>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
+                </a:form>
+                <a:box padding="0" style="margin-top:10px" width="768">
+                    <a:table id="result_table" bindTarget="detail_ds" canWheel="false" percentwidth="100" title="  ">
+                        <a:columns>
+                            <a:column name="manualflag" editor="grid_cb"/>
+                            <a:column name="times" prompt="回数"/>
+                            <a:column name="paydt" footerRenderer="footTitle" prompt="支付日"/>
+                            <a:column name="payamt" align="right" editorFunction="payamtEditFunction" footerRenderer="footPayAmt" prompt="支付金额" renderer="numberRenderer"/>
+                            <a:column prompt="明细（合同利息）">
+                                <a:column name="principal" align="right" footerRenderer="footPrn" prompt="本金" renderer="numberRenderer"/>
+                                <a:column name="interest" align="right" footerRenderer="footInt" prompt="利息" renderer="numberRenderer"/>
+                            </a:column>
+                            <a:column name="prncbalance" align="right" prompt="本金余额" renderer="numberRenderer"/>
+                        </a:columns>
+                        <a:editors>
+                            <a:checkBox id="grid_cb"/>
+                            <a:numberField id="grid_nf" allowDecimals="true" allowFormat="true" allowNegative="false"/>
+                        </a:editors>
+                    </a:table>
+                    <table border="0" cellpadding="0" cellspacing="0" style="margin-top:10px;margin-bottom:25px" width="100%">
+                        <tr>
+                            <td>
+                                <a:radio name="printflg" bindTarget="ord_contract_ds" layout="horizontal" width="400">
+                                    <a:items>
+                                        <a:item label="概算书（客户用）" value="1"/>
+                                        <a:item label="概算书（代理店用）" value="2"/>
+                                    </a:items>
+                                </a:radio>
+                            </td>
+                            <td align="right">
+                                <a:switch test="/parameter/@isAdd">
+                                    <a:case value="0">
+                                        <a:button click="back" text="HAP_BACK"/>
+                                    </a:case>
+                                </a:switch>
+                            </td>
+                            <td align="right">
+                                <a:button id="saveButton" click="saveResult" text="保存结果"/>
+                            </td>
+                            <td align="right">
+                                <a:button click="print" text="打印"/>
+                            </td>
+                        </tr>
+                    </table>
+                </a:box>
+            </div>
+        </a:screenBody>
+        <script><![CDATA[
+        
+            //initPageView();
+        
+        ]]></script>
+    </a:view>
+</a:screen>

src/main/webapp/modules/zjwfl/WFL5120/zj_wfl_to_do_list_batch.lview

@@ -12,7 +12,9 @@
         <script type="text/javascript"><![CDATA[
             
             function query_zjwfl5110_toDoDs() {
-                $("zjwfl5110_toDoDs").query();
+                //$("zjwfl5110_toDoDs").query();
+
+                window.parent.location.reload();
             }
             
             function winOpen_zjwfl5110_wfl_approve(instance_id, node_id, record_id, workflow_id, record_type) {

src/main/webapp/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview

@@ -167,7 +167,8 @@
             }
             
             function zjwfl5110_approvePage_close() {
-                wflCmp('zj_wfl_approve_win').close();
+               // wflCmp('zj_wfl_approve_win').close();
+                window.parent.location.reload();
             }
             
             function zjwfl5110_approvePage_mask() {

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

@@ -28,13 +28,13 @@
         <a:link id="prj_attach_downloadfile_link" url="${/request/@context_path}/downloadFile.lview"/>
         <!-- <a:link id="check_agent_link" model="zjwfl.ZJWFL1060.zj_wfl_check_agent_re" modelaction="update"/> -->
         <style><![CDATA[
-    		.cell_n{
-    		    word-wrap : break-word;
-    		    word-break: break-all; 
-    		}
+    	.cell_n{
+            white-space:normal;
+        }
     	]]></style>
         <a:screen-include screen="modules/zjwfl/zj_wfl_common_javascript.lview"/>
         <script type="text/javascript"><![CDATA[
+        document.getElementById('zj_wfl_approve_history_table_id_tb').style.display = 'none';
             function render_action_type_desc(value, record, name) {
                 return f_zjwfl.getApproveImg(record.get('record_type'), value);
             }
@@ -116,18 +116,21 @@
         </a:dataSets>
         <a:screenBody>
             <a:form marginWidth="30" padding="0">
-                <a:table id="zj_wfl_approve_history_table_id" bindTarget="approveHistoryDs" canWheel="false" className="cell_n" percentWidth="100">
+                <a:grid id="zj_wfl_approve_history_table_id" bindTarget="approveHistoryDs" marginWidth="30" marginHeight="250">
                     <a:columns>
                         <a:column name="create_date_fmt" prompt="审批时间" width="150"/>
-                        <a:column name="action_type_desc" prompt="审批操作" renderer="render_action_type_desc" width="200"/>
-                         <a:column name="comment_text" prompt="审批意见" width="250"/>
+                        <a:column name="action_type_desc" prompt="审批操作" renderer="render_action_type_desc" width="150"/>
+                         <a:column name="comment_text" prompt="审批意见" width="600" editor="textArea_e"/>
                         <!--<a:column name="comment_text_out" prompt="审批意见" width="400"/>-->
                         <a:column name="node_desc" prompt="审批节点" width="200"/>
-                        <a:column name="approver" prompt="审批人" renderer="check_agent_renderer" width="200"/>
+                        <a:column name="approver" prompt="审批人" renderer="check_agent_renderer" width="140" />
                         <a:placeHolder id="dynamicLineColumn_id"/>
                         <!--<a:column name="attachement" align="center" prompt="附件查看" renderer="attachement_renderer" width="80"/>-->
                     </a:columns>
-                </a:table>
+                    <a:editors>
+                        <a:textArea id="textArea_e" readOnly="true" height="100"/>
+                    </a:editors>
+                </a:grid>
             </a:form>
         </a:screenBody>
         <script type="text/javascript"><![CDATA[